Merge branch 'main' into dependabot/pub/flutter_markdown-0.7.1

OWASP-BLT · May 24, 2024 · 2565b20 · 2565b20
2 parents 0e2b39c + 694b57d
commit 2565b20
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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
@@ -165,17 +165,17 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
                                 ),
                               ),
                               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
@@ -261,16 +261,16 @@ class _LoginFormState extends ConsumerState<LoginForm> {
                 ),
               ),
               style: ButtonStyle(
-                elevation: MaterialStateProperty.all(8),
-                shadowColor: MaterialStateProperty.all(
+                elevation: WidgetStateProperty.all(8),
+                shadowColor: WidgetStateProperty.all(
                   Colors.black.withOpacity(0.5),
                 ),
-                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                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/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<SignUpForm> {
                 ),
               ),
               style: ButtonStyle(
-                elevation: MaterialStateProperty.all(8),
-                shadowColor: MaterialStateProperty.all(
+                elevation: WidgetStateProperty.all(8),
+                shadowColor: WidgetStateProperty.all(
                   Colors.black.withOpacity(0.5),
                 ),
-                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                   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
@@ -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<CompanyDetailPage> {
                               ),
                             ),
                             style: ButtonStyle(
-                              backgroundColor: MaterialStateProperty.all(
+                              backgroundColor: WidgetStateProperty.all(
                                 companyColor,
                               ),
                             ),
@@ -250,7 +249,7 @@ class _CompanyDetailPageState extends State<CompanyDetailPage> {
                               ),
                             ),
                             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
@@ -245,16 +245,16 @@ class _ChangePasswordFormState extends State<ChangePasswordForm> {
                 ),
               ),
               style: ButtonStyle(
-                elevation: MaterialStateProperty.all(8),
-                shadowColor: MaterialStateProperty.all(
+                elevation: WidgetStateProperty.all(8),
+                shadowColor: WidgetStateProperty.all(
                   Colors.black.withOpacity(0.5),
                 ),
-                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                   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
@@ -116,17 +116,17 @@ class _ReferralPageState extends State<ReferralPage> {
                           ),
                         ),
                         style: ButtonStyle(
-                          elevation: MaterialStateProperty.all(8),
-                          shadowColor: MaterialStateProperty.all(
+                          elevation: WidgetStateProperty.all(8),
+                          shadowColor: WidgetStateProperty.all(
                             Colors.black.withOpacity(0.5),
                           ),
                           shape:
-                              MaterialStateProperty.all<RoundedRectangleBorder>(
+                              WidgetStateProperty.all<RoundedRectangleBorder>(
                             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
@@ -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<RoundedRectangleBorder>(
+                  shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                     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<RoundedRectangleBorder>(
+                  shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                     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
@@ -124,7 +124,7 @@ class _HomeState extends ConsumerState<Home> {
                 },
                 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<Home> {
                 },
                 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<Home> {
                         ),
                       ),
                       style: ButtonStyle(
-                        shape:
-                            MaterialStateProperty.all<RoundedRectangleBorder>(
+                        shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                           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
@@ -533,13 +533,13 @@ class _ReportFormState extends ConsumerState<ReportForm> {
                               ),
                             ),
                             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<ReportForm> {
                                   ),
                                 ),
                                 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<ReportForm> {
                 ),
               ),
               style: ButtonStyle(
-                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                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),

diff --git a/lib/src/pages/home/start_hunt.dart b/lib/src/pages/home/start_hunt.dart
@@ -152,7 +152,7 @@ class _HuntFormState extends State<HuntForm> {
                       _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<HuntForm> {
                       _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<HuntForm> {
                 ),
               ),
               style: ButtonStyle(
-                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                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),

diff --git 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
@@ -120,13 +120,12 @@ class _WelcomePageState extends State<WelcomePage> {
               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<RoundedRectangleBorder>(
+            elevation: WidgetStateProperty.all(12),
+            shadowColor: WidgetStateProperty.all(Colors.black.withOpacity(0.5)),
+            shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                 RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(15.0))),
-            backgroundColor: MaterialStateProperty.all(Color(0xFFDC4654)),
+            backgroundColor: WidgetStateProperty.all(Color(0xFFDC4654)),
           ),
         ),
       ),
@@ -150,15 +149,15 @@ class _WelcomePageState extends State<WelcomePage> {
                     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<RoundedRectangleBorder>(
+                  WidgetStateProperty.all(Colors.black.withOpacity(0.5)),
+              shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                 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
@@ -20,15 +20,15 @@ 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
   path_provider: ^2.0.13
   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