Merge pull request #50 from angrezichatterbox/main

angrezichatterbox · web-flow · commit f53dc304dc34 · 2025-01-27T19:28:22.000+05:30
Bringing in the onboarding page
diff --git a/.gitignore b/.gitignore
@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.2.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
 }
 
 include ":app"
diff --git a/assets/bunked.png b/assets/bunked.png
diff --git a/assets/cancelled.png b/assets/cancelled.png
diff --git a/assets/present.png b/assets/present.png
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -33,4 +33,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
diff --git a/lib/controllers/auth/login_controller.dart b/lib/controllers/auth/login_controller.dart
@@ -8,7 +8,8 @@ import 'package:http/http.dart' as http;
 import 'dart:io';
 
 class LoginController extends GetxController {
-  final CourseSummaryController courseSummaryController = Get.put(CourseSummaryController());
+  final CourseSummaryController courseSummaryController =
+      Get.put(CourseSummaryController());
   final _storage = const FlutterSecureStorage();
   var isLogged = false.obs;
 
@@ -18,34 +19,37 @@ class LoginController extends GetxController {
   Future<String?> getToken() async {
     return await _storage.read(key: 'token');
   }
-Future<bool> logoutfunction() async {
-      var headers = { HttpHeaders.authorizationHeader: "Token ${await getToken()}"};
-      try {
-        var url = Uri.parse(
-            ApiEndPoints.baseUrl + ApiEndPoints.authEndPoints.logoutEmail);
-        http.Response response =
-            await http.post(url, headers: headers);
-        if (response.statusCode == 200) {
-          await _storage.delete(key: 'token');
-          isLogged.value = false;
 
-        } else {
-          throw jsonDecode(response.body);
-        }
-      } catch (error) {
-        Get.back();
-        showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SimpleDialog(
-                title: const Text('Error'),
-                contentPadding: const EdgeInsets.all(20),
-                children: [Text(error.toString())],
-              );
-            });
+  Future<bool> logoutfunction() async {
+    var headers = {
+      HttpHeaders.authorizationHeader: "Token ${await getToken()}"
+    };
+    try {
+      var url = Uri.parse(
+          ApiEndPoints.baseUrl + ApiEndPoints.authEndPoints.logoutEmail);
+      http.Response response = await http.post(url, headers: headers);
+      if (response.statusCode == 200) {
+        await _storage.delete(key: 'token');
+        await _storage.delete(key: 'onboarding');
+        isLogged.value = false;
+      } else {
+        throw jsonDecode(response.body);
       }
-    return isLogged.value;
+    } catch (error) {
+      Get.back();
+      showDialog(
+          context: Get.context!,
+          builder: (context) {
+            return SimpleDialog(
+              title: const Text('Error'),
+              contentPadding: const EdgeInsets.all(20),
+              children: [Text(error.toString())],
+            );
+          });
     }
+    return isLogged.value;
+  }
+
   Future<bool> loginFunction() async {
     var headers = {"Content-Type": "application/json"};
     try {
@@ -80,6 +84,6 @@ Future<bool> logoutfunction() async {
             );
           });
     }
-  return isLogged.value ;
+    return isLogged.value;
+  }
 }
