diff --git a/.github/workflows/flutter_ci.yml b/.github/workflows/flutter_ci.yml new file mode 100644 index 0000000..7e7e9c4 --- /dev/null +++ b/.github/workflows/flutter_ci.yml @@ -0,0 +1,49 @@ +name: Flutter CI + +on: + push: + branches: + - main + - 2023 + pull_request: + branches: + - main + - 2023 + +jobs: + build: + name: Build and Test + runs-on: ubuntu-latest + + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Set up Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: 3.7.10 + + - name: Install dependencies + run: flutter pub get + + - name: Run tests + run: flutter test + + - name: Build APK for Android + run: flutter build apk + + - name: Build iOS App + run: flutter build ios + + - name: Archive and upload Android artifacts + uses: actions/upload-artifact@v2 + with: + name: build-android + path: build/app/outputs/flutter-apk/app-release.apk + + - name: Archive and upload iOS artifacts + uses: actions/upload-artifact@v2 + with: + name: build-ios + path: build/ios/Runner.app diff --git a/.gitignore b/.gitignore index 0fa6b67..6a076d3 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release +.fvm +.vscode \ No newline at end of file diff --git a/.metadata b/.metadata deleted file mode 100644 index 6a04d0b..0000000 --- a/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: b22742018b3edf16c6cadd7b76d9db5e7f9064b5 - channel: beta - -project_type: app diff --git a/README.md b/README.md index ddd918d..0ffcc37 100644 --- a/README.md +++ b/README.md @@ -65,8 +65,12 @@ Start working on this Project and getting started with Prerequisties.have a over ### Prerequisites you should have Flutter SDK installed in your environment. +<<<<<<< HEAD +* flutter +======= * To Install flutter +>>>>>>> Rebuildthescreen ```sh git clone https://github.com/flutter/flutter.git -b stable ``` diff --git a/android/.project b/android/.project index b2b288b..dc1108a 100644 --- a/android/.project +++ b/android/.project @@ -16,12 +16,12 @@ - 1629728049991 + 1696155690225 30 org.eclipse.core.resources.regexFilterMatcher - node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs index 5bc0652..1241795 100644 --- a/android/.settings/org.eclipse.buildship.core.prefs +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -1,11 +1,11 @@ -arguments= +arguments=--init-script C\:\\Users\\hp\\AppData\\Roaming\\Code\\User\\globalStorage\\redhat.java\\1.23.0\\config_win\\org.eclipse.osgi\\57\\0\\.cp\\gradle\\init\\init.gradle --init-script C\:\\Users\\hp\\AppData\\Roaming\\Code\\User\\globalStorage\\redhat.java\\1.23.0\\config_win\\org.eclipse.osgi\\57\\0\\.cp\\gradle\\protobuf\\init.gradle auto.sync=false build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2)) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= -java.home=/usr/lib/jvm/java-14-openjdk-amd64 +java.home=C\:/Users/hp/.vscode/extensions/redhat.java-1.23.0-win32-x64/jre/17.0.8.1-win32-x86_64 jvm.arguments= offline.mode=false override.workspace.settings=true diff --git a/android/app/.classpath b/android/app/.classpath index 993fef6..0b62ab9 100644 --- a/android/app/.classpath +++ b/android/app/.classpath @@ -1,6 +1,6 @@ - + diff --git a/android/app/.project b/android/app/.project index 6d1348f..450c626 100644 --- a/android/app/.project +++ b/android/app/.project @@ -22,12 +22,12 @@ - 1629728049996 + 1696155690255 30 org.eclipse.core.resources.regexFilterMatcher - node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ diff --git a/android/app/.settings/org.eclipse.jdt.core.prefs b/android/app/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..e9186c3 --- /dev/null +++ b/android/app/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.source=21 diff --git a/android/app/build.gradle b/android/app/build.gradle index bc15c0d..af1ac9d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -33,7 +33,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" } android { - compileSdkVersion 30 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -43,9 +43,10 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.arcadia.auction" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName + multiDexEnabled true } signingConfigs { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7871501..814f959 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,40 +1,23 @@ - - + android:name="com.google.firebase.messaging.default_notification_icon" + android:resource="@drawable/notification_icon" /> + - - - - - + android:windowSoftInputMode="adjustResize" + android:exported="true"> + diff --git a/android/build.gradle b/android/build.gradle index 7c50225..6cc04f2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,13 +1,13 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.9.10' repositories { google() jcenter() } dependencies { - classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.google.gms:google-services:4.3.14' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -25,6 +25,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..6b66533 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/lib/main.dart b/lib/main.dart index 7416f72..b62c153 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -24,9 +24,14 @@ import 'screens/onboarding/signin_screen.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - SystemChrome.setEnabledSystemUIOverlays( - [SystemUiOverlay.bottom, SystemUiOverlay.top]); + SystemChrome.setEnabledSystemUIMode( + SystemUiMode.manual, overlays: [SystemUiOverlay.bottom, SystemUiOverlay.top]); FirebaseMessaging.onBackgroundMessage(_messageHandler); + SystemChrome.setPreferredOrientations + ([ + DeviceOrientation.portraitUp, + DeviceOrientation.portraitDown, + ]); runApp(MyApp()); } @@ -68,7 +73,7 @@ class MyApp extends StatelessWidget { title: 'CSGO League', theme: ThemeData( primaryColor: CustomColors.primaryColor, - accentColor: CustomColors.secondaryColor, + hintColor: CustomColors.secondaryColor, textTheme: GoogleFonts.poppinsTextTheme(Theme.of(context).textTheme), ), diff --git a/lib/screens/onboarding/onboarding_screen.dart b/lib/screens/onboarding/onboarding_screen.dart index e7805a3..0d54326 100644 --- a/lib/screens/onboarding/onboarding_screen.dart +++ b/lib/screens/onboarding/onboarding_screen.dart @@ -56,14 +56,15 @@ class _OnboardingScreenState extends State { ), ), child: Padding( - padding: EdgeInsets.symmetric(vertical: 40.0), + padding: EdgeInsets.symmetric(vertical: 22.0), child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ Container( + padding: EdgeInsets.only(right: 8), alignment: Alignment.centerRight, child: _currentPage != 2 - ? FlatButton( + ? TextButton( onPressed: () => Navigator.of(context) .pushReplacementNamed(SignInScreen.routeName), child: Text( @@ -74,7 +75,7 @@ class _OnboardingScreenState extends State { ), ), ) - : FlatButton( + : TextButton( onPressed: () => Navigator.of(context) .pushReplacementNamed(SignInScreen.routeName), child: Text( @@ -86,7 +87,7 @@ class _OnboardingScreenState extends State { ), )), Container( - height: 600.0, + height:MediaQuery.of(context).size.height*0.75, // width: MediaQuery.of(context).size.width, child: PageView( physics: ClampingScrollPhysics(), @@ -105,8 +106,8 @@ class _OnboardingScreenState extends State { children: [ Center( child: Container( - height: 600.0, - width: MediaQuery.of(context).size.width, + height:MediaQuery.of(context).size.height*0.75, + width: MediaQuery.of(context).size.width*0.8, child: FittedBox( fit: BoxFit.cover, clipBehavior: Clip.hardEdge, @@ -118,7 +119,7 @@ class _OnboardingScreenState extends State { ), Positioned( top: 3, - left: 90, + left: 40, child: Center( child: Text( 'Make Your Profile', @@ -129,12 +130,6 @@ class _OnboardingScreenState extends State { ), ], ), - - // SizedBox(height: 15.0), - // Text( - // 'Lorem ipsum dolor sit amet, consect adipiscing elit, sed do eiusmod tempor incididunt ut labore et.', - // style: kSubtitleStyle, - // ), ], ), Stack( @@ -142,7 +137,7 @@ class _OnboardingScreenState extends State { Center( child: Container( height: 600.0, - width: MediaQuery.of(context).size.width, + width: MediaQuery.of(context).size.width*0.8, child: FittedBox( fit: BoxFit.cover, clipBehavior: Clip.hardEdge, @@ -152,11 +147,6 @@ class _OnboardingScreenState extends State { ), ), ), - // Image.asset( - // 'assets/onboarding1.png', - // height: 600.0, - // width: MediaQuery.of(context).size.width, - // ), Positioned( top: 3, left: 70, @@ -206,9 +196,9 @@ class _OnboardingScreenState extends State { ], ), ), - SizedBox( - height: 20, - ), + SizedBox( + height: 20, + ), Row( mainAxisAlignment: MainAxisAlignment.center, children: _buildPageIndicator(), @@ -217,31 +207,36 @@ class _OnboardingScreenState extends State { ? Expanded( child: Align( alignment: FractionalOffset.bottomRight, - child: FlatButton( + child: TextButton( onPressed: () { _pageController.nextPage( duration: Duration(milliseconds: 500), curve: Curves.ease, ); }, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - 'Next', - style: TextStyle( + child: Padding( + padding: const EdgeInsets.only(right: 8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + child: Text( + 'Next', + style: TextStyle( + color: Colors.white, + fontSize: 22.0, + ), + ), + ), + SizedBox(width: 10.0), + Icon( + Icons.arrow_forward, color: Colors.white, - fontSize: 22.0, + size: 30.0, ), - ), - SizedBox(width: 10.0), - Icon( - Icons.arrow_forward, - color: Colors.white, - size: 30.0, - ), - ], + ], + ), ), ), ), @@ -249,10 +244,9 @@ class _OnboardingScreenState extends State { : Expanded( child: Align( alignment: FractionalOffset.bottomRight, - child: FlatButton( - onPressed: - () => Navigator.of(context) - .pushReplacementNamed(SignInScreen.routeName), + child: TextButton( + onPressed: () => Navigator.of(context) + .pushReplacementNamed(SignInScreen.routeName), child: Row( mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, diff --git a/lib/screens/player/forms/player_form.dart b/lib/screens/player/forms/player_form.dart index 20ba02b..ffdd52e 100644 --- a/lib/screens/player/forms/player_form.dart +++ b/lib/screens/player/forms/player_form.dart @@ -42,7 +42,7 @@ class _PlayerFormState extends State { Future _showMyDialog() async { return showDialog( context: context, - barrierDismissible: false, // user must tap button! + barrierDismissible: false, builder: (BuildContext context) { return AlertDialog( title: const Text('Compulsary!!'), @@ -75,7 +75,7 @@ class _PlayerFormState extends State { var permissionStatus = await Permission.photos.status; - if (permissionStatus.isGranted) { + //if (permissionStatus.isGranted) { //Select Image // image = (await _imagePicker.getImage(source: ImageSource.gallery))!; // var file = File(image.path); @@ -99,9 +99,10 @@ class _PlayerFormState extends State { } else { print('No Image Path Received'); } - } else { - print('Permission not granted. Try Again with permission access'); - } + // } + // else { + // print('Permission not granted. Try Again with permission access'); + // } } final _formKey = GlobalKey(); @@ -109,16 +110,6 @@ class _PlayerFormState extends State { @override Widget build(BuildContext context) { return Scaffold( - // backgroundColor: CustomColors.primaryColor, - appBar: AppBar( - title: Text( - "Player Details Form", - style: TextStyle( - color: Colors.white, - ), - ), - iconTheme: IconThemeData(color: Colors.white), - ), body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 24), @@ -126,6 +117,17 @@ class _PlayerFormState extends State { color: CustomColors.primaryColor, child: Column( children: [ + Container( + margin: EdgeInsets.only(top: 10), + padding: EdgeInsets.all(20), + width: double.infinity, + child: Center( + child: Text( + "Player Registration", + style: TextStyle(color: Colors.yellow, fontSize: 30), + ), + ), + ), SizedBox( height: 12, ), @@ -134,29 +136,34 @@ class _PlayerFormState extends State { onTap: () async { await uploadImage(); }, - child: Container( - width: 200, - height: 200, - decoration: BoxDecoration(color: Colors.red[200]), - child: _image != null - ? Image.file( - _image, - width: 200.0, - height: 200.0, - fit: BoxFit.fitHeight, - ) - : Container( - decoration: BoxDecoration(color: Colors.red[200]), - width: 200, - height: 200, - child: Icon( - Icons.camera_alt, - color: Colors.grey[800], + child: ClipRRect( + borderRadius: BorderRadius.circular(200), + child: Container( + width: 150, + height: 150, + decoration: BoxDecoration(color: Colors.grey), + child: _image != null + ? Image.file( + _image, + width: 150.0, + height: 150.0, + fit: BoxFit.fitHeight, + ) + : Container( + decoration: BoxDecoration(color: Colors.white70), + width: 150, + height: 150, + child: Icon( + Icons.add_a_photo_rounded, + color: Colors.grey[800], + size: 35, + ), ), - ), + ), ), ), ), + SizedBox( height: 40, ), @@ -169,19 +176,26 @@ class _PlayerFormState extends State { children: [ TextFormField( controller: namecontroller, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 14, + color: Colors.white, + ), decoration: InputDecoration( hintText: "Enter Your Name", - labelText: "Your Name", + labelText: "Name", + hintStyle: TextStyle(color: Colors.white54), filled: true, - fillColor: CustomColors.firebaseGrey, + fillColor: CustomColors.taskez1, + // floatingLabelStyle: TextStyle(color: Colors.yellow), labelStyle: TextStyle( fontWeight: FontWeight.w900, fontSize: 14, - color: Colors.blueAccent), + color: Colors.white70), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10.0), borderSide: BorderSide( - color: Colors.blueAccent, + color: Colors.yellow, ), ), enabledBorder: OutlineInputBorder( @@ -198,6 +212,7 @@ class _PlayerFormState extends State { } return null; }, + ), SizedBox( height: 40.0, @@ -205,24 +220,28 @@ class _PlayerFormState extends State { TextFormField( cursorColor: CustomColors.primaryColor, controller: studentIDcontroller, + keyboardType:TextInputType.number , style: TextStyle( fontWeight: FontWeight.w400, fontSize: 14, - color: CustomColors.primaryColor, + color: Colors.white, ), decoration: InputDecoration( - hintText: "Ex:-20195513", + hintText: " Ex:-20195513", labelText: "Student ID", + hintStyle: + TextStyle(color: Colors.white54, fontSize: 16), filled: true, - fillColor: CustomColors.firebaseGrey, + fillColor: CustomColors.taskez1, + // floatingLabelStyle: TextStyle(color: Colors.yellow), labelStyle: TextStyle( fontWeight: FontWeight.w900, fontSize: 14, - color: Colors.blueAccent), + color: Colors.white70), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10.0), borderSide: BorderSide( - color: Colors.blueAccent, + color: Colors.yellow, ), ), enabledBorder: OutlineInputBorder( @@ -245,19 +264,26 @@ class _PlayerFormState extends State { ), TextFormField( controller: iGNcontroller, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 14, + color: Colors.white, + ), decoration: InputDecoration( - hintText: "Ex:- MadMani", - labelText: "IGN(In Game Name)", + hintText: " Ex:- MadMani", + labelText: "IGN (In Game Name)", + hintStyle: TextStyle(color: Colors.white54), filled: true, - fillColor: CustomColors.firebaseGrey, + fillColor: CustomColors.taskez1, + // floatingLabelStyle: TextStyle(color: Colors.yellow), labelStyle: TextStyle( fontWeight: FontWeight.w900, fontSize: 14, - color: Colors.blueAccent), + color: Colors.white70), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10.0), borderSide: BorderSide( - color: Colors.blueAccent, + color: Colors.yellow, ), ), enabledBorder: OutlineInputBorder( @@ -281,20 +307,27 @@ class _PlayerFormState extends State { TextFormField( controller: gameHRScontroller, keyboardType: TextInputType.numberWithOptions(), + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 14, + color: Colors.white, + ), obscureText: false, decoration: InputDecoration( hintText: "Ex:-1520", labelText: "Game Hours", + hintStyle: TextStyle(color: Colors.white54), filled: true, - fillColor: CustomColors.firebaseGrey, + fillColor: CustomColors.taskez1, + // floatingLabelStyle: TextStyle(color: Colors.yellow), labelStyle: TextStyle( fontWeight: FontWeight.w900, fontSize: 14, - color: Colors.blueAccent), + color: Colors.white70), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10.0), borderSide: BorderSide( - color: Colors.blueAccent, + color: Colors.yellow, ), ), enabledBorder: OutlineInputBorder( @@ -315,16 +348,16 @@ class _PlayerFormState extends State { }, ), SizedBox( - height: 40.0, + height: 25.0, ), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "Primary Weapon:", + "Primary Weapon", style: TextStyle( fontSize: 16, - color: Colors.blueAccent, + color: Colors.yellow, fontWeight: FontWeight.bold), ), // SizedBox(width: 20,), @@ -332,7 +365,7 @@ class _PlayerFormState extends State { // menuMaxHeight: MediaQuery.of(context).size.height, iconEnabledColor: Colors.blueAccent, iconDisabledColor: Colors.blueAccent, - + dropdownColor: CustomColors.taskez1, underline: Container( // child: Text("Primary Weapons"), color: Colors.transparent), @@ -343,14 +376,19 @@ class _PlayerFormState extends State { child: Text( value.toString().split('.').last, style: TextStyle( - fontSize: 17, color: Colors.blueAccent), + color: primaryWeapons == value + ? Colors.yellow // Color for selected item + : Colors.white, + fontSize: 17), ), ); }).toList(), onChanged: (value) { setState(() { // print('value is : $value'); + primaryWeapons = value!; + }); }, // hint: Text(_playerStatus.toString().split('.').last), @@ -358,21 +396,22 @@ class _PlayerFormState extends State { ], ), SizedBox( - height: 40.0, + height: 10.0, ), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - " Secondary Weapon:", + "Secondary Weapon", style: TextStyle( fontSize: 16, - color: Colors.blueAccent, + color: Colors.yellow, fontWeight: FontWeight.bold), ), DropdownButton( iconEnabledColor: Colors.blueAccent, iconDisabledColor: Colors.blueAccent, + dropdownColor: CustomColors.taskez1, underline: Container(color: Colors.transparent), value: secondadryWeapons, // menuMaxHeight: @@ -383,7 +422,11 @@ class _PlayerFormState extends State { child: Text( value.toString().split('.').last, style: TextStyle( - fontSize: 17, color: Colors.blueAccent), + color: secondadryWeapons == value + ? Colors.yellow // Color for selected item + : Colors.white, // Color for unselected items + + fontSize: 17), ), ); }).toList(), @@ -398,25 +441,32 @@ class _PlayerFormState extends State { ], ), SizedBox( - height: 20.0, + height: 25.0, ), TextFormField( controller: streamURLcontroller, obscureText: false, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 14, + color: Colors.white, + ), decoration: InputDecoration( hintText: "https://steamcommunity.com/profiles/76561199007256891/", labelText: "Steam URL", + hintStyle: TextStyle(color: Colors.white54), filled: true, - fillColor: CustomColors.firebaseGrey, + fillColor: CustomColors.taskez1, + // floatingLabelStyle: TextStyle(color: Colors.yellow), labelStyle: TextStyle( fontWeight: FontWeight.w900, fontSize: 14, - color: Colors.blueAccent), + color: Colors.white70), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10.0), borderSide: BorderSide( - color: Colors.blueAccent, + color: Colors.yellow, ), ), enabledBorder: OutlineInputBorder( @@ -479,18 +529,19 @@ class _PlayerFormState extends State { child: Text( "Register", style: TextStyle( - color: Colors.black54, + color: CustomColors.taskez1, fontWeight: FontWeight.bold, fontSize: 18, ), ), decoration: BoxDecoration( - color: Colors.blue, + color: Colors.yellow, borderRadius: BorderRadius.circular(10), ), )), SizedBox(height: 20), - ElevatedButton.icon( + ElevatedButton( + onPressed: () async { await Provider.of(context, listen: false) .signOut(); @@ -499,8 +550,19 @@ class _PlayerFormState extends State { return SignInScreen(); }), (route) => false); }, - icon: Icon(Icons.arrow_forward), - label: Text('Sign Out'), + style: ElevatedButton.styleFrom( + backgroundColor: Color.fromARGB(255, 73, 82, 96), + shape: RoundedRectangleBorder(borderRadius:BorderRadius.circular(15)) + ), + + child:Padding( + padding: const EdgeInsets.all(14.0), + child: Text( + 'Sign Out', + style: TextStyle( + color: Colors.white, fontWeight: FontWeight.bold), + ), + ), ), ], ), @@ -512,4 +574,5 @@ class _PlayerFormState extends State { ), ); } + } diff --git a/lib/screens/player/rules_pdf_viewer.dart b/lib/screens/player/rules_pdf_viewer.dart index f392471..f5ed829 100644 --- a/lib/screens/player/rules_pdf_viewer.dart +++ b/lib/screens/player/rules_pdf_viewer.dart @@ -1,5 +1,5 @@ +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart'; class RulesPdfViewer extends StatefulWidget { static const routeName = '/rules-pdf-viewer'; @@ -9,83 +9,84 @@ class RulesPdfViewer extends StatefulWidget { } class _RulesPdfViewerState extends State { - PdfViewerController? _pdfViewerController; - @override - void initState() { - _pdfViewerController = PdfViewerController(); - _pdfViewerController!.jumpToPage(1); - super.initState(); - } + // PdfViewerController? _pdfViewerController; + // @override + // void initState() { + // _pdfViewerController = PdfViewerController(); + // _pdfViewerController!.jumpToPage(1); + // super.initState(); + // } - PdfTextSearchResult? _searchResult; + // PdfTextSearchResult? _searchResult; @override Widget build(BuildContext context) { - // String pdfUrl = ModalRoute.of(context)!.settings.arguments as String; + Object? s = ModalRoute.of(context)?.settings.arguments; + return Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text('Rules'), - actions: [ - // IconButton( - // icon: Icon( - // Icons.search, - // color: Colors.white, - // ), - // onPressed: () async { - // _searchResult = await _pdfViewerController?.searchText( - // 'the', - // searchOption: TextSearchOption.caseSensitive, - // ); - // }, - // ), - Visibility( - visible: _searchResult?.hasResult ?? false, - child: IconButton( - icon: Icon( - Icons.clear, - color: Colors.white, - ), - onPressed: () { - setState(() { - _searchResult!.clear(); - }); - }, - ), - ), - Visibility( - visible: _searchResult?.hasResult ?? false, - child: IconButton( - icon: Icon( - Icons.keyboard_arrow_up, - color: Colors.white, - ), - onPressed: () { - _searchResult?.previousInstance(); - }, - ), - ), - Visibility( - visible: _searchResult?.hasResult ?? false, - child: IconButton( - icon: Icon( - Icons.keyboard_arrow_down, - color: Colors.white, - ), - onPressed: () { - _searchResult?.nextInstance(); - }, - ), - ), - ], - ), - body: Container( - // child: SfPdfViewer.network( - // pdfUrl, - // initialZoomLevel: 2, + // appBar: AppBar( + // centerTitle: true, + // title: Text('Rules'), + // actions: [ + // // IconButton( + // // icon: Icon( + // // Icons.search, + // // color: Colors.white, + // // ), + // // onPressed: () async { + // // _searchResult = await _pdfViewerController?.searchText( + // // 'the', + // // searchOption: TextSearchOption.caseSensitive, + // // ); + // // }, + // // ), + // Visibility( + // visible: _searchResult?.hasResult ?? false, + // child: IconButton( + // icon: Icon( + // Icons.clear, + // color: Colors.white, + // ), + // onPressed: () { + // setState(() { + // _searchResult!.clear(); + // }); + // }, + // ), + // ), + // Visibility( + // visible: _searchResult?.hasResult ?? false, + // child: IconButton( + // icon: Icon( + // Icons.keyboard_arrow_up, + // color: Colors.white, + // ), + // onPressed: () { + // _searchResult?.previousInstance(); + // }, + // ), + // ), + // Visibility( + // visible: _searchResult?.hasResult ?? false, + // child: IconButton( + // icon: Icon( + // Icons.keyboard_arrow_down, + // color: Colors.white, + // ), + // onPressed: () { + // _searchResult?.nextInstance(); + // }, + // ), + // ), + // ], + // ), + // body: Container( + // // child: SfPdfViewer.network( + // // pdfUrl, + // // initialZoomLevel: 2, + // // ), + // child: SfPdfViewer.asset('assets/docs/RuleBook.pdf'), // ), - child: SfPdfViewer.asset('assets/docs/RuleBook.pdf'), - ), - ); + ); } } diff --git a/pubspec.lock b/pubspec.lock index 40195f1..a2a4cf1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,291 +1,395 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + url: "https://pub.dev" + source: hosted + version: "61.0.0" + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + sha256: d84d98f1992976775f83083523a34c5d22fea191eec3abb2bd09537fb623c2e0 + url: "https://pub.dev" + source: hosted + version: "1.3.7" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + url: "https://pub.dev" + source: hosted + version: "5.13.0" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03" + url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.4.6" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.1" + version: "2.11.0" auto_size_text_pk: dependency: transitive description: name: auto_size_text_pk - url: "https://pub.dartlang.org" + sha256: ced55de5336fa7f438c1f5a9aa234e25d7a120c1d40d376a7cdc2af28cdb6995 + url: "https://pub.dev" source: hosted version: "3.0.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" cached_network_image: dependency: "direct main" description: name: cached_network_image - url: "https://pub.dartlang.org" + sha256: f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.3.0" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - url: "https://pub.dartlang.org" + sha256: "56aa42a7a01e3c9db8456d9f3f999931f1e05535b5a424271e9a38cabf066613" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "3.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - url: "https://pub.dartlang.org" + sha256: "759b9a9f8f6ccbb66c185df805fac107f05730b1dab9c64626d1008cca532257" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" carousel_slider: dependency: "direct main" description: name: carousel_slider - url: "https://pub.dartlang.org" + sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.2.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" cloud_firestore: dependency: "direct main" description: name: cloud_firestore - url: "https://pub.dartlang.org" + sha256: "1179ae4c69e2ea18179d844d70fc6ed2f082a2bbeb7fa62d35a2a24e2992bd4d" + url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "4.9.3" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface - url: "https://pub.dartlang.org" + sha256: acdcf0743bbdd0e6b342f3d2033e15d260a2c6f9434dd34b008b8f1c35e62b23 + url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.16.2" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - url: "https://pub.dartlang.org" + sha256: "321bb0732c8d782a49aede96805e59609e05cf98b6c34370faa04103f46a4a3a" + url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "3.7.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.2" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" cross_file: dependency: transitive description: name: cross_file - url: "https://pub.dartlang.org" + sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c" + url: "https://pub.dev" source: hosted - version: "0.3.1+4" + version: "0.3.3+6" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.3" + csslib: + dependency: transitive + description: + name: csslib + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + url: "https://pub.dev" + source: hosted + version: "1.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.6" date_format: dependency: "direct main" description: name: date_format - url: "https://pub.dartlang.org" + sha256: "8e5154ca363411847220c8cbc43afcf69c08e8debe40ba09d57710c25711760c" + url: "https://pub.dev" + source: hosted + version: "2.0.7" + device_info_plus: + dependency: transitive + description: + name: device_info_plus + sha256: "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "9.1.0" + device_info_plus_platform_interface: + dependency: transitive + description: + name: device_info_plus_platform_interface + sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + url: "https://pub.dev" + source: hosted + version: "7.0.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "2.1.0" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "7.0.0" + file_selector_linux: + dependency: transitive + description: + name: file_selector_linux + sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492" + url: "https://pub.dev" + source: hosted + version: "0.9.2+1" + file_selector_macos: + dependency: transitive + description: + name: file_selector_macos + sha256: b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6 + url: "https://pub.dev" + source: hosted + version: "0.9.3+3" + file_selector_platform_interface: + dependency: transitive + description: + name: file_selector_platform_interface + sha256: "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262" + url: "https://pub.dev" + source: hosted + version: "2.6.1" + file_selector_windows: + dependency: transitive + description: + name: file_selector_windows + sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0 + url: "https://pub.dev" + source: hosted + version: "0.9.3+1" firebase_auth: dependency: "direct main" description: name: firebase_auth - url: "https://pub.dartlang.org" + sha256: "95c74884ff25eafcbbbcd5506b738e68ee98ff54d09522a6092a2fb95d02ee7a" + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.10.1" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - url: "https://pub.dartlang.org" + sha256: "05d2636673e145d2b5eccc452c009808af4c15e8b402f34bb8fec63f2c76e86b" + url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.19.1" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - url: "https://pub.dartlang.org" + sha256: "4b8374da5d8969f99453ebd65074c1d379fe781bb3680fa7f65a4d3ac4ec87b3" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.8.2" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "95580fa07c8ca3072a2bb1fecd792616a33f8683477d25b7d29d3a6a399e6ece" + url: "https://pub.dev" source: hosted - version: "1.6.0" + version: "2.17.0" firebase_core_platform_interface: - dependency: transitive + dependency: "direct main" description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2 + url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.8.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: e8c408923cd3a25bd342c576a114f2126769cd1a57106a4edeaa67ea4a84e962 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "2.8.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - url: "https://pub.dartlang.org" + sha256: "67f9d7c87457e71ad78ee81e332f232b8a24f7d5e338f8c958fa7d6e9e0e3636" + url: "https://pub.dev" source: hosted - version: "10.0.6" + version: "14.6.9" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - url: "https://pub.dartlang.org" + sha256: "8c7ced3201886ad7ba37f344c1468ccfc08abb3023922e0e5a016eaf38abb96c" + url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "4.5.8" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - url: "https://pub.dartlang.org" + sha256: b601322bdb44e2fefe4cc7b85ef0dbb7a2479d4a7653a51340821cf8d60696b5 + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "3.5.8" firebase_storage: dependency: "direct main" description: name: firebase_storage - url: "https://pub.dartlang.org" + sha256: "4ceb092cd14c3bce0dc8cd4046754cd1e5e5c1977155e286b512b3f84fe1c03e" + url: "https://pub.dev" source: hosted - version: "10.0.2" + version: "11.2.8" firebase_storage_platform_interface: dependency: transitive description: name: firebase_storage_platform_interface - url: "https://pub.dartlang.org" + sha256: "88f8b8bb7181eef125536297f11b28171f59d2f53a59610e3966c2e38be3de4c" + url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.4.7" firebase_storage_web: dependency: transitive description: name: firebase_storage_web - url: "https://pub.dartlang.org" + sha256: bd05589cf17a8d5e2a90bdffcdab434c97e27bc37ca0056bfa90accf0366a7b0 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.6.8" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_blurhash: - dependency: transitive - description: - name: flutter_blurhash - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.0" flutter_cache_manager: dependency: transitive description: name: flutter_cache_manager - url: "https://pub.dartlang.org" + sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.3.1" flutter_native_splash: dependency: "direct main" description: name: flutter_native_splash - url: "https://pub.dartlang.org" + sha256: "5bf4c3e5e5a0426c1e2fc8ca3555a9e617e76369c3442e1dae8385c7767ba97a" + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "2.3.4" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -300,233 +404,418 @@ packages: dependency: "direct main" description: name: font_awesome_flutter - url: "https://pub.dartlang.org" + sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08" + url: "https://pub.dev" source: hosted - version: "9.1.0" + version: "10.6.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" google_fonts: dependency: "direct main" description: name: google_fonts - url: "https://pub.dartlang.org" + sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "6.1.0" + google_identity_services_web: + dependency: transitive + description: + name: google_identity_services_web + sha256: "000b7a31e1fa17ee04b6c0553a2b2ea18f9f9352e4dcc0c9fcc785cf10f2484e" + url: "https://pub.dev" + source: hosted + version: "0.2.2" google_sign_in: dependency: "direct main" description: name: google_sign_in - url: "https://pub.dartlang.org" + sha256: f45038d27bcad37498f282295ae97eece23c9349fc16649154067b87b9f1fd03 + url: "https://pub.dev" + source: hosted + version: "6.1.5" + google_sign_in_android: + dependency: transitive + description: + name: google_sign_in_android + sha256: "6031f59074a337fdd81be821aba84cee3a41338c6e958499a5cd34d3e1db80ef" + url: "https://pub.dev" + source: hosted + version: "6.1.20" + google_sign_in_ios: + dependency: transitive + description: + name: google_sign_in_ios + sha256: "974944859f9cd40eb8a15b3fe8efb2d47fb7e99438f763f61a1ccd28d74ff4ce" + url: "https://pub.dev" source: hosted - version: "5.0.7" + version: "5.6.4" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - url: "https://pub.dartlang.org" + sha256: "35ceee5f0eadc1c07b0b4af7553246e315c901facbb7d3dadf734ba2693ceec4" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.4.2" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - url: "https://pub.dartlang.org" + sha256: "939e9172a378ec4eaeb7f71eeddac9b55ebd0e8546d336daec476a68e5279766" + url: "https://pub.dev" source: hosted - version: "0.10.0+2" + version: "0.12.0+5" + html: + dependency: transitive + description: + name: html + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + url: "https://pub.dev" + source: hosted + version: "0.15.4" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + url: "https://pub.dev" source: hosted - version: "0.13.3" + version: "1.1.0" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271" + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.1.3" image_picker: dependency: "direct main" description: name: image_picker - url: "https://pub.dartlang.org" + sha256: "7d7f2768df2a8b0a3cefa5ef4f84636121987d403130e70b17ef7e2cf650ba84" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + image_picker_android: + dependency: transitive + description: + name: image_picker_android + sha256: d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f + url: "https://pub.dev" source: hosted - version: "0.8.3+2" + version: "0.8.8+2" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - url: "https://pub.dartlang.org" + sha256: "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + image_picker_ios: + dependency: transitive + description: + name: image_picker_ios + sha256: c5538cacefacac733c724be7484377923b476216ad1ead35a0d2eadcdc0fc497 + url: "https://pub.dev" + source: hosted + version: "0.8.8+2" + image_picker_linux: + dependency: transitive + description: + name: image_picker_linux + sha256: "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa" + url: "https://pub.dev" + source: hosted + version: "0.2.1+1" + image_picker_macos: + dependency: transitive + description: + name: image_picker_macos + sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "0.2.1+1" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.dartlang.org" + sha256: ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514 + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.9.1" + image_picker_windows: + dependency: transitive + description: + name: image_picker_windows + sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb" + url: "https://pub.dev" + source: hosted + version: "0.2.1+1" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.1" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.3" + version: "0.6.7" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.5.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.9.1" + mime: + dependency: transitive + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" octo_image: dependency: transitive description: name: octo_image - url: "https://pub.dartlang.org" + sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted - version: "1.0.0+1" + version: "2.1.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.8.3" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.dartlang.org" + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + url: "https://pub.dev" source: hosted - version: "2.0.2" - path_provider_linux: + version: "2.1.1" + path_provider_android: dependency: transitive description: - name: path_provider_linux - url: "https://pub.dartlang.org" + name: path_provider_android + sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + url: "https://pub.dev" source: hosted - version: "2.0.2" - path_provider_macos: + version: "2.2.1" + path_provider_foundation: dependency: transitive description: - name: path_provider_macos - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.3.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + url: "https://pub.dev" source: hosted - version: "2.0.3" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" + version: "2.2.1" permission_handler: dependency: "direct main" description: name: permission_handler - url: "https://pub.dartlang.org" + sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" + url: "https://pub.dev" + source: hosted + version: "11.0.1" + permission_handler_android: + dependency: transitive + description: + name: permission_handler_android + sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e + url: "https://pub.dev" + source: hosted + version: "11.1.0" + permission_handler_apple: + dependency: transitive + description: + name: permission_handler_apple + sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + url: "https://pub.dev" source: hosted - version: "8.1.4+2" + version: "9.1.4" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - url: "https://pub.dartlang.org" + sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "3.12.0" + permission_handler_windows: + dependency: transitive + description: + name: permission_handler_windows + sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + url: "https://pub.dev" + source: hosted + version: "0.1.3" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "5.4.0" + pigeon: + dependency: transitive + description: + name: pigeon + sha256: "5a79fd0b10423f6b5705525e32015597f861c31220b522a67d1e6b580da96719" + url: "https://pub.dev" + source: hosted + version: "11.0.1" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.1.3" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + url: "https://pub.dev" source: hosted - version: "2.0.1" - process: + version: "2.1.6" + pointycastle: dependency: transitive description: - name: process - url: "https://pub.dartlang.org" + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" source: hosted - version: "4.2.3" + version: "3.7.3" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "6.0.5" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.2.1" + rflutter_alert: + dependency: "direct main" + description: + name: rflutter_alert + sha256: "8ff35e3f9712ba24c746499cfa95bf320385edf38901a1a4eab0fe555867f66c" + url: "https://pub.dev" + source: hosted + version: "2.0.7" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + url: "https://pub.dev" source: hosted - version: "0.27.1" + version: "0.27.7" sky_engine: dependency: transitive description: flutter @@ -536,177 +825,314 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "7.0.0" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.dartlang.org" + sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" + url: "https://pub.dev" source: hosted - version: "2.0.0+3" + version: "2.3.0" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a" + url: "https://pub.dev" source: hosted - version: "2.0.0+2" + version: "2.5.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" syncfusion_flutter_core: dependency: transitive description: name: syncfusion_flutter_core - url: "https://pub.dartlang.org" + sha256: d3405e92dbfc1c68e55bf883fb9cd7e3dcae1f53eefd00b8b6b1803e474cf4d6 + url: "https://pub.dev" source: hosted - version: "19.2.57" + version: "23.1.42" syncfusion_flutter_pdf: dependency: transitive description: name: syncfusion_flutter_pdf - url: "https://pub.dartlang.org" + sha256: "5dc498ba4ba540752db83c9993219b556682bf9ad172d266e00f98b1cd8696d6" + url: "https://pub.dev" source: hosted - version: "19.2.57-beta" + version: "23.1.42" syncfusion_flutter_pdfviewer: dependency: "direct main" description: name: syncfusion_flutter_pdfviewer - url: "https://pub.dartlang.org" + sha256: "9926f037a52254f12c95a1d472b7fbcec5835fd7015d4b39a0a9b3489d82c9d2" + url: "https://pub.dev" source: hosted - version: "19.2.57-beta" - syncfusion_flutter_pdfviewer_macos: + version: "23.1.42" + syncfusion_flutter_signaturepad: dependency: transitive description: - name: syncfusion_flutter_pdfviewer_macos - url: "https://pub.dartlang.org" + name: syncfusion_flutter_signaturepad + sha256: "1a8cc87c828a5d246e19e781ddb590c4fa9df8c625f8221d6da81a07c980bf25" + url: "https://pub.dev" source: hosted - version: "19.2.57-beta" - syncfusion_flutter_pdfviewer_platform_interface: + version: "23.1.42" + syncfusion_pdfviewer_macos: dependency: transitive description: - name: syncfusion_flutter_pdfviewer_platform_interface - url: "https://pub.dartlang.org" + name: syncfusion_pdfviewer_macos + sha256: "933a1430b6be6e1c045eed0a534ac83f7a76332bcb6b415072dc7d894347a755" + url: "https://pub.dev" source: hosted - version: "19.2.57-beta" - syncfusion_flutter_pdfviewer_web: + version: "23.1.42" + syncfusion_pdfviewer_platform_interface: dependency: transitive description: - name: syncfusion_flutter_pdfviewer_web - url: "https://pub.dartlang.org" + name: syncfusion_pdfviewer_platform_interface + sha256: c3d58a0add28b2196307ffd8141595b71cd05a7e42e5991f86e2786008182614 + url: "https://pub.dev" source: hosted - version: "19.2.57-beta" + version: "23.1.42" + syncfusion_pdfviewer_web: + dependency: transitive + description: + name: syncfusion_pdfviewer_web + sha256: "1c9b267c27213fa07aba626ceaa1fedc156ddb5a519ed1f50b2ff89360bdf1e4" + url: "https://pub.dev" + source: hosted + version: "23.1.42" + syncfusion_pdfviewer_windows: + dependency: transitive + description: + name: syncfusion_pdfviewer_windows + sha256: "37daf723238b6704ff576be693ae2743b919d9cd304f3b946cbe65ff988dec46" + url: "https://pub.dev" + source: hosted + version: "23.1.42" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.6.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.2" universal_io: dependency: transitive description: name: universal_io - url: "https://pub.dartlang.org" + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + url_launcher: + dependency: transitive + description: + name: url_launcher + sha256: fa6675dc49dea33b0f228bca6f9ad5445c25b51284ca5f88c0d49ab770a0450a + url: "https://pub.dev" + source: hosted + version: "6.2.0" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" + url: "https://pub.dev" + source: hosted + version: "6.2.0" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "6.2.0" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd" + url: "https://pub.dev" + source: hosted + version: "3.1.0" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 + url: "https://pub.dev" + source: hosted + version: "3.1.0" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc" + url: "https://pub.dev" + source: hosted + version: "3.1.0" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7 + url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "4.1.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" velocity_x: dependency: "direct main" description: name: velocity_x - url: "https://pub.dartlang.org" + sha256: "41734c40f1609aaafa5337fd9a9e7e9aaf3464dce8ee2cad18be4226b184e5ca" + url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "4.1.1" vxstate: dependency: transitive description: name: vxstate - url: "https://pub.dartlang.org" + sha256: ed5a880018191c5cfed8528bd77f2a942b04847168ca12636a306c323d311086 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.0" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + url: "https://pub.dev" source: hosted - version: "2.2.6" + version: "5.0.9" + win32_registry: + dependency: transitive + description: + name: win32_registry + sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a" + url: "https://pub.dev" + source: hosted + version: "1.1.2" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "1.0.3" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" source: hosted - version: "5.1.2" + version: "6.3.0" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.0.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index 32e81f9..c3b1488 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,25 +23,27 @@ environment: dependencies: cached_network_image: ^3.1.0 carousel_slider: ^4.0.0 - cloud_firestore: ^2.5.0 + cloud_firestore: ^4.9.3 cupertino_icons: ^1.0.2 date_format: ^2.0.4 - firebase_auth: ^3.0.2 - firebase_core: ^1.5.0 - firebase_messaging: ^10.0.6 - firebase_storage: ^10.0.2 + firebase_auth: ^4.10.1 + firebase_core: ^2.17.0 + firebase_storage: ^11.2.8 flutter: sdk: flutter - flutter_native_splash: ^1.2.1 - font_awesome_flutter: ^9.1.0 - google_fonts: ^2.1.0 - google_sign_in: ^5.0.7 - image_picker: ^0.8.3+2 - intl: ^0.17.0 - permission_handler: ^8.1.4+2 + flutter_native_splash: ^2.3.3 + font_awesome_flutter: ^10.5.0 + google_fonts: ^6.1.0 + google_sign_in: ^6.1.5 + image_picker: ^1.0.4 + intl: ^0.18.1 + permission_handler: ^11.0.1 provider: ^6.0.0 - syncfusion_flutter_pdfviewer: ^19.1.69-beta - velocity_x: ^3.3.0 + velocity_x: ^4.1.1 + firebase_core_platform_interface: ^4.8.0 + firebase_messaging: ^14.6.9 + syncfusion_flutter_pdfviewer: ^23.1.39 + rflutter_alert: ^2.0.7 dev_dependencies: flutter_test: