Merge remote-tracking branch 'refs/remotes/origin/main'

xbjfk · xbjfk · commit 71119b4d1ccf · 2024-11-28T20:22:23.000+13:00
diff --git a/CubeTime/Assets.xcassets/ThemeColours/grey.colorset/Contents.json b/CubeTime/Assets.xcassets/ThemeColours/grey.colorset/Contents.json
@@ -24,7 +24,7 @@
         "components" : {
           "alpha" : "1.000",
           "blue" : "0x96",
-          "green" : "0x91",
+          "green" : "0x92",
           "red" : "0x90"
         }
       },
diff --git a/CubeTime/Assets.xcassets/ThemeColours/overlay/overlay0.colorset/Contents.json b/CubeTime/Assets.xcassets/ThemeColours/overlay/overlay0.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x19",
-          "green" : "0x16",
-          "red" : "0x15"
+          "blue" : "0x21",
+          "green" : "0x1F",
+          "red" : "0x1E"
         }
       },
       "idiom" : "universal"
diff --git a/CubeTime/Assets.xcassets/ThemeColours/overlay/overlay1.colorset/Contents.json b/CubeTime/Assets.xcassets/ThemeColours/overlay/overlay1.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x0C",
-          "green" : "0x0A",
-          "red" : "0x0A"
+          "blue" : "0x14",
+          "green" : "0x13",
+          "red" : "0x12"
         }
       },
       "idiom" : "universal"
