disabled timer start, change scramble when generating scramble

Author: pdtxie

CubeTime/Timer/StopwatchManager.swift

@@ -120,13 +120,13 @@ class StopWatchManager: ObservableObject {
         NSLog("starting")
         #endif
         mode = .running
-        
+
         timer?.invalidate() // Stop possibly running inspections
-        
+
         secondsElapsed = 0
         secondsStr = formatSolveTime(secs: 0)
         timerStartTime = Date()
-        
+
         if timeDP != -1 {
             timer = Timer.scheduledTimer(withTimeInterval: 1/60, repeats: true) { [self] timer in
                 self.secondsElapsed = -timerStartTime!.timeIntervalSinceNow

CubeTime/Timer/TimerTouchView.swift

@@ -139,32 +139,21 @@ final class TimerTouchView: UIViewRepresentable {
     func updateUIView(_ uiView: TimerUIView, context: UIViewRepresentableContext<TimerTouchView>) {
         if stopWatchManager.scrambleStr == nil {
             for gesture in uiView.gestureRecognizers! {
+                /*
                 if gesture is UISwipeGestureRecognizer && (gesture as! UISwipeGestureRecognizer).direction == UISwipeGestureRecognizer.Direction.right {
                     uiView.removeGestureRecognizer(gesture)
-                } else if gesture is UILongPressGestureRecognizer {
+                } else */
+                if gesture is UILongPressGestureRecognizer {
                     uiView.removeGestureRecognizer(gesture)
                 }
             }
-            
-            print("RAN")
         } else {
             let longPressGesture = UILongPressGestureRecognizer(target: context.coordinator, action: #selector(Coordinator.longPress))
             longPressGesture.allowableMovement = gestureThreshold
             longPressGesture.minimumPressDuration = userHoldTime
-
-            
 
             uiView.addGestureRecognizer(longPressGesture)
-            
-            print("ADDED")
         }
-        
-        print("view updated")
-        
-        
-        
-        
-        
     }
 
     class Coordinator: NSObject {

CubeTime/Timer/TimerView.swift

@@ -123,7 +123,7 @@ struct TimerView: View {
             Color(uiColor: colourScheme == .light ? .systemGray6 : .black)
                 .ignoresSafeArea()
 
-            // SCRAMBLE            
+            // SCRAMBLE
             if stopWatchManager.mode == .inspecting {
                 if colourScheme == .light {
                     switch stopWatchManager.inspectionSecs {
@@ -289,6 +289,7 @@ struct TimerView: View {
                                             .font(.system(size: 15, weight: .regular))
                                     }
                                 }
+                                .disabled(stopWatchManager.scrambleStr == nil)
                                 .accentColor(accentColour)
                                 .pickerStyle(.menu)
                                 .onChange(of: playgroundScrambleType) { newValue in
@@ -657,48 +658,50 @@ struct TimerView: View {
 
                         if currentSession.session_type != 2 {
                             if !stopWatchManager.nilSolve {
-                                if !manualInputFocused {
+                                if !manualInputFocused && stopWatchManager.scrambleStr != nil {
                                     Rectangle()
                                         .fill(Color(uiColor: colourScheme == .light ? .systemGray5 : .systemGray4))
                                         .frame(width: 1.5, height: 20)
                                         .padding(.horizontal, 12)
                                 }
                             }
 
-                            PenaltyBar(manualInputFocused ? 68 : 34) {
-                                Button(action: {
-                                    if manualInputFocused {
-                                        if manualInputTime != "" {
-                                            stopWatchManager.stop(timeFromStr(manualInputTime))
-                                            
-                                            
-                                            showInputField = false
+                            if stopWatchManager.scrambleStr != nil {
+                                PenaltyBar(manualInputFocused ? 68 : 34) {
+                                    Button(action: {
+                                        if manualInputFocused {
+                                            if manualInputTime != "" {
+                                                stopWatchManager.stop(timeFromStr(manualInputTime))
+                                                
+                                                
+                                                showInputField = false
+                                                
+                                                
+                                                manualInputFocused = false
+
+                                                manualInputTime = ""
+                                            }
+                                        } else {
+                                            showInputField = true
 
+                                            DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
+                                                manualInputFocused = true
+                                            }
 
-                                            manualInputFocused = false
-
                                             manualInputTime = ""
+                                            
                                         }
-                                    } else {
-                                        showInputField = true
-                                        
-                                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
-                                            manualInputFocused = true
+                                    }, label: {
+                                        if manualInputFocused {
+                                            Text("Done")
+                                                .font(.system(size: 21, weight: .semibold, design: .rounded))
+                                        } else {
+                                            Image(systemName: "plus.circle")
+                                                .font(.system(size: 24, weight: .semibold, design: .rounded))
                                         }
-                                        
-                                        manualInputTime = ""
-                                        
-                                    }
-                                }, label: {
-                                    if manualInputFocused {
-                                        Text("Done")
-                                            .font(.system(size: 21, weight: .semibold, design: .rounded))
-                                    } else {
-                                        Image(systemName: "plus.circle")
-                                            .font(.system(size: 24, weight: .semibold, design: .rounded))
-                                    }
-                                })
-                                    .disabled(manualInputFocused ? (manualInputTime == "") : false)
+                                    })
+                                        .disabled(manualInputFocused ? (manualInputTime == "") : false)
+                                }
                             }
                         }
                     }