From 1f246fe15d8fbe5fdef87ce7f728aaaefb5460b3 Mon Sep 17 00:00:00 2001 From: Uttkarsh-raj <106571927+Uttkarsh-raj@users.noreply.github.com> Date: Fri, 24 May 2024 18:05:40 +0530 Subject: [PATCH 1/2] Migrating from flutter 3.19.1 to 3.22.1 for latest builds. (#402) --- .github/workflows/build-flutter.yml | 2 +- android/app/build.gradle | 2 ++ ios/Podfile | 2 +- lib/src/pages/auth/forgot.dart | 8 ++++---- lib/src/pages/auth/login.dart | 8 ++++---- lib/src/pages/auth/signup.dart | 9 ++++----- lib/src/pages/company_details.dart | 5 ++--- lib/src/pages/drawer/change_password.dart | 8 ++++---- lib/src/pages/drawer/referral.dart | 8 ++++---- lib/src/pages/error.dart | 9 ++++----- lib/src/pages/home/home.dart | 9 ++++----- lib/src/pages/home/report_bug.dart | 12 ++++++------ lib/src/pages/home/start_hunt.dart | 8 ++++---- .../pages/leaderboards/monthly_leaderboard.dart | 2 +- lib/src/pages/welcome.dart | 17 ++++++++--------- pubspec.yaml | 2 +- 16 files changed, 54 insertions(+), 57 deletions(-) diff --git a/.github/workflows/build-flutter.yml b/.github/workflows/build-flutter.yml index 9f02e88138..ec43ab3f7a 100644 --- a/.github/workflows/build-flutter.yml +++ b/.github/workflows/build-flutter.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@v2 with: channel: 'stable' diff --git a/android/app/build.gradle b/android/app/build.gradle index c2ed861b53..c3c16bfc2b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,6 +38,7 @@ android { applicationId "com.apps.blt" minSdkVersion 21 targetSdkVersion 33 + multiDexEnabled true versionCode flutterVersionCode.toInteger() versionName flutterVersionName vectorDrawables.useSupportLibrary = true @@ -65,4 +66,5 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "androidx.multidex:multidex:2.0.1" } diff --git a/ios/Podfile b/ios/Podfile index 95f657e57f..86ead0d6bb 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -38,7 +38,7 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' config.build_settings['ENABLE_BITCODE'] = 'NO' end end diff --git a/lib/src/pages/auth/forgot.dart b/lib/src/pages/auth/forgot.dart index 56bf2b24d6..c2fc8cb9c4 100644 --- a/lib/src/pages/auth/forgot.dart +++ b/lib/src/pages/auth/forgot.dart @@ -165,17 +165,17 @@ class _ForgotPasswordPageState extends State { ), ), style: ButtonStyle( - elevation: MaterialStateProperty.all(8), - shadowColor: MaterialStateProperty.all( + elevation: WidgetStateProperty.all(8), + shadowColor: WidgetStateProperty.all( Colors.black.withOpacity(0.5), ), - shape: MaterialStateProperty.all< + shape: WidgetStateProperty.all< RoundedRectangleBorder>( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Color(0xFFDC4654), ), ), diff --git a/lib/src/pages/auth/login.dart b/lib/src/pages/auth/login.dart index 1c08d3400e..a4a67d2474 100644 --- a/lib/src/pages/auth/login.dart +++ b/lib/src/pages/auth/login.dart @@ -261,16 +261,16 @@ class _LoginFormState extends ConsumerState { ), ), style: ButtonStyle( - elevation: MaterialStateProperty.all(8), - shadowColor: MaterialStateProperty.all( + elevation: WidgetStateProperty.all(8), + shadowColor: WidgetStateProperty.all( Colors.black.withOpacity(0.5), ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Color(0xFFDC4654), ), ), diff --git a/lib/src/pages/auth/signup.dart b/lib/src/pages/auth/signup.dart index fa1b3312c6..3cd7cbf3ff 100644 --- a/lib/src/pages/auth/signup.dart +++ b/lib/src/pages/auth/signup.dart @@ -1,7 +1,6 @@ import 'package:blt/src/pages/pages_import.dart'; import 'package:flutter/material.dart'; - /// The signup page for the app. class SignUpPage extends StatefulWidget { const SignUpPage({Key? key}) : super(key: key); @@ -283,16 +282,16 @@ class _SignUpFormState extends State { ), ), style: ButtonStyle( - elevation: MaterialStateProperty.all(8), - shadowColor: MaterialStateProperty.all( + elevation: WidgetStateProperty.all(8), + shadowColor: WidgetStateProperty.all( Colors.black.withOpacity(0.5), ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Color(0xFFDC4654), ), ), diff --git a/lib/src/pages/company_details.dart b/lib/src/pages/company_details.dart index a088d993f0..0d0df81b95 100644 --- a/lib/src/pages/company_details.dart +++ b/lib/src/pages/company_details.dart @@ -1,7 +1,6 @@ import 'package:blt/src/pages/pages_import.dart'; import 'package:flutter/material.dart'; - /// Popup page for viewing company details when a company /// is clicked on the Company Scoreboard page. class CompanyDetailPage extends StatefulWidget { @@ -227,7 +226,7 @@ class _CompanyDetailPageState extends State { ), ), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( companyColor, ), ), @@ -250,7 +249,7 @@ class _CompanyDetailPageState extends State { ), ), style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( companyColor, ), ), diff --git a/lib/src/pages/drawer/change_password.dart b/lib/src/pages/drawer/change_password.dart index f79ed4eafc..a855ace99b 100644 --- a/lib/src/pages/drawer/change_password.dart +++ b/lib/src/pages/drawer/change_password.dart @@ -245,16 +245,16 @@ class _ChangePasswordFormState extends State { ), ), style: ButtonStyle( - elevation: MaterialStateProperty.all(8), - shadowColor: MaterialStateProperty.all( + elevation: WidgetStateProperty.all(8), + shadowColor: WidgetStateProperty.all( Colors.black.withOpacity(0.5), ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Color(0xFFDC4654), ), ), diff --git a/lib/src/pages/drawer/referral.dart b/lib/src/pages/drawer/referral.dart index f85a87edeb..dccfec578c 100644 --- a/lib/src/pages/drawer/referral.dart +++ b/lib/src/pages/drawer/referral.dart @@ -116,17 +116,17 @@ class _ReferralPageState extends State { ), ), style: ButtonStyle( - elevation: MaterialStateProperty.all(8), - shadowColor: MaterialStateProperty.all( + elevation: WidgetStateProperty.all(8), + shadowColor: WidgetStateProperty.all( Colors.black.withOpacity(0.5), ), shape: - MaterialStateProperty.all( + WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode ? Color.fromRGBO(126, 33, 58, 1) : Color(0xFFDC4654), diff --git a/lib/src/pages/error.dart b/lib/src/pages/error.dart index 008ab9eb18..493ac4a6aa 100644 --- a/lib/src/pages/error.dart +++ b/lib/src/pages/error.dart @@ -1,7 +1,6 @@ import 'package:blt/src/pages/pages_import.dart'; import 'package:flutter/material.dart'; - /// This page is thrown in case when a Navigation exception occurs. class ErrorPage extends StatelessWidget { const ErrorPage({Key? key}) : super(key: key); @@ -72,12 +71,12 @@ class ErrorPage extends StatelessWidget { ), ), style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Color(0xFFDC4654), ), ), @@ -107,13 +106,13 @@ class ErrorPage extends StatelessWidget { ), ), style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), side: BorderSide(color: Colors.red), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Colors.white, ), ), diff --git a/lib/src/pages/home/home.dart b/lib/src/pages/home/home.dart index 8a97e01e84..7d7a6b0df3 100644 --- a/lib/src/pages/home/home.dart +++ b/lib/src/pages/home/home.dart @@ -124,7 +124,7 @@ class _HomeState extends ConsumerState { }, style: ButtonStyle( alignment: Alignment.center, - backgroundColor: MaterialStateProperty.all(Color(0xFFDC4654)), + backgroundColor: WidgetStateProperty.all(Color(0xFFDC4654)), ), child: Text( AppLocalizations.of(context)!.logout, @@ -141,7 +141,7 @@ class _HomeState extends ConsumerState { }, style: ButtonStyle( alignment: Alignment.center, - backgroundColor: MaterialStateProperty.all(Color(0xFF737373)), + backgroundColor: WidgetStateProperty.all(Color(0xFF737373)), ), child: Text( AppLocalizations.of(context)!.cancel, @@ -350,13 +350,12 @@ class _HomeState extends ConsumerState { ), ), style: ButtonStyle( - shape: - MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode.isDarkMode ? Color.fromRGBO(126, 33, 58, 1) : Color(0xFFDC4654), diff --git a/lib/src/pages/home/report_bug.dart b/lib/src/pages/home/report_bug.dart index 2bbdd42547..603f54d13e 100644 --- a/lib/src/pages/home/report_bug.dart +++ b/lib/src/pages/home/report_bug.dart @@ -533,13 +533,13 @@ class _ReportFormState extends ConsumerState { ), ), style: ButtonStyle( - shape: MaterialStateProperty.all< + shape: WidgetStateProperty.all< RoundedRectangleBorder>( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( duplicateVerified ? Color(0xFF50C878) : isDarkMode @@ -741,13 +741,13 @@ class _ReportFormState extends ConsumerState { ), ), style: ButtonStyle( - shape: MaterialStateProperty.all< + shape: WidgetStateProperty.all< RoundedRectangleBorder>( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode ? Color.fromRGBO(126, 33, 58, 1) : Color(0xFFDC4654), @@ -916,12 +916,12 @@ class _ReportFormState extends ConsumerState { ), ), style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode ? Color.fromRGBO(126, 33, 58, 1) : Color(0xFFDC4654), diff --git a/lib/src/pages/home/start_hunt.dart b/lib/src/pages/home/start_hunt.dart index 875c6fd4c3..e57f87d8a1 100644 --- a/lib/src/pages/home/start_hunt.dart +++ b/lib/src/pages/home/start_hunt.dart @@ -152,7 +152,7 @@ class _HuntFormState extends State { _pickImageFromGallery(); }, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode ? Color.fromRGBO(126, 33, 58, 1) : Color(0xFFDC4654), @@ -178,7 +178,7 @@ class _HuntFormState extends State { _pasteImageFromClipBoard(); }, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode ? Color.fromRGBO(126, 33, 58, 1) : Color(0xFFDC4654), @@ -288,12 +288,12 @@ class _HuntFormState extends State { ), ), style: ButtonStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(8.0), ), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode ? Color.fromRGBO(126, 33, 58, 1) : Color(0xFFDC4654), diff --git a/lib/src/pages/leaderboards/monthly_leaderboard.dart b/lib/src/pages/leaderboards/monthly_leaderboard.dart index 0480729253..579d84f62f 100644 --- a/lib/src/pages/leaderboards/monthly_leaderboard.dart +++ b/lib/src/pages/leaderboards/monthly_leaderboard.dart @@ -187,7 +187,7 @@ class _MonthlyLeaderBoardPageState ), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(Color(0xFFDC4654)), + WidgetStateProperty.all(Color(0xFFDC4654)), ), ), ]), diff --git a/lib/src/pages/welcome.dart b/lib/src/pages/welcome.dart index dd14eb156d..6ee6c40e50 100644 --- a/lib/src/pages/welcome.dart +++ b/lib/src/pages/welcome.dart @@ -120,13 +120,12 @@ class _WelcomePageState extends State { style: GoogleFonts.ubuntu( textStyle: TextStyle(color: Colors.white, fontSize: 20))), style: ButtonStyle( - elevation: MaterialStateProperty.all(12), - shadowColor: - MaterialStateProperty.all(Colors.black.withOpacity(0.5)), - shape: MaterialStateProperty.all( + elevation: WidgetStateProperty.all(12), + shadowColor: WidgetStateProperty.all(Colors.black.withOpacity(0.5)), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0))), - backgroundColor: MaterialStateProperty.all(Color(0xFFDC4654)), + backgroundColor: WidgetStateProperty.all(Color(0xFFDC4654)), ), ), ), @@ -150,15 +149,15 @@ class _WelcomePageState extends State { textStyle: TextStyle(color: Color(0xFF737373), fontSize: 20))), style: ButtonStyle( - elevation: MaterialStateProperty.all(12), + elevation: WidgetStateProperty.all(12), shadowColor: - MaterialStateProperty.all(Colors.black.withOpacity(0.5)), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(Colors.black.withOpacity(0.5)), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0), side: BorderSide(color: Color(0xFF737373))), ), - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( isDarkMode ? Color.fromRGBO(43, 42, 42, 1) : Theme.of(context).canvasColor, diff --git a/pubspec.yaml b/pubspec.yaml index 6d341a3a14..8749fa6b01 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: shared_preferences: ^2.0.5 flutter_svg: ">=1.0.3 <3.0.0" flutter_riverpod: ^1.0.3 - intl: ">=0.17.0 <0.19.0" + intl: flutter_secure_storage: ^9.0.0 smooth_page_indicator: ^1.0.0+2 pasteboard: ^0.2.0 From 694b57db3096e4f5317ec22bb991645b8d163dd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 09:01:05 -0400 Subject: [PATCH 2/2] Bump sentry_flutter from 7.20.2 to 8.2.0 (#403) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 8749fa6b01..5b804cb9cd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,7 +28,7 @@ dependencies: url_launcher: ^6.2.5 #flutter_inappwebview: ^5.7.2+3 font_awesome_flutter: ^10.4.0 - sentry_flutter: ^7.2.0 + sentry_flutter: ^8.2.0 cached_network_image: ^3.2.3 flutter_localizations: sdk: flutter