♻️ (LekaApp): Refactor SettingsView without Appearance

leka · Feb 7, 2024 · e34e5fb · e34e5fb
1 parent c1da810
commit e34e5fb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 166 deletions.
diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift
@@ -46,27 +46,22 @@ struct MainView: View {
                     CategoryLabel(category: .stories)
                 }
 
-                HStack {
-                    Spacer()
-                    VStack(spacing: 20) {
+                VStack(alignment: .center, spacing: 20) {
+                    if self.rootOwnerViewModel.isCompanyConnected {
                         Button {
                             self.rootOwnerViewModel.isSettingsViewPresented = true
                         } label: {
                             SettingsLabel()
                         }
-
-                        Text("My Leka App - Version \(Bundle.version!) (\(Bundle.buildNumber!))")
-                            .foregroundColor(.gray)
-                            .font(.caption2)
                     }
-                    Spacer()
-                }
 
-                HStack {
-                    Spacer()
+                    Text("My Leka App - Version \(Bundle.version!) (\(Bundle.buildNumber!))")
+                        .foregroundColor(.gray)
+                        .font(.caption2)
+
                     LekaLogo(width: 50)
-                    Spacer()
                 }
+                .frame(maxWidth: .infinity)
             }
             // TODO: (@ladislas) remove if not necessary
             // .disabled(navigation.disableUICompletly)

diff --git a/...p/Sources/_NEWCodeBase/Views/Settings/SettingsView+AppearanceSection+AccentColorRow.swift b/...p/Sources/_NEWCodeBase/Views/Settings/SettingsView+AppearanceSection+AccentColorRow.swift
diff --git a/...pp/Sources/_NEWCodeBase/Views/Settings/SettingsView+AppearanceSection+AppearanceRow.swift b/...pp/Sources/_NEWCodeBase/Views/Settings/SettingsView+AppearanceSection+AppearanceRow.swift
diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+AppearanceSection.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+AppearanceSection.swift
diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+l10n.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+l10n.swift
@@ -8,18 +8,6 @@ import LocalizationKit
 
 extension l10n {
     enum SettingsView {
-        enum AppearanceSection {
-            enum AppearanceRow {
-                static let title = LocalizedString("settings_view.appearance_section.appearance_row.title", value: "Dark mode", comment: "Appearance Row title")
-            }
-
-            enum AccentColorRow {
-                static let title = LocalizedString("settings_view.appearance_section.accent_color_row.title", value: "Accent Color", comment: "AccentColor Row title")
-            }
-
-            static let header = LocalizedString("settings_view.appearance_section.header", value: "Appearance", comment: "Appearance section header")
-        }
-
         enum CredentialsSection {
             enum ChangeCredentials {
                 static let buttonLabel = LocalizedString("settings_view.credentials_section.change_credentials.button_label", value: "Change email and password", comment: "Change credentials button label")

diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView.swift
@@ -15,12 +15,8 @@ struct SettingsView: View {
     var body: some View {
         NavigationStack {
             Form {
-                AppearanceSection()
-
-                if self.rootOwnerViewModel.isCompanyConnected {
-                    CredentialsSection()
-                    AccountSection()
-                }
+                CredentialsSection()
+                AccountSection()
             }
             .navigationTitle(String(l10n.SettingsView.navigationTitle.characters))
             .navigationBarTitleDisplayMode(.inline)