BAL-183-GP-BPM-CONFIGURATION (#184)

gperissetcelteeka · web-flow · commit f4d66579324e · 2023-11-01T19:36:02.000-03:00
- BPM Step configuration on profile section
- Cell adjust (width)
diff --git a/Balance/Balance.swift b/Balance/Balance.swift
@@ -56,6 +56,11 @@ struct Balance: App {
                 if !userModel.existLocalUser(uid: demoID) {
                     userModel.createDemoUser()
                 }
+                
+                let bmpStep = UserDefaults.standard.value(forKey: bpmKEY)
+                if bmpStep == nil {
+                    UserDefaults.standard.setValue(defaultBPM, forKey: bpmKEY)
+                }
             })
             .onChange(of: scenePhase) { phase in
                 switch phase {
diff --git a/Balance/Chill/ChillCellView.swift b/Balance/Chill/ChillCellView.swift
@@ -36,7 +36,8 @@ struct ChillCellView: View {
             }
         }
         .padding(EdgeInsets(top: 24, leading: 24, bottom: 24, trailing: 0))
-        .frame(maxWidth: 311, maxHeight: 114)
+        .frame(maxWidth: UIScreen.screenWidth - 20)
+        .frame(height: 120)
         .foregroundColor(darkBlueColor)
         .background(RoundedRectangle(cornerRadius: 20).fill(.white))
         .clipped()
diff --git a/Balance/Distraction/DistractionCellView.swift b/Balance/Distraction/DistractionCellView.swift
@@ -25,7 +25,8 @@ struct DistractionCellView: View {
                 Spacer()
             }
         }
-        .frame(maxWidth: 311, maxHeight: 120)
+        .frame(maxWidth: UIScreen.screenWidth - 20)
+        .frame(height: 120)
         .foregroundColor(darkBlueColor)
         .background(RoundedRectangle(cornerRadius: 20).fill(.white))
         .clipped()
diff --git a/Balance/Distraction/Drawing/DrawView.swift b/Balance/Distraction/Drawing/DrawView.swift
@@ -29,6 +29,7 @@ struct DrawingView: UIViewRepresentable {
         canvas.maximumZoomScale = 10
         canvas.contentSize = CGSize(width: 1000, height: 1000)
         canvas.contentInset = UIEdgeInsets(top: 500, left: 500, bottom: 500, right: 500)
+        canvas.isScrollEnabled = false
         return canvas
     }
     
