fix: 🐛 layout

0x1-company · Jan 10, 2024 · 9abd54e · 9abd54e
1 parent f7a28ac
commit 9abd54e
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 42 deletions.
diff --git a/Packages/BeMatch/Sources/SettingsFeature/Localizable.xcstrings b/Packages/BeMatch/Sources/SettingsFeature/Localizable.xcstrings
@@ -221,12 +221,12 @@
         }
       }
     },
-    "Version %@" : {
+    "Version" : {
       "localizations" : {
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Version %@"
+            "value" : "バージョン"
           }
         }
       }

diff --git a/Packages/BeMatch/Sources/SettingsFeature/Settings.swift b/Packages/BeMatch/Sources/SettingsFeature/Settings.swift
@@ -239,95 +239,97 @@ public struct SettingsView: View {
         } header: {
           Text("Settings", bundle: .module)
         }
-
+        
         Section {
-          Link(destination: Constants.termsOfUseURL) {
+          Link(destination: Constants.instagramURL) {
             LabeledContent {
               Image(systemName: "chevron.right")
             } label: {
-              Text("Terms of Use", bundle: .module)
+              Text("Instagram", bundle: .module)
                 .foregroundStyle(Color.primary)
             }
           }
-
-          Link(destination: Constants.privacyPolicyURL) {
+          
+          Link(destination: Constants.tiktokURL) {
             LabeledContent {
               Image(systemName: "chevron.right")
             } label: {
-              Text("Privacy Policy", bundle: .module)
+              Text("TikTok", bundle: .module)
                 .foregroundStyle(Color.primary)
             }
           }
 
-          Button {
-            store.send(.shareButtonTapped)
-          } label: {
+          Link(destination: Constants.xURL) {
             LabeledContent {
               Image(systemName: "chevron.right")
             } label: {
-              Text("Share BeMatch.", bundle: .module)
+              Text("X", bundle: .module)
                 .foregroundStyle(Color.primary)
             }
           }
+        } header: {
+          Text("FOLLOW ME", bundle: .module)
+        }
 
-          Button {
-            store.send(.rateButtonTapped)
-          } label: {
+        Section {
+          Link(destination: Constants.termsOfUseURL) {
             LabeledContent {
               Image(systemName: "chevron.right")
             } label: {
-              Text("Rate BeMatch.", bundle: .module)
+              Text("Terms of Use", bundle: .module)
                 .foregroundStyle(Color.primary)
             }
           }
-        } header: {
-          Text("ABOUT", bundle: .module)
-        }
-
-        Section {
-          Link(destination: Constants.instagramURL) {
+
+          Link(destination: Constants.privacyPolicyURL) {
             LabeledContent {
               Image(systemName: "chevron.right")
             } label: {
-              Text("Instagram", bundle: .module)
+              Text("Privacy Policy", bundle: .module)
                 .foregroundStyle(Color.primary)
             }
           }
-
-          Link(destination: Constants.tiktokURL) {
+
+          Button {
+            store.send(.shareButtonTapped)
+          } label: {
             LabeledContent {
               Image(systemName: "chevron.right")
             } label: {
-              Text("TikTok", bundle: .module)
+              Text("Share BeMatch.", bundle: .module)
                 .foregroundStyle(Color.primary)
             }
           }
 
-          Link(destination: Constants.xURL) {
+          Button {
+            store.send(.rateButtonTapped)
+          } label: {
             LabeledContent {
               Image(systemName: "chevron.right")
             } label: {
-              Text("X", bundle: .module)
+              Text("Rate BeMatch.", bundle: .module)
                 .foregroundStyle(Color.primary)
             }
           }
-        } header: {
-          Text("FOLLOW ME", bundle: .module)
-        } footer: {
-          VStack(spacing: 24) {
-            Button {
-              store.send(.versionButtonTapped, animation: .default)
+          
+          Button {
+            store.send(.versionButtonTapped, animation: .default)
+          } label: {
+            LabeledContent {
+              Text(viewStore.bundleShortVersion)
             } label: {
-              Text("Version \(viewStore.bundleShortVersion)", bundle: .module)
-                .foregroundStyle(Color.secondary)
+              Text("Version", bundle: .module)
+                .foregroundStyle(Color.primary)
             }
-
-            IfLetStore(
-              store.scope(state: \.creationDate, action: \.creationDate),
-              then: CreationDateView.init(store:)
-            )
           }
-          .padding(.vertical, 24)
+        } header: {
+          Text("ABOUT", bundle: .module)
+        } footer: {
+          IfLetStore(
+            store.scope(state: \.creationDate, action: \.creationDate),
+            then: CreationDateView.init(store:)
+          )
+          .padding(.bottom, 24)
           .frame(maxWidth: .infinity, alignment: .center)
           .multilineTextAlignment(.center)
         }