now in a list

heyjaywilson · Oct 18, 2024 · 4755f94 · 4755f94
1 parent 889a3cb
commit 4755f94
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 16 deletions.
diff --git a/AppPackages/Settings/Sources/Settings/SettingsView.swift b/AppPackages/Settings/Sources/Settings/SettingsView.swift
@@ -21,21 +21,24 @@ public struct SettingsView: View {
 
     public var body: some View {
         NavigationStack {
-            HStack {
-                Text("Rest")
-                    .bold()
-                Picker("", selection: $restTimeMinutes) {
-                    ForEach(0...5, id: \.self) {
-                        Text("\($0)")
+            List {
+                HStack {
+                    Text("Rest")
+                        .bold()
+                    Picker("", selection: $restTimeMinutes) {
+                        ForEach(0...5, id: \.self) {
+                            Text("\($0)")
+                        }
                     }
-                }
-                Text(restTimeMinutes <= 1 ? "minute" : "minutes")
-                Picker("", selection: $restTimeSeconds) {
-                    ForEach(Array(stride(from: 0, to: 60, by: 5)), id: \.self) {
-                        Text("\($0)")
+                    Text(restTimeMinutes <= 1 ? "minute" : "minutes")
+                    Picker("", selection: $restTimeSeconds) {
+                        ForEach(Array(stride(from: 0, to: 60, by: 5)), id: \.self) {
+                            Text("\($0)")
+                        }
                     }
+                    Text("seconds")
+                        .fixedSize(horizontal: true, vertical: false)
                 }
-                Text("seconds")
             }.navigationTitle("Settings")
         }
     }

diff --git a/PeakFit.xcodeproj/project.pbxproj b/PeakFit.xcodeproj/project.pbxproj
@@ -322,7 +322,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"PeakFit/Preview Content\"";
-				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
+				DEVELOPMENT_TEAM = CY96495443;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = PeakFit/Info.plist;
@@ -336,7 +336,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
+				PRODUCT_BUNDLE_IDENTIFIER = ca.charland.peakfit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -353,7 +353,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"PeakFit/Preview Content\"";
-				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
+				DEVELOPMENT_TEAM = CY96495443;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = PeakFit/Info.plist;
@@ -367,7 +367,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
+				PRODUCT_BUNDLE_IDENTIFIER = ca.charland.peakfit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

diff --git a/PeakFit.xcodeproj/xcshareddata/xcschemes/PeakFit.xcscheme b/PeakFit.xcodeproj/xcshareddata/xcschemes/PeakFit.xcscheme
@@ -29,6 +29,30 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "69448C7E2C91323E00E1E698"
+               BuildableName = "PeakFitTests.xctest"
+               BlueprintName = "PeakFitTests"
+               ReferencedContainer = "container:PeakFit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "69448C882C91323E00E1E698"
+               BuildableName = "PeakFitUITests.xctest"
+               BlueprintName = "PeakFitUITests"
+               ReferencedContainer = "container:PeakFit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -50,6 +74,13 @@
             ReferencedContainer = "container:PeakFit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "PRODUCT_BUNDLE_IDENTIFIER"
+            value = "ca.charland.peakfit"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"