registered new settings keys, small fixes to 'what's new page'

Author: pdtxie

CubeTime.xcodeproj/project.pbxproj

@@ -697,7 +697,7 @@
 					"$(PROJECT_DIR)/CubeTime/3rdparty/j2objc/lib",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 1.0.8;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"-ltnoodle",
 					"-ljre_core",
@@ -754,7 +754,7 @@
 					"$(PROJECT_DIR)/CubeTime/3rdparty/j2objc/lib",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 1.0.8;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"-ltnoodle",
 					"-ljre_core",

CubeTime/CubeTimeApp.swift

@@ -27,16 +27,26 @@ struct CubeTime: App {
         let userDefaults = UserDefaults.standard
         userDefaults.register(
             defaults: [
+                // timer settings
                 gsKeys.inspection.rawValue: false,
+                gsKeys.inspectionCountsDown.rawValue: false,
                 gsKeys.freeze.rawValue: 0.5,
-                gsKeys.gestureDistance.rawValue: 50,
-                gsKeys.hapBool.rawValue: true,
-                gsKeys.hapType.rawValue: UIImpactFeedbackGenerator.FeedbackStyle.rigid.rawValue,
                 gsKeys.timeDpWhenRunning.rawValue: 3,
-                gsKeys.displayDP.rawValue: 3,
-                gsKeys.showStats.rawValue: true,
+                
+                // timer tools
                 gsKeys.showScramble.rawValue: true,
+                gsKeys.showStats.rawValue: true,
+                
+                // accessibility
+                gsKeys.hapBool.rawValue: true,
+                gsKeys.hapType.rawValue: UIImpactFeedbackGenerator.FeedbackStyle.rigid.rawValue,
                 gsKeys.scrambleSize.rawValue: 18,
+                gsKeys.gestureDistance.rawValue: 50,
+                
+                // statistics
+                gsKeys.displayDP.rawValue: 3,
+                
+                // colours
                 asKeys.graphGlow.rawValue: true
             ]
         )

CubeTime/Settings/AppearanceSettings.swift

@@ -16,22 +16,25 @@ enum asKeys: String {
 struct AppearanceSettingsView: View {
     @Environment(\.colorScheme) var colourScheme
 
-    @AppStorage(asKeys.accentColour.rawValue) private var accentColour: Color = .indigo
+    @State var showThemeOptions: Bool = false
 
-//    @State private var accentColour: Color = .indigo
     let accentColours: [Color] = [.cyan, .blue, .indigo, .purple, .red]
 
-    @State var showThemeOptions: Bool = false
-    
     private let columns = [GridItem(spacing: 16), GridItem(spacing: 16)]
 
+    // colours
+    @AppStorage(asKeys.accentColour.rawValue) private var accentColour: Color = .indigo
+    @AppStorage(asKeys.staticGradient.rawValue) private var staticGradient: Bool = true
+    @AppStorage(asKeys.gradientSelected.rawValue) private var gradientSelected: Int = 6
+    @AppStorage(asKeys.graphGlow.rawValue) private var graphGlow: Bool = true
+    
+    // system settings (appearance)
     @AppStorage(asKeys.overrideDM.rawValue) private var overrideSystemAppearance: Bool = false
     @AppStorage(asKeys.dmBool.rawValue) private var darkMode: Bool = false
 
-    @AppStorage(asKeys.staticGradient.rawValue) private var staticGradient: Bool = true
-    @AppStorage(asKeys.gradientSelected.rawValue) private var gradientSelected: Int = 6
 
-    @AppStorage(asKeys.graphGlow.rawValue) private var graphGlow: Bool = true
+    
+    
 
 
     var body: some View {

CubeTime/Settings/GeneralSettings.swift

@@ -11,20 +11,28 @@ extension UIImpactFeedbackGenerator.FeedbackStyle: CaseIterable {
 }
 
 struct GeneralSettingsView: View {
-    
+    // timer settings
     @AppStorage(gsKeys.inspection.rawValue) private var inspectionTime: Bool = false
+    @AppStorage(gsKeys.inspectionCountsDown.rawValue) private var insCountDown: Bool = false
     @AppStorage(gsKeys.freeze.rawValue) private var holdDownTime: Double = 0.5
     @AppStorage(gsKeys.timeDpWhenRunning.rawValue) private var timerDP: Int = 3
-    @AppStorage(gsKeys.hapBool.rawValue) private var hapticFeedback: Bool = true
-    @AppStorage(gsKeys.hapType.rawValue) private var feedbackType: UIImpactFeedbackGenerator.FeedbackStyle = .rigid
-    @AppStorage(gsKeys.gestureDistance.rawValue) private var gestureActivationDistance: Double = 50
-    @AppStorage(gsKeys.displayDP.rawValue) private var displayDP: Int = 3
 
+    // timer tools
     @AppStorage(gsKeys.showScramble.rawValue) private var showScramble: Bool = true
     @AppStorage(gsKeys.showStats.rawValue) private var showStats: Bool = true
 
+    // accessibility
+    @AppStorage(gsKeys.hapBool.rawValue) private var hapticFeedback: Bool = true
+    @AppStorage(gsKeys.hapType.rawValue) private var feedbackType: UIImpactFeedbackGenerator.FeedbackStyle = .rigid
     @AppStorage(gsKeys.scrambleSize.rawValue) private var scrambleSize: Int = 18
-    @AppStorage(gsKeys.inspectionCountsDown.rawValue) private var insCountDown: Bool = false
+    @AppStorage(gsKeys.gestureDistance.rawValue) private var gestureActivationDistance: Double = 50
+    
+    // statistics
+    @AppStorage(gsKeys.displayDP.rawValue) private var displayDP: Int = 3
+    
+        
+    @Environment(\.colorScheme) var colourScheme
+    @EnvironmentObject var stopWatchManager: StopWatchManager
 
     @AppStorage(asKeys.accentColour.rawValue) private var accentColour: Color = .indigo
 
@@ -36,15 +44,6 @@ struct GeneralSettingsView: View {
         UIImpactFeedbackGenerator.FeedbackStyle.rigid: "Rigid"
     ]
 
-    @Environment(\.colorScheme) var colourScheme
-    
-    @EnvironmentObject var stopWatchManager: StopWatchManager
-    
-    
-    // im thinking of using these interval modes: seconds, 0.1s, 0.001, your refresh rate
-    // and for haptics just .light, .medium, .heavy, .rigid, .soft
-    // and we need to have a clear to defaults option or something
-    
     var body: some View {
         VStack(spacing: 16) {
             VStack {

CubeTime/Updates.swift

@@ -10,6 +10,8 @@ import SwiftUI
 struct Updates: View {
     @Environment(\.colorScheme) var colourScheme
     @Environment(\.dismiss) var dismiss
+    
+    @AppStorage(asKeys.accentColour.rawValue) private var accentColour: Color = .indigo
     @Binding var showUpdates: Bool
 
     var body: some View {
@@ -91,6 +93,7 @@ struct Updates: View {
                             .padding([.top, .trailing])
                     }
                 }
+                
                 Spacer()
             }
         }