chore: PR Feedback

Infomaniak · Nov 22, 2024 · 92ef4ae · 92ef4ae
1 parent 2e0a730
commit 92ef4ae
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 49 deletions.
diff --git a/SwissTransferCoreUI/Modifiers/STNavigationBarStyleModifier.swift b/SwissTransferCoreUI/Modifiers/STNavigationBarStyleModifier.swift
@@ -18,7 +18,7 @@
 
 import SwiftUI
 
-struct STNavigationBarStyleModifier: ViewModifier {
+struct STNavigationTitleModifierStyleModifier: ViewModifier {
     func body(content: Content) -> some View {
         content
             .navigationBarTitleDisplayMode(.inline)
@@ -31,6 +31,6 @@ struct STNavigationBarStyleModifier: ViewModifier {
 public extension View {
     /// Style the navigationBar
     func stNavigationBarStyle() -> some View {
-        modifier(STNavigationBarStyleModifier())
+        modifier(STNavigationTitleModifierStyleModifier())
     }
 }
diff --git a/SwissTransferCoreUI/Modifiers/STToolbar.swift b/SwissTransferCoreUI/Modifiers/STToolbar.swift
@@ -1,4 +1,3 @@
-//
 /*
  Infomaniak SwissTransfer - iOS App
  Copyright (C) 2024 Infomaniak Network SA
@@ -19,7 +18,7 @@
 
 import SwiftUI
 
-public struct STNavigationBar: ViewModifier {
+public struct STNavigationTitleModifier: ViewModifier {
     public let title: String
 
     public func body(content: Content) -> some View {
@@ -35,7 +34,7 @@ public struct STNavigationBar: ViewModifier {
 }
 
 public extension View {
-    func stNavigationBar(title: String) -> some View {
-        modifier(STNavigationBar(title: title))
+    func stNavigationTitle(_ title: String) -> some View {
+        modifier(STNavigationTitleModifier(title: title))
     }
 }
diff --git a/SwissTransferFeatures/NewTransferView/STNavigationBarNewTransferModifier.swift b/SwissTransferFeatures/NewTransferView/STNavigationBarNewTransferModifier.swift
@@ -18,7 +18,7 @@
 
 import SwiftUI
 
-struct STNavigationBarNewTransferModifier: ViewModifier {
+struct STNavigationTitleModifierNewTransferModifier: ViewModifier {
     @Environment(\.dismissModal) private var dismissModal
 
     let title: String
@@ -45,6 +45,6 @@ struct STNavigationBarNewTransferModifier: ViewModifier {
 
 public extension View {
     func stNavigationBarNewTransfer(title: String = "Transfer") -> some View {
-        modifier(STNavigationBarNewTransferModifier(title: title))
+        modifier(STNavigationTitleModifierNewTransferModifier(title: title))
     }
 }
diff --git a/SwissTransferFeatures/SettingsView/Cells/AboutSettingsCell.swift b/SwissTransferFeatures/SettingsView/Cells/AboutSettingsCell.swift
@@ -26,15 +26,13 @@ struct AboutSettingsCell: View {
     let subtitle: String
 
     var body: some View {
-        HStack {
-            VStack(alignment: .leading) {
-                Text(title)
-                    .foregroundStyle(Color.ST.textPrimary)
-                    .font(.ST.body)
-                Text(subtitle)
-                    .foregroundStyle(Color.ST.textSecondary)
-                    .font(.ST.callout)
-            }
+        VStack(alignment: .leading) {
+            Text(title)
+                .foregroundStyle(Color.ST.textPrimary)
+                .font(.ST.body)
+            Text(subtitle)
+                .foregroundStyle(Color.ST.textSecondary)
+                .font(.ST.callout)
         }
     }
 }

diff --git a/SwissTransferFeatures/SettingsView/Cells/SettingsCell.swift b/SwissTransferFeatures/SettingsView/Cells/SettingsCell.swift
@@ -26,7 +26,6 @@ struct SettingsCell<Content: View>: View {
     let title: String
     let subtitle: String
     var leftIconAsset: STResourcesImages?
-    var rightIconAsset: STResourcesImages?
     @ViewBuilder var destination: () -> Content
 
     var body: some View {
@@ -49,11 +48,6 @@ struct SettingsCell<Content: View>: View {
                         .font(.ST.callout)
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
-
-                if let rightIconAsset {
-                    Image(asset: rightIconAsset)
-                        .iconSize(.large)
-                }
             }
         }
     }
@@ -62,6 +56,5 @@ struct SettingsCell<Content: View>: View {
 #Preview {
     SettingsCell(title: "Time",
                  subtitle: "Clock",
-                 leftIconAsset: STResourcesAsset.Images.clock,
-                 rightIconAsset: STResourcesAsset.Images.clock) {}
+                 leftIconAsset: STResourcesAsset.Images.clock) {}
 }
diff --git a/SwissTransferFeatures/SettingsView/EditSettings/Cells/EditSettingsCell.swift b/SwissTransferFeatures/SettingsView/EditSettings/Cells/EditSettingsCell.swift
@@ -20,7 +20,7 @@ import InfomaniakCoreSwiftUI
 import STResources
 import SwiftUI
 
-struct EditSettingsView: View {
+struct EditSettingCell: View {
     let selected: Bool
     let label: String
     var leftImage: Image?
@@ -51,7 +51,7 @@ struct EditSettingsView: View {
 }
 
 #Preview {
-    EditSettingsView(selected: true, label: "EditSettingsView") {
+    EditSettingCell(selected: true, label: "EditSettingsView", leftImage: nil) {
         print("EditSettingsView action")
     }
 }
diff --git a/SwissTransferFeatures/SettingsView/EditSettings/EditSettingView.swift b/SwissTransferFeatures/SettingsView/EditSettings/EditSettingView.swift
@@ -30,21 +30,19 @@ struct EditSettingView<T: SettingSelectable>: View {
     let section: String
     let items: [T]
     let selected: T
-    let onSelection: (T) async -> Void
 
-    public init(_ type: T.Type, selected: T, title: String, section: String, onSelection: @escaping (T) async -> Void) {
+    public init(_ type: T.Type, selected: T, title: String, section: String) {
         items = Array(type.allCases)
         self.selected = selected
         self.title = title
         self.section = section
-        self.onSelection = onSelection
     }
 
     var body: some View {
         List(selection: $mainViewState.selectedDestination) {
             Section(header: Text(section)) {
                 ForEach(items, id: \.self) { item in
-                    EditSettingsView(selected: item == selected,
+                    EditSettingCell(selected: item == selected,
                                      label: item.title,
                                      leftImage: item.leftImage) {
                         action(item)
@@ -53,18 +51,16 @@ struct EditSettingView<T: SettingSelectable>: View {
             }
         }
         .stNavigationBarStyle()
-        .stNavigationBar(title: title)
+        .stNavigationTitle(title)
     }
 
     private func action(_ item: T) {
         Task {
-            await onSelection(item)
+            await item.setSelected()
         }
     }
 }
 
 #Preview {
-    EditSettingView(Theme.self, selected: .dark, title: "Title", section: "Section") { theme in
-        print("selected \(theme)")
-    }
+    EditSettingView(Theme.self, selected: .dark, title: "Title", section: "Section")
 }
diff --git a/SwissTransferFeatures/SettingsView/EditSettings/NotificationsSettings.swift b/SwissTransferFeatures/SettingsView/EditSettings/NotificationsSettings.swift
@@ -115,7 +115,7 @@ struct NotificationsSettingsView: View {
             expiredTransfers = newValue
         }
         .stNavigationBarStyle()
-        .stNavigationBar(title: STResourcesStrings.Localizable.settingsOptionNotifications)
+        .stNavigationTitle(STResourcesStrings.Localizable.settingsOptionNotifications)
     }
 
     private func computeAllNotificationsEnabled() -> Bool {

diff --git a/SwissTransferFeatures/SettingsView/SettingsView.swift b/SwissTransferFeatures/SettingsView/SettingsView.swift
@@ -53,9 +53,7 @@ public struct SettingsView: View {
                     EditSettingView(Theme.self,
                                     selected: appSettings.value?.theme ?? .system,
                                     title: STResourcesStrings.Localizable.settingsOptionTheme,
-                                    section: STResourcesStrings.Localizable.settingsThemeTitle) { theme in
-                        await theme.setSelected()
-                    }
+                                    section: STResourcesStrings.Localizable.settingsThemeTitle)
                 }
 
                 NotificationsSettingsCell {
@@ -70,9 +68,7 @@ public struct SettingsView: View {
                     EditSettingView(ValidityPeriod.self,
                                     selected: appSettings.value?.validityPeriod ?? .thirty,
                                     title: STResourcesStrings.Localizable.settingsOptionValidityPeriod,
-                                    section: STResourcesStrings.Localizable.settingsValidityPeriodTitle) { validity in
-                        await validity.setSelected()
-                    }
+                                    section: STResourcesStrings.Localizable.settingsValidityPeriodTitle)
                 }
 
                 SettingsCell(title: STResourcesStrings.Localizable.settingsOptionDownloadLimit,
@@ -81,9 +77,7 @@ public struct SettingsView: View {
                     EditSettingView(DownloadLimit.self,
                                     selected: appSettings.value?.downloadLimit ?? .twoHundredFifty,
                                     title: STResourcesStrings.Localizable.settingsOptionDownloadLimit,
-                                    section: STResourcesStrings.Localizable.settingsDownloadsLimitTitle) { downloadLimit in
-                        await downloadLimit.setSelected()
-                    }
+                                    section: STResourcesStrings.Localizable.settingsDownloadsLimitTitle)
                 }
 
                 SettingsCell(title: STResourcesStrings.Localizable.settingsOptionEmailLanguage,
@@ -92,9 +86,7 @@ public struct SettingsView: View {
                     EditSettingView(EmailLanguage.self,
                                     selected: appSettings.value?.emailLanguage ?? .french,
                                     title: STResourcesStrings.Localizable.settingsOptionEmailLanguage,
-                                    section: STResourcesStrings.Localizable.settingsEmailLanguageTitle) { emailLanguage in
-                        await emailLanguage.setSelected()
-                    }
+                                    section: STResourcesStrings.Localizable.settingsEmailLanguageTitle)
                 }
             }