fix: Bugs due to scroll view in onboarding

Bunk-Mate · Feb 5, 2025 · 49deecd · 49deecd
1 parent 21e693a
commit 49deecd
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 37 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -12,6 +12,14 @@ if (localPropertiesFile.exists()) {
     }
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.withReader('UTF-8') { reader ->
+        keystoreProperties.load(reader)
+    }
+}
+
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -42,7 +50,9 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.bunk_mate"
+        applicationId "college.bunkmate"
+        versionCode 2  // Increase this by 1
+        versionName "1.0.1" // Optional, update if needed
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion flutter.minSdkVersion
@@ -51,11 +61,21 @@ android {
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            storeFile file(keystoreProperties["storeFile"])
+            storePassword keystoreProperties["storePassword"]
+            keyAlias keystoreProperties["keyAlias"]
+            keyPassword keystoreProperties["keyPassword"]
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -27,9 +27,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 

diff --git a/lib/controllers/homepage/course_summary_controller.dart b/lib/controllers/homepage/course_summary_controller.dart
@@ -29,7 +29,6 @@ class CourseSummaryController extends GetxController {
       final token = await getToken();
 
       if (token == null) {
-        Get.snackbar('Error', 'No token found.');
         return;
       }
 
@@ -59,11 +58,6 @@ class CourseSummaryController extends GetxController {
       }
     } catch (error) {
       print('Error fetching course summary: $error');
-      Get.snackbar(
-        'Error',
-        'Failed to fetch course data. Please try again.',
-        snackPosition: SnackPosition.BOTTOM,
-      );
     } finally {
       isLoading.value = false;
     }

diff --git a/lib/controllers/timetable/time_table_controller.dart b/lib/controllers/timetable/time_table_controller.dart
@@ -123,6 +123,5 @@ class TimeTableController extends GetxController {
     } catch (e) {
       message = 'Failed to parse error response';
     }
-    Get.snackbar("Error", message);
   }
 }
diff --git a/lib/screens/Status/status_page.dart b/lib/screens/Status/status_page.dart
@@ -36,11 +36,12 @@ class StatusViewState extends State<StatusView> {
     return Scaffold(
       backgroundColor: bgColor,
       appBar: AppBar(
+        centerTitle: false,
         backgroundColor: bgColor,
         elevation: 0,
         actions: [
           Padding(
-            padding: const EdgeInsets.only(left: 25),
+            padding: const EdgeInsets.only(left: 30),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -62,9 +63,6 @@ class StatusViewState extends State<StatusView> {
           Row(
             children: [
               _buildRewindTimeButton(context),
-              const SizedBox(
-                width: 10,
-              ),
               _buildHelpButon(context)
             ],
           ),
@@ -114,9 +112,7 @@ class StatusViewState extends State<StatusView> {
   }
 
   Widget _buildRewindTimeButton(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(right: 20),
-      child: ElevatedButton(
+    return  ElevatedButton(
         style: ElevatedButton.styleFrom(
           backgroundColor: bgColor,
           shape: RoundedRectangleBorder(
@@ -125,8 +121,7 @@ class StatusViewState extends State<StatusView> {
           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
         ),
         onPressed: () => controller.selectDate(context),
-        child: const Icon(LineIcons.calendar, size: 50, color: Colors.white),
-      ),
+        child: const Icon(LineIcons.calendar, size: 40, color: Colors.white),
     );
   }
 

diff --git a/lib/screens/homepage/homepage_screen.dart b/lib/screens/homepage/homepage_screen.dart
@@ -47,10 +47,12 @@ class HomePageState extends State<HomePage> {
       backgroundColor: bgColor,
       appBar: AppBar(
         title: Text('Bunk-Mate',
+
             style: TextStyle(
                 color: textColor, fontSize: 24, fontWeight: FontWeight.bold)),
         backgroundColor: bgColor,
         elevation: 0,
+        centerTitle: true,
         actions: [_buildPopupMenu()],
       ),
       body: Padding(

diff --git a/lib/screens/on_board_view.dart b/lib/screens/on_board_view.dart
@@ -34,6 +34,7 @@ class _OnBoardViewState extends State<OnBoardView> {
             fontSize: 24,
           ),
         ),
+        centerTitle: true,
         backgroundColor: bgColor,
         elevation: 0,
       ),

diff --git a/lib/utils/Navigation.dart b/lib/utils/Navigation.dart
@@ -61,23 +61,18 @@ class _NavigationState extends State<Navigation> {
           focusNode: focusNodes[0],
           titleText: "",
           bodyText: '',
-          overlayColor: Colors.black.withOpacity(0.7),
-          overlayShape: const RoundedRectangleBorder(),
           overlayBehavior: HitTestBehavior.deferToChild,
           stepBuilder: (context, renderInfo) {
             return Scaffold(
               backgroundColor: Colors.transparent,
-              body: SingleChildScrollView(
-                child: Center(
+              body: Center(
                   child: Container(
                     width: MediaQuery.of(context).size.width,
                     height: MediaQuery.of(context).size.height,
                     padding: const EdgeInsets.all(25),
                     decoration: BoxDecoration(
-                      color: const Color(0xFF121212),
-                      border: Border.all(color: const Color(0xFF4CAF50)),
+                      color: const Color(0x80000020)
                     ),
-                    child: SingleChildScrollView(
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
@@ -100,14 +95,14 @@ class _NavigationState extends State<Navigation> {
                           ),
                           buildGuideStep(
                             'Long Press to mark present again',
-                            'assets/present.png', // Make sure the path is correct.
+                            'assets/present.png',
                           ),
                           const SizedBox(height: 20),
                           Center(
                             child: ElevatedButton(
-                              onPressed: renderInfo.close, // Close the guide
+                              onPressed: renderInfo.close,
                               style: ElevatedButton.styleFrom(
-                                backgroundColor: Color(0xFF4CAF50),
+                                backgroundColor: const Color(0xFF4CAF50),
                               ),
                               child: const Text(
                                 "close",
@@ -122,9 +117,7 @@ class _NavigationState extends State<Navigation> {
                         ],
                       ),
                     ),
-                  ),
-                ),
-              ),
+                  )
             );
           },
         ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: bunk_mate
 description: "A new Flutter project."
 publish_to: "none"
-version: 1.0.0+1
+version: 1.0.0+3.1
 
 environment:
   sdk: ">=3.3.4 <4.0.0"