Skip to content

Commit 49deecd

Browse files
fix: Bugs due to scroll view in onboarding
1 parent 21e693a commit 49deecd

File tree

9 files changed

+41
-37
lines changed

9 files changed

+41
-37
lines changed

android/app/build.gradle

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ if (localPropertiesFile.exists()) {
1212
}
1313
}
1414

15+
def keystoreProperties = new Properties()
16+
def keystorePropertiesFile = rootProject.file('key.properties')
17+
if (keystorePropertiesFile.exists()) {
18+
keystorePropertiesFile.withReader('UTF-8') { reader ->
19+
keystoreProperties.load(reader)
20+
}
21+
}
22+
1523
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1624
if (flutterVersionCode == null) {
1725
flutterVersionCode = '1'
@@ -42,7 +50,9 @@ android {
4250

4351
defaultConfig {
4452
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
45-
applicationId "com.example.bunk_mate"
53+
applicationId "college.bunkmate"
54+
versionCode 2 // Increase this by 1
55+
versionName "1.0.1" // Optional, update if needed
4656
// You can update the following values to match your application needs.
4757
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
4858
minSdkVersion flutter.minSdkVersion
@@ -51,11 +61,21 @@ android {
5161
versionName flutterVersionName
5262
}
5363

64+
signingConfigs {
65+
release {
66+
storeFile file(keystoreProperties["storeFile"])
67+
storePassword keystoreProperties["storePassword"]
68+
keyAlias keystoreProperties["keyAlias"]
69+
keyPassword keystoreProperties["keyPassword"]
70+
}
71+
}
72+
5473
buildTypes {
5574
release {
56-
// TODO: Add your own signing config for the release build.
57-
// Signing with the debug keys for now, so `flutter run --release` works.
58-
signingConfig signingConfigs.debug
75+
signingConfig signingConfigs.release
76+
minifyEnabled true
77+
shrinkResources true
78+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5979
}
6080
}
6181
}

ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ EXTERNAL SOURCES:
2727

2828
SPEC CHECKSUMS:
2929
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
30-
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
31-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
32-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
30+
flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
31+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
32+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
3333

3434
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
3535

lib/controllers/homepage/course_summary_controller.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class CourseSummaryController extends GetxController {
2929
final token = await getToken();
3030

3131
if (token == null) {
32-
Get.snackbar('Error', 'No token found.');
3332
return;
3433
}
3534

@@ -59,11 +58,6 @@ class CourseSummaryController extends GetxController {
5958
}
6059
} catch (error) {
6160
print('Error fetching course summary: $error');
62-
Get.snackbar(
63-
'Error',
64-
'Failed to fetch course data. Please try again.',
65-
snackPosition: SnackPosition.BOTTOM,
66-
);
6761
} finally {
6862
isLoading.value = false;
6963
}

lib/controllers/timetable/time_table_controller.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,5 @@ class TimeTableController extends GetxController {
123123
} catch (e) {
124124
message = 'Failed to parse error response';
125125
}
126-
Get.snackbar("Error", message);
127126
}
128127
}

