Improvements to the UX of reporting

Localization/StringsConvertor/input/Base.lproj/app.json

@@ -87,6 +87,7 @@
                 "share": "Share",
                 "share_user": "Share %s",
                 "share_post": "Share Post",
+                "submit": "Submit",
                 "open_in_safari": "Open in Safari",
                 "open_in_browser": "Open in Browser",
                 "find_people": "Find people to follow",
@@ -710,7 +711,7 @@
             "report_sent_title": "Thanks for reporting, we’ll look into this.",
             "send": "Send Report",
             "skip_to_send": "Send without comment",
-            "text_placeholder": "Type or paste additional comments",
+            "text_placeholder": "Type or paste additional comments (optional)",
             "reported": "REPORTED",
             "step_one": {
                 "step_1_of_4": "Step 1 of 4",
@@ -747,6 +748,7 @@
                 "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
                 "unfollow": "Unfollow",
                 "unfollowed": "Unfollowed",
+                "not_following": "Not Following",
                 "unfollow_user": "Unfollow %s",
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",

Localization/app.json

@@ -87,6 +87,7 @@
                 "share": "Share",
                 "share_user": "Share %s",
                 "share_post": "Share Post",
+                "submit": "Submit",
                 "open_in_safari": "Open in Safari",
                 "open_in_browser": "Open in Browser",
                 "find_people": "Find people to follow",
@@ -727,7 +728,7 @@
             "report_sent_title": "Thanks for reporting, we’ll look into this.",
             "send": "Send Report",
             "skip_to_send": "Send without comment",
-            "text_placeholder": "Type or paste additional comments",
+            "text_placeholder": "Type or paste additional comments (optional)",
             "reported": "REPORTED",
             "step_one": {
                 "step_1_of_4": "Step 1 of 4",
@@ -764,6 +765,7 @@
                 "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.",
                 "unfollow": "Unfollow",
                 "unfollowed": "Unfollowed",
+                "not_following": "Not Following",
                 "unfollow_user": "Unfollow %s",
                 "mute_user": "Mute %s",
                 "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.",

Mastodon/Scene/Report/Report/ReportViewController.swift

@@ -150,15 +150,7 @@ extension ReportViewController: ReportStatusViewControllerDelegate {
 
 // MARK: - ReportSupplementaryViewControllerDelegate
 extension ReportViewController: ReportSupplementaryViewControllerDelegate {
-    func reportSupplementaryViewController(_ viewController: ReportSupplementaryViewController, skipButtonDidPressed button: UIButton) {
-        report()
-    }
-
-    func reportSupplementaryViewController(_ viewController: ReportSupplementaryViewController, nextButtonDidPressed button: UIButton) {
-        report()
-    }
-
-    private func report() {
+    func reportSupplementaryViewController(_ viewController: ReportSupplementaryViewController, submitButtonDidPressed button: UIButton) {
         Task { @MainActor in
             do {
                 let _ = try await viewModel.report()

Mastodon/Scene/Report/Report/ReportViewModel.swift

@@ -120,8 +120,8 @@ extension ReportViewModel {
             // the user comment is essential step in report flow
             // only check isSkip or not
             let comment: String? = {
-                let _comment = self.reportSupplementaryViewModel.isSkip ? nil : self.reportSupplementaryViewModel.commentContext.comment
-                if let comment = _comment, !comment.isEmpty {
+                let comment = self.reportSupplementaryViewModel.commentContext.comment
+                if !comment.isEmpty {
                     return comment
                 } else {
                     return nil

Mastodon/Scene/Report/ReportResult/ReportResultView.swift

@@ -75,9 +75,15 @@ struct ReportResultView: View {
                         action: {
                             viewModel.followActionPublisher.send()
                         },
-                        title: viewModel.relationshipViewModel.isFollowing ? L10n.Scene.Report.StepFinal.unfollow : L10n.Scene.Report.StepFinal.unfollowed,
+                        title: viewModel.relationshipViewModel.isFollowing
+                        ? L10n.Scene.Report.StepFinal.unfollow
+                        : (viewModel.wasFollowing
+                           ? L10n.Scene.Report.StepFinal.unfollowed
+                           : L10n.Scene.Report.StepFinal.notFollowing),
                         isBusy: viewModel.isRequestFollow
                     )
+                    .disabled(!viewModel.wasFollowing)
+                    .opacity(viewModel.wasFollowing ? 1 : 0.5)
                 }
 
                 // Mute

Mastodon/Scene/Report/ReportResult/ReportResultViewController.swift

@@ -82,7 +82,7 @@ extension ReportResultViewController {
             .store(in: &observations)
 
 
-        navigationActionView.nextButton.addTarget(self, action: #selector(ReportSupplementaryViewController.nextButtonDidPressed(_:)), for: .touchUpInside)
+        navigationActionView.nextButton.addTarget(self, action: #selector(ReportSupplementaryViewController.submitButtonDidPressed(_:)), for: .touchUpInside)
 
         viewModel.followActionPublisher
             .throttle(for: 0.3, scheduler: DispatchQueue.main, latest: false)

Mastodon/Scene/Report/ReportResult/ReportResultViewModel.swift

@@ -37,6 +37,8 @@ class ReportResultViewModel: ObservableObject {
     @Published var isRequestMute = false
     @Published var isRequestBlock = false
 
+    @Published var wasFollowing = false
+
     // output
     @Published var avatarURL: URL?
     @Published var username: String = ""
@@ -63,6 +65,7 @@ class ReportResultViewModel: ObservableObject {
             guard let me = authContext.mastodonAuthenticationBox.authenticationRecord.object(in: context.managedObjectContext)?.user else { return }
             self.relationshipViewModel.user = user
             self.relationshipViewModel.me = me
+            self.wasFollowing = self.relationshipViewModel.isFollowing
 
             self.avatarURL = user.avatarImageURL()
             self.username = user.acctWithDomain

Mastodon/Scene/Report/ReportSupplementary/ReportSupplementaryViewController.swift

@@ -14,8 +14,7 @@ import MastodonUI
 import MastodonLocalization
 
 protocol ReportSupplementaryViewControllerDelegate: AnyObject {
-    func reportSupplementaryViewController(_ viewController: ReportSupplementaryViewController, skipButtonDidPressed button: UIButton)
-    func reportSupplementaryViewController(_ viewController: ReportSupplementaryViewController, nextButtonDidPressed button: UIButton)
+    func reportSupplementaryViewController(_ viewController: ReportSupplementaryViewController, submitButtonDidPressed button: UIButton)
 }
 
 final class ReportSupplementaryViewController: UIViewController, NeedsDependency, ReportViewControllerAppearance {
@@ -59,7 +58,8 @@ final class ReportSupplementaryViewController: UIViewController, NeedsDependency
     let navigationActionView: NavigationActionView = {
         let navigationActionView = NavigationActionView()
         navigationActionView.backgroundColor = Asset.Scene.Onboarding.background.color
-        navigationActionView.backButton.setTitle(L10n.Common.Controls.Actions.skip, for: .normal)
+        navigationActionView.nextButton.setTitle(L10n.Common.Controls.Actions.submit, for: .normal)
+        navigationActionView.hidesBackButton = true
         return navigationActionView
     }()
 
@@ -83,7 +83,7 @@ extension ReportSupplementaryViewController {
                 guard let self = self else { return }
                 self.navigationItem.rightBarButtonItem = isBusy ? self.activityIndicatorBarButtonItem : self.cancelBarButtonItem
                 self.navigationItem.hidesBackButton = isBusy
-                self.navigationActionView.backButton.isUserInteractionEnabled = !isBusy
+                self.navigationActionView.nextButton.isUserInteractionEnabled = !isBusy
             }
             .store(in: &disposeBag)
 
@@ -116,13 +116,7 @@ extension ReportSupplementaryViewController {
             }
             .store(in: &observations)
 
-        viewModel.$isNextButtonEnabled
-            .receive(on: DispatchQueue.main)
-            .assign(to: \.isEnabled, on: navigationActionView.nextButton)
-            .store(in: &disposeBag)
-
-        navigationActionView.backButton.addTarget(self, action: #selector(ReportSupplementaryViewController.skipButtonDidPressed(_:)), for: .touchUpInside)
-        navigationActionView.nextButton.addTarget(self, action: #selector(ReportSupplementaryViewController.nextButtonDidPressed(_:)), for: .touchUpInside)
+        navigationActionView.nextButton.addTarget(self, action: #selector(ReportSupplementaryViewController.submitButtonDidPressed(_:)), for: .touchUpInside)
     }
 
 }
@@ -133,22 +127,12 @@ extension ReportSupplementaryViewController {
         dismiss(animated: true, completion: nil)
     }
 
-    @objc func skipButtonDidPressed(_ sender: UIButton) {
+    @objc func submitButtonDidPressed(_ sender: UIButton) {
         logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)")
 
         assert(viewModel.delegate != nil)
-        viewModel.isSkip = true
-        viewModel.delegate?.reportSupplementaryViewController(self, skipButtonDidPressed: sender)
+        viewModel.delegate?.reportSupplementaryViewController(self, submitButtonDidPressed: sender)
     }
-
-    @objc func nextButtonDidPressed(_ sender: UIButton) {
-        logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)")
-
-        assert(viewModel.delegate != nil)
-        viewModel.isSkip = false
-        viewModel.delegate?.reportSupplementaryViewController(self, nextButtonDidPressed: sender)
-    }
-
 }
 
 // MARK: - UITableViewDelegate

Mastodon/Scene/Report/ReportSupplementary/ReportSupplementaryViewModel.swift

@@ -21,7 +21,6 @@ class ReportSupplementaryViewModel {
     let user: ManagedObjectRecord<MastodonUser>
     let commentContext = ReportItem.CommentContext()
 
-    @Published var isSkip = false
     @Published var isBusy = false
 
     // output

MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift

@@ -180,6 +180,8 @@ public enum L10n {
         public static let signUp = L10n.tr("Localizable", "Common.Controls.Actions.SignUp", fallback: "Create account")
         /// Skip
         public static let skip = L10n.tr("Localizable", "Common.Controls.Actions.Skip", fallback: "Skip")
+        /// Submit
+        public static let submit = L10n.tr("Localizable", "Common.Controls.Actions.Submit", fallback: "Submit")
         /// Take Photo
         public static let takePhoto = L10n.tr("Localizable", "Common.Controls.Actions.TakePhoto", fallback: "Take Photo")
         /// Try Again
@@ -1072,8 +1074,8 @@ public enum L10n {
       public static let step1 = L10n.tr("Localizable", "Scene.Report.Step1", fallback: "Step 1 of 2")
       /// Step 2 of 2
       public static let step2 = L10n.tr("Localizable", "Scene.Report.Step2", fallback: "Step 2 of 2")
-      /// Type or paste additional comments
-      public static let textPlaceholder = L10n.tr("Localizable", "Scene.Report.TextPlaceholder", fallback: "Type or paste additional comments")
+      /// Type or paste additional comments (optional)
+      public static let textPlaceholder = L10n.tr("Localizable", "Scene.Report.TextPlaceholder", fallback: "Type or paste additional comments (optional)")
       /// Report %@
       public static func title(_ p1: Any) -> String {
         return L10n.tr("Localizable", "Scene.Report.Title", String(describing: p1), fallback: "Report %@")
@@ -1091,6 +1093,8 @@ public enum L10n {
         public static func muteUser(_ p1: Any) -> String {
           return L10n.tr("Localizable", "Scene.Report.StepFinal.MuteUser", String(describing: p1), fallback: "Mute %@")
         }
+        /// Not Following
+        public static let notFollowing = L10n.tr("Localizable", "Scene.Report.StepFinal.NotFollowing", fallback: "Not Following")
         /// They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.
         public static let theyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked = L10n.tr("Localizable", "Scene.Report.StepFinal.TheyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked", fallback: "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.")
         /// Unfollow

MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings

@@ -62,6 +62,7 @@ Please check your internet connection.";
 "Common.Controls.Actions.SignIn" = "Log in";
 "Common.Controls.Actions.SignUp" = "Create account";
 "Common.Controls.Actions.Skip" = "Skip";
+"Common.Controls.Actions.Submit" = "Submit";
 "Common.Controls.Actions.TakePhoto" = "Take Photo";
 "Common.Controls.Actions.TranslatePost.Title" = "Translate from %@";
 "Common.Controls.Actions.TranslatePost.UnknownLanguage" = "Unknown";
@@ -365,6 +366,7 @@ uploaded to Mastodon.";
 "Scene.Report.StepFinal.BlockUser" = "Block %@";
 "Scene.Report.StepFinal.DontWantToSeeThis" = "Don’t want to see this?";
 "Scene.Report.StepFinal.MuteUser" = "Mute %@";
+"Scene.Report.StepFinal.NotFollowing" = "Not Following";
 "Scene.Report.StepFinal.TheyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked" = "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.";
 "Scene.Report.StepFinal.Unfollow" = "Unfollow";
 "Scene.Report.StepFinal.UnfollowUser" = "Unfollow %@";
@@ -394,7 +396,7 @@ uploaded to Mastodon.";
 "Scene.Report.StepTwo.SelectAllThatApply" = "Select all that apply";
 "Scene.Report.StepTwo.Step2Of4" = "Step 2 of 4";
 "Scene.Report.StepTwo.WhichRulesAreBeingViolated" = "Which rules are being violated?";
-"Scene.Report.TextPlaceholder" = "Type or paste additional comments";
+"Scene.Report.TextPlaceholder" = "Type or paste additional comments (optional)";
 "Scene.Report.Title" = "Report %@";
 "Scene.Report.TitleReport" = "Report";
 "Scene.Search.Recommend.Accounts.Description" = "You may like to follow these accounts";