Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xx messenger iOS
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile
iOS
xx messenger iOS
Commits
a4ea3b28
Commit
a4ea3b28
authored
2 years ago
by
Dariusz Rybicki
Browse files
Options
Downloads
Patches
Plain Diff
Use MakeReportDrawer functor in SingleChatController
parent
1ab5963f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!71
Releasing v1.1.5 (214)
,
!69
Implemented filtering for banned/blocked users and reporting
,
!67
v1.1.5 b(203)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Sources/ChatFeature/Controllers/SingleChatController.swift
+11
-53
11 additions, 53 deletions
Sources/ChatFeature/Controllers/SingleChatController.swift
with
11 additions
and
53 deletions
Sources/ChatFeature/Controllers/SingleChatController.swift
+
11
−
53
View file @
a4ea3b28
...
...
@@ -29,6 +29,7 @@ public final class SingleChatController: UIViewController {
@Dependency
private
var
logger
:
XXLogger
@Dependency
private
var
voxophone
:
Voxophone
@Dependency
private
var
coordinator
:
ChatCoordinating
@Dependency
private
var
makeReportDrawer
:
MakeReportDrawer
@Dependency
private
var
makeAppScreenshot
:
MakeAppScreenshot
@Dependency
private
var
statusBarController
:
StatusBarStyleControlling
...
...
@@ -395,59 +396,16 @@ public final class SingleChatController: UIViewController {
}
private
func
presentReportDrawer
()
{
let
cancelButton
=
CapsuleButton
()
cancelButton
.
setStyle
(
.
seeThrough
)
cancelButton
.
setTitle
(
Localized
.
Chat
.
Report
.
cancel
,
for
:
.
normal
)
let
reportButton
=
CapsuleButton
()
reportButton
.
setStyle
(
.
red
)
reportButton
.
setTitle
(
Localized
.
Chat
.
Report
.
action
,
for
:
.
normal
)
let
drawer
=
DrawerController
(
with
:
[
DrawerImage
(
image
:
Asset
.
drawerNegative
.
image
),
DrawerText
(
font
:
Fonts
.
Mulish
.
semiBold
.
font
(
size
:
18.0
),
text
:
Localized
.
Chat
.
Report
.
title
,
color
:
Asset
.
neutralActive
.
color
),
DrawerText
(
font
:
Fonts
.
Mulish
.
semiBold
.
font
(
size
:
14.0
),
text
:
Localized
.
Chat
.
Report
.
subtitle
,
color
:
Asset
.
neutralWeak
.
color
,
lineHeightMultiple
:
1.35
,
spacingAfter
:
25
),
DrawerStack
(
axis
:
.
vertical
,
spacing
:
20.0
,
views
:
[
reportButton
,
cancelButton
]
)
])
reportButton
.
publisher
(
for
:
.
touchUpInside
)
.
receive
(
on
:
DispatchQueue
.
main
)
.
sink
{
drawer
.
dismiss
(
animated
:
true
)
{
[
weak
self
]
in
guard
let
self
=
self
else
{
return
}
self
.
drawerCancellables
.
removeAll
()
let
screenshot
=
try!
self
.
makeAppScreenshot
()
self
.
viewModel
.
report
(
screenshot
:
screenshot
)
{
success
in
guard
success
else
{
return
}
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
}
}
.
store
(
in
:
&
drawerCancellables
)
cancelButton
.
publisher
(
for
:
.
touchUpInside
)
.
receive
(
on
:
DispatchQueue
.
main
)
.
sink
{
drawer
.
dismiss
(
animated
:
true
)
{
[
weak
self
]
in
self
?
.
drawerCancellables
.
removeAll
()
}
}
.
store
(
in
:
&
drawerCancellables
)
var
config
=
MakeReportDrawer
.
Config
()
config
.
onReport
=
{
[
weak
self
]
in
guard
let
self
=
self
else
{
return
}
let
screenshot
=
try!
self
.
makeAppScreenshot
()
self
.
viewModel
.
report
(
screenshot
:
screenshot
)
{
success
in
guard
success
else
{
return
}
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
}
let
drawer
=
makeReportDrawer
(
config
)
coordinator
.
toDrawer
(
drawer
,
from
:
self
)
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment