Merge pull request #459 from SUPLA/develop

v24.12.01
SUPLA · Dec 17, 2024 · 64af3f5 · 64af3f5
2 parents e6c4071 + 8f1d4ac
commit 64af3f5
Show file tree

Hide file tree

Showing 121 changed files with 3,339 additions and 2,523 deletions.
diff --git a/SUPLA.xcodeproj/project.pbxproj b/SUPLA.xcodeproj/project.pbxproj
diff --git a/SUPLA/Core/Config/GlobalSettings.swift b/SUPLA/Core/Config/GlobalSettings.swift
@@ -39,6 +39,8 @@ protocol GlobalSettings: SharedCore.ApplicationPreferences {
     var backgroundEntryTime: Double? { get set }
     var nextProfileId: Int32 { get }
     var nextServerId: Int32 { get }
+    var showEmGeneralIntroduction: Bool { get set }
+    var showEmHistoryIntroduction: Bool { get set }
 }
 
 class GlobalSettingsImpl: GlobalSettings {
@@ -220,6 +222,26 @@ class GlobalSettingsImpl: GlobalSettings {
         }
     }
 
+    private let emGeneralIntroductionKey = "em_general_introduction_key"
+    var showEmGeneralIntroduction: Bool {
+        get {
+            exists(emGeneralIntroductionKey).ifTrue { defaults.bool(forKey: emGeneralIntroductionKey) } ?? true
+        }
+        set {
+            defaults.set(newValue, forKey: emGeneralIntroductionKey)
+        }
+    }
+
+    private let emHistoryIntroductionKey = "em_history_introduction_key"
+    var showEmHistoryIntroduction: Bool {
+        get {
+            exists(emHistoryIntroductionKey).ifTrue { defaults.bool(forKey: emHistoryIntroductionKey) } ?? true
+        }
+        set {
+            defaults.set(newValue, forKey: emHistoryIntroductionKey)
+        }
+    }
+
     private func exists(_ key: String) -> Bool {
         defaults.object(forKey: key) != nil
     }

diff --git a/SUPLA/Core/SwiftUiComponents/Architecture/SuplaCore+Dialog.swift b/SUPLA/Core/SwiftUiComponents/Architecture/SuplaCore+Dialog.swift
@@ -173,14 +173,14 @@ extension SuplaCore.Dialog {
                     SwiftUI.Text(message)
                         .fontBodyMedium()
                         .multilineTextAlignment(.center)
-                        .padding([.leading, .trailing], Distance.standard)
+                        .padding([.leading, .trailing], Distance.default)
 
                     SuplaCore.Dialog.Divider()
-                        .padding([.top], Distance.standard)
+                        .padding([.top], Distance.default)
 
                     FilledButton(title: button, fullWidth: true) { onDismiss() }
                     .padding([.top, .bottom], Distance.small)
-                    .padding([.leading, .trailing], Distance.standard)
+                    .padding([.leading, .trailing], Distance.default)
                 }
             }
         }
@@ -191,11 +191,13 @@ extension SuplaCore.Dialog {
 
         var body: some SwiftUI.View {
             VStack(spacing: 0) {
-                Text.HeadlineSmall(text: title)
-                    .padding([.leading, .top, .trailing, .bottom], Distance.standard)
+                Text(title)
+                    .fontHeadlineSmall()
+                    .multilineTextAlignment(.center)
+                    .padding([.leading, .top, .trailing, .bottom], Distance.default)
                 Divider()
             }
-            .padding([.bottom], Distance.standard)
+            .padding([.bottom], Distance.default)
         }
     }
 

diff --git a/SUPLA/Core/SwiftUiComponents/Button/BorderedButton.swift b/SUPLA/Core/SwiftUiComponents/Button/BorderedButton.swift
@@ -27,10 +27,12 @@ struct BorderedButton: View {
     var body: some View {
         Button(action: action) {
             if (fullWidth) {
-                Text.LabelLarge(text: title)
+                Text(title)
+                    .fontLabelLarge()
                     .frame(maxWidth: .infinity)
             } else {
-                Text.LabelLarge(text: title)
+                Text(title)
+                    .fontLabelLarge()
             }
         }
         .buttonStyle(BorderedButtonStyle())

diff --git a/SUPLA/Core/SwiftUiComponents/Button/FilledButton.swift b/SUPLA/Core/SwiftUiComponents/Button/FilledButton.swift
@@ -28,10 +28,12 @@ struct FilledButton: View {
     var body: some View {
         return Button(action: action) {
             if (fullWidth) {
-                Text.LabelLarge(text: title)
+                Text(title)
+                    .fontLabelLarge()
                     .frame(maxWidth: .infinity)
             } else {
-                Text.LabelLarge(text: title)
+                Text(title)
+                    .fontLabelLarge()
             }
         }
         .buttonStyle(FilledButtonStyle(isEnabled: isEnabled))

diff --git a/SUPLA/Core/SwiftUiComponents/Picker.swift b/SUPLA/Core/SwiftUiComponents/Picker.swift
@@ -31,21 +31,24 @@ extension SuplaCore {
             Menu {
                 SwiftUI.Picker(selection: selected) {
                     ForEach(items) { item in
-                        Text.BodyMedium(text: item.label).tag(item)
+                        Text(item.label)
+                            .fontBodyMedium()
+                            .tag(item)
                             .padding([.top, .bottom], 4)
-                            .padding([.leading, .trailing], Distance.standard)
+                            .padding([.leading, .trailing], Distance.default)
                     }
                 } label: {}
             } label: {
                 HStack {
-                    Text.BodyMedium(text: selected.wrappedValue.label)
+                    Text(selected.wrappedValue.label)
+                        .fontBodyMedium()
                     Image(.Icons.arrowDown)
                         .resizable()
                         .frame(width: 16, height: 16)
                         .foregroundColor(Color.Supla.onBackground)
                 }
                 .padding([.top, .bottom], 4)
-                .padding([.leading, .trailing], Distance.standard)
+                .padding([.leading, .trailing], Distance.default)
             }
             .accentColor(Color.Supla.onBackground)
         }