@@ -64,7 +65,7 @@ struct DrawView: View {
     @State var eraserWidth: Double = 99.0
     @State var lineWidth: CGFloat = 1.0
     @State var showLineWith = false
-    
+
     var body: some View {
         ZStack {
             Color.white.edgesIgnoringSafeArea(.all)
@@ -125,7 +126,9 @@ struct DrawView: View {
             if self.title.isEmpty {
                 self.emptyDrawAlert = true
             } else {
-                saveImage()
+                Task {
+                    await saveImage()
+                }
             }
         } label: {
             Text("Save")
@@ -143,7 +146,11 @@ struct DrawView: View {
         .buttonStyle(ActivityLogButtonStyle(activityDescription: isColoring == true ? "Coloring Draw SAVED" : "Draw SAVED"))
         .alert("Enter the title of the drawing", isPresented: $emptyDrawAlert) {
             TextField("Title", text: $title)
-            Button("OK", action: saveImage)
+            Button("OK") {
+                Task {
+                    await saveImage()
+                }
+            }
         }
     }
     
@@ -377,7 +384,7 @@ struct DrawView: View {
         }
     }
     
-    func saveImage() {
+    func saveImage() async {
         let newDraw = Draw(
             id: currentDraw.id,
             title: title,
diff --git a/Balance/Distraction/Drawing/Sketch/Classes/Main.storyboard b/Balance/Distraction/Drawing/Sketch/Classes/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
     <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -45,7 +45,7 @@
                                     <outlet property="delegate" destination="vXZ-lx-hvc" id="u92-QC-S2R"/>
                                 </connections>
                             </scrollView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vWS-wj-bz5">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vWS-wj-bz5">
                                 <rect key="frame" x="40" y="786" width="334" height="36"/>
                                 <color key="tintColor" red="0.2666509151" green="0.78627187009999999" blue="0.94962674380000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <state key="normal" title="Button"/>
@@ -54,7 +54,7 @@
                                         <fragment content="Save">
                                             <attributes>
                                                 <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                <font key="NSFont" size="18" name="Montserrat-Regular"/>
+                                                <font key="NSFont" metaFont="system" size="18"/>
                                                 <font key="NSOriginalFont" size="12" name="Helvetica"/>
                                             </attributes>
                                         </fragment>
diff --git a/Balance/Distraction/Drawing/Sketch/Classes/SketchViewController.swift b/Balance/Distraction/Drawing/Sketch/Classes/SketchViewController.swift
@@ -63,16 +63,20 @@ class SketchViewController: UIViewController, ButtonViewInterface, UIScrollViewD
             alert.addAction(UIAlertAction(title: "Save", style: .default, handler: { [weak alert] (_) in
                 let textField = alert?.textFields![0]
                 self.draw?.title = textField!.text!
-                self.save()
+                Task {
+                    await self.save()
+                }
             }))
             
             self.present(alert, animated: true, completion: nil)
         } else {
-            save()
+            Task {
+                await save()
+            }
         }
     }
     
-    func save() {
+    func save() async{
         let imageData = (self.sketchView.image?.pngData())!
         self.draw?.image = imageData
         self.coloringStore!.saveDraw((self.draw)!)
diff --git a/Balance/Distraction/Games/GamesCellView.swift b/Balance/Distraction/Games/GamesCellView.swift
@@ -16,7 +16,8 @@ struct GamesCellView: View {
             iconView
             textView
         }
-        .frame(maxWidth: 311, maxHeight: 120)
+        .frame(maxWidth: UIScreen.screenWidth - 20)
+        .frame(height: 120)
         .foregroundColor(darkBlueColor)
         .background(RoundedRectangle(cornerRadius: 20).fill(.white))
         .clipped()
diff --git a/Balance/Home/CellView.swift b/Balance/Home/CellView.swift
@@ -16,7 +16,8 @@ struct CellView: View {
             iconView
             textView
         }
-        .frame(maxWidth: 311, maxHeight: 120)
+        .frame(maxWidth: UIScreen.screenWidth - 20)
+        .frame(height: 120)
         .foregroundColor(darkBlueColor)
         .background(RoundedRectangle(cornerRadius: 20).fill(.white))
         .clipped()
diff --git a/Balance/Home/Home.swift b/Balance/Home/Home.swift
@@ -46,7 +46,7 @@ struct HomeView: View {
                 }
             }
             .onChange(of: counter.count, perform: { _ in
-                if counter.count > 100 {
+                if counter.count > UserDefaults.standard.double(forKey: bpmKEY) {
                     print(counter.count)
                     alertHeartRate()
                 }
diff --git a/Balance/Home/NavigationView.swift b/Balance/Home/NavigationView.swift
@@ -28,7 +28,8 @@ struct NavView: View {
                 .frame(maxWidth: .infinity)
         }
         .padding(EdgeInsets(top: 24, leading: 24, bottom: 24, trailing: 0))
-        .frame(maxWidth: 311, maxHeight: 114)
+        .frame(maxWidth: UIScreen.screenWidth - 20)
+        .frame(height: 120)
         .foregroundColor(darkBlueColor)
         .background(RoundedRectangle(cornerRadius: 20).fill(.white))
         .clipped()
diff --git a/Balance/Profile/ProfileCellView.swift b/Balance/Profile/ProfileCellView.swift
@@ -16,7 +16,7 @@ struct ProfileCellView: View {
             iconView
             textView
         }
-        .frame(maxWidth: 300)
+        .frame(maxWidth: UIScreen.screenWidth - 20)
         .frame(height: 60)
         .foregroundColor(darkBlueColor)
         .background(RoundedRectangle(cornerRadius: 20).fill(.white))
diff --git a/Balance/Profile/ProfileView.swift b/Balance/Profile/ProfileView.swift
@@ -31,19 +31,24 @@ struct ProfileView: View {
     @State private var showAlert = false
     @State private var logs = [ActivityLogEntry]()
     @State private var logsIsEmpty = true
-    
+    @State private var sliderValue: Float = 0.0
+    @State private var isEditing = false
+    @State private var sliderStringValue: String = ""
+
     var body: some View {
         ZStack {
             VStack(alignment: .center, spacing: 0) {
                 HeaderMenu(title: "")
                     .background(primaryColor)
                 avatarChangeView
                 userData
+                bpmView
                 cellsView
                 Spacer()
             }
         }
         .onAppear {
+            loadBPM()
 #if DEMO
             loadUserLocal()
             loadLogs()
@@ -61,6 +66,29 @@ struct ProfileView: View {
         }
     }
     
+    var bpmView: some View {
+        VStack(spacing: 20) {
+            Text("BPM Alert at: \(sliderStringValue)")
+                .font(.custom("Nunito-Bold", size: 20))
+                .foregroundColor(darkBlueColor)
+            Slider(value: $sliderValue, in: 0...4, step: 1) {
+                Text("Slider")
+            } minimumValueLabel: {
+                Text("80")
+                    .font(.custom("Montserrat-Thin", size: 20))
+                    .foregroundColor(darkBlueColor)
+            } maximumValueLabel: {
+                Text("120")
+                    .font(.custom("Montserrat-Thin", size: 20))
+                    .foregroundColor(darkBlueColor)
+            } onEditingChanged: { editing in
+                isEditing = editing
+                readBPM()
+            }.tint(primaryColor)
+                .padding(.horizontal, 50)
+        }
+    }
+    
     var userData: some View {
         Group {
             Spacer().frame(height: 50)
@@ -88,6 +116,7 @@ struct ProfileView: View {
     var cellsView: some View {
         ScrollView(.vertical) {
             VStack(spacing: 20) {
+                Spacer().frame(height: 10)
 #if !DEMO
                 infoOption
                 updateOption
@@ -206,6 +235,8 @@ struct ProfileView: View {
             //            coloringStore.removeStore()
             // #endif
             //            dismiss()
+            
+            UserDefaults.standard.setValue(defaultBPM, forKey: bpmKEY)
             authModel.signOut()
             completedOnboardingFlow = false
             //            account.signedIn = false
@@ -267,6 +298,66 @@ struct ProfileView: View {
             .accessibility(hidden: true)
     }
     
+    func saveBPM() {
+        var value = 100.0
+        switch sliderValue {
+        case 0:
+            value = 80.0
+        case 1:
+            value = 90.0
+        case 2:
+            value = 100.0
+        case 3:
+            value = 110.0
+        case 4:
+            value = 120.0
+        default:
+            value = 100.0
+        }
+        UserDefaults.standard.set(value, forKey: bpmKEY)
+    }
+    
+    func readBPM() {
+        switch sliderValue {
+        case 0:
+            sliderStringValue = "80"
+        case 1:
+            sliderStringValue = "90"
+        case 2:
+            sliderStringValue = "100"
+        case 3:
+            sliderStringValue = "110"
+        case 4:
+            sliderStringValue = "120"
+        default:
+            sliderStringValue = "100"
+        }
+        saveBPM()
+    }
+    
+    func loadBPM() {
+        switch UserDefaults.standard.float(forKey: bpmKEY) {
+        case 80.0:
+            sliderValue = 0
+            sliderStringValue = "80"
+        case 90.0:
+            sliderValue = 1
+            sliderStringValue = "90"
+        case 100.0:
+            sliderValue = 2
+            sliderStringValue = "100"
+        case 110.0:
+            sliderValue = 3
+            sliderStringValue = "110"
+        case 120.0:
+            sliderValue = 4
+            sliderStringValue = "120"
+        default:
+            sliderValue = 2
+            sliderStringValue = "100"
+        }
+    }
+    
     func loadUser() {
         authModel.listenAuthentificationState()
         UserProfileRepository.shared.fetchCurrentProfile { profileUser, error in
diff --git a/Balance/Utils/BalanceExtensions.swift b/Balance/Utils/BalanceExtensions.swift
@@ -152,3 +152,9 @@ extension DateFormatter {
         return dateFormatter
     }()
 }
+
+extension UIScreen {
+   static let screenWidth = UIScreen.main.bounds.size.width
+   static let screenHeight = UIScreen.main.bounds.size.height
+   static let screenSize = UIScreen.main.bounds.size
+}
diff --git a/Balance/Utils/Constant.swift b/Balance/Utils/Constant.swift
@@ -80,3 +80,6 @@ let coinsValue = 5
 let coinsTime = 15
 
 let demoID = "0"
+
+let bpmKEY = "bpmKEY"
+let defaultBPM = 100.0

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ struct ChillCellView: View {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`.padding(EdgeInsets(top: 24, leading: 24, bottom: 24, trailing: 0))`
`39`		`- .frame(maxWidth: 311, maxHeight: 114)`
	`39`	`+ .frame(maxWidth: UIScreen.screenWidth - 20)`
	`40`	`+ .frame(height: 120)`
`40`	`41`	`.foregroundColor(darkBlueColor)`
`41`	`42`	`.background(RoundedRectangle(cornerRadius: 20).fill(.white))`
`42`	`43`	`.clipped()`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ struct DistractionCellView: View {`
`25`	`25`	`Spacer()`
`26`	`26`	`}`
`27`	`27`	`}`
`28`		`- .frame(maxWidth: 311, maxHeight: 120)`
	`28`	`+ .frame(maxWidth: UIScreen.screenWidth - 20)`
	`29`	`+ .frame(height: 120)`
`29`	`30`	`.foregroundColor(darkBlueColor)`
`30`	`31`	`.background(RoundedRectangle(cornerRadius: 20).fill(.white))`
`31`	`32`	`.clipped()`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ struct HomeView: View {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`.onChange(of: counter.count, perform: { _ in`
`49`		`- if counter.count > 100 {`
	`49`	`+ if counter.count > UserDefaults.standard.double(forKey: bpmKEY) {`
`50`	`50`	`print(counter.count)`
`51`	`51`	`alertHeartRate()`
`52`	`52`	`}`