Feature/ux improvements

CloudMaster.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		8D26A31C2C0EA9C100E9B015 /* QuestionNavbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D26A31B2C0EA9C100E9B015 /* QuestionNavbar.swift */; };
 		8D8D8A862C05A23600ACC61C /* CloudMasterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8A852C05A23600ACC61C /* CloudMasterTests.swift */; };
 		8D8D8A902C05A23600ACC61C /* CloudMasterUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8A8F2C05A23600ACC61C /* CloudMasterUITests.swift */; };
 		8D8D8A922C05A23600ACC61C /* CloudMasterUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8A912C05A23600ACC61C /* CloudMasterUITestsLaunchTests.swift */; };
@@ -61,6 +62,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		8D26A31B2C0EA9C100E9B015 /* QuestionNavbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestionNavbar.swift; sourceTree = "<group>"; };
 		8D8D8A712C05A23400ACC61C /* CloudMaster Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "CloudMaster Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D8D8A812C05A23600ACC61C /* CloudMasterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CloudMasterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D8D8A852C05A23600ACC61C /* CloudMasterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudMasterTests.swift; sourceTree = "<group>"; };
@@ -125,6 +127,23 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		8D26A3192C0EA9A400E9B015 /* Components */ = {
+			isa = PBXGroup;
+			children = (
+				8D8D8A9F2C05A27800ACC61C /* ConfirmPopup.swift */,
+				8D26A31B2C0EA9C100E9B015 /* QuestionNavbar.swift */,
+			);
+			path = Components;
+			sourceTree = "<group>";
+		};
+		8D26A31A2C0EA9B300E9B015 /* Shared */ = {
+			isa = PBXGroup;
+			children = (
+				8D26A3192C0EA9A400E9B015 /* Components */,
+			);
+			path = Shared;
+			sourceTree = "<group>";
+		};
 		8D8D8A682C05A23400ACC61C = {
 			isa = PBXGroup;
 			children = (
@@ -183,7 +202,6 @@
 			isa = PBXGroup;
 			children = (
 				8DABB7722C0D7CF900B40E25 /* ViewModels */,
-				8D8D8A9F2C05A27800ACC61C /* ConfirmPopup.swift */,
 				8D8D8AA02C05A27800ACC61C /* DownloadOverlayView.swift */,
 				8D8D8AA12C05A27800ACC61C /* NotificationSettingsView.swift */,
 			);
@@ -342,6 +360,7 @@
 		8D8D8AC32C05A27800ACC61C /* Features */ = {
 			isa = PBXGroup;
 			children = (
+				8D26A31A2C0EA9B300E9B015 /* Shared */,
 				8D8D8AA22C05A27800ACC61C /* Common */,
 				8D8D8AA62C05A27800ACC61C /* Course */,
 				8D8D8AA92C05A27800ACC61C /* Courses */,
@@ -574,6 +593,7 @@
 				8D8D8AD92C05A27800ACC61C /* HomeView.swift in Sources */,
 				8D8D8AD42C05A27800ACC61C /* ExamModesView.swift in Sources */,
 				8D8D8AE12C05A27800ACC61C /* Courses.swift in Sources */,
+				8D26A31C2C0EA9C100E9B015 /* QuestionNavbar.swift in Sources */,
 				8D8D8AD12C05A27800ACC61C /* CourseView.swift in Sources */,
 				8DABB7742C0D7D0300B40E25 /* DownloadViewModel.swift in Sources */,
 			);

CloudMaster/Assets.xcassets/githubIcon.symbolset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "githubIcon.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

CloudMaster/CloudMaster.swift

@@ -16,9 +16,6 @@ struct CloudMaster: App {
                 HomeView(favorites: $favorites)
             } else {
                 IntroView(favorites: $favorites, isAppConfigured: $isFirstStart)
-                    .onAppear {
-                        UserDefaults.standard.set(true, forKey: "isFirstStart")
-                    }
             }
         }
     }

CloudMaster/Features/Common/DownloadOverlayView.swift

@@ -7,7 +7,7 @@ struct DownloadOverlayView: View {
     var body: some View {
         if isShowing {
             ZStack {
-                Color.black.opacity(0.4)
+                Color.black.opacity(0.8)
                     .edgesIgnoringSafeArea(.all)
 
                 VStack {
@@ -61,7 +61,7 @@ struct CircularProgressView: View {
                 withAnimation(.spring()) {
                     Image(systemName: "checkmark.circle.fill")
                         .resizable()
-                        .foregroundColor(Color.green)
+                        .foregroundColor(Color.correct)
                         .frame(width: 50, height: 50)
                 }
             }

CloudMaster/Features/Course/Views/CourseView.swift

@@ -132,7 +132,6 @@ struct CourseView: View {
             }
         }) {
             Image(systemName: notificationsEnabled ? "bell.fill" : "bell")
-                .foregroundColor(notificationsEnabled ? Color.correct : .gray)
         }
     }
 

CloudMaster/Features/Courses/Views/CoursesView.swift

@@ -41,7 +41,8 @@ struct CoursesView: View {
             viewModel.downloadCourses(favorites)
         }) {
             Image(systemName: "arrow.down.circle")
+                .foregroundColor(viewModel.isDownloading ? .gray : .accentColor) // Change color based on state (optional)
         }
+        .disabled(viewModel.isDownloading)
     }
 }
