Merge pull request #34 from Ditectrev/fix/33-az-104-image-download-fails

Fix/33 az 104 image download fails

Author: danieldanielecki

CloudMaster.xcodeproj/project.xcworkspace/xcuserdata/benedikt.xcuserdatad/UserInterfaceState.xcuserstate

@@ -13,7 +13,7 @@ enum CodingKeys: String, CodingKey {
 }
 
 struct Course: Codable, Hashable, Identifiable {
-    let id = UUID() // Add this line
+    var id = UUID() // Add this line
     let fullName: String
     let shortName: String
     let description: String

CloudMaster/Constants/Courses.swift

@@ -3,69 +3,63 @@ import SwiftUI
 struct DownloadOverlayView: View {
     @Binding var isShowing: Bool
     @StateObject var viewModel: DownloadViewModel
-
+    
     var body: some View {
         if isShowing {
             ZStack {
                 Color.black.opacity(0.8)
                     .edgesIgnoringSafeArea(.all)
-
+                
                 VStack {
+                    Text("\(viewModel.completedDownloads) / \(Int(viewModel.totalCourses)) courses")
+                        .font(.title2)
+                        .foregroundColor(.white)
+        
                     CircularProgressView(progress: $viewModel.overallProgress)
                         .frame(width: 250, height: 250)
                         .shadow(radius: 10)
-
-                    HStack {
-                        if viewModel.totalCourses > 1 {
-                               Text("\(viewModel.completedDownloads) / \(Int(viewModel.totalCourses)) courses")
-                                   .font(.headline)
-                                   .foregroundColor(.white)
-                                   .padding(.top, 10)
-                           }
-                    }
-                          
-                  Text(viewModel.statusMessage)
-                      .font(.subheadline)
-                      .bold()
-                      .foregroundColor(.white)
-                      .padding(.top, 5)
 
+                    Text(viewModel.statusMessage)
+                        .font(.subheadline)
+                        .bold()
+                        .foregroundColor(.gray)
+                        .padding(.top, 10)
                 }
             }
         }
     }
-}
-
-struct CircularProgressView: View {
-    @Binding var progress: Double
-
-    var body: some View {
-        ZStack {
-            Circle()
-                .stroke(lineWidth: 10.0)
-                .opacity(0.5)
-                .foregroundColor(Color.customSecondary)
-            
-            Circle()
-                .trim(from: 0.0, to: CGFloat(min(self.progress, 1.0)))
-                .stroke(style: StrokeStyle(lineWidth: 10.0, lineCap: .round, lineJoin: .round))
-                .foregroundColor(Color.customAccent)
-                .rotationEffect(Angle(degrees: 270.0))
-                .animation(.linear, value: progress)
-            
-            if progress < 1.0 {
-                Text(String(format: "%.0f %%", min(self.progress, 1.0) * 100.0))
-                    .font(.largeTitle)
-                    .bold()
-            } else {
-                withAnimation(.spring()) {
-                    Image(systemName: "checkmark.circle.fill")
-                        .resizable()
-                        .foregroundColor(Color.correct)
-                        .frame(width: 50, height: 50)
+    
+    struct CircularProgressView: View {
+        @Binding var progress: Double
+        
+        var body: some View {
+            ZStack {
+                Circle()
+                    .stroke(lineWidth: 10.0)
+                    .opacity(0.5)
+                    .foregroundColor(Color.customSecondary)
+                
+                Circle()
+                    .trim(from: 0.0, to: CGFloat(min(self.progress, 1.0)))
+                    .stroke(style: StrokeStyle(lineWidth: 10.0, lineCap: .round, lineJoin: .round))
+                    .foregroundColor(Color.customAccent)
+                    .rotationEffect(Angle(degrees: 270.0))
+                    .animation(.linear, value: progress)
+                
+                if progress < 1.0 {
+                    Text(String(format: "%.0f %%", min(self.progress, 1.0) * 100.0))
+                        .font(.largeTitle)
+                        .bold()
+                } else {
+                    withAnimation(.spring()) {
+                        Image(systemName: "checkmark.circle.fill")
+                            .resizable()
+                            .foregroundColor(Color.correct)
+                            .frame(width: 50, height: 50)
+                    }
                 }
             }
+            .padding(40)
         }
-        .padding(40)
     }
 }

CloudMaster/Features/Common/DownloadOverlayView.swift

@@ -130,7 +130,7 @@ struct CourseView: View {
             )
         )
         .alert(isPresented: $viewModel.showAlert) {
-            Alert(title: Text("Download Error"), message: Text(viewModel.alertMessage ?? ""), dismissButton: .default(Text("OK")))
+            Alert(title: Text("Download Error"), message: Text(viewModel.alertMessage), dismissButton: .default(Text("OK")))
         }
     }
 

CloudMaster/Features/Course/Views/CourseView.swift

@@ -19,7 +19,7 @@ struct CoursesView: View {
             )
         )
         .alert(isPresented: $viewModel.showAlert) {
-            Alert(title: Text("Download Error"), message: Text(viewModel.alertMessage ?? ""), dismissButton: .default(Text("OK")))
+            Alert(title: Text("Download Error"), message: Text(viewModel.alertMessage), dismissButton: .default(Text("OK")))
         }
     }
 

CloudMaster/Features/Courses/Views/CoursesView.swift

@@ -34,7 +34,7 @@ struct IntroView: View {
                 viewModel.downloadCourses(favorites)
             }
         }
-        .onChange(of: viewModel.downloadCompleted) { completed in
+        .onChange(of: viewModel.downloadCompleted) { completed, _ in
             if completed {
                 isAppConfigured = true
             }

CloudMaster/Features/Intro/Views/IntroView.swift

@@ -87,7 +87,6 @@ struct QuestionView: View {
     }
 
     private func adjustedFontSize(for text: String) -> CGFloat {
-        let maxWidth = UIScreen.main.bounds.width - 32
         let baseFontSize: CGFloat = 20
         let minFontSize: CGFloat = 14
 

CloudMaster/Features/Shared/Components/QuestionView.swift

@@ -22,7 +22,6 @@ struct TrainingView: View {
             VStack {
                 if !questionLoader.questions.isEmpty {
                     let questions = Array(questionLoader.questions)
-                    let totalQuestions = questions.count
                     let question = questions[currentQuestionIndex]
 
                     QuestionNavbar(