Merge pull request #288 from mdgspace/temp

am-casper · am-casper · commit 8e6323a700bb · 2024-10-10T03:53:23.000+05:30
chore: changes flutter version
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -8,7 +8,7 @@ env:
   GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
   FIREBASE_OPTIONS: ${{ secrets.FIREBASE_OPTIONS }}
   FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
-  PROD_BASE_URL: ${{ secrets.PROD_BASE_URL }}
+  PROD_BASE_URL: ${{ secrets.BASE_URL }}
   SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
   FASTLANE_SUPPLY_JSON_KEY: ${{ secrets.FASTLANE_SUPPLY_JSON_KEY }}
   RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
@@ -39,7 +39,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: 3.19.0
+          flutter-version: 3.24.x
 
       # Get flutter dependencies.
       - run: flutter pub get
@@ -78,7 +78,7 @@ jobs:
 
       - name: 'Build prod appbundle'
         if: "!contains(github.event.release.tag_name, 'internal')"
-        run: flutter build appbundle --dart-define=SENTRY_DSN=${SENTRY_DSN} --dart-define=BASE_URL=${PROD_BASE_URL} --dart-define=OAUTH_REDIRECT_URI=${PROD_BASE_URL}/oauth/
+        run: flutter build appbundle --dart-define=SENTRY_DSN=${SENTRY_DSN} --dart-define=BASE_URL=${PROD_BASE_URL} --dart-define=OAUTH_REDIRECT_URI=${PROD_BASE_URL}/api/user/oauth/redirect/
 
       # Run fastlane internal
       - uses: maierj/fastlane-action@v1.4.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: 3.19.0
+          flutter-version: 3.24.x
       
       # Get flutter dependencies.
       - run: flutter pub get
diff --git a/lib/presentation/coupons/components/coupon_banner.dart b/lib/presentation/coupons/components/coupon_banner.dart
@@ -14,7 +14,7 @@ class CouponBanner extends StatelessWidget {
       child: Row(
         children: [
           IconButton(
-            onPressed: context.router.pop,
+            onPressed: context.router.maybePop,
             icon: const Icon(
               Icons.arrow_back,
               color: Colors.white,
diff --git a/lib/presentation/feedback/components/feedback_banner.dart b/lib/presentation/feedback/components/feedback_banner.dart
@@ -14,7 +14,7 @@ class FeedbackBanner extends StatelessWidget {
       child: Row(
         children: [
           IconButton(
-            onPressed: context.router.pop,
+            onPressed: context.router.maybePop,
             icon: const Icon(
               Icons.arrow_back,
               color: Colors.white,
diff --git a/lib/presentation/feedback/feedback_view.dart b/lib/presentation/feedback/feedback_view.dart
@@ -148,7 +148,7 @@ class FeedbackScreen extends StatelessWidget {
                   textColor: Colors.white,
                   backgroundColor: AppTheme.green,
                   fontSize: 12.toAutoScaledFont);
-              context.router.pop();
+              context.router.maybePop();
             }
             if (state.error) {
               Fluttertoast.showToast(
diff --git a/lib/presentation/hostel_change/components/hostel_change_banner.dart b/lib/presentation/hostel_change/components/hostel_change_banner.dart
@@ -14,7 +14,7 @@ class HostelChangeBanner extends StatelessWidget {
       child: Row(
         children: [
           IconButton(
-            onPressed: () => context.router.pop(),
+            onPressed: () => context.router.maybePop(),
             icon: const Icon(
               Icons.arrow_back,
               color: Colors.white,
diff --git a/lib/presentation/login/components/oauth_webview.dart b/lib/presentation/login/components/oauth_webview.dart
@@ -34,7 +34,7 @@ class OAuthWebScreen extends StatelessWidget {
                   onUpdateVisitedHistory: (_, uri, __) {
                     if (uri != null) {
                       if (uri.toString().contains('https://channeli.in/feed')) {
-                        context.router.pop();
+                        context.router.maybePop();
                         //TODO: show dialog box
                         // SnackBarUtils.showDark('Error', 'Permission Denied!');
                       }
@@ -49,7 +49,7 @@ class OAuthWebScreen extends StatelessWidget {
                     var params = url.split('?').last.split('&');
                     if (params.first.contains('code')) {
                       var code = params.first.split('=').last;
-                      context.router.pop(code);
+                      context.router.maybePop(code);
                     }
 
                     return NavigationActionPolicy.CANCEL;
diff --git a/lib/presentation/notifications/components/notification_banner.dart b/lib/presentation/notifications/components/notification_banner.dart
@@ -14,7 +14,7 @@ class NotificationBanner extends StatelessWidget {
       child: Row(
         children: [
           IconButton(
-            onPressed: context.router.pop,
+            onPressed: context.router.maybePop,
             icon: const Icon(
               Icons.arrow_back,
               color: Colors.white,
diff --git a/lib/presentation/profile/profile_view.dart b/lib/presentation/profile/profile_view.dart
@@ -126,13 +126,13 @@ class ProfileScreen extends StatelessWidget {
                                                               ProfilePageBloc>()
                                                           .add(
                                                               const DeleteHostelChangeRequest());
-                                                      ctx.router.pop();
+                                                      ctx.router.maybePop();
                                                     },
                                                     child: const Text('Delete'),
                                                   ),
                                                   TextButton(
                                                     onPressed: () =>
-                                                        ctx.router.pop(),
+                                                        ctx.router.maybePop(),
                                                     child: const Text('Cancel'),
                                                   )
                                                 ],
diff --git a/lib/presentation/reset_password/components/reset_password_banner.dart b/lib/presentation/reset_password/components/reset_password_banner.dart
@@ -14,7 +14,7 @@ class ResetPasswordBanner extends StatelessWidget {
       child: Row(
         children: [
           IconButton(
-            onPressed: context.router.pop,
+            onPressed: context.router.maybePop,
             icon: const Icon(
               Icons.arrow_back,
               color: Colors.white,
diff --git a/lib/presentation/reset_password/reset_password_view.dart b/lib/presentation/reset_password/reset_password_view.dart
@@ -41,7 +41,7 @@ class ResetPasswordScreen extends StatelessWidget {
                       content: Text('Password reset successfully!'),
                       backgroundColor: Colors.green,
                     ));
-                    context.router.pop();
+                    context.router.maybePop();
                   }
                 },
                 builder: (context, state) {
diff --git a/lib/presentation/week_menu/components/DayMenu/menu_card.dart b/lib/presentation/week_menu/components/DayMenu/menu_card.dart
@@ -92,7 +92,7 @@ class CouponDialogBox extends StatelessWidget {
           Align(
             alignment: Alignment.topRight,
             child: GestureDetector(
-              onTap: context.router.pop,
+              onTap: context.router.maybePop,
               child: const Padding(
                 padding: EdgeInsets.all(2.0),
                 child: Icon(Icons.close),
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ description: A new Flutter project.
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 3.0.3+28
+version: 3.0.4+29
 
 environment:
   sdk: '>=3.0.0 <4.0.0'

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class FeedbackScreen extends StatelessWidget {`
`148`	`148`	`textColor: Colors.white,`
`149`	`149`	`backgroundColor: AppTheme.green,`
`150`	`150`	`fontSize: 12.toAutoScaledFont);`
`151`		`- context.router.pop();`
	`151`	`+ context.router.maybePop();`
`152`	`152`	`}`
`153`	`153`	`if (state.error) {`
`154`	`154`	`Fluttertoast.showToast(`