Merge branch 'main' into iOS-18

Dimillian · Sep 3, 2024 · e5fb928 · e5fb928
2 parents 3f6c3a0 + 55cbd9e
commit e5fb928
Show file tree

Hide file tree

Showing 4 changed files with 442 additions and 29 deletions.
diff --git a/IceCubesApp.xcodeproj/project.pbxproj b/IceCubesApp.xcodeproj/project.pbxproj
@@ -1201,7 +1201,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1236,7 +1236,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1275,7 +1275,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1311,7 +1311,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1344,7 +1344,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1378,7 +1378,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1562,7 +1562,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
 				PRODUCT_NAME = "Ice Cubes";
 				SDKROOT = auto;
@@ -1629,7 +1629,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
 				PRODUCT_NAME = "Ice Cubes";
 				SDKROOT = auto;
@@ -1675,7 +1675,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1710,7 +1710,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.50;
+				MARKETING_VERSION = 1.10.51;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

diff --git a/IceCubesApp/App/Tabs/Settings/AboutView.swift b/IceCubesApp/App/Tabs/Settings/AboutView.swift
@@ -67,12 +67,15 @@ struct AboutView: View {
 
       Section("Telemetry") {
         Link(destination: .init(string: "https://telemetrydeck.com")!) {
-          Label("Telemetry by TelemtryDeck", systemImage: "link")
+          Label("Telemetry by TelemetryDeck", systemImage: "link")
         }
         Link(destination: .init(string: "https://telemetrydeck.com/privacy/")!) {
           Label("Privacy Policy", systemImage: "checkmark.shield")
         }
       }
+      #if !os(visionOS)
+      .listRowBackground(theme.primaryBackgroundColor)
+      #endif
 
       Section {
         Text("""

diff --git a/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift b/IceCubesApp/App/Tabs/Settings/TabbarEntriesSettingsView.swift
@@ -15,27 +15,37 @@ struct TabbarEntriesSettingsView: View {
       Section {
         Picker("settings.tabs.first-tab", selection: $tabs.firstTab) {
           ForEach(AppTab.allCases) { tab in
-            tab.label.tag(tab)
+            if tab == tabs.firstTab || !tabs.tabs.contains(tab) {
+              tab.label.tag(tab)
+            }
           }
         }
         Picker("settings.tabs.second-tab", selection: $tabs.secondTab) {
           ForEach(AppTab.allCases) { tab in
-            tab.label.tag(tab)
+            if tab == tabs.secondTab || !tabs.tabs.contains(tab) {
+              tab.label.tag(tab)
+            }
           }
         }
         Picker("settings.tabs.third-tab", selection: $tabs.thirdTab) {
           ForEach(AppTab.allCases) { tab in
-            tab.label.tag(tab)
+            if tab == tabs.thirdTab || !tabs.tabs.contains(tab) {
+              tab.label.tag(tab)
+            }
           }
         }
         Picker("settings.tabs.fourth-tab", selection: $tabs.fourthTab) {
           ForEach(AppTab.allCases) { tab in
-            tab.label.tag(tab)
+            if tab == tabs.fourthTab || !tabs.tabs.contains(tab) {
+              tab.label.tag(tab)
+            }
           }
         }
         Picker("settings.tabs.fifth-tab", selection: $tabs.fifthTab) {
           ForEach(AppTab.allCases) { tab in
-            tab.label.tag(tab)
+            if tab == tabs.fifthTab || !tabs.tabs.contains(tab) {
+              tab.label.tag(tab)
+            }
           }
         }
       }