diff --git a/CubeTime/Helper/HelperButtons.swift b/CubeTime/Helper/HelperButtons.swift
@@ -60,7 +60,7 @@ struct CTShareButton: UIViewControllerRepresentable {
 // MARK: - Copy Button
 struct CTCopyButton: View {
     let toCopy: String
-    let buttonText: String
+    let buttonText: LocalizedStringKey
     @Environment(\.dynamicTypeSize) private var dynamicTypeSize
     
     @State private var offsetValue: CGFloat = -25
diff --git a/CubeTime/Onboarding/Updates.swift b/CubeTime/Onboarding/Updates.swift
@@ -281,7 +281,7 @@ struct Update: View {
                     Text("Major Additions: ")
                         .font(.title3).fontWeight(.semibold)
                     
-                    VStack(alignment: .leading, spacing: 2) {
+                    VStack(alignment: .leading, spacing: 3) {
                         ForEach(majorAdditions, id: \.self) { point in
                             ListLine(point.depth, .init(stringLiteral: point.text))
                                 .if(point.depth == 1) { body in
@@ -296,7 +296,7 @@ struct Update: View {
                     Text("Minor Additions: ")
                         .font(.title3).fontWeight(.semibold)
                     
-                    VStack(alignment: .leading, spacing: 2) {
+                    VStack(alignment: .leading, spacing: 3) {
                         ForEach(minorAdditions, id: \.self) { point in
                             ListLine(point.depth, .init(stringLiteral: point.text))
                         }
@@ -308,7 +308,7 @@ struct Update: View {
                     Text("Bug Fixes: ")
                         .font(.title3).fontWeight(.semibold)
                     
-                    VStack(alignment: .leading, spacing: 2) {
+                    VStack(alignment: .leading, spacing: 3) {
                         ForEach(bugFixes, id: \.self) { point in
                             ListLine(point.depth, .init(stringLiteral: point.text))
                         }
diff --git a/CubeTime/Settings/GeneralSettings.swift b/CubeTime/Settings/GeneralSettings.swift
@@ -49,15 +49,16 @@ struct GeneralSettingsView: View {
     @Preference(\.gestureDistance) private var gestureActivationDistance
     @Preference(\.gestureDistanceTrackpad) private var gestureDistanceTrackpad
     
-    // show previous time after delete
+    // timer interface & solves
     @Preference(\.showPrevTime) private var showPrevTime
-    
+    @Preference(\.promptDelete) private var promptDelete
+
     // statistics
     @Preference(\.displayDP) private var displayDP
     @Preference(\.timeTrendSolves) private var timeTrendSolves
     
     @State private var showResetDialog = false
-        
+
     @EnvironmentObject var stopwatchManager: StopwatchManager
     
     var body: some View {
@@ -140,10 +141,14 @@ struct GeneralSettingsView: View {
                 }
             }
             
-            SettingsGroup(Label("Timer Interface", systemImage: "rectangle.and.pencil.and.ellipsis")) {
+            SettingsGroup(Label("Timer Interface & Solves", systemImage: "rectangle.and.pencil.and.ellipsis")) {
                 DescribedSetting(description: "Show the previous time after a solve is deleted by swipe gesture. With this option off, the default time of 0.00 or 0.000 will be shown instead.") {
                     SettingsToggle(String(localized: "Show Previous Time"), $showPrevTime)
                 }
+                
+                DescribedSetting(description: "Display a prompt before deleting solves.", {
+                    SettingsToggle(String(localized: "Show Solve Deletion Prompt"), $promptDelete)
+                })
             }
             
             SettingsGroup(Label("Accessibility", systemImage: "eye")) {
diff --git a/CubeTime/Settings/SettingsManager.swift b/CubeTime/Settings/SettingsManager.swift
@@ -52,6 +52,7 @@ final class SettingsManager {
         fontCasual = 0.0
         fontCursive = false
         showZenMode = false
+        promptDelete = false
     }
 
     init(userDefaults: NSUbiquitousKeyValueStore) {
@@ -162,6 +163,9 @@ final class SettingsManager {
     
     @UserDefault("showZenMode")
     var showZenMode: Bool = false
+    
+    @UserDefault("promptDelete")
+    var promptDelete: Bool = false
 }
 
 @propertyWrapper
diff --git a/CubeTime/Stats/StatsDetailView.swift b/CubeTime/Stats/StatsDetailView.swift
@@ -142,7 +142,7 @@ struct StatsDetailView: View {
                     let shareStr = getShareStr(solves: solves)
                     
                     HStack(spacing: 8) {
-                        CTCopyButton(toCopy: shareStr, buttonText: String(localized: "Copy Average"))
+                        CTCopyButton(toCopy: shareStr, buttonText: "Copy Average")
                         
                         CTShareButton(toShare: shareStr, buttonText: String(localized: "Share Average"))
                     }
diff --git a/CubeTime/StopwatchManager/TimerController.swift b/CubeTime/StopwatchManager/TimerController.swift
@@ -103,7 +103,7 @@ class TimerController: ObservableObject {
     
     
     private var timer: Timer?
-    private var timerStartTime: Date?
+    private var timerStartTime: UInt64?
     var secondsElapsed = 0.0
     
     
@@ -203,18 +203,22 @@ class TimerController: ObservableObject {
 
         secondsElapsed = 0
         secondsStr = formatSolveTime(secs: 0)
-        timerStartTime = Date()
+        timerStartTime = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW)
 
         if sm.timeDpWhenRunning == -1 {
             self.secondsStr = "..."
         } else {
             timer = Timer.scheduledTimer(withTimeInterval: 1/60, repeats: true) { [self] timer in
-                self.secondsElapsed = -timerStartTime!.timeIntervalSinceNow
+                self.secondsElapsed = getElapsedTime()
                 self.secondsStr = formatSolveTime(secs: self.secondsElapsed, dp: sm.timeDpWhenRunning)
             }
         }
     }
     
+    private func getElapsedTime() -> Double {
+        return Double(clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW) - timerStartTime!) / 1e9
+    }
+    
     
     func stop(_ time: Double?) {
         #if DEBUG
@@ -227,7 +231,7 @@ class TimerController: ObservableObject {
             self.secondsElapsed = time
         } else {
             prevDownStoppedTimer = true
-            self.secondsElapsed = -timerStartTime!.timeIntervalSinceNow
+            self.secondsElapsed = getElapsedTime()
         }
         
         self.secondsStr = formatSolveTime(secs: self.secondsElapsed)
@@ -329,7 +333,7 @@ class TimerController: ObservableObject {
     // multiphase
     func lap() {
         currentMPCount += 1
-        phaseTimes.append(-timerStartTime!.timeIntervalSinceNow)
+        phaseTimes.append(getElapsedTime())
         feedbackStyle?.impactOccurred(intensity: 0.5)
     }
 }
diff --git a/CubeTime/TimeList/TimeCard.swift b/CubeTime/TimeList/TimeCard.swift
@@ -66,7 +66,7 @@ struct TimeCard: View {
                 copySolve(solve: solve)
             } label: {
                 Label {
-                    Text("Copy")
+                    Text(String(localized: "Copy"))
                 } icon: {
                     Image(systemName: "doc.on.doc")
                 }
@@ -76,7 +76,7 @@ struct TimeCard: View {
                 Button {
                     stopwatchManager.changePen(solve: self.solve, pen: .none)
                 } label: {
-                    Label("No Penalty", systemImage: "checkmark.circle")
+                    Label(String(localized: "No Penalty"), systemImage: "checkmark.circle")
                 }
                 
                 Button {
@@ -91,7 +91,7 @@ struct TimeCard: View {
                     Label("DNF", systemImage: "xmark.circle")
                 }
             } label: {
-                Label("Penalty", systemImage: "exclamationmark.triangle")
+                Label(String(localized: "Penalty"), systemImage: "exclamationmark.triangle")
             }
             
             if sessionType != SessionType.compsim.rawValue {
@@ -116,7 +116,7 @@ struct TimeCard: View {
                 }
             } label: {
                 Label {
-                    Text("Delete")
+                    Text(String(localized: "Delete"))
                 } icon: {
                     Image(systemName: "trash")
                 }
diff --git a/CubeTime/TimeList/TimeDetailView.swift b/CubeTime/TimeList/TimeDetailView.swift
@@ -35,11 +35,14 @@ struct TimeDetailView: View {
     private let phases: Array<Double>?
     
     @State private var userComment: String
+    @State private var showAlert = false
     
     @Binding var currentSolve: Solve?
     
     @FocusState private var commentFocus: Bool
     
+    @Preference(\.promptDelete) private var promptDelete
+    
     
     init(for solve: Solve, currentSolve: Binding<Solve?>?, sessionsCanMoveTo: Binding<[Session]?>? = nil, sessionsCanMoveTo_playground: Binding<[Session]?>? = nil) {
         self.solve = solve
@@ -203,25 +206,37 @@ struct TimeDetailView: View {
                                 CTCopyButton(toCopy: getShareStr(solve: solve, phases: (solve as? MultiphaseSolve)?.phases), buttonText: "Copy Solve")
                                 
                                 
-                                CTShareButton(toShare: getShareStr(solve: solve, phases: (solve as? MultiphaseSolve)?.phases), buttonText: "Share Solve")
+                                CTShareButton(toShare: getShareStr(solve: solve, phases: (solve as? MultiphaseSolve)?.phases), buttonText: String(localized: "Share Solve"))
                                 
                                 
                                 CTButton(type: .coloured(Color("red")), size: .large, square: true, onTapRun: {
-                                    if currentSolve == nil {
-                                        dismiss()
+                                    if(promptDelete){
+                                        showAlert = true
                                     }
-
-                                    currentSolve = nil
-
-                                    withAnimation {
-                                        stopwatchManager.delete(solve: solve)
+                                    else{
+                                        deleteSolve()
                                     }
                                 }) {
                                     Image(systemName: "trash")
                                 }
                             }
                             .padding(.top, 16)
                             .padding(.bottom, 4)
+                            .alert(isPresented: $showAlert){
+                                Alert(
+                                       title: Text("Are you sure you want to delete this solve?"),
+                                       primaryButton: .cancel(
+                                           Text("Cancel"),
+                                           action: { }
+                                       ),
+                                       secondaryButton: .destructive(
+                                           Text("Delete Solve"),
+                                           action: {
+                                               deleteSolve()
+                                           }
+                                       )
+                                   )
+                            }
                             
                             // END BUTTONS
                             
@@ -356,5 +371,16 @@ struct TimeDetailView: View {
             }
         }
     }
+    
+    func deleteSolve() -> Void{
+        if currentSolve == nil {
+            dismiss()
+        }
+        currentSolve = nil
+        
+        withAnimation {
+            stopwatchManager.delete(solve: solve)
+        }
+    }
 }
 
diff --git a/CubeTime/TimeList/TimeListView.swift b/CubeTime/TimeList/TimeListView.swift
@@ -289,6 +289,10 @@ struct TimeListView: View {
     
     @State var isCleaningSession = false
     
+    @State var showAlert = false
+    
+    @Preference(\.promptDelete) private var promptDelete
+    
     var body: some View {
         let sessionType = stopwatchManager.currentSession.sessionType
         NavigationView {
@@ -329,7 +333,7 @@ struct TimeListView: View {
                                         
                                         stopwatchManager.timeListSolvesSelected.removeAll()
                                     } label: {
-                                        Label("Copy", systemImage: "doc.on.doc")
+                                        Label(String(localized: "Copy"), systemImage: "doc.on.doc")
                                     }
                                     
                                     Menu {
@@ -340,7 +344,7 @@ struct TimeListView: View {
                                             
                                             stopwatchManager.timeListSolvesSelected.removeAll()
                                         } label: {
-                                            Label("No Penalty", systemImage: "checkmark.circle")
+                                            Label(String(localized: "No Penalty"), systemImage: "checkmark.circle")
                                         }
                                         
                                         Button {
@@ -360,12 +364,13 @@ struct TimeListView: View {
                                             
                                             stopwatchManager.timeListSolvesSelected.removeAll()
                                         } label: {
-                                            Label("DNF", systemImage: "xmark.circle")
+                                            Label(String(localized: "DNF"), systemImage: "xmark.circle")
                                         }
                                     } label: {
-                                        Label("Penalty", systemImage: "exclamationmark.triangle")
+                                        Label(String(localized: "Penalty"), systemImage: "exclamationmark.triangle")
                                     }
                                     
+                                    
                                     if stopwatchManager.currentSession.sessionType != SessionType.compsim.rawValue {
                                         SessionPickerMenu(sessions: sessionType == SessionType.playground.rawValue ? sessionsCanMoveToPlaygroundContextMenu : stopwatchManager.sessionsCanMoveTo) { session in
                                             for object in stopwatchManager.timeListSolvesSelected {
@@ -379,15 +384,15 @@ struct TimeListView: View {
                                     
                                     Divider()
                                     
-                                    Button(role: .destructive) {
-                                        isSelectMode = false
-                                        for object in stopwatchManager.timeListSolvesSelected {
-                                            stopwatchManager.delete(solve: object)
+                                    Button(role: .destructive, action: {
+                                        if(promptDelete){
+                                            showAlert = true
                                         }
-                                        
-                                        stopwatchManager.timeListSolvesSelected.removeAll()
-                                    } label: {
-                                        Label("Delete", systemImage: "trash")
+                                        else{
+                                            deleteSolves()
+                                        }
+                                    }) {
+                                        Label(String(localized: "Delete"), systemImage: "trash")
                                     }
                                 }
                             } label: {
@@ -444,6 +449,13 @@ struct TimeListView: View {
             Text("Are you sure you want to continue? This will delete every solve in this session!")
         }
         
+        .confirmationDialog(String(localized: "Are you sure you want to delete the selected solves? This cannot be undone."), isPresented: $showAlert, titleVisibility: .visible) {
+            Button("Confirm", role: .destructive) {
+                deleteSolves()
+            }
+            Button("Cancel", role: .cancel) {}
+        }
+        
         .sheet(item: $solve) { item in
             TimeDetailView(for: item, currentSolve: $solve)
                 .tint(Color("accent"))
@@ -474,4 +486,14 @@ struct TimeListView: View {
             }
         }
     }
+    
+    func deleteSolves() -> Void{
+        isSelectMode = false
+        for object in stopwatchManager.timeListSolvesSelected {
+            stopwatchManager.delete(solve: object)
+        }
+
+        stopwatchManager.timeListSolvesSelected.removeAll()
+    }
 }
+
diff --git a/CubeTime/TimeList/TimeListViewInner.swift b/CubeTime/TimeList/TimeListViewInner.swift
diff --git a/Localizable.xcstrings b/Localizable.xcstrings

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"components" : {`
`25`	`25`	`"alpha" : "1.000",`
`26`	`26`	`"blue" : "0x96",`
`27`		`- "green" : "0x91",`
	`27`	`+ "green" : "0x92",`
`28`	`28`	`"red" : "0x90"`
`29`	`29`	`}`
`30`	`30`	`},`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ final class SettingsManager {`
`52`	`52`	`fontCasual = 0.0`
`53`	`53`	`fontCursive = false`
`54`	`54`	`showZenMode = false`
	`55`	`+ promptDelete = false`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`init(userDefaults: NSUbiquitousKeyValueStore) {`
`@@ -162,6 +163,9 @@ final class SettingsManager {`
`162`	`163`
`163`	`164`	`@UserDefault("showZenMode")`
`164`	`165`	`var showZenMode: Bool = false`
	`166`	`+`
	`167`	`+ @UserDefault("promptDelete")`
	`168`	`+ var promptDelete: Bool = false`
`165`	`169`	`}`
`166`	`170`
`167`	`171`	`@propertyWrapper`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ struct StatsDetailView: View {`
`142`	`142`	`let shareStr = getShareStr(solves: solves)`
`143`	`143`
`144`	`144`	`HStack(spacing: 8) {`
`145`		`- CTCopyButton(toCopy: shareStr, buttonText: String(localized: "Copy Average"))`
	`145`	`+ CTCopyButton(toCopy: shareStr, buttonText: "Copy Average")`
`146`	`146`
`147`	`147`	`CTShareButton(toShare: shareStr, buttonText: String(localized: "Share Average"))`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ struct TimeCard: View {`
`66`	`66`	`copySolve(solve: solve)`
`67`	`67`	`} label: {`
`68`	`68`	`Label {`
`69`		`- Text("Copy")`
	`69`	`+ Text(String(localized: "Copy"))`
`70`	`70`	`} icon: {`
`71`	`71`	`Image(systemName: "doc.on.doc")`
`72`	`72`	`}`
`@@ -76,7 +76,7 @@ struct TimeCard: View {`
`76`	`76`	`Button {`
`77`	`77`	`stopwatchManager.changePen(solve: self.solve, pen: .none)`
`78`	`78`	`} label: {`
`79`		`- Label("No Penalty", systemImage: "checkmark.circle")`
	`79`	`+ Label(String(localized: "No Penalty"), systemImage: "checkmark.circle")`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`Button {`
`@@ -91,7 +91,7 @@ struct TimeCard: View {`
`91`	`91`	`Label("DNF", systemImage: "xmark.circle")`
`92`	`92`	`}`
`93`	`93`	`} label: {`
`94`		`- Label("Penalty", systemImage: "exclamationmark.triangle")`
	`94`	`+ Label(String(localized: "Penalty"), systemImage: "exclamationmark.triangle")`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if sessionType != SessionType.compsim.rawValue {`
`@@ -116,7 +116,7 @@ struct TimeCard: View {`
`116`	`116`	`}`
`117`	`117`	`} label: {`
`118`	`118`	`Label {`
`119`		`- Text("Delete")`
	`119`	`+ Text(String(localized: "Delete"))`
`120`	`120`	`} icon: {`
`121`	`121`	`Image(systemName: "trash")`
`122`	`122`	`}`