Disable unregistration on macOS

treehollow · May 4, 2021 · ce3dfc4 · ce3dfc4
1 parent 8e1576b
commit ce3dfc4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 1 deletion.
diff --git a/Source/Hollow/App/AppDelegate.swift b/Source/Hollow/App/AppDelegate.swift
@@ -24,4 +24,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
     }
+
+    #if targetEnvironment(macCatalyst)
+    override func buildMenu(with builder: UIMenuBuilder) {
+        builder.remove(menu: .file)
+        builder.remove(menu: .edit)
+        builder.remove(menu: .format)
+        builder.remove(menu: .help)
+        builder.remove(menu: .services)
+        builder.remove(menu: .toolbar)
+    }
+    #endif
 }
diff --git a/Source/Hollow/View/Hierarchy/Account/AccountInfoView.swift b/Source/Hollow/View/Hierarchy/Account/AccountInfoView.swift
@@ -23,7 +23,9 @@ struct AccountInfoView: View {
                     destination: ChangePasswordView().environmentObject(viewModel)
                 )
 
+                #if !targetEnvironment(macCatalyst)
                 NavigationLink(NSLocalizedString("LOGINVIEW_RESTORE_PASSWORD_ALERT_UNREGISTER_BUTTON", comment: ""), destination: UnregisterView())
+                #endif
             }
 
             Section {

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Content/HollowCommentContentView.swift b/Source/Hollow/View/Hierarchy/Hollow/Content/HollowCommentContentView.swift
@@ -25,7 +25,7 @@ struct HollowCommentContentView: View {
     static let avatarWidth: CGFloat = 45
     static let avatarProportion: CGFloat = 0.7
 
-    @ScaledMetric(wrappedValue: 50, relativeTo: .body) var labelWidth: CGFloat
+    @ScaledMetric(wrappedValue: UIDevice.isPad ? 60 : 50, relativeTo: .body) var labelWidth: CGFloat
     @ScaledMetric(wrappedValue: avatarWidth, relativeTo: .body) var body45: CGFloat
     @ScaledMetric(wrappedValue: 5, relativeTo: .body) var body5: CGFloat
     @ScaledMetric(wrappedValue: 4, relativeTo: .body) var body4: CGFloat
@@ -34,6 +34,17 @@ struct HollowCommentContentView: View {
     @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
+        // View created by view builder in macOS is HStack by default, so
+        // we can only explictly wrap them inside a VStack. The scrolling
+        // issue does not appear on macOS so this trick is OK.
+        #if targetEnvironment(macCatalyst)
+        VStack(spacing: 0) { content }
+        #else
+        content
+        #endif
+    }
+
+    @ViewBuilder var content: some View {
         if let padding = contentVerticalPadding {
             Spacer(minLength: padding)
                 .fixedSize()

diff --git a/Source/Hollow/View/Hierarchy/Login/UnregisterView.swift b/Source/Hollow/View/Hierarchy/Login/UnregisterView.swift
@@ -31,6 +31,11 @@ struct UnregisterView: View {
 
     var body: some View {
         VStack(spacing: 0) {
+            #if targetEnvironment(macCatalyst)
+            Text("UNREGISTERVIEW_NOT_SUPPORT_MAC_NOTICE")
+                .horizontalCenter()
+                .verticalCenter()
+            #else
             ScrollView(showsIndicators: false) {
                 VStack(spacing: ViewConstants.listVStackSpacing) {
                     MyTextField<EmptyView>(
@@ -80,6 +85,7 @@ struct UnregisterView: View {
                 text: buttonText
             )
             .disabled(disableButton)
+            #endif
         }
         .padding(.horizontal)
         .padding(.horizontal)

diff --git a/Source/Hollow/en.lproj/Localizable.strings b/Source/Hollow/en.lproj/Localizable.strings
@@ -243,6 +243,8 @@
 
 "UNREGISTERVIEW_BUTTON_UNREGISTER" = "Unregister";
 
+"UNREGISTERVIEW_NOT_SUPPORT_MAC_NOTICE" = "Unregistering is not support on macOS.";
+
 /* No comment provided by engineer. */
 "LOGINVIEW_RESTORE_PASSWORD_ALERT_TITLE" = "Restore Password";
 

diff --git a/Source/Hollow/zh-Hans.lproj/Localizable.strings b/Source/Hollow/zh-Hans.lproj/Localizable.strings
@@ -234,6 +234,8 @@
 
 "UNREGISTERVIEW_BUTTON_UNREGISTER" = "注销";
 
+"UNREGISTERVIEW_NOT_SUPPORT_MAC_NOTICE" = "注销账户在macOS上暂时不支持。";
+
 /* No comment provided by engineer. */
 "LOGINVIEW_RESTORE_PASSWORD_ALERT_TITLE" = "重置密码";