-

CloudMaster/Features/Exam/Views/ExamSummaryView.swift

@@ -1,9 +1,6 @@
 import Foundation
 import SwiftUI
 
-import Foundation
-import SwiftUI
-
 struct ExamSummaryView: View {
     @State private var expandedQuestionIDs: Set<UUID> = []
     @State private var showDeleteConfirmation = false
@@ -15,6 +12,8 @@ struct ExamSummaryView: View {
     // Helper variable to hide backbutton after Exam
     let afterExam: Bool
 
+    @Environment(\.presentationMode) var presentationMode 
+
     var body: some View {
         VStack {
             Text(exam.isPassed ? "Passed" : "Failed")
@@ -103,6 +102,7 @@ struct ExamSummaryView: View {
         }
         .confirmPopup(isPresented: $showDeleteConfirmation, title: "Delete Exam", message: "Are you sure you want to delete this exam?", confirmAction: {
             examDataStore.deleteExam(withId: exam.id)
+            presentationMode.wrappedValue.dismiss() // Dismiss the view after deletion
         })
     }
 

CloudMaster/Features/Exam/Views/ExamView.swift

@@ -180,8 +180,8 @@ struct ExamQuestion: View {
                     .lineLimit(nil) // Allow text to wrap as needed
                     .fixedSize(horizontal: false, vertical: true)
                     .padding(.horizontal)
-                    .frame(alignment: .leading)
-                    .multilineTextAlignment(.center)
+                    .multilineTextAlignment(.leading) // Justify the text
+                    .lineSpacing(2)
 
                 if let imagePath = question.imagePath,
                    let image = loadImage(from: imagePath) {
@@ -223,9 +223,15 @@ struct ExamQuestion: View {
     }
 
     private func adjustedFontSize(for text: String) -> CGFloat {
-        _ = UIScreen.main.bounds.width - 32 // Adjust for desired padding
-        let fontSize = max(min(text.count / 80, 24), 14) // Simplified dynamic font sizing
-        return CGFloat(fontSize)
+        let maxWidth = UIScreen.main.bounds.width - 32
+        let baseFontSize: CGFloat = 24
+        let minFontSize: CGFloat = 14
+
+        // Scale the font size based on the text length
+        let lengthFactor = CGFloat(text.count) / 100.0
+        let scaledFontSize = max(baseFontSize - lengthFactor, minFontSize)
+
+        return scaledFontSize
     }
 }
 

CloudMaster/Features/Home/Views/HomeView.swift

@@ -3,10 +3,11 @@ import SwiftUI
 struct HomeView: View {
     @Binding var favorites: Set<Course>
 
+    @Environment(\.colorScheme) var colorScheme
+
     private var appVersion: String {
         let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "Unknown"
-        let build = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? "Unknown"
-        return "Version \(version) (\(build))"
+        return "\(version)"
     }
 
 
@@ -50,6 +51,16 @@ struct HomeView: View {
                     .background(Color.customPrimary)
                     .cornerRadius(10)
                 }
+                .padding(.top, 10)
+
+                Link(destination: URL(string: "https://github.com/Ditectrev/CloudMaster")!) {
+                    Image("githubIcon")
+                        .resizable()
+                        .scaledToFit()
+                        .foregroundColor(colorScheme == .dark ? .gray : .black)
+                        .frame(width: 24, height: 24)
+                }
+                .padding(.bottom, 5)
 
                 Text(appVersion)
                      .font(.footnote)
@@ -75,7 +86,6 @@ extension HomeView {
             Image(systemName: "gearshape")
         }
     }
-
 }
 
 

CloudMaster/Features/Intro/Views/IntroView.swift

@@ -50,19 +50,26 @@ struct FirstPage: View {
         let isIpad = UIDevice.current.userInterfaceIdiom == .pad
         let imageSize: CGFloat = isIpad ? 300 : 200
 
-        VStack {
-            Text("Welcome to CloudMaster")
-                .font(.largeTitle)
-                .bold()
-                .padding()
+        VStack() {
+            Text("WELCOME TO")
+                .font(.system(size: 24, weight: .light, design: .default))
+                .transition(.opacity)
+                .frame(alignment: .leading)
+                .multilineTextAlignment(.center)
+
+            Text("Cloudmaster")
+                .font(.system(size: 36, weight: .bold, design: .default))
                 .transition(.opacity)
                 .frame(alignment: .leading)
                 .multilineTextAlignment(.center)
 
             Text("Improve your knowledge and get ready for exams")
-                .font(.subheadline)
+                .font(.system(size: 18, weight: .light, design: .default))
                 .bold()
                 .padding(.bottom, 20)
+                .frame(alignment: .leading)
+                .multilineTextAlignment(.center)
+                .padding()
 
             Spacer()
 
@@ -93,14 +100,25 @@ struct SecondPage: View {
 
     var body: some View {
         VStack {
-            Text("Welcome to CloudMaster")
-                .font(.largeTitle)
-                .bold()
-                .padding()
+            Text("WELCOME TO")
+                .font(.system(size: 24, weight: .light, design: .default))
+                .transition(.opacity)
+                .frame(alignment: .leading)
+                .multilineTextAlignment(.center)
 
+            Text("Cloudmaster")
+                .font(.system(size: 36, weight: .bold, design: .default))
+                .transition(.opacity)
+                .frame(alignment: .leading)
+                .multilineTextAlignment(.center)
+
             Text("Select your courses to study")
-                .font(.subheadline)
+                .font(.system(size: 18, weight: .light, design: .default))
                 .bold()
+                .padding(.bottom, 20)
+                .frame(alignment: .leading)
+                .multilineTextAlignment(.center)
+                .padding()
 
             SearchBar(text: $searchText)
                 .padding()
@@ -119,6 +137,7 @@ struct SecondPage: View {
             Spacer()
 
             Button("Finish Setup") {
+                UserDefaults.standard.set(true, forKey: "isFirstStart")
                 showDownloadOverlayView = true
             }
             .foregroundColor(.white)

CloudMaster/Features/Settings/Views/SettingsView.swift

@@ -32,21 +32,6 @@ struct SettingsView: View {
                 alertAction?()
             })
 
-            Spacer()
-
-            HStack {
-                Spacer()
-                Link(destination: URL(string: "https://github.com/your-repository-url")!) {
-                    HStack {
-                        Image(systemName: "link.circle")
-                        Text("View on GitHub")
-                    }
-                    .padding()
-                }
-                .foregroundColor(.blue)
-                Spacer()
-            }
-            .padding()
         }
     }
 

CloudMaster/Features/Shared/Components/QuestionNavbar.swift

@@ -0,0 +1,28 @@
+import SwiftUI
+
+struct QuestionNavbar: View {
+    @Environment(\.presentationMode) var presentationMode
+    let currentQuestionIndex: Int
+    let totalQuestions: Int
+
+    var body: some View {
+        HStack {
+            Button(action: {
+                presentationMode.wrappedValue.dismiss()
+            }) {
+                Image(systemName: "chevron.left")
+                    .font(.title3)
+                    .foregroundColor(.blue)
+            }
+
+            Spacer()
+
+            Text("\(currentQuestionIndex + 1) of \(totalQuestions)")
+                .font(.subheadline)
+                .foregroundColor(.secondary)
+
+            Spacer()
+        }
+        .padding()
+    }
+}