-}
diff --git a/lib/controllers/auth/signup_controller.dart b/lib/controllers/auth/signup_controller.dart
@@ -28,7 +28,7 @@ class SignupController extends GetxController {
       if (response.statusCode == 201) {
         usernameController.clear();
         passwordController.clear();
-        Get.off(const AuthScreen());
+        Get.off(const LoginScreen());
       }
       else {
         throw jsonDecode(response.body) ?? 'Unknown Error occured' ;
diff --git a/lib/controllers/navigation/navigation_controller.dart b/lib/controllers/navigation/navigation_controller.dart
@@ -1,3 +1,5 @@
+import 'package:bunk_mate/screens/Status/status_page.dart';
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 class NavigationController extends GetxController {
diff --git a/lib/controllers/onBoard/on_board_controller.dart b/lib/controllers/onBoard/on_board_controller.dart
@@ -39,7 +39,7 @@ class OnBoardController extends GetxController {
       );
       _service.submitTimetable(timetable).then((_) {
         Get.snackbar("Success", "TimeTable has been created");
-        Get.off(const Navigation());
+        Get.off( Navigation());
       }).catchError((error) {
         Get.snackbar("Error", "Could not create timetableld");
       });
diff --git a/lib/main.dart b/lib/main.dart
@@ -15,7 +15,7 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     const storage = FlutterSecureStorage();
- WidgetsFlutterBinding.ensureInitialized();
+    WidgetsFlutterBinding.ensureInitialized();
     return FutureBuilder(
       future: storage.read(key: 'token'),
       builder: (BuildContext context, AsyncSnapshot<String?> snapshot) {
@@ -37,7 +37,7 @@ class MyApp extends StatelessWidget {
                     ColorScheme.fromSeed(seedColor: Colors.greenAccent),
                 useMaterial3: true,
               ),
-              home: const Navigation(),
+              home:  Navigation(),
             );
           } else {
             return GetMaterialApp(
@@ -49,7 +49,7 @@ class MyApp extends StatelessWidget {
                     ColorScheme.fromSeed(seedColor: Colors.greenAccent),
                 useMaterial3: true,
               ),
-              home: const AuthScreen(),
+              home: const LoginScreen(),
             );
           }
         }
diff --git a/lib/screens/Status/status_page.dart b/lib/screens/Status/status_page.dart
@@ -1,20 +1,33 @@
 import 'package:bunk_mate/controllers/status/status_controller.dart';
+import 'package:bunk_mate/services/storage_service.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:line_icons/line_icons.dart';
 import 'package:intl/intl.dart';
+import 'package:onboarding_overlay/onboarding_overlay.dart';
 
-class StatusView extends StatelessWidget {
+class StatusView extends StatefulWidget {
+  final FocusNode focusNode;
+  StatusView({super.key, required this.focusNode});
+
+  @override
+  State<StatusView> createState() => StatusViewState();
+}
+
+class StatusViewState extends State<StatusView> {
   final StatusController controller =
       Get.put(StatusController(apiUrl: 'https://api.bunkmate.college'));
+
   final Color bgColor = const Color(0xFF121212);
+
   final Color cardColor = const Color(0xFF1E1E1E);
+
   final Color accentColor = const Color(0xFF4CAF50);
+
   final Color textColor = Colors.white;
-  final Color secondaryTextColor = Colors.white70;
 
-  StatusView({super.key});
+  final Color secondaryTextColor = Colors.white70;
 
   @override
   Widget build(BuildContext context) {
@@ -46,7 +59,15 @@ class StatusView extends StatelessWidget {
             ),
           ),
           const Spacer(),
-          _buildRewindTimeButton(context),
+          Row(
+            children: [
+              _buildRewindTimeButton(context),
+              const SizedBox(
+                width: 10,
+              ),
+              _buildHelpButon(context)
+            ],
+          ),
         ],
       ),
       body: Obx(
@@ -57,6 +78,41 @@ class StatusView extends StatelessWidget {
     );
   }
 
+  void showPageGuide() async {
+    bool isOnboardingCompleted = await StorageService().getOnboardingComplete();
+    final OnboardingState? onboarding = Onboarding.of(context);
+    if (onboarding != null && !isOnboardingCompleted) {
+      onboarding.show();
+      await StorageService().setOnboardingComplete();
+    } else {
+      print("Onboarding is null");
+    }
+  }
+
+  Widget _buildHelpButon(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(right: 20),
+      child: ElevatedButton(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: bgColor,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(20),
+          ),
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+        ),
+        onPressed: () {
+          final OnboardingState? onboarding = Onboarding.of(context);
+          if (onboarding != null) {
+            onboarding.show();
+          } else {
+            print("Onboarding is null");
+          }
+        },
+        child: const Icon(Icons.help_outline, size: 40, color: Colors.white),
+      ),
+    );
+  }
+
   Widget _buildRewindTimeButton(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.only(right: 20),
@@ -79,6 +135,11 @@ class StatusView extends StatelessWidget {
       padding: const EdgeInsets.all(20.0),
       itemCount: controller.courses.length,
       itemBuilder: (BuildContext context, int index) {
+        if (index == 0)
+          return Focus(
+            focusNode: widget.focusNode,
+            child: _buildCourseItem(controller.courses[index]),
+          );
         return _buildCourseItem(controller.courses[index]);
       },
     );
diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart
@@ -6,14 +6,14 @@ import 'package:bunk_mate/controllers/auth/login_controller.dart';
 import 'package:get/get.dart';
 import 'package:google_fonts/google_fonts.dart';
 
-class AuthScreen extends StatefulWidget {
-  const AuthScreen({super.key});
+class LoginScreen extends StatefulWidget {
+  const LoginScreen({super.key});
 
   @override
-  State<AuthScreen> createState() => _AuthScreenState();
+  State<LoginScreen> createState() => _LoginScreenState();
 }
 
-class _AuthScreenState extends State<AuthScreen>
+class _LoginScreenState extends State<LoginScreen>
     with SingleTickerProviderStateMixin {
   LoginController loginController = Get.put(LoginController());
   late AnimationController _animationController;
@@ -185,7 +185,7 @@ class _AuthScreenState extends State<AuthScreen>
       onPressed: () async {
         bool success = await loginController.loginFunction();
         if (success) {
-          Get.off(const Navigation());
+          Get.off( Navigation());
         }
       },
       style: ElevatedButton.styleFrom(
diff --git a/lib/screens/auth/signup_screen.dart b/lib/screens/auth/signup_screen.dart
@@ -199,7 +199,7 @@ class _SignupScreenState extends State<SignupScreen> with SingleTickerProviderSt
         ),
         GestureDetector(
           onTap: () {
-            Get.off(const AuthScreen());
+            Get.off(const LoginScreen());
           },
           child: Text(
             "Sign in",
diff --git a/lib/screens/homepage/homepage_screen.dart b/lib/screens/homepage/homepage_screen.dart
@@ -248,12 +248,12 @@ class HomePageState extends State<HomePage> {
   Future<void> _handleLogout() async {
     bool success = await loginController.logoutfunction();
     if (!success) {
-      Get.off(const AuthScreen());
+      Get.off(const LoginScreen());
       Get.snackbar("Logout Successful", "You were logged out successfully");
       Get.deleteAll();
     } else {
       Get.snackbar("Error", "You weren't logged out. Try again.");
-      Get.to(const Navigation());
+      Get.to( Navigation());
     }
   }
 
diff --git a/lib/screens/on_board_view.dart b/lib/screens/on_board_view.dart
@@ -72,7 +72,7 @@ class _OnBoardViewState extends State<OnBoardView> {
                                 _service
                                     .timeTablePresets(value as int)
                                     .then((_) {
-                                  Get.off(const Navigation());
+                                  Get.off( Navigation());
                                 }).catchError((error) {
                                   ScaffoldMessenger.of(context).showSnackBar(
                                     const SnackBar(
diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart
@@ -14,4 +14,17 @@ class StorageService {
   Future<void> deleteToken() async {
     await _storage.delete(key: 'token');
   }
+
+  Future<void> setOnboardingComplete() async {
+    await _storage.write(key: 'onboarding', value: 'true');
+  }
+
+  Future<void> deleteOnboarding() async {
+    await _storage.delete(key: 'onboarding');
+  }
+
+  Future<bool> getOnboardingComplete() async {
+    final onboarding = await _storage.read(key: 'onboarding');
+    return onboarding == 'true';
+  }
 }
diff --git a/lib/utils/Navigation.dart b/lib/utils/Navigation.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ pluginManagement {`
`19`	`19`
`20`	`20`	`plugins {`
`21`	`21`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`22`		`- id "com.android.application" version "7.3.0" apply false`
`23`		`- id "org.jetbrains.kotlin.android" version "1.7.10" apply false`
	`22`	`+ id "com.android.application" version "8.2.0" apply false`
	`23`	`+ id "org.jetbrains.kotlin.android" version "1.9.10" apply false`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`include ":app"`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,4 @@ SPEC CHECKSUMS:`
`33`	`33`
`34`	`34`	`PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796`
`35`	`35`
`36`		`-COCOAPODS: 1.15.2`
	`36`	`+COCOAPODS: 1.16.2`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class SignupController extends GetxController {`
`28`	`28`	`if (response.statusCode == 201) {`
`29`	`29`	`usernameController.clear();`
`30`	`30`	`passwordController.clear();`
`31`		`- Get.off(const AuthScreen());`
	`31`	`+ Get.off(const LoginScreen());`
`32`	`32`	`}`
`33`	`33`	`else {`
`34`	`34`	`throw jsonDecode(response.body) ?? 'Unknown Error occured' ;`