Completed challenges for BetterRest app, updated related README.md

Author: alexandrei64

Assets/Mockup_BetterRest.png

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "6D270DBC-53A7-474D-AAC0-312FFE3E6DF1"
+   type = "1"
+   version = "2.0">
+</Bucket>

BetterRest/BetterRest.xcodeproj/project.xcworkspace/xcuserdata/alexandruandrei.xcuserdatad/UserInterfaceState.xcuserstate

@@ -18,55 +18,58 @@ struct ContentView: View {
     @State private var showingAlert = false
 
     var body: some View {
-        NavigationView {
+        NavigationView { 
             Form {
 
                 Section (header: Text("When do you want to wake up?")) {
-                /*
-                VStack(alignment: .leading, spacing: 0) {
-                    Text("When do you want to wake up?")
-                        .font(.headline)
-                */
+                    
                     DatePicker("Please enter a time", selection: $wakeUp, displayedComponents: .hourAndMinute)
                         .labelsHidden()
                         .datePickerStyle(WheelDatePickerStyle())
                 }
 
                 Section (header: Text("Desired amount of sleep")) {
-                /*
-                VStack(alignment: .leading, spacing: 0) {
-                    Text("Desired amount of sleep")
-                        .font(.headline)
-                */
+                    
                     Stepper(value: $sleepAmount, in: 4 ... 12, step: 0.25) {
                         Text("\(sleepAmount, specifier: "%g") hours")
                     }
                 }
 
                 Section (header: Text("Daily coffe intake")) {
-                /*
-                VStack(alignment: .leading, spacing: 0) {
-                    Text("Daily coffe intake")
-                        .font(.headline)
-                */
+                    
                     Stepper(value: $coffeeAmount, in: 1 ... 20) {
                         if coffeeAmount == 1{
                             Text("1 cup")
                         } else {
                             Text("\(coffeeAmount) cups")
                         }
                     }
+                    
+                    // Commented code represents the solution to challenge 2, but a Stepper was a better design
+                    
+                    /*
+                    Picker("Daily coffee intake", selection: $coffeeAmount) {
+                        ForEach(1 ... 20, id: \.self) {
+                            if $0 == 1  {
+                                Text("\($0) cup")
+                            } else {
+                                Text("\($0) cups")
+                            }
+                        }
+                    }
+                    .pickerStyle(DefaultPickerStyle())
+                    */
                 }
-            }
-            .navigationBarTitle("BetterRest")
-            .navigationBarItems(trailing:
-                Button(action: calculateBedtime) {
-                    Text("Calculate")
+                
+                Section (header: Text("Your ideal bedtime is")) {
+                    Text("\(calculateBedtime())")
+                        .foregroundColor(.yellow)
+                        .font(.largeTitle)
+                        .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
                 }
-            )
-            .alert(isPresented: $showingAlert) {
-                Alert(title: Text(alertTitle), message: Text(alertMessage), dismissButton: .default(Text("OK")))
             }
+            .preferredColorScheme(/*@START_MENU_TOKEN@*/.dark/*@END_MENU_TOKEN@*/)
+            .navigationBarTitle(Text("BetterRest"))
         }
     }
 
@@ -77,26 +80,25 @@ struct ContentView: View {
         return Calendar.current.date(from: components) ?? Date()
     }
 
-    func calculateBedtime() {
+    func calculateBedtime() -> String {
         let model = SleepCalculator()
         let components = Calendar.current.dateComponents([.hour, .minute], from: wakeUp)
         let hour = (components.hour ?? 0) * 60 * 60
         let minute = (components.minute ?? 0) * 60
-        
+        var bedtimePrediction: String = ""
+
         do {
             let prediction = try model.prediction(wake: Double(hour + minute), estimatedSleep: sleepAmount, coffee: Double(coffeeAmount))
             let sleepTime = wakeUp - prediction.actualSleep
 
             let formatter = DateFormatter()
             formatter.timeStyle = .short
 
-            alertMessage = formatter.string(from: sleepTime)
-            alertTitle = "Your ideal bedtime is..."
+             bedtimePrediction = formatter.string(from: sleepTime)
         } catch {
-            alertTitle = "Error"
-            alertMessage = "Sorry, there was a problem calculating your bedtime."
+            bedtimePrediction = "Oops! I encountered an error 🤭"
         }
-        showingAlert = true
+        return bedtimePrediction
     }
 }
 

BetterRest/BetterRest.xcodeproj/xcuserdata/alexandruandrei.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,9 +10,9 @@ Create ML, Core ML, DatePicker, Stepper, navigationBarItems(), Date, DateCompone
 > * Replace the “Number of cups” stepper with a Picker showing the same range of values.
 > * Change the user interface so that it always shows their recommended bedtime using a nice and large font. You should be able to remove the “Calculate” button entirely.
 
+Second challenge was completed and is contained as a comment inside the project. A stepper implementation seemed like a better design in this case.
+
 ## 📸 Screenshots
-<!---
 <div align ="center">
 <img src="/Assets/Mockup_BetterRest.png" width=800>
-</div>
---->
+</div>

BetterRest/BetterRest/ContentView.swift

@@ -45,17 +45,13 @@ struct ContentView: View {
                 }
                 Spacer()
                     .frame(height: 33)
-                HStack{
+                HStack (spacing: 38) {
                     ForEach(0 ..< 3) { number in
                         Button(action: {
                             self.buttonTapped(number)
                         }) {
-                            Spacer()
-                                .frame(width:19)
                             Text("\(self.choices[number])")
                                 .font(.system(size: 65))
-                            Spacer()
-                                .frame(width:19)
                         }
                     }
                 }