lib/screens/Status/status_page.dart

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ class StatusViewState extends State<StatusView> {
3636
return Scaffold(
3737
backgroundColor: bgColor,
3838
appBar: AppBar(
39+
centerTitle: false,
3940
backgroundColor: bgColor,
4041
elevation: 0,
4142
actions: [
4243
Padding(
43-
padding: const EdgeInsets.only(left: 25),
44+
padding: const EdgeInsets.only(left: 30),
4445
child: Column(
4546
mainAxisAlignment: MainAxisAlignment.center,
4647
crossAxisAlignment: CrossAxisAlignment.start,
@@ -62,9 +63,6 @@ class StatusViewState extends State<StatusView> {
6263
Row(
6364
children: [
6465
_buildRewindTimeButton(context),
65-
const SizedBox(
66-
width: 10,
67-
),
6866
_buildHelpButon(context)
6967
],
7068
),
@@ -114,9 +112,7 @@ class StatusViewState extends State<StatusView> {
114112
}
115113

116114
Widget _buildRewindTimeButton(BuildContext context) {
117-
return Padding(
118-
padding: const EdgeInsets.only(right: 20),
119-
child: ElevatedButton(
115+
return ElevatedButton(
120116
style: ElevatedButton.styleFrom(
121117
backgroundColor: bgColor,
122118
shape: RoundedRectangleBorder(
@@ -125,8 +121,7 @@ class StatusViewState extends State<StatusView> {
125121
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
126122
),
127123
onPressed: () => controller.selectDate(context),
128-
child: const Icon(LineIcons.calendar, size: 50, color: Colors.white),
129-
),
124+
child: const Icon(LineIcons.calendar, size: 40, color: Colors.white),
130125
);
131126
}
132127

lib/screens/homepage/homepage_screen.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ class HomePageState extends State<HomePage> {
4747
backgroundColor: bgColor,
4848
appBar: AppBar(
4949
title: Text('Bunk-Mate',
50+
5051
style: TextStyle(
5152
color: textColor, fontSize: 24, fontWeight: FontWeight.bold)),
5253
backgroundColor: bgColor,
5354
elevation: 0,
55+
centerTitle: true,
5456
actions: [_buildPopupMenu()],
5557
),
5658
body: Padding(

lib/screens/on_board_view.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class _OnBoardViewState extends State<OnBoardView> {
3434
fontSize: 24,
3535
),
3636
),
37+
centerTitle: true,
3738
backgroundColor: bgColor,
3839
elevation: 0,
3940
),

lib/utils/Navigation.dart

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,18 @@ class _NavigationState extends State<Navigation> {
6161
focusNode: focusNodes[0],
6262
titleText: "",
6363
bodyText: '',
64-
overlayColor: Colors.black.withOpacity(0.7),
65-
overlayShape: const RoundedRectangleBorder(),
6664
overlayBehavior: HitTestBehavior.deferToChild,
6765
stepBuilder: (context, renderInfo) {
6866
return Scaffold(
6967
backgroundColor: Colors.transparent,
70-
body: SingleChildScrollView(
71-
child: Center(
68+
body: Center(
7269
child: Container(
7370
width: MediaQuery.of(context).size.width,
7471
height: MediaQuery.of(context).size.height,
7572
padding: const EdgeInsets.all(25),
7673
decoration: BoxDecoration(
77-
color: const Color(0xFF121212),
78-
border: Border.all(color: const Color(0xFF4CAF50)),
74+
color: const Color(0x80000020)
7975
),
80-
child: SingleChildScrollView(
8176
child: Column(
8277
crossAxisAlignment: CrossAxisAlignment.start,
8378
children: [
@@ -100,14 +95,14 @@ class _NavigationState extends State<Navigation> {
10095
),
10196
buildGuideStep(
10297
'Long Press to mark present again',
103-
'assets/present.png', // Make sure the path is correct.
98+
'assets/present.png',
10499
),
105100
const SizedBox(height: 20),
106101
Center(
107102
child: ElevatedButton(
108-
onPressed: renderInfo.close, // Close the guide
103+
onPressed: renderInfo.close,
109104
style: ElevatedButton.styleFrom(
110-
backgroundColor: Color(0xFF4CAF50),
105+
backgroundColor: const Color(0xFF4CAF50),
111106
),
112107
child: const Text(
113108
"close",
@@ -122,9 +117,7 @@ class _NavigationState extends State<Navigation> {
122117
],
123118
),
124119
),
125-
),
126-
),
127-
),
120+
)
128121
);
129122
},
130123
),

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: bunk_mate
22
description: "A new Flutter project."
33
publish_to: "none"
4-
version: 1.0.0+1
4+
version: 1.0.0+3.1
55

66
environment:
77
sdk: ">=3.3.4 <4.0.0"

0 commit comments

Comments
 (0)