From 65a3e079ad18a1a30be04d684358f46db38a4093 Mon Sep 17 00:00:00 2001
From: Nishant Andoriya <56160262+M-A-D-A-R-A@users.noreply.github.com>
Date: Thu, 30 Sep 2021 02:14:09 +0530
Subject: [PATCH 01/22] Update README.md
---
README.md | 89 +++++++++++++++++++++++++++----------------------------
1 file changed, 43 insertions(+), 46 deletions(-)
diff --git a/README.md b/README.md
index 915c968..4511d0a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
An App where all the details about a tournament can be found.
-## ⚡Features
+## Features
- User Side
@@ -21,52 +21,49 @@ An App where all the details about a tournament can be found.
- Admin can add match schedule on the App which will be displayed to the users.
- Admin can announce any updates throught the App itself.
-
-
-
-## ⚡Screenshots
-
-
-
- 
- 
- 
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
- 
- 
- 
-
-
-
-
-
-
-## 💻Tech Stack
-- Flutter
-- Firebase
+
+## Getting Started
+
+Start working on this Project and getting started with Prerequisties.have a overview of this app on [wiki](https://github.com/iiitv/Arcadia-Auction/wiki)
+
+### Prerequisites
+
+you should have Flutter SDK installed in your environment.
+* flutter
+ ```sh
+ git clone https://github.com/flutter/flutter.git -b stable
+ ```
+
+### Installation
-
+1. Fork this repo
+2. Clone the repo
+ ```sh
+ git clone https://github.com/iiitv/Arcadia-Auction
+ ```
+3. Install pubspec Dependencies
+ ```sh
+ flutter pub get
+ ```
+4. Create your Feature Branch
+ ```sh
+ git branch (Feature name)
+ ```
+5. Start working on issue/feature
-## 🤓 Contributors
+## Contributing
-- [Ashish Kumar Singh](https://github.com/AshishSingh2001)
-- [Kapil Kumar](https://github.com/kapilkumar2001)
-- [Nishant Andoriya](https://github.com/M-A-D-A-R-A)
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+Read guidelines and getting started [here](https://github.com/iiitv/Arcadia-Auction/blob/main/CONTRIBUTION.md). Start working on the [issue](https://github.com/iiitv/Arcadia-Auction/issues).
+
+
+## License
+
+Distributed under the MIT License. See `LICENSE` for more information.
+
+## Tech Stack
+
+- Flutter
+- Firebase
+- Provider
From 4782e993c678a4f99c224568c2c1e9b5d5fe115c Mon Sep 17 00:00:00 2001
From: Kapil Kumar <56160115+kapilkumar2001@users.noreply.github.com>
Date: Thu, 30 Sep 2021 08:56:25 +0530
Subject: [PATCH 02/22] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 4511d0a..3c10b06 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ you should have Flutter SDK installed in your environment.
1. Fork this repo
2. Clone the repo
```sh
- git clone https://github.com/iiitv/Arcadia-Auction
+ git clone https://github.com//Arcadia-Auction
```
3. Install pubspec Dependencies
```sh
From 626c3a0ffe5f48c1e8a4e4147471e06444a0d42f Mon Sep 17 00:00:00 2001
From: Priya Nagda
Date: Sun, 3 Oct 2021 04:56:26 +0530
Subject: [PATCH 03/22] Replace deprecated widgets
---
lib/main.dart | 7 +--
lib/screens/onboarding/onboarding_screen.dart | 51 ++++++++++---------
2 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/lib/main.dart b/lib/main.dart
index f67bfc8..7d59ef3 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -24,8 +24,8 @@ 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);
runApp(MyApp());
}
@@ -68,7 +68,8 @@ class MyApp extends StatelessWidget {
title: 'CSGO League',
theme: ThemeData(
primaryColor: CustomColors.primaryColor,
- accentColor: CustomColors.secondaryColor,
+ colorScheme: ColorScheme.fromSwatch()
+ .copyWith(secondary: 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..cfd2ae0 100644
--- a/lib/screens/onboarding/onboarding_screen.dart
+++ b/lib/screens/onboarding/onboarding_screen.dart
@@ -61,9 +61,10 @@ class _OnboardingScreenState extends State {
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(
@@ -217,31 +218,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 +255,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,
From 5c13b6c146b28f3d05598408fb6f026f9197a91f Mon Sep 17 00:00:00 2001
From: Nishant Andoriya <56160262+M-A-D-A-R-A@users.noreply.github.com>
Date: Mon, 4 Oct 2021 09:56:04 +0530
Subject: [PATCH 04/22] Update README.md
---
README.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/README.md b/README.md
index 3c10b06..3d57722 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,13 @@ you should have Flutter SDK installed in your environment.
```
5. Start working on issue/feature
+### Note
+ - If you are not able to debug your app, that's maybe because you need to configure SHA1 in Firebase, just copy the code below and paste it in your terminal (if asked password use "android") and set it up on firebase.[Admin access](https://github.com/iiitv/Arcadia-Auction/issues/9).
+ ```sh
+ keytool -list -v -alias androiddebugkey -keystore %USERPROFILE%\.android\debug.keystore
+ ```
+
+
## Contributing
Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
From 4401daf373f0f5f7df438497bd20ff828a553525 Mon Sep 17 00:00:00 2001
From: Vedant
Date: Thu, 7 Oct 2021 16:18:26 +0530
Subject: [PATCH 05/22] Improved UI of SignUp Page
---
lib/main.dart | 4 +-
lib/screens/player/forms/player_form.dart | 150 ++++++++++++++--------
2 files changed, 99 insertions(+), 55 deletions(-)
diff --git a/lib/main.dart b/lib/main.dart
index 7d59ef3..fee1c08 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -64,6 +64,7 @@ class MyApp extends StatelessWidget {
),
],
child: MaterialApp(
+
debugShowCheckedModeBanner: false,
title: 'CSGO League',
theme: ThemeData(
@@ -73,7 +74,8 @@ class MyApp extends StatelessWidget {
textTheme:
GoogleFonts.poppinsTextTheme(Theme.of(context).textTheme),
),
- home: getHome(snapshot.data),
+ // home: getHome(snapshot.data),
+ home: PlayerForm(),
routes: {
AdminMainPage.routeName: (ctx) => AdminMainPage(),
AuctionHome.routeName: (ctx) => AuctionHome(),
diff --git a/lib/screens/player/forms/player_form.dart b/lib/screens/player/forms/player_form.dart
index 20ba02b..9fe6df0 100644
--- a/lib/screens/player/forms/player_form.dart
+++ b/lib/screens/player/forms/player_form.dart
@@ -110,50 +110,54 @@ class _PlayerFormState extends State {
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),
alignment: Alignment.topCenter,
- color: CustomColors.primaryColor,
+ color: CustomColors.firebaseNavy,
child: Column(
children: [
+ Container(
+ padding: EdgeInsets.all(15),
+ width: double.infinity,
+ child: Text(
+ "Player Details Form",
+ style: TextStyle(color: Colors.yellow, fontSize: 30),
+ ),
+ ),
SizedBox(
- height: 12,
+ height: 15,
),
Center(
child: GestureDetector(
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: 200,
+ height: 200,
+ decoration: BoxDecoration(color: Colors.grey),
+ child: _image != null
+ ? Image.file(
+ _image,
+ width: 200.0,
+ height: 200.0,
+ fit: BoxFit.fitHeight,
+ )
+ : Container(
+ decoration: BoxDecoration(color: Colors.white70),
+ width: 200,
+ height: 200,
+ child: Icon(
+ Icons.camera_alt_rounded,
+ color: Colors.grey[800],
+ size: 35,
+ ),
),
- ),
+ ),
),
),
),
@@ -169,19 +173,26 @@ class _PlayerFormState extends State {
children: [
TextFormField(
controller: namecontroller,
+ style: TextStyle(
+ fontWeight: FontWeight.w400,
+ fontSize: 14,
+ color: Colors.yellow,
+ ),
decoration: InputDecoration(
hintText: "Enter Your Name",
labelText: "Your 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(
@@ -208,21 +219,24 @@ class _PlayerFormState extends State {
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 14,
- color: CustomColors.primaryColor,
+ color: Colors.yellow,
),
decoration: InputDecoration(
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 +259,26 @@ class _PlayerFormState extends State {
),
TextFormField(
controller: iGNcontroller,
+ style: TextStyle(
+ fontWeight: FontWeight.w400,
+ fontSize: 14,
+ color: Colors.yellow,
+ ),
decoration: InputDecoration(
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 +302,27 @@ class _PlayerFormState extends State {
TextFormField(
controller: gameHRScontroller,
keyboardType: TextInputType.numberWithOptions(),
+ style: TextStyle(
+ fontWeight: FontWeight.w400,
+ fontSize: 14,
+ color: Colors.yellow,
+ ),
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(
@@ -321,10 +349,10 @@ class _PlayerFormState extends State {
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 +360,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),
@@ -364,15 +392,16 @@ class _PlayerFormState extends State {
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:
@@ -403,20 +432,27 @@ class _PlayerFormState extends State {
TextFormField(
controller: streamURLcontroller,
obscureText: false,
+ style: TextStyle(
+ fontWeight: FontWeight.w400,
+ fontSize: 14,
+ color: Colors.yellow,
+ ),
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,13 +515,13 @@ 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),
),
)),
@@ -499,8 +535,14 @@ class _PlayerFormState extends State {
return SignInScreen();
}), (route) => false);
},
+ style: ElevatedButton.styleFrom(
+ primary: Colors.blueAccent),
icon: Icon(Icons.arrow_forward),
- label: Text('Sign Out'),
+ label: Text(
+ 'Sign Out ?',
+ style: TextStyle(
+ color: Colors.white, fontWeight: FontWeight.bold),
+ ),
),
],
),
From fdfb66b88584bdef9b61a4ff7b744de9985dcf6a Mon Sep 17 00:00:00 2001
From: Vedant
Date: Thu, 7 Oct 2021 16:27:58 +0530
Subject: [PATCH 06/22] Final UI and Workflow checked
---
lib/main.dart | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/main.dart b/lib/main.dart
index fee1c08..7d59ef3 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -64,7 +64,6 @@ class MyApp extends StatelessWidget {
),
],
child: MaterialApp(
-
debugShowCheckedModeBanner: false,
title: 'CSGO League',
theme: ThemeData(
@@ -74,8 +73,7 @@ class MyApp extends StatelessWidget {
textTheme:
GoogleFonts.poppinsTextTheme(Theme.of(context).textTheme),
),
- // home: getHome(snapshot.data),
- home: PlayerForm(),
+ home: getHome(snapshot.data),
routes: {
AdminMainPage.routeName: (ctx) => AdminMainPage(),
AuctionHome.routeName: (ctx) => AuctionHome(),
From 0800bb2b9e0fb99ead5b89d3dfd6f6f0243383a2 Mon Sep 17 00:00:00 2001
From: marizvi <202051121@iiitvadodara.ac.in>
Date: Sat, 9 Oct 2021 18:26:03 +0530
Subject: [PATCH 07/22] Deprecated method replaced
---
lib/main.dart | 3 +--
pubspec.lock | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/main.dart b/lib/main.dart
index 7d59ef3..b68c617 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -24,8 +24,7 @@ import 'screens/onboarding/signin_screen.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
- SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
- overlays: [SystemUiOverlay.bottom, SystemUiOverlay.top]);
+ SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.bottom, SystemUiOverlay.top]);
FirebaseMessaging.onBackgroundMessage(_messageHandler);
runApp(MyApp());
}
diff --git a/pubspec.lock b/pubspec.lock
index 40195f1..1e3c254 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -21,7 +21,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.8.1"
+ version: "2.6.1"
auto_size_text_pk:
dependency: transitive
description:
@@ -77,7 +77,7 @@ packages:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.1"
+ version: "1.2.0"
clock:
dependency: transitive
description:
@@ -400,7 +400,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.7.0"
+ version: "1.3.0"
nested:
dependency: transitive
description:
@@ -636,7 +636,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.2"
+ version: "0.3.0"
typed_data:
dependency: transitive
description:
From 6e7f20fc94c21d7504646d2cfaa1cdf5ad316125 Mon Sep 17 00:00:00 2001
From: Vedant
Date: Thu, 14 Oct 2021 15:27:07 +0530
Subject: [PATCH 08/22] changed form color
---
lib/screens/player/forms/player_form.dart | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/screens/player/forms/player_form.dart b/lib/screens/player/forms/player_form.dart
index 9fe6df0..271b0b0 100644
--- a/lib/screens/player/forms/player_form.dart
+++ b/lib/screens/player/forms/player_form.dart
@@ -115,7 +115,7 @@ class _PlayerFormState extends State {
child: Container(
padding: EdgeInsets.only(top: 24),
alignment: Alignment.topCenter,
- color: CustomColors.firebaseNavy,
+ color: CustomColors.primaryColor,
child: Column(
children: [
Container(
From a35df0d16d96548208f33fa6e0d1cd3ba407f0dc Mon Sep 17 00:00:00 2001
From: marizvi <202051121@iiitvadodara.ac.in>
Date: Wed, 20 Oct 2021 11:44:34 +0530
Subject: [PATCH 09/22] overflow issue resolved
---
lib/screens/onboarding/onboarding_screen.dart | 25 +++++++++----------
lib/screens/player/forms/player_form.dart | 10 ++++----
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/lib/screens/onboarding/onboarding_screen.dart b/lib/screens/onboarding/onboarding_screen.dart
index cfd2ae0..5a016c4 100644
--- a/lib/screens/onboarding/onboarding_screen.dart
+++ b/lib/screens/onboarding/onboarding_screen.dart
@@ -87,7 +87,7 @@ class _OnboardingScreenState extends State {
),
)),
Container(
- height: 600.0,
+ height: 480.0,
// width: MediaQuery.of(context).size.width,
child: PageView(
physics: ClampingScrollPhysics(),
@@ -106,7 +106,7 @@ class _OnboardingScreenState extends State {
children: [
Center(
child: Container(
- height: 600.0,
+ height: 480.0,
width: MediaQuery.of(context).size.width,
child: FittedBox(
fit: BoxFit.cover,
@@ -117,6 +117,11 @@ class _OnboardingScreenState extends State {
),
),
),
+ Image.asset(
+ 'assets/onboarding.png',
+ height: 480.0,
+ width: MediaQuery.of(context).size.width,
+ ),
Positioned(
top: 3,
left: 90,
@@ -130,12 +135,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(
@@ -153,11 +152,11 @@ class _OnboardingScreenState extends State {
),
),
),
- // Image.asset(
- // 'assets/onboarding1.png',
- // height: 600.0,
- // width: MediaQuery.of(context).size.width,
- // ),
+ Image.asset(
+ 'assets/onboarding1.png',
+ height: 600.0,
+ width: MediaQuery.of(context).size.width,
+ ),
Positioned(
top: 3,
left: 70,
diff --git a/lib/screens/player/forms/player_form.dart b/lib/screens/player/forms/player_form.dart
index 271b0b0..dcf30c0 100644
--- a/lib/screens/player/forms/player_form.dart
+++ b/lib/screens/player/forms/player_form.dart
@@ -184,7 +184,7 @@ class _PlayerFormState extends State {
hintStyle: TextStyle(color: Colors.white54),
filled: true,
fillColor: CustomColors.taskez1,
- floatingLabelStyle: TextStyle(color: Colors.yellow),
+ // floatingLabelStyle: TextStyle(color: Colors.yellow),
labelStyle: TextStyle(
fontWeight: FontWeight.w900,
fontSize: 14,
@@ -228,7 +228,7 @@ class _PlayerFormState extends State {
TextStyle(color: Colors.white54, fontSize: 16),
filled: true,
fillColor: CustomColors.taskez1,
- floatingLabelStyle: TextStyle(color: Colors.yellow),
+ // floatingLabelStyle: TextStyle(color: Colors.yellow),
labelStyle: TextStyle(
fontWeight: FontWeight.w900,
fontSize: 14,
@@ -270,7 +270,7 @@ class _PlayerFormState extends State {
hintStyle: TextStyle(color: Colors.white54),
filled: true,
fillColor: CustomColors.taskez1,
- floatingLabelStyle: TextStyle(color: Colors.yellow),
+ // floatingLabelStyle: TextStyle(color: Colors.yellow),
labelStyle: TextStyle(
fontWeight: FontWeight.w900,
fontSize: 14,
@@ -314,7 +314,7 @@ class _PlayerFormState extends State {
hintStyle: TextStyle(color: Colors.white54),
filled: true,
fillColor: CustomColors.taskez1,
- floatingLabelStyle: TextStyle(color: Colors.yellow),
+ // floatingLabelStyle: TextStyle(color: Colors.yellow),
labelStyle: TextStyle(
fontWeight: FontWeight.w900,
fontSize: 14,
@@ -444,7 +444,7 @@ class _PlayerFormState extends State {
hintStyle: TextStyle(color: Colors.white54),
filled: true,
fillColor: CustomColors.taskez1,
- floatingLabelStyle: TextStyle(color: Colors.yellow),
+ // floatingLabelStyle: TextStyle(color: Colors.yellow),
labelStyle: TextStyle(
fontWeight: FontWeight.w900,
fontSize: 14,
From 75ab9271a65dff15bcf5c61c9f25241bf3a1beb5 Mon Sep 17 00:00:00 2001
From: marizvi <202051121@iiitvadodara.ac.in>
Date: Tue, 26 Oct 2021 14:46:34 +0530
Subject: [PATCH 10/22] responsiveness added
---
lib/screens/onboarding/onboarding_screen.dart | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/screens/onboarding/onboarding_screen.dart b/lib/screens/onboarding/onboarding_screen.dart
index 5a016c4..0d34557 100644
--- a/lib/screens/onboarding/onboarding_screen.dart
+++ b/lib/screens/onboarding/onboarding_screen.dart
@@ -56,7 +56,7 @@ class _OnboardingScreenState extends State {
),
),
child: Padding(
- padding: EdgeInsets.symmetric(vertical: 40.0),
+ padding: EdgeInsets.symmetric(vertical: 22.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
@@ -87,7 +87,7 @@ class _OnboardingScreenState extends State {
),
)),
Container(
- height: 480.0,
+ height: MediaQuery.of(context).orientation == Orientation.landscape? MediaQuery.of(context).size.height*0.60:MediaQuery.of(context).size.height*0.75,
// width: MediaQuery.of(context).size.width,
child: PageView(
physics: ClampingScrollPhysics(),
@@ -106,7 +106,7 @@ class _OnboardingScreenState extends State {
children: [
Center(
child: Container(
- height: 480.0,
+ height:MediaQuery.of(context).orientation == Orientation.landscape? MediaQuery.of(context).size.height*0.60:MediaQuery.of(context).size.height*0.75,
width: MediaQuery.of(context).size.width,
child: FittedBox(
fit: BoxFit.cover,
@@ -119,12 +119,12 @@ class _OnboardingScreenState extends State {
),
Image.asset(
'assets/onboarding.png',
- height: 480.0,
+ height: MediaQuery.of(context).orientation == Orientation.landscape? MediaQuery.of(context).size.height*0.60:MediaQuery.of(context).size.height*0.75,
width: MediaQuery.of(context).size.width,
),
Positioned(
top: 3,
- left: 90,
+ left: 40,
child: Center(
child: Text(
'Make Your Profile',
@@ -206,9 +206,9 @@ class _OnboardingScreenState extends State {
],
),
),
- SizedBox(
- height: 20,
- ),
+ SizedBox(
+ height: 20,
+ ),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: _buildPageIndicator(),
From ccb6f3d72751c35e127b5ca2fadcbcde894f0999 Mon Sep 17 00:00:00 2001
From: marizvi <202051121@iiitvadodara.ac.in>
Date: Fri, 29 Oct 2021 01:09:51 +0530
Subject: [PATCH 11/22] Orientation and Multiple images fixed
---
lib/main.dart | 8 +++++++-
lib/screens/onboarding/onboarding_screen.dart | 18 ++++--------------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/lib/main.dart b/lib/main.dart
index b68c617..de3fd9a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -24,8 +24,14 @@ import 'screens/onboarding/signin_screen.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
- SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.bottom, SystemUiOverlay.top]);
+ SystemChrome.setEnabledSystemUIOverlays(
+ [SystemUiOverlay.bottom, SystemUiOverlay.top]);
FirebaseMessaging.onBackgroundMessage(_messageHandler);
+ SystemChrome.setPreferredOrientations
+ ([
+ DeviceOrientation.portraitUp,
+ DeviceOrientation.portraitDown,
+ ]);
runApp(MyApp());
}
diff --git a/lib/screens/onboarding/onboarding_screen.dart b/lib/screens/onboarding/onboarding_screen.dart
index 0d34557..0d54326 100644
--- a/lib/screens/onboarding/onboarding_screen.dart
+++ b/lib/screens/onboarding/onboarding_screen.dart
@@ -87,7 +87,7 @@ class _OnboardingScreenState extends State {
),
)),
Container(
- height: MediaQuery.of(context).orientation == Orientation.landscape? MediaQuery.of(context).size.height*0.60:MediaQuery.of(context).size.height*0.75,
+ height:MediaQuery.of(context).size.height*0.75,
// width: MediaQuery.of(context).size.width,
child: PageView(
physics: ClampingScrollPhysics(),
@@ -106,8 +106,8 @@ class _OnboardingScreenState extends State {
children: [
Center(
child: Container(
- height:MediaQuery.of(context).orientation == Orientation.landscape? MediaQuery.of(context).size.height*0.60:MediaQuery.of(context).size.height*0.75,
- 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,
@@ -117,11 +117,6 @@ class _OnboardingScreenState extends State {
),
),
),
- Image.asset(
- 'assets/onboarding.png',
- height: MediaQuery.of(context).orientation == Orientation.landscape? MediaQuery.of(context).size.height*0.60:MediaQuery.of(context).size.height*0.75,
- width: MediaQuery.of(context).size.width,
- ),
Positioned(
top: 3,
left: 40,
@@ -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,
From e3d19eb623c3fa715b043e80b2a1fdd15d65b16b Mon Sep 17 00:00:00 2001
From: Mehul-Kumar-27
Date: Sun, 1 Oct 2023 16:30:37 +0530
Subject: [PATCH 12/22] build failed resolved
---
.fvm/flutter_sdk | 1 +
.fvm/fvm_config.json | 4 +
.metadata | 10 -
.vscode/settings.json | 12 +
android/.project | 4 +-
.../org.eclipse.buildship.core.prefs | 4 +-
android/app/.classpath | 2 +-
android/app/.project | 4 +-
.../app/.settings/org.eclipse.jdt.core.prefs | 4 +
android/app/build.gradle | 2 +-
android/build.gradle | 6 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
lib/main.dart | 4 +-
lib/screens/player/rules_pdf_viewer.dart | 143 ++--
pubspec.lock | 740 ++++++++++++------
pubspec.yaml | 28 +-
16 files changed, 627 insertions(+), 343 deletions(-)
create mode 120000 .fvm/flutter_sdk
create mode 100644 .fvm/fvm_config.json
delete mode 100644 .metadata
create mode 100644 .vscode/settings.json
create mode 100644 android/app/.settings/org.eclipse.jdt.core.prefs
diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk
new file mode 120000
index 0000000..b9591be
--- /dev/null
+++ b/.fvm/flutter_sdk
@@ -0,0 +1 @@
+C:/Users/hp/fvm/versions/3.7.10
\ No newline at end of file
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
new file mode 100644
index 0000000..e003d0a
--- /dev/null
+++ b/.fvm/fvm_config.json
@@ -0,0 +1,4 @@
+{
+ "flutterSdkVersion": "3.7.10",
+ "flavors": {}
+}
\ 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/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..250f9ba
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+ "dart.flutterSdkPath": ".fvm/flutter_sdk",
+ // Remove .fvm files from search
+ "search.exclude": {
+ "**/.fvm": true
+ },
+ // Remove from file watching
+ "files.watcherExclude": {
+ "**/.fvm": true
+ },
+ "java.configuration.updateBuildConfiguration": "interactive"
+ }
\ No newline at end of file
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..f4e88ed 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.project.dir=
eclipse.preferences.version=1
gradle.user.home=
-java.home=/usr/lib/jvm/java-14-openjdk-amd64
+java.home=C\:/Program Files/Java/jdk-18.0.1
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 d2cc6ce..1811434 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -27,7 +27,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
- compileSdkVersion 30
+ compileSdkVersion 33
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
diff --git a/android/build.gradle b/android/build.gradle
index 7c50225..ef74d07 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.3.50'
+ ext.kotlin_version = '1.9.10'
repositories {
google()
jcenter()
@@ -7,7 +7,7 @@ buildscript {
dependencies {
classpath 'com.google.gms:google-services:4.3.10'
- classpath 'com.android.tools.build:gradle:4.1.0'
+ classpath 'com.android.tools.build:gradle:7.2.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 de3fd9a..2126950 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -24,8 +24,8 @@ 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
([
diff --git a/lib/screens/player/rules_pdf_viewer.dart b/lib/screens/player/rules_pdf_viewer.dart
index f392471..ec13a23 100644
--- a/lib/screens/player/rules_pdf_viewer.dart
+++ b/lib/screens/player/rules_pdf_viewer.dart
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
-import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
class RulesPdfViewer extends StatefulWidget {
static const routeName = '/rules-pdf-viewer';
@@ -9,83 +8,83 @@ 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;
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 1e3c254..69f1888 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,258 +1,342 @@
# 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: "2d8e8e123ca3675625917f535fcc0d3a50092eef44334168f9b18adc050d4c6e"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.3.6"
+ 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: "06a96f1249f38a00435b3b0c9a3246d934d7dbc8183fc7c9e56989860edb99d4"
+ url: "https://pub.dev"
source: hosted
- version: "3.1.2"
+ version: "3.4.4"
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: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+ url: "https://pub.dev"
source: hosted
- version: "2.6.1"
+ version: "2.10.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: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15
+ url: "https://pub.dev"
source: hosted
- version: "3.1.0"
+ version: "3.2.3"
cached_network_image_platform_interface:
dependency: transitive
description:
name: cached_network_image_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7
+ url: "https://pub.dev"
source: hosted
- version: "1.0.0"
+ version: "2.0.0"
cached_network_image_web:
dependency: transitive
description:
name: cached_network_image_web
- url: "https://pub.dartlang.org"
+ sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0
+ url: "https://pub.dev"
source: hosted
- version: "1.0.1"
+ version: "1.0.2"
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"
+ sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+ url: "https://pub.dev"
source: hosted
- version: "1.1.0"
- charcode:
- dependency: transitive
- description:
- name: charcode
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.2.0"
+ version: "1.2.1"
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: "50e1ffa143fc5c49db1800392f8d9524fd015f9d26a9e4fc01b5ddb1e603e01b"
+ url: "https://pub.dev"
source: hosted
- version: "2.5.0"
+ version: "4.9.2"
cloud_firestore_platform_interface:
dependency: transitive
description:
name: cloud_firestore_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: "150e603a40d52b3199e46b1e38d9f8ef8c2dee9e1fb2122d58d456c50015bf7c"
+ url: "https://pub.dev"
source: hosted
- version: "5.4.0"
+ version: "5.16.1"
cloud_firestore_web:
dependency: transitive
description:
name: cloud_firestore_web
- url: "https://pub.dartlang.org"
+ sha256: f033aef13b13f94b0f361898df39307d8710859c8912626cfb08e439e350bd66
+ url: "https://pub.dev"
source: hosted
- version: "2.4.0"
+ version: "3.7.1"
collection:
dependency: transitive
description:
name: collection
- url: "https://pub.dartlang.org"
+ sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+ url: "https://pub.dev"
source: hosted
- version: "1.15.0"
+ version: "1.17.0"
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: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb
+ url: "https://pub.dev"
source: hosted
- version: "0.3.1+4"
+ version: "0.3.3+5"
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"
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.4"
+ version: "2.0.7"
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: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+ url: "https://pub.dev"
source: hosted
- version: "1.1.2"
+ version: "2.0.2"
file:
dependency: transitive
description:
name: file
- url: "https://pub.dartlang.org"
+ sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+ url: "https://pub.dev"
+ source: hosted
+ version: "6.1.4"
+ file_selector_linux:
+ dependency: transitive
+ description:
+ name: file_selector_linux
+ sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
+ url: "https://pub.dev"
source: hosted
- version: "6.1.2"
+ 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: e7b7e2a08888cb8ef073a9b6d4df9039ea0ff07c920d4258fb4886c55fe2dbb6
+ url: "https://pub.dev"
source: hosted
- version: "3.0.2"
+ version: "4.10.0"
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: "4862bd649268e32ebd685a58abe1eb7ef13aef3f668ce9c56a7d283c971ec6ff"
+ url: "https://pub.dev"
source: hosted
- version: "6.0.1"
+ version: "6.19.0"
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
- url: "https://pub.dartlang.org"
+ sha256: "090d531cc0dcf1e39edc0d64cffa18ccc5745b1fd1081a13ee1bf42d861ff764"
+ url: "https://pub.dev"
source: hosted
- version: "3.0.1"
+ version: "5.8.1"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
- url: "https://pub.dartlang.org"
+ sha256: "675c209c94a1817649137cbd113fc4c9ae85e48d03dd578629abbec6d8a4d93d"
+ url: "https://pub.dev"
source: hosted
- version: "1.6.0"
+ version: "2.16.0"
firebase_core_platform_interface:
dependency: transitive
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: "4544524c22de3ffdc7e0ffaeeba212a04d09e76d0549ae6f42ce285d9d8f0513"
+ url: "https://pub.dev"
source: hosted
- version: "10.0.6"
+ version: "14.6.8"
firebase_messaging_platform_interface:
dependency: transitive
description:
name: firebase_messaging_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: a6e1fae8242a14d5d8f5ab1cf94693511f06bab49ff1d46e3d83c0af3c4becb8
+ url: "https://pub.dev"
source: hosted
- version: "3.0.5"
+ version: "4.5.7"
firebase_messaging_web:
dependency: transitive
description:
name: firebase_messaging_web
- url: "https://pub.dartlang.org"
+ sha256: a9fe837dc2dcdd3e32e6109a6b0ce62592d7a44cb8f69cb5b73190865c5aa28e
+ url: "https://pub.dev"
source: hosted
- version: "2.0.5"
+ version: "3.5.7"
firebase_storage:
dependency: "direct main"
description:
name: firebase_storage
- url: "https://pub.dartlang.org"
+ sha256: "0b6423dc6acb8185121a974843ab7678127b93fe68f22683f3852b3634e19c8e"
+ url: "https://pub.dev"
source: hosted
- version: "10.0.2"
+ version: "11.2.7"
firebase_storage_platform_interface:
dependency: transitive
description:
name: firebase_storage_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: "8ad840f019b4d3e25dcf9fa64563dc9eff981f9ca9207aff7b717038e69ec868"
+ url: "https://pub.dev"
source: hosted
- version: "4.0.1"
+ version: "4.4.6"
firebase_storage_web:
dependency: transitive
description:
name: firebase_storage_web
- url: "https://pub.dartlang.org"
+ sha256: "37b44ea1f54ad993a1b0aea99d7083b251669f91af799e50cc3e84a969642f8f"
+ url: "https://pub.dev"
source: hosted
- version: "3.0.1"
+ version: "3.6.7"
flutter:
dependency: "direct main"
description: flutter
@@ -262,30 +346,34 @@ packages:
dependency: transitive
description:
name: flutter_blurhash
- url: "https://pub.dartlang.org"
+ sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6"
+ url: "https://pub.dev"
source: hosted
- version: "0.6.0"
+ version: "0.7.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: bd36d1a7f05ff8378cad17d20c33ca904630bfd3fcf8b15c9e8237efbccfad0a
+ url: "https://pub.dev"
source: hosted
- version: "1.2.1"
+ version: "2.2.0+1"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
- url: "https://pub.dartlang.org"
+ sha256: f185ac890306b5779ecbd611f52502d8d4d63d27703ef73161ca0407e815f02c
+ url: "https://pub.dev"
source: hosted
- version: "2.0.2"
+ version: "2.0.16"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -300,233 +388,410 @@ packages:
dependency: "direct main"
description:
name: font_awesome_flutter
- url: "https://pub.dartlang.org"
+ sha256: "959ef4add147753f990b4a7c6cccb746d5792dbdc81b1cde99e62e7edb31b206"
+ url: "https://pub.dev"
source: hosted
- version: "9.1.0"
+ version: "10.4.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: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "4.0.4"
+ google_identity_services_web:
+ dependency: transitive
+ description:
+ name: google_identity_services_web
+ sha256: "554748f2478619076128152c58905620d10f9c7fc270ff1d3a9675f9f53838ed"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.2.1+1"
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: "5.0.7"
+ 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.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: b48263e47f9493ba4120ccdfffe7412549ee297e82b97be9b8fa16ea8919ffbe
+ url: "https://pub.dev"
source: hosted
- version: "0.10.0+2"
+ version: "0.12.0+4"
http:
dependency: transitive
description:
name: http
- url: "https://pub.dartlang.org"
+ sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+ url: "https://pub.dev"
source: hosted
- version: "0.13.3"
+ version: "0.13.6"
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: "02bafd3b4f399bfeb10034deba9753d93b55ce41cd0c4d3d8b355626f80e5b32"
+ url: "https://pub.dev"
source: hosted
- version: "3.0.2"
+ version: "3.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: "0.8.3+2"
+ version: "1.0.4"
+ image_picker_android:
+ dependency: transitive
+ description:
+ name: image_picker_android
+ sha256: "0c7b83bbe2980c8a8e36e974f055e11e51675784e13a4762889feed0f3937ff2"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.8.8+1"
image_picker_for_web:
dependency: transitive
description:
name: image_picker_for_web
- url: "https://pub.dartlang.org"
+ sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.0"
+ 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: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+ url: "https://pub.dev"
source: hosted
- version: "0.6.3"
+ version: "0.6.5"
+ lint:
+ dependency: transitive
+ description:
+ name: lint
+ sha256: "4a539aa34ec5721a2c7574ae2ca0336738ea4adc2a34887d54b7596310b33c85"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.10.0"
matcher:
dependency: transitive
description:
name: matcher
- url: "https://pub.dartlang.org"
+ sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+ url: "https://pub.dev"
source: hosted
- version: "0.12.10"
+ version: "0.12.13"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
- url: "https://pub.dartlang.org"
+ sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+ url: "https://pub.dev"
source: hosted
- version: "1.3.0"
+ version: "1.8.0"
+ 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: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.2"
+ 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: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+ url: "https://pub.dev"
source: hosted
- version: "1.8.0"
+ version: "1.8.2"
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: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.2"
- path_provider_macos:
+ version: "2.2.0"
+ 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: ad65ba9af42a3d067203641de3fd9f547ded1410bad3b84400c2b4899faede70
+ url: "https://pub.dev"
+ source: hosted
+ version: "11.0.0"
+ permission_handler_android:
+ dependency: transitive
+ description:
+ name: permission_handler_android
+ sha256: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790
+ url: "https://pub.dev"
source: hosted
- version: "8.1.4+2"
+ version: "11.0.5"
+ permission_handler_apple:
+ dependency: transitive
+ description:
+ name: permission_handler_apple
+ sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
+ url: "https://pub.dev"
+ source: hosted
+ version: "9.1.4"
permission_handler_platform_interface:
dependency: transitive
description:
name: permission_handler_platform_interface
- url: "https://pub.dartlang.org"
+ sha256: f2343e9fa9c22ae4fd92d4732755bfe452214e7189afcc097380950cf567b4b2
+ url: "https://pub.dev"
source: hosted
- version: "3.6.1"
+ version: "3.11.5"
+ 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: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+ url: "https://pub.dev"
source: hosted
- version: "4.1.0"
+ version: "5.1.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: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+ url: "https://pub.dev"
source: hosted
- version: "3.0.2"
+ version: "3.1.2"
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"
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 +801,186 @@ packages:
dependency: transitive
description:
name: source_span
- url: "https://pub.dartlang.org"
+ sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+ url: "https://pub.dev"
source: hosted
- version: "1.8.1"
+ version: "1.9.1"
+ sprintf:
+ dependency: transitive
+ description:
+ name: sprintf
+ sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+ url: "https://pub.dev"
+ source: hosted
+ version: "7.0.0"
sqflite:
dependency: transitive
description:
name: sqflite
- url: "https://pub.dartlang.org"
+ sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
+ url: "https://pub.dev"
source: hosted
- version: "2.0.0+3"
+ version: "2.2.8+4"
sqflite_common:
dependency: transitive
description:
name: sqflite_common
- url: "https://pub.dartlang.org"
+ sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.0+2"
+ version: "2.4.5+1"
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: "9f0a4593f7642b2f106e329734d0e5fc746baf8d0a59495eec586cd0d9ba7d02"
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57"
+ version: "22.2.12"
syncfusion_flutter_pdf:
- dependency: transitive
- description:
- name: syncfusion_flutter_pdf
- url: "https://pub.dartlang.org"
- source: hosted
- version: "19.2.57-beta"
- syncfusion_flutter_pdfviewer:
dependency: "direct main"
description:
- name: syncfusion_flutter_pdfviewer
- url: "https://pub.dartlang.org"
- source: hosted
- version: "19.2.57-beta"
- syncfusion_flutter_pdfviewer_macos:
- dependency: transitive
- description:
- name: syncfusion_flutter_pdfviewer_macos
- url: "https://pub.dartlang.org"
- source: hosted
- version: "19.2.57-beta"
- syncfusion_flutter_pdfviewer_platform_interface:
- dependency: transitive
- description:
- name: syncfusion_flutter_pdfviewer_platform_interface
- url: "https://pub.dartlang.org"
- source: hosted
- version: "19.2.57-beta"
- syncfusion_flutter_pdfviewer_web:
- dependency: transitive
- description:
- name: syncfusion_flutter_pdfviewer_web
- url: "https://pub.dartlang.org"
+ name: syncfusion_flutter_pdf
+ sha256: "05d1a6cde581504cf1e86307fe308a6d1433903677b604d006ed67ef19a4fbc6"
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57-beta"
+ version: "22.2.12"
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: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+ url: "https://pub.dev"
source: hosted
- version: "0.3.0"
+ version: "0.4.16"
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: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.4"
+ version: "2.2.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: "16afc758004143b2f5f6955c39ac4a7381c367067ee9f005764182a4624a44cb"
+ url: "https://pub.dev"
source: hosted
- version: "3.3.0"
+ version: "4.1.0"
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: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.2"
win32:
dependency: transitive
description:
name: win32
- url: "https://pub.dartlang.org"
+ sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
+ url: "https://pub.dev"
source: hosted
- version: "2.2.6"
+ version: "4.1.4"
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: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a"
+ url: "https://pub.dev"
source: hosted
- version: "5.1.2"
+ version: "5.4.1"
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: ">=2.19.0 <3.0.0"
+ flutter: ">=3.7.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index c72125c..f88b636 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,25 +23,25 @@ environment:
dependencies:
cached_network_image: ^3.1.0
carousel_slider: ^4.0.0
- cloud_firestore: ^2.5.0
+ cloud_firestore: ^4.9.2
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.0
+ firebase_core: ^2.16.0
+ firebase_messaging: ^14.6.8
+ firebase_storage: ^11.2.7
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.2.0+1
+ font_awesome_flutter: ^10.4.0
+ google_fonts: ^4.0.4
+ google_sign_in: ^6.1.5
+ image_picker: ^1.0.4
+ intl: ^0.18.1
+ permission_handler: ^11.0.0
provider: ^6.0.0
- syncfusion_flutter_pdfviewer: ^19.1.69-beta
- velocity_x: ^3.3.0
+ syncfusion_flutter_pdf: ^22.2.8
+ velocity_x: ^4.1.0
dev_dependencies:
flutter_test:
From a57d37b7e4e54f7380e4a2a1caf945bc2ce24dfc Mon Sep 17 00:00:00 2001
From: Mehul Kumar <97253470+Mehul-Kumar-27@users.noreply.github.com>
Date: Sun, 1 Oct 2023 16:48:00 +0530
Subject: [PATCH 13/22] Delete .fvm directory
---
.fvm/flutter_sdk | 1 -
.fvm/fvm_config.json | 4 ----
2 files changed, 5 deletions(-)
delete mode 120000 .fvm/flutter_sdk
delete mode 100644 .fvm/fvm_config.json
diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk
deleted file mode 120000
index b9591be..0000000
--- a/.fvm/flutter_sdk
+++ /dev/null
@@ -1 +0,0 @@
-C:/Users/hp/fvm/versions/3.7.10
\ No newline at end of file
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
deleted file mode 100644
index e003d0a..0000000
--- a/.fvm/fvm_config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "flutterSdkVersion": "3.7.10",
- "flavors": {}
-}
\ No newline at end of file
From 8b55cc11d9fc984c8df4f82dd210f77f63ef184b Mon Sep 17 00:00:00 2001
From: Mehul Kumar <97253470+Mehul-Kumar-27@users.noreply.github.com>
Date: Sun, 1 Oct 2023 16:49:07 +0530
Subject: [PATCH 14/22] Delete .vscode directory
---
.vscode/settings.json | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 .vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 250f9ba..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "dart.flutterSdkPath": ".fvm/flutter_sdk",
- // Remove .fvm files from search
- "search.exclude": {
- "**/.fvm": true
- },
- // Remove from file watching
- "files.watcherExclude": {
- "**/.fvm": true
- },
- "java.configuration.updateBuildConfiguration": "interactive"
- }
\ No newline at end of file
From 0d2ad6c29352e4bb72b51fa6c4067092b138c7c5 Mon Sep 17 00:00:00 2001
From: Mehul-Kumar-27
Date: Sun, 1 Oct 2023 22:16:04 +0530
Subject: [PATCH 15/22] minor
---
.gitignore | 2 ++
android/.settings/org.eclipse.buildship.core.prefs | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
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/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
index f4e88ed..1241795 100644
--- a/android/.settings/org.eclipse.buildship.core.prefs
+++ b/android/.settings/org.eclipse.buildship.core.prefs
@@ -1,11 +1,11 @@
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=C\:/Program Files/Java/jdk-18.0.1
+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
From 23af41b694b9d25287d7a1deb11dc5a5006798ba Mon Sep 17 00:00:00 2001
From: aspiringgarv <202251048@iiitvadodara.ac.in>
Date: Wed, 4 Oct 2023 21:55:58 +0530
Subject: [PATCH 16/22] solved issue number 22 and upgraded the dependencies
and gradle also
---
android/app/build.gradle | 5 +-
android/app/src/main/AndroidManifest.xml | 35 +-
android/build.gradle | 8 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
lib/main.dart | 6 +-
lib/screens/onboarding/onboarding_screen.dart | 8 +-
lib/screens/player/rules_pdf_viewer.dart | 7 +-
pubspec.lock | 858 +++++++++++++-----
pubspec.yaml | 29 +-
9 files changed, 674 insertions(+), 284 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index bc15c0d..26e35ab 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -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..62428e8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,13 +1,13 @@
buildscript {
- ext.kotlin_version = '1.3.50'
+ ext.kotlin_version = '1.7.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..8d4d00c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -24,8 +24,8 @@ 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);
runApp(MyApp());
}
@@ -68,7 +68,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..2396c52 100644
--- a/lib/screens/onboarding/onboarding_screen.dart
+++ b/lib/screens/onboarding/onboarding_screen.dart
@@ -63,7 +63,7 @@ class _OnboardingScreenState extends State {
Container(
alignment: Alignment.centerRight,
child: _currentPage != 2
- ? FlatButton(
+ ? TextButton(
onPressed: () => Navigator.of(context)
.pushReplacementNamed(SignInScreen.routeName),
child: Text(
@@ -74,7 +74,7 @@ class _OnboardingScreenState extends State {
),
),
)
- : FlatButton(
+ : TextButton(
onPressed: () => Navigator.of(context)
.pushReplacementNamed(SignInScreen.routeName),
child: Text(
@@ -217,7 +217,7 @@ class _OnboardingScreenState extends State {
? Expanded(
child: Align(
alignment: FractionalOffset.bottomRight,
- child: FlatButton(
+ child: TextButton(
onPressed: () {
_pageController.nextPage(
duration: Duration(milliseconds: 500),
@@ -249,7 +249,7 @@ class _OnboardingScreenState extends State {
: Expanded(
child: Align(
alignment: FractionalOffset.bottomRight,
- child: FlatButton(
+ child: TextButton(
onPressed:
() => Navigator.of(context)
.pushReplacementNamed(SignInScreen.routeName),
diff --git a/lib/screens/player/rules_pdf_viewer.dart b/lib/screens/player/rules_pdf_viewer.dart
index f392471..0725a28 100644
--- a/lib/screens/player/rules_pdf_viewer.dart
+++ b/lib/screens/player/rules_pdf_viewer.dart
@@ -1,13 +1,10 @@
import 'package:flutter/material.dart';
import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
-
class RulesPdfViewer extends StatefulWidget {
static const routeName = '/rules-pdf-viewer';
-
@override
_RulesPdfViewerState createState() => _RulesPdfViewerState();
}
-
class _RulesPdfViewerState extends State {
PdfViewerController? _pdfViewerController;
@override
@@ -16,9 +13,7 @@ class _RulesPdfViewerState extends State {
_pdfViewerController!.jumpToPage(1);
super.initState();
}
-
PdfTextSearchResult? _searchResult;
-
@override
Widget build(BuildContext context) {
// String pdfUrl = ModalRoute.of(context)!.settings.arguments as String;
@@ -83,7 +78,7 @@ class _RulesPdfViewerState extends State {
// child: SfPdfViewer.network(
// pdfUrl,
// initialZoomLevel: 2,
- // ),
+ // ),name
child: SfPdfViewer.asset('assets/docs/RuleBook.pdf'),
),
);
diff --git a/pubspec.lock b/pubspec.lock
index 40195f1..ad9dcf1 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: "06a96f1249f38a00435b3b0c9a3246d934d7dbc8183fc7c9e56989860edb99d4"
+ url: "https://pub.dev"
source: hosted
- version: "3.1.2"
+ version: "3.4.4"
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: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb
+ url: "https://pub.dev"
source: hosted
- version: "0.3.1+4"
+ version: "0.3.3+5"
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: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.4"
+ version: "9.0.3"
+ 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: "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: "6.1.2"
+ 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: "91004565166dbbc7a85e7e99b84124a287839830ca957cfe45004793fe6fe69f"
+ url: "https://pub.dev"
source: hosted
- version: "1.2.1"
+ version: "2.3.3"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
- url: "https://pub.dartlang.org"
+ sha256: f185ac890306b5779ecbd611f52502d8d4d63d27703ef73161ca0407e815f02c
+ url: "https://pub.dev"
source: hosted
- version: "2.0.2"
+ version: "2.0.16"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -300,233 +404,410 @@ packages:
dependency: "direct main"
description:
name: font_awesome_flutter
- url: "https://pub.dartlang.org"
+ sha256: "5fb789145cae1f4c3245c58b3f8fb287d055c26323879eab57a7bf0cfd1e45f3"
+ url: "https://pub.dev"
+ source: hosted
+ version: "10.5.0"
+ glob:
+ dependency: transitive
+ description:
+ name: glob
+ sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+ url: "https://pub.dev"
source: hosted
- version: "9.1.0"
+ 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: "554748f2478619076128152c58905620d10f9c7fc270ff1d3a9675f9f53838ed"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.2.1+1"
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.12.0+5"
+ html:
+ dependency: transitive
+ description:
+ name: html
+ sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+ url: "https://pub.dev"
source: hosted
- version: "0.10.0+2"
+ 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: "0c7b83bbe2980c8a8e36e974f055e11e51675784e13a4762889feed0f3937ff2"
+ url: "https://pub.dev"
source: hosted
- version: "0.8.3+2"
+ version: "0.8.8+1"
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: "2.1.3"
+ 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: "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.10"
+ version: "0.12.16"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+ url: "https://pub.dev"
+ source: hosted
+ 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: "1.0.0+1"
+ version: "2.0.0"
+ package_config:
+ dependency: transitive
+ description:
+ name: package_config
+ sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+ url: "https://pub.dev"
+ source: hosted
+ 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: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.2"
- path_provider_macos:
+ version: "2.2.0"
+ 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"
- source: hosted
- version: "2.0.3"
- pedantic:
- dependency: transitive
- description:
- name: pedantic
- url: "https://pub.dartlang.org"
+ sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+ url: "https://pub.dev"
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: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790
+ url: "https://pub.dev"
+ source: hosted
+ version: "11.0.5"
+ 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: f2343e9fa9c22ae4fd92d4732755bfe452214e7189afcc097380950cf567b4b2
+ url: "https://pub.dev"
source: hosted
- version: "3.6.1"
+ version: "3.11.5"
+ 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: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+ url: "https://pub.dev"
source: hosted
- version: "3.0.2"
+ version: "3.1.2"
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.5"
+ pub_semver:
+ dependency: transitive
+ description:
+ name: pub_semver
+ sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+ url: "https://pub.dev"
source: hosted
- version: "6.0.0"
+ 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"
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 +817,306 @@ packages:
dependency: transitive
description:
name: source_span
- url: "https://pub.dartlang.org"
+ sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+ url: "https://pub.dev"
source: hosted
- version: "1.8.1"
+ version: "1.10.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: "505a07deaeb326ae9af5ee4e50937b7563cbb639982e760c26f3511b4fa535d5"
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57"
+ version: "23.1.39"
syncfusion_flutter_pdf:
dependency: transitive
description:
name: syncfusion_flutter_pdf
- url: "https://pub.dartlang.org"
+ sha256: df8cc9ce3efe14c8d229bcac93b16d361ac1c0e01b9700ee75fe1bdfce440f63
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57-beta"
+ version: "23.1.39"
syncfusion_flutter_pdfviewer:
dependency: "direct main"
description:
name: syncfusion_flutter_pdfviewer
- url: "https://pub.dartlang.org"
+ sha256: "202a8f39dc80b5e9f24dd59cb3979aae73fa5cd2533597d07baaf4638084eadc"
+ url: "https://pub.dev"
+ source: hosted
+ version: "23.1.39"
+ syncfusion_flutter_signaturepad:
+ dependency: transitive
+ description:
+ name: syncfusion_flutter_signaturepad
+ sha256: "26a1d4bfd1d16fac091f1671c9426e75830545fccd46eb5a71db948f7e17bcdf"
+ url: "https://pub.dev"
+ source: hosted
+ version: "23.1.39"
+ syncfusion_pdfviewer_macos:
+ dependency: transitive
+ description:
+ name: syncfusion_pdfviewer_macos
+ sha256: "176a44ee71e07dac4ca1e662eb9d778217287a53343f65747a34254821c13fd4"
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57-beta"
- syncfusion_flutter_pdfviewer_macos:
+ version: "23.1.39"
+ syncfusion_pdfviewer_platform_interface:
dependency: transitive
description:
- name: syncfusion_flutter_pdfviewer_macos
- url: "https://pub.dartlang.org"
+ name: syncfusion_pdfviewer_platform_interface
+ sha256: d9fe70d59dc3d11b225291b458eb86785048b32f827723818b02133fce79db7d
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57-beta"
- syncfusion_flutter_pdfviewer_platform_interface:
+ version: "23.1.39"
+ syncfusion_pdfviewer_web:
dependency: transitive
description:
- name: syncfusion_flutter_pdfviewer_platform_interface
- url: "https://pub.dartlang.org"
+ name: syncfusion_pdfviewer_web
+ sha256: "26df36c18aa1b11d30cdbf578c5e3f51db875092c8cbe96a3d6e18bc35e5d4f9"
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57-beta"
- syncfusion_flutter_pdfviewer_web:
+ version: "23.1.39"
+ syncfusion_pdfviewer_windows:
dependency: transitive
description:
- name: syncfusion_flutter_pdfviewer_web
- url: "https://pub.dartlang.org"
+ name: syncfusion_pdfviewer_windows
+ sha256: "0d7259c645f6572f39923c9492d8349d7ffd51d263bdbc39e7b231fbda73abe7"
+ url: "https://pub.dev"
source: hosted
- version: "19.2.57-beta"
+ version: "23.1.39"
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: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27"
+ url: "https://pub.dev"
+ source: hosted
+ version: "6.1.14"
+ url_launcher_android:
+ dependency: transitive
+ description:
+ name: url_launcher_android
+ sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330
+ url: "https://pub.dev"
+ source: hosted
+ version: "6.1.0"
+ url_launcher_ios:
+ dependency: transitive
+ description:
+ name: url_launcher_ios
+ sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f"
+ url: "https://pub.dev"
+ source: hosted
+ version: "6.1.5"
+ url_launcher_linux:
+ dependency: transitive
+ description:
+ name: url_launcher_linux
+ sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.6"
+ url_launcher_macos:
+ dependency: transitive
+ description:
+ name: url_launcher_macos
+ sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.7"
+ url_launcher_platform_interface:
+ dependency: transitive
+ description:
+ name: url_launcher_platform_interface
+ sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.5"
+ url_launcher_web:
+ dependency: transitive
+ description:
+ name: url_launcher_web
+ sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.0.20"
+ url_launcher_windows:
+ dependency: transitive
+ description:
+ name: url_launcher_windows
+ sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069"
+ url: "https://pub.dev"
source: hosted
- version: "2.0.4"
+ version: "3.0.8"
uuid:
dependency: transitive
description:
name: uuid
- url: "https://pub.dartlang.org"
+ sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+ url: "https://pub.dev"
source: hosted
- version: "3.0.4"
+ version: "3.0.7"
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: "5.0.9"
+ win32_registry:
+ dependency: transitive
+ description:
+ name: win32_registry
+ sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a"
+ url: "https://pub.dev"
source: hosted
- version: "2.2.6"
+ 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..b402b50 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,25 +23,26 @@ 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
dev_dependencies:
flutter_test:
From 38300e0a2694b9791b7ce9c0272a31fd6b6bbe11 Mon Sep 17 00:00:00 2001
From: aspiringgarv <202251048@iiitvadodara.ac.in>
Date: Thu, 5 Oct 2023 14:01:14 +0530
Subject: [PATCH 17/22] resolved error 22
---
lib/screens/player/rules_pdf_viewer.dart | 133 +++++++++++++++++------
pubspec.lock | 8 ++
pubspec.yaml | 1 +
3 files changed, 109 insertions(+), 33 deletions(-)
diff --git a/lib/screens/player/rules_pdf_viewer.dart b/lib/screens/player/rules_pdf_viewer.dart
index 0725a28..e2a56cb 100644
--- a/lib/screens/player/rules_pdf_viewer.dart
+++ b/lib/screens/player/rules_pdf_viewer.dart
@@ -1,85 +1,152 @@
+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';
+
@override
_RulesPdfViewerState createState() => _RulesPdfViewerState();
}
+
class _RulesPdfViewerState extends State {
- PdfViewerController? _pdfViewerController;
+ late PdfViewerController _pdfViewerController;
+ late PdfTextSearchResult _searchResult;
+ TextEditingController searchcontroller = TextEditingController();
+
@override
void initState() {
_pdfViewerController = PdfViewerController();
- _pdfViewerController!.jumpToPage(1);
+ _searchResult = PdfTextSearchResult();
super.initState();
}
- PdfTextSearchResult? _searchResult;
+
+ @override
+ void dispose() {
+ searchcontroller.dispose();
+ _pdfViewerController.dispose();
+ super.dispose();
+ }
+
+
+ void showNotFoundSnackBar(BuildContext context) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(
+
+ duration: Duration(milliseconds: 1000),
+ content: Text("Not Found"),
+
+ ),
+ );
+ }
+
@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'),
+ title: const Text('Syncfusion Flutter PdfViewer'),
actions: [
- // IconButton(
- // icon: Icon(
- // Icons.search,
- // color: Colors.white,
- // ),
- // onPressed: () async {
- // _searchResult = await _pdfViewerController?.searchText(
- // 'the',
- // searchOption: TextSearchOption.caseSensitive,
- // );
- // },
- // ),
+ IconButton(
+ icon: const Icon(
+ Icons.search,
+ color: Colors.white,
+ ),
+ onPressed: () async {
+ showDialog(
+ context: context,
+ builder: (context) {
+ return AlertDialog(
+
+ title: Text('Search'),
+ content: Column(
+ children: [
+ TextField(
+ decoration: InputDecoration(
+ hintText: 'Search',
+ ),
+ controller: searchcontroller,
+ ),
+ ],
+ ),
+ actions: [
+ TextButton(
+ child: Text("Search"),
+ onPressed: () async {
+ _searchResult = await _pdfViewerController
+ .searchText(searchcontroller.text.toString());
+ if (kIsWeb) {
+ setState(() {});
+ } else {
+ _searchResult.addListener(() {
+ if (_searchResult.hasResult) {
+ Navigator.maybePop(context);
+ searchcontroller.clear();
+ setState(() {});
+ } else if (!_searchResult.hasResult) {
+ Navigator.maybePop(context);
+ searchcontroller.clear();
+ setState(() {
+ showNotFoundSnackBar(context);
+ });
+ }
+ });
+ }
+ },
+ ),
+ ],
+
+ );
+ },
+ );
+ },
+ ),
Visibility(
- visible: _searchResult?.hasResult ?? false,
+ visible: _searchResult.hasResult,
child: IconButton(
- icon: Icon(
+ icon: const Icon(
Icons.clear,
color: Colors.white,
),
onPressed: () {
setState(() {
- _searchResult!.clear();
+ _searchResult.clear();
});
},
),
),
Visibility(
- visible: _searchResult?.hasResult ?? false,
+ visible: _searchResult.hasResult,
child: IconButton(
- icon: Icon(
+ icon: const Icon(
Icons.keyboard_arrow_up,
color: Colors.white,
),
onPressed: () {
- _searchResult?.previousInstance();
+ _searchResult.previousInstance();
},
),
),
Visibility(
- visible: _searchResult?.hasResult ?? false,
+ visible: _searchResult.hasResult,
child: IconButton(
- icon: Icon(
+ icon: const Icon(
Icons.keyboard_arrow_down,
color: Colors.white,
),
onPressed: () {
- _searchResult?.nextInstance();
+ _searchResult.nextInstance();
},
),
),
],
),
- body: Container(
- // child: SfPdfViewer.network(
- // pdfUrl,
- // initialZoomLevel: 2,
- // ),name
- child: SfPdfViewer.asset('assets/docs/RuleBook.pdf'),
+ body: SfPdfViewer.asset(
+ 'assets/docs/RuleBook.pdf',
+ controller: _pdfViewerController,
+ currentSearchTextHighlightColor: Colors.yellow.withOpacity(0.6),
+ otherSearchTextHighlightColor: Colors.yellow.withOpacity(0.3),
),
);
}
diff --git a/pubspec.lock b/pubspec.lock
index ad9dcf1..70b7031 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -800,6 +800,14 @@ packages:
url: "https://pub.dev"
source: hosted
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:
diff --git a/pubspec.yaml b/pubspec.yaml
index b402b50..c3b1488 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -43,6 +43,7 @@ dependencies:
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:
From a6c66ac10ac3890e379c856b4490e827deb1635b Mon Sep 17 00:00:00 2001
From: andoriyaprashant
Date: Wed, 11 Oct 2023 22:38:49 +0530
Subject: [PATCH 18/22] Flutter ci workflow added
---
.github/workflows/flutter_ci.yml | 38 ++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 .github/workflows/flutter_ci.yml
diff --git a/.github/workflows/flutter_ci.yml b/.github/workflows/flutter_ci.yml
new file mode 100644
index 0000000..2f80a81
--- /dev/null
+++ b/.github/workflows/flutter_ci.yml
@@ -0,0 +1,38 @@
+name: Flutter CI
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ branches:
+ - main
+
+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.13.6
+
+ - name: Install dependencies
+ run: flutter pub get
+
+ - name: Run tests
+ run: flutter test
+
+ - name: Build APK
+ run: flutter build apk
+
+ - name: Archive and upload artifacts
+ uses: actions/upload-artifact@v2
+ with:
+ name: build
+ path: build/app/outputs/flutter-apk/app-release.apk
\ No newline at end of file
From 1253b9a5e360ddb15250f032529db2a4ed2275ed Mon Sep 17 00:00:00 2001
From: andoriyaprashant
Date: Wed, 11 Oct 2023 22:51:44 +0530
Subject: [PATCH 19/22] 2023
---
.github/workflows/flutter_ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/flutter_ci.yml b/.github/workflows/flutter_ci.yml
index 2f80a81..d882391 100644
--- a/.github/workflows/flutter_ci.yml
+++ b/.github/workflows/flutter_ci.yml
@@ -4,9 +4,11 @@ on:
push:
branches:
- main
+ - 2023
pull_request:
branches:
- main
+ - 2023
jobs:
build:
From 2c399f560be8e0e46c0e79845de0e7668594bb9e Mon Sep 17 00:00:00 2001
From: andoriyaprashant
Date: Thu, 12 Oct 2023 23:41:51 +0530
Subject: [PATCH 20/22] version and ios
---
.github/workflows/flutter_ci.yml | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/flutter_ci.yml b/.github/workflows/flutter_ci.yml
index d882391..7e7e9c4 100644
--- a/.github/workflows/flutter_ci.yml
+++ b/.github/workflows/flutter_ci.yml
@@ -20,9 +20,9 @@ jobs:
uses: actions/checkout@v2
- name: Set up Flutter
- uses: subosito/flutter-action@@v2
+ uses: subosito/flutter-action@v2
with:
- flutter-version: 3.13.6
+ flutter-version: 3.7.10
- name: Install dependencies
run: flutter pub get
@@ -30,11 +30,20 @@ jobs:
- name: Run tests
run: flutter test
- - name: Build APK
+ - name: Build APK for Android
run: flutter build apk
- - name: Archive and upload artifacts
+ - 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
- path: build/app/outputs/flutter-apk/app-release.apk
\ No newline at end of file
+ name: build-ios
+ path: build/ios/Runner.app
From d0a24556fae8616a87cba6e4a410434b8a7a8896 Mon Sep 17 00:00:00 2001
From: manasiPandey21
Date: Wed, 25 Oct 2023 23:50:24 +0530
Subject: [PATCH 21/22] resolved merge conflict
---
android/app/build.gradle | 2 +-
android/build.gradle | 9 -
lib/main.dart | 5 -
lib/screens/onboarding/onboarding_screen.dart | 6 -
lib/screens/player/rules_pdf_viewer.dart | 139 -----
pubspec.lock | 493 +++---------------
pubspec.yaml | 22 -
7 files changed, 59 insertions(+), 617 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 26e35ab..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')
diff --git a/android/build.gradle b/android/build.gradle
index ff85091..6cc04f2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,22 +1,13 @@
buildscript {
-<<<<<<< HEAD
ext.kotlin_version = '1.9.10'
-=======
- ext.kotlin_version = '1.7.10'
->>>>>>> Rebuildthescreen
repositories {
google()
jcenter()
}
dependencies {
-<<<<<<< HEAD
- classpath 'com.google.gms:google-services:4.3.10'
- classpath 'com.android.tools.build:gradle:7.2.0'
-=======
classpath 'com.google.gms:google-services:4.3.14'
classpath 'com.android.tools.build:gradle:7.3.0'
->>>>>>> Rebuildthescreen
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
diff --git a/lib/main.dart b/lib/main.dart
index e3bf548..b62c153 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -73,12 +73,7 @@ class MyApp extends StatelessWidget {
title: 'CSGO League',
theme: ThemeData(
primaryColor: CustomColors.primaryColor,
-<<<<<<< HEAD
- colorScheme: ColorScheme.fromSwatch()
- .copyWith(secondary: CustomColors.secondaryColor),
-=======
hintColor: CustomColors.secondaryColor,
->>>>>>> Rebuildthescreen
textTheme:
GoogleFonts.poppinsTextTheme(Theme.of(context).textTheme),
),
diff --git a/lib/screens/onboarding/onboarding_screen.dart b/lib/screens/onboarding/onboarding_screen.dart
index 5d6d384..0d54326 100644
--- a/lib/screens/onboarding/onboarding_screen.dart
+++ b/lib/screens/onboarding/onboarding_screen.dart
@@ -245,14 +245,8 @@ class _OnboardingScreenState extends State {
child: Align(
alignment: FractionalOffset.bottomRight,
child: TextButton(
-<<<<<<< HEAD
onPressed: () => Navigator.of(context)
.pushReplacementNamed(SignInScreen.routeName),
-=======
- onPressed:
- () => Navigator.of(context)
- .pushReplacementNamed(SignInScreen.routeName),
->>>>>>> Rebuildthescreen
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
diff --git a/lib/screens/player/rules_pdf_viewer.dart b/lib/screens/player/rules_pdf_viewer.dart
index b97216e..f5ed829 100644
--- a/lib/screens/player/rules_pdf_viewer.dart
+++ b/lib/screens/player/rules_pdf_viewer.dart
@@ -9,7 +9,6 @@ class RulesPdfViewer extends StatefulWidget {
}
class _RulesPdfViewerState extends State {
-<<<<<<< HEAD
// PdfViewerController? _pdfViewerController;
// @override
// void initState() {
@@ -19,44 +18,12 @@ class _RulesPdfViewerState extends State {
// }
// PdfTextSearchResult? _searchResult;
-=======
- late PdfViewerController _pdfViewerController;
- late PdfTextSearchResult _searchResult;
- TextEditingController searchcontroller = TextEditingController();
-
- @override
- void initState() {
- _pdfViewerController = PdfViewerController();
- _searchResult = PdfTextSearchResult();
- super.initState();
- }
-
- @override
- void dispose() {
- searchcontroller.dispose();
- _pdfViewerController.dispose();
- super.dispose();
- }
-
-
- void showNotFoundSnackBar(BuildContext context) {
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(
-
- duration: Duration(milliseconds: 1000),
- content: Text("Not Found"),
-
- ),
- );
- }
->>>>>>> Rebuildthescreen
@override
Widget build(BuildContext context) {
Object? s = ModalRoute.of(context)?.settings.arguments;
return Scaffold(
-<<<<<<< HEAD
// appBar: AppBar(
// centerTitle: true,
// title: Text('Rules'),
@@ -121,111 +88,5 @@ class _RulesPdfViewerState extends State {
// child: SfPdfViewer.asset('assets/docs/RuleBook.pdf'),
// ),
);
-=======
- appBar: AppBar(
- title: const Text('Syncfusion Flutter PdfViewer'),
- actions: [
- IconButton(
- icon: const Icon(
- Icons.search,
- color: Colors.white,
- ),
- onPressed: () async {
- showDialog(
- context: context,
- builder: (context) {
- return AlertDialog(
-
- title: Text('Search'),
- content: Column(
- children: [
- TextField(
- decoration: InputDecoration(
- hintText: 'Search',
- ),
- controller: searchcontroller,
- ),
- ],
- ),
- actions: [
- TextButton(
- child: Text("Search"),
- onPressed: () async {
- _searchResult = await _pdfViewerController
- .searchText(searchcontroller.text.toString());
- if (kIsWeb) {
- setState(() {});
- } else {
- _searchResult.addListener(() {
- if (_searchResult.hasResult) {
- Navigator.maybePop(context);
- searchcontroller.clear();
- setState(() {});
- } else if (!_searchResult.hasResult) {
- Navigator.maybePop(context);
- searchcontroller.clear();
- setState(() {
- showNotFoundSnackBar(context);
- });
- }
- });
- }
- },
- ),
- ],
-
- );
- },
- );
- },
- ),
- Visibility(
- visible: _searchResult.hasResult,
- child: IconButton(
- icon: const Icon(
- Icons.clear,
- color: Colors.white,
- ),
- onPressed: () {
- setState(() {
- _searchResult.clear();
- });
- },
- ),
- ),
- Visibility(
- visible: _searchResult.hasResult,
- child: IconButton(
- icon: const Icon(
- Icons.keyboard_arrow_up,
- color: Colors.white,
- ),
- onPressed: () {
- _searchResult.previousInstance();
- },
- ),
- ),
- Visibility(
- visible: _searchResult.hasResult,
- child: IconButton(
- icon: const Icon(
- Icons.keyboard_arrow_down,
- color: Colors.white,
- ),
- onPressed: () {
- _searchResult.nextInstance();
- },
- ),
- ),
- ],
- ),
- body: SfPdfViewer.asset(
- 'assets/docs/RuleBook.pdf',
- controller: _pdfViewerController,
- currentSearchTextHighlightColor: Colors.yellow.withOpacity(0.6),
- otherSearchTextHighlightColor: Colors.yellow.withOpacity(0.3),
- ),
- );
->>>>>>> Rebuildthescreen
}
}
diff --git a/pubspec.lock b/pubspec.lock
index 292760a..a2a4cf1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,17 +13,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
-<<<<<<< HEAD
- sha256: "2d8e8e123ca3675625917f535fcc0d3a50092eef44334168f9b18adc050d4c6e"
- url: "https://pub.dev"
- source: hosted
- version: "1.3.6"
-=======
sha256: d84d98f1992976775f83083523a34c5d22fea191eec3abb2bd09537fb623c2e0
url: "https://pub.dev"
source: hosted
version: "1.3.7"
->>>>>>> Rebuildthescreen
analyzer:
dependency: transitive
description:
@@ -36,10 +29,10 @@ packages:
dependency: transitive
description:
name: archive
- sha256: "06a96f1249f38a00435b3b0c9a3246d934d7dbc8183fc7c9e56989860edb99d4"
+ sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
url: "https://pub.dev"
source: hosted
- version: "3.4.4"
+ version: "3.4.6"
args:
dependency: transitive
description:
@@ -52,17 +45,10 @@ packages:
dependency: transitive
description:
name: async
-<<<<<<< HEAD
- sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
- url: "https://pub.dev"
- source: hosted
- version: "2.10.0"
-=======
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.11.0"
->>>>>>> Rebuildthescreen
auto_size_text_pk:
dependency: transitive
description:
@@ -83,47 +69,26 @@ packages:
dependency: "direct main"
description:
name: cached_network_image
-<<<<<<< HEAD
- sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15
- url: "https://pub.dev"
- source: hosted
- version: "3.2.3"
-=======
sha256: f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f
url: "https://pub.dev"
source: hosted
version: "3.3.0"
->>>>>>> Rebuildthescreen
cached_network_image_platform_interface:
dependency: transitive
description:
name: cached_network_image_platform_interface
-<<<<<<< HEAD
- sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7
- url: "https://pub.dev"
- source: hosted
- version: "2.0.0"
-=======
sha256: "56aa42a7a01e3c9db8456d9f3f999931f1e05535b5a424271e9a38cabf066613"
url: "https://pub.dev"
source: hosted
version: "3.0.0"
->>>>>>> Rebuildthescreen
cached_network_image_web:
dependency: transitive
description:
name: cached_network_image_web
-<<<<<<< HEAD
- sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0
- url: "https://pub.dev"
- source: hosted
- version: "1.0.2"
-=======
sha256: "759b9a9f8f6ccbb66c185df805fac107f05730b1dab9c64626d1008cca532257"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
->>>>>>> Rebuildthescreen
carousel_slider:
dependency: "direct main"
description:
@@ -136,17 +101,10 @@ packages:
dependency: transitive
description:
name: characters
-<<<<<<< HEAD
- sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
- url: "https://pub.dev"
- source: hosted
- version: "1.2.1"
-=======
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
->>>>>>> Rebuildthescreen
clock:
dependency: transitive
description:
@@ -159,62 +117,34 @@ packages:
dependency: "direct main"
description:
name: cloud_firestore
-<<<<<<< HEAD
- sha256: "50e1ffa143fc5c49db1800392f8d9524fd015f9d26a9e4fc01b5ddb1e603e01b"
- url: "https://pub.dev"
- source: hosted
- version: "4.9.2"
-=======
sha256: "1179ae4c69e2ea18179d844d70fc6ed2f082a2bbeb7fa62d35a2a24e2992bd4d"
url: "https://pub.dev"
source: hosted
version: "4.9.3"
->>>>>>> Rebuildthescreen
cloud_firestore_platform_interface:
dependency: transitive
description:
name: cloud_firestore_platform_interface
-<<<<<<< HEAD
- sha256: "150e603a40d52b3199e46b1e38d9f8ef8c2dee9e1fb2122d58d456c50015bf7c"
- url: "https://pub.dev"
- source: hosted
- version: "5.16.1"
-=======
sha256: acdcf0743bbdd0e6b342f3d2033e15d260a2c6f9434dd34b008b8f1c35e62b23
url: "https://pub.dev"
source: hosted
version: "5.16.2"
->>>>>>> Rebuildthescreen
cloud_firestore_web:
dependency: transitive
description:
name: cloud_firestore_web
-<<<<<<< HEAD
- sha256: f033aef13b13f94b0f361898df39307d8710859c8912626cfb08e439e350bd66
- url: "https://pub.dev"
- source: hosted
- version: "3.7.1"
-=======
sha256: "321bb0732c8d782a49aede96805e59609e05cf98b6c34370faa04103f46a4a3a"
url: "https://pub.dev"
source: hosted
version: "3.7.2"
->>>>>>> Rebuildthescreen
collection:
dependency: transitive
description:
name: collection
-<<<<<<< HEAD
- sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
- url: "https://pub.dev"
- source: hosted
- version: "1.17.0"
-=======
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.17.2"
->>>>>>> Rebuildthescreen
convert:
dependency: transitive
description:
@@ -227,10 +157,10 @@ packages:
dependency: transitive
description:
name: cross_file
- sha256: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb
+ sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c"
url: "https://pub.dev"
source: hosted
- version: "0.3.3+5"
+ version: "0.3.3+6"
crypto:
dependency: transitive
description:
@@ -239,8 +169,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.3"
-<<<<<<< HEAD
-=======
csslib:
dependency: transitive
description:
@@ -249,7 +177,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.0"
->>>>>>> Rebuildthescreen
cupertino_icons:
dependency: "direct main"
description:
@@ -266,16 +193,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.7"
-<<<<<<< HEAD
-=======
device_info_plus:
dependency: transitive
description:
name: device_info_plus
- sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659"
+ sha256: "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419"
url: "https://pub.dev"
source: hosted
- version: "9.0.3"
+ version: "9.1.0"
device_info_plus_platform_interface:
dependency: transitive
description:
@@ -284,7 +209,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "7.0.0"
->>>>>>> Rebuildthescreen
fake_async:
dependency: transitive
description:
@@ -297,32 +221,18 @@ packages:
dependency: transitive
description:
name: ffi
-<<<<<<< HEAD
- sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
- url: "https://pub.dev"
- source: hosted
- version: "2.0.2"
-=======
sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
->>>>>>> Rebuildthescreen
file:
dependency: transitive
description:
name: file
-<<<<<<< HEAD
- sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
- url: "https://pub.dev"
- source: hosted
- version: "6.1.4"
-=======
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
url: "https://pub.dev"
source: hosted
version: "7.0.0"
->>>>>>> Rebuildthescreen
file_selector_linux:
dependency: transitive
description:
@@ -359,62 +269,34 @@ packages:
dependency: "direct main"
description:
name: firebase_auth
-<<<<<<< HEAD
- sha256: e7b7e2a08888cb8ef073a9b6d4df9039ea0ff07c920d4258fb4886c55fe2dbb6
- url: "https://pub.dev"
- source: hosted
- version: "4.10.0"
-=======
sha256: "95c74884ff25eafcbbbcd5506b738e68ee98ff54d09522a6092a2fb95d02ee7a"
url: "https://pub.dev"
source: hosted
version: "4.10.1"
->>>>>>> Rebuildthescreen
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
-<<<<<<< HEAD
- sha256: "4862bd649268e32ebd685a58abe1eb7ef13aef3f668ce9c56a7d283c971ec6ff"
- url: "https://pub.dev"
- source: hosted
- version: "6.19.0"
-=======
sha256: "05d2636673e145d2b5eccc452c009808af4c15e8b402f34bb8fec63f2c76e86b"
url: "https://pub.dev"
source: hosted
version: "6.19.1"
->>>>>>> Rebuildthescreen
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
-<<<<<<< HEAD
- sha256: "090d531cc0dcf1e39edc0d64cffa18ccc5745b1fd1081a13ee1bf42d861ff764"
- url: "https://pub.dev"
- source: hosted
- version: "5.8.1"
-=======
sha256: "4b8374da5d8969f99453ebd65074c1d379fe781bb3680fa7f65a4d3ac4ec87b3"
url: "https://pub.dev"
source: hosted
version: "5.8.2"
->>>>>>> Rebuildthescreen
firebase_core:
dependency: "direct main"
description:
name: firebase_core
-<<<<<<< HEAD
- sha256: "675c209c94a1817649137cbd113fc4c9ae85e48d03dd578629abbec6d8a4d93d"
- url: "https://pub.dev"
- source: hosted
- version: "2.16.0"
-=======
sha256: "95580fa07c8ca3072a2bb1fecd792616a33f8683477d25b7d29d3a6a399e6ece"
url: "https://pub.dev"
source: hosted
version: "2.17.0"
->>>>>>> Rebuildthescreen
firebase_core_platform_interface:
dependency: "direct main"
description:
@@ -435,108 +317,55 @@ packages:
dependency: "direct main"
description:
name: firebase_messaging
-<<<<<<< HEAD
- sha256: "4544524c22de3ffdc7e0ffaeeba212a04d09e76d0549ae6f42ce285d9d8f0513"
- url: "https://pub.dev"
- source: hosted
- version: "14.6.8"
-=======
sha256: "67f9d7c87457e71ad78ee81e332f232b8a24f7d5e338f8c958fa7d6e9e0e3636"
url: "https://pub.dev"
source: hosted
version: "14.6.9"
->>>>>>> Rebuildthescreen
firebase_messaging_platform_interface:
dependency: transitive
description:
name: firebase_messaging_platform_interface
-<<<<<<< HEAD
- sha256: a6e1fae8242a14d5d8f5ab1cf94693511f06bab49ff1d46e3d83c0af3c4becb8
- url: "https://pub.dev"
- source: hosted
- version: "4.5.7"
-=======
sha256: "8c7ced3201886ad7ba37f344c1468ccfc08abb3023922e0e5a016eaf38abb96c"
url: "https://pub.dev"
source: hosted
version: "4.5.8"
->>>>>>> Rebuildthescreen
firebase_messaging_web:
dependency: transitive
description:
name: firebase_messaging_web
-<<<<<<< HEAD
- sha256: a9fe837dc2dcdd3e32e6109a6b0ce62592d7a44cb8f69cb5b73190865c5aa28e
- url: "https://pub.dev"
- source: hosted
- version: "3.5.7"
-=======
sha256: b601322bdb44e2fefe4cc7b85ef0dbb7a2479d4a7653a51340821cf8d60696b5
url: "https://pub.dev"
source: hosted
version: "3.5.8"
->>>>>>> Rebuildthescreen
firebase_storage:
dependency: "direct main"
description:
name: firebase_storage
-<<<<<<< HEAD
- sha256: "0b6423dc6acb8185121a974843ab7678127b93fe68f22683f3852b3634e19c8e"
- url: "https://pub.dev"
- source: hosted
- version: "11.2.7"
-=======
sha256: "4ceb092cd14c3bce0dc8cd4046754cd1e5e5c1977155e286b512b3f84fe1c03e"
url: "https://pub.dev"
source: hosted
version: "11.2.8"
->>>>>>> Rebuildthescreen
firebase_storage_platform_interface:
dependency: transitive
description:
name: firebase_storage_platform_interface
-<<<<<<< HEAD
- sha256: "8ad840f019b4d3e25dcf9fa64563dc9eff981f9ca9207aff7b717038e69ec868"
- url: "https://pub.dev"
- source: hosted
- version: "4.4.6"
-=======
sha256: "88f8b8bb7181eef125536297f11b28171f59d2f53a59610e3966c2e38be3de4c"
url: "https://pub.dev"
source: hosted
version: "4.4.7"
->>>>>>> Rebuildthescreen
firebase_storage_web:
dependency: transitive
description:
name: firebase_storage_web
-<<<<<<< HEAD
- sha256: "37b44ea1f54ad993a1b0aea99d7083b251669f91af799e50cc3e84a969642f8f"
- url: "https://pub.dev"
- source: hosted
- version: "3.6.7"
-=======
sha256: bd05589cf17a8d5e2a90bdffcdab434c97e27bc37ca0056bfa90accf0366a7b0
url: "https://pub.dev"
source: hosted
version: "3.6.8"
->>>>>>> Rebuildthescreen
flutter:
dependency: "direct main"
description: flutter
source: sdk
version: "0.0.0"
-<<<<<<< HEAD
- flutter_blurhash:
- dependency: transitive
- description:
- name: flutter_blurhash
- sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6"
- url: "https://pub.dev"
- source: hosted
- version: "0.7.0"
-=======
->>>>>>> Rebuildthescreen
flutter_cache_manager:
dependency: transitive
description:
@@ -549,25 +378,18 @@ packages:
dependency: "direct main"
description:
name: flutter_native_splash
-<<<<<<< HEAD
- sha256: bd36d1a7f05ff8378cad17d20c33ca904630bfd3fcf8b15c9e8237efbccfad0a
- url: "https://pub.dev"
- source: hosted
- version: "2.2.0+1"
-=======
- sha256: "91004565166dbbc7a85e7e99b84124a287839830ca957cfe45004793fe6fe69f"
+ sha256: "5bf4c3e5e5a0426c1e2fc8ca3555a9e617e76369c3442e1dae8385c7767ba97a"
url: "https://pub.dev"
source: hosted
- version: "2.3.3"
->>>>>>> Rebuildthescreen
+ version: "2.3.4"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
- sha256: f185ac890306b5779ecbd611f52502d8d4d63d27703ef73161ca0407e815f02c
+ sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
url: "https://pub.dev"
source: hosted
- version: "2.0.16"
+ version: "2.0.17"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -582,17 +404,10 @@ packages:
dependency: "direct main"
description:
name: font_awesome_flutter
-<<<<<<< HEAD
- sha256: "959ef4add147753f990b4a7c6cccb746d5792dbdc81b1cde99e62e7edb31b206"
- url: "https://pub.dev"
- source: hosted
- version: "10.4.0"
-=======
- sha256: "5fb789145cae1f4c3245c58b3f8fb287d055c26323879eab57a7bf0cfd1e45f3"
+ sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08"
url: "https://pub.dev"
source: hosted
- version: "10.5.0"
->>>>>>> Rebuildthescreen
+ version: "10.6.0"
glob:
dependency: transitive
description:
@@ -605,25 +420,18 @@ packages:
dependency: "direct main"
description:
name: google_fonts
-<<<<<<< HEAD
- sha256: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
- url: "https://pub.dev"
- source: hosted
- version: "4.0.4"
-=======
sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8
url: "https://pub.dev"
source: hosted
version: "6.1.0"
->>>>>>> Rebuildthescreen
google_identity_services_web:
dependency: transitive
description:
name: google_identity_services_web
- sha256: "554748f2478619076128152c58905620d10f9c7fc270ff1d3a9675f9f53838ed"
+ sha256: "000b7a31e1fa17ee04b6c0553a2b2ea18f9f9352e4dcc0c9fcc785cf10f2484e"
url: "https://pub.dev"
source: hosted
- version: "0.2.1+1"
+ version: "0.2.2"
google_sign_in:
dependency: "direct main"
description:
@@ -660,12 +468,6 @@ packages:
dependency: transitive
description:
name: google_sign_in_web
-<<<<<<< HEAD
- sha256: b48263e47f9493ba4120ccdfffe7412549ee297e82b97be9b8fa16ea8919ffbe
- url: "https://pub.dev"
- source: hosted
- version: "0.12.0+4"
-=======
sha256: "939e9172a378ec4eaeb7f71eeddac9b55ebd0e8546d336daec476a68e5279766"
url: "https://pub.dev"
source: hosted
@@ -678,22 +480,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.15.4"
->>>>>>> Rebuildthescreen
http:
dependency: transitive
description:
name: http
-<<<<<<< HEAD
- sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
- url: "https://pub.dev"
- source: hosted
- version: "0.13.6"
-=======
sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
->>>>>>> Rebuildthescreen
http_parser:
dependency: transitive
description:
@@ -706,17 +500,10 @@ packages:
dependency: transitive
description:
name: image
-<<<<<<< HEAD
- sha256: "02bafd3b4f399bfeb10034deba9753d93b55ce41cd0c4d3d8b355626f80e5b32"
- url: "https://pub.dev"
- source: hosted
- version: "3.1.3"
-=======
sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
url: "https://pub.dev"
source: hosted
version: "4.1.3"
->>>>>>> Rebuildthescreen
image_picker:
dependency: "direct main"
description:
@@ -729,25 +516,18 @@ packages:
dependency: transitive
description:
name: image_picker_android
- sha256: "0c7b83bbe2980c8a8e36e974f055e11e51675784e13a4762889feed0f3937ff2"
+ sha256: d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f
url: "https://pub.dev"
source: hosted
- version: "0.8.8+1"
+ version: "0.8.8+2"
image_picker_for_web:
dependency: transitive
description:
name: image_picker_for_web
-<<<<<<< HEAD
- sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
- url: "https://pub.dev"
- source: hosted
- version: "2.2.0"
-=======
sha256: "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
->>>>>>> Rebuildthescreen
image_picker_ios:
dependency: transitive
description:
@@ -800,70 +580,34 @@ packages:
dependency: transitive
description:
name: js
-<<<<<<< HEAD
- sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
- url: "https://pub.dev"
- source: hosted
- version: "0.6.5"
- lint:
- dependency: transitive
- description:
- name: lint
- sha256: "4a539aa34ec5721a2c7574ae2ca0336738ea4adc2a34887d54b7596310b33c85"
- url: "https://pub.dev"
- source: hosted
- version: "1.10.0"
-=======
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
url: "https://pub.dev"
source: hosted
version: "0.6.7"
->>>>>>> Rebuildthescreen
matcher:
dependency: transitive
description:
name: matcher
-<<<<<<< HEAD
- sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
- url: "https://pub.dev"
- source: hosted
- version: "0.12.13"
-=======
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.16"
->>>>>>> Rebuildthescreen
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
-<<<<<<< HEAD
- sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
- url: "https://pub.dev"
- source: hosted
- version: "0.2.0"
-=======
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
->>>>>>> Rebuildthescreen
meta:
dependency: transitive
description:
name: meta
-<<<<<<< HEAD
- sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
- url: "https://pub.dev"
- source: hosted
- version: "1.8.0"
-=======
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
->>>>>>> Rebuildthescreen
mime:
dependency: transitive
description:
@@ -884,17 +628,10 @@ packages:
dependency: transitive
description:
name: octo_image
-<<<<<<< HEAD
- sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.2"
-=======
sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
->>>>>>> Rebuildthescreen
package_config:
dependency: transitive
description:
@@ -907,17 +644,10 @@ packages:
dependency: transitive
description:
name: path
-<<<<<<< HEAD
- sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
- url: "https://pub.dev"
- source: hosted
- version: "1.8.2"
-=======
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
->>>>>>> Rebuildthescreen
path_provider:
dependency: transitive
description:
@@ -930,10 +660,10 @@ packages:
dependency: transitive
description:
name: path_provider_android
- sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1"
+ sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
url: "https://pub.dev"
source: hosted
- version: "2.2.0"
+ version: "2.2.1"
path_provider_foundation:
dependency: transitive
description:
@@ -970,25 +700,18 @@ packages:
dependency: "direct main"
description:
name: permission_handler
-<<<<<<< HEAD
- sha256: ad65ba9af42a3d067203641de3fd9f547ded1410bad3b84400c2b4899faede70
- url: "https://pub.dev"
- source: hosted
- version: "11.0.0"
-=======
sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8"
url: "https://pub.dev"
source: hosted
version: "11.0.1"
->>>>>>> Rebuildthescreen
permission_handler_android:
dependency: transitive
description:
name: permission_handler_android
- sha256: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790
+ sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e
url: "https://pub.dev"
source: hosted
- version: "11.0.5"
+ version: "11.1.0"
permission_handler_apple:
dependency: transitive
description:
@@ -1001,10 +724,10 @@ packages:
dependency: transitive
description:
name: permission_handler_platform_interface
- sha256: f2343e9fa9c22ae4fd92d4732755bfe452214e7189afcc097380950cf567b4b2
+ sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
url: "https://pub.dev"
source: hosted
- version: "3.11.5"
+ version: "3.12.0"
permission_handler_windows:
dependency: transitive
description:
@@ -1017,17 +740,10 @@ packages:
dependency: transitive
description:
name: petitparser
-<<<<<<< HEAD
- sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
- url: "https://pub.dev"
- source: hosted
- version: "5.1.0"
-=======
sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
url: "https://pub.dev"
source: hosted
version: "5.4.0"
->>>>>>> Rebuildthescreen
pigeon:
dependency: transitive
description:
@@ -1040,10 +756,10 @@ packages:
dependency: transitive
description:
name: platform
- sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+ sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
url: "https://pub.dev"
source: hosted
- version: "3.1.2"
+ version: "3.1.3"
plugin_platform_interface:
dependency: transitive
description:
@@ -1084,8 +800,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.2.1"
-<<<<<<< HEAD
-=======
rflutter_alert:
dependency: "direct main"
description:
@@ -1094,7 +808,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.7"
->>>>>>> Rebuildthescreen
rxdart:
dependency: transitive
description:
@@ -1112,11 +825,10 @@ packages:
dependency: transitive
description:
name: source_span
-<<<<<<< HEAD
- sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+ sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
- version: "1.9.1"
+ version: "1.10.0"
sprintf:
dependency: transitive
description:
@@ -1125,42 +837,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "7.0.0"
-=======
- sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
- url: "https://pub.dev"
- source: hosted
- version: "1.10.0"
->>>>>>> Rebuildthescreen
sqflite:
dependency: transitive
description:
name: sqflite
-<<<<<<< HEAD
- sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
- url: "https://pub.dev"
- source: hosted
- version: "2.2.8+4"
-=======
sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
url: "https://pub.dev"
source: hosted
version: "2.3.0"
->>>>>>> Rebuildthescreen
sqflite_common:
dependency: transitive
description:
name: sqflite_common
-<<<<<<< HEAD
- sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f"
- url: "https://pub.dev"
- source: hosted
- version: "2.4.5+1"
-=======
sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a"
url: "https://pub.dev"
source: hosted
version: "2.5.0"
->>>>>>> Rebuildthescreen
stack_trace:
dependency: transitive
description:
@@ -1189,81 +881,66 @@ packages:
dependency: transitive
description:
name: syncfusion_flutter_core
-<<<<<<< HEAD
- sha256: "9f0a4593f7642b2f106e329734d0e5fc746baf8d0a59495eec586cd0d9ba7d02"
+ sha256: d3405e92dbfc1c68e55bf883fb9cd7e3dcae1f53eefd00b8b6b1803e474cf4d6
url: "https://pub.dev"
source: hosted
- version: "22.2.12"
- syncfusion_flutter_pdf:
- dependency: "direct main"
- description:
- name: syncfusion_flutter_pdf
- sha256: "05d1a6cde581504cf1e86307fe308a6d1433903677b604d006ed67ef19a4fbc6"
- url: "https://pub.dev"
- source: hosted
- version: "22.2.12"
-=======
- sha256: "505a07deaeb326ae9af5ee4e50937b7563cbb639982e760c26f3511b4fa535d5"
- url: "https://pub.dev"
- source: hosted
- version: "23.1.39"
+ version: "23.1.42"
syncfusion_flutter_pdf:
dependency: transitive
description:
name: syncfusion_flutter_pdf
- sha256: df8cc9ce3efe14c8d229bcac93b16d361ac1c0e01b9700ee75fe1bdfce440f63
+ sha256: "5dc498ba4ba540752db83c9993219b556682bf9ad172d266e00f98b1cd8696d6"
url: "https://pub.dev"
source: hosted
- version: "23.1.39"
+ version: "23.1.42"
syncfusion_flutter_pdfviewer:
dependency: "direct main"
description:
name: syncfusion_flutter_pdfviewer
- sha256: "202a8f39dc80b5e9f24dd59cb3979aae73fa5cd2533597d07baaf4638084eadc"
+ sha256: "9926f037a52254f12c95a1d472b7fbcec5835fd7015d4b39a0a9b3489d82c9d2"
url: "https://pub.dev"
source: hosted
- version: "23.1.39"
+ version: "23.1.42"
syncfusion_flutter_signaturepad:
dependency: transitive
description:
name: syncfusion_flutter_signaturepad
- sha256: "26a1d4bfd1d16fac091f1671c9426e75830545fccd46eb5a71db948f7e17bcdf"
+ sha256: "1a8cc87c828a5d246e19e781ddb590c4fa9df8c625f8221d6da81a07c980bf25"
url: "https://pub.dev"
source: hosted
- version: "23.1.39"
+ version: "23.1.42"
syncfusion_pdfviewer_macos:
dependency: transitive
description:
name: syncfusion_pdfviewer_macos
- sha256: "176a44ee71e07dac4ca1e662eb9d778217287a53343f65747a34254821c13fd4"
+ sha256: "933a1430b6be6e1c045eed0a534ac83f7a76332bcb6b415072dc7d894347a755"
url: "https://pub.dev"
source: hosted
- version: "23.1.39"
+ version: "23.1.42"
syncfusion_pdfviewer_platform_interface:
dependency: transitive
description:
name: syncfusion_pdfviewer_platform_interface
- sha256: d9fe70d59dc3d11b225291b458eb86785048b32f827723818b02133fce79db7d
+ sha256: c3d58a0add28b2196307ffd8141595b71cd05a7e42e5991f86e2786008182614
url: "https://pub.dev"
source: hosted
- version: "23.1.39"
+ version: "23.1.42"
syncfusion_pdfviewer_web:
dependency: transitive
description:
name: syncfusion_pdfviewer_web
- sha256: "26df36c18aa1b11d30cdbf578c5e3f51db875092c8cbe96a3d6e18bc35e5d4f9"
+ sha256: "1c9b267c27213fa07aba626ceaa1fedc156ddb5a519ed1f50b2ff89360bdf1e4"
url: "https://pub.dev"
source: hosted
- version: "23.1.39"
+ version: "23.1.42"
syncfusion_pdfviewer_windows:
dependency: transitive
description:
name: syncfusion_pdfviewer_windows
- sha256: "0d7259c645f6572f39923c9492d8349d7ffd51d263bdbc39e7b231fbda73abe7"
+ sha256: "37daf723238b6704ff576be693ae2743b919d9cd304f3b946cbe65ff988dec46"
url: "https://pub.dev"
source: hosted
- version: "23.1.39"
->>>>>>> Rebuildthescreen
+ version: "23.1.42"
synchronized:
dependency: transitive
description:
@@ -1284,17 +961,10 @@ packages:
dependency: transitive
description:
name: test_api
-<<<<<<< HEAD
- sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
- url: "https://pub.dev"
- source: hosted
- version: "0.4.16"
-=======
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.6.0"
->>>>>>> Rebuildthescreen
typed_data:
dependency: transitive
description:
@@ -1307,12 +977,6 @@ packages:
dependency: transitive
description:
name: universal_io
-<<<<<<< HEAD
- sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d"
- url: "https://pub.dev"
- source: hosted
- version: "2.2.0"
-=======
sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
url: "https://pub.dev"
source: hosted
@@ -1321,82 +985,74 @@ packages:
dependency: transitive
description:
name: url_launcher
- sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27"
+ sha256: fa6675dc49dea33b0f228bca6f9ad5445c25b51284ca5f88c0d49ab770a0450a
url: "https://pub.dev"
source: hosted
- version: "6.1.14"
+ version: "6.2.0"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
- sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330
+ sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def"
url: "https://pub.dev"
source: hosted
- version: "6.1.0"
+ version: "6.2.0"
url_launcher_ios:
dependency: transitive
description:
name: url_launcher_ios
- sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f"
+ sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a"
url: "https://pub.dev"
source: hosted
- version: "6.1.5"
+ version: "6.2.0"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
- sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e
+ sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd"
url: "https://pub.dev"
source: hosted
- version: "3.0.6"
+ version: "3.1.0"
url_launcher_macos:
dependency: transitive
description:
name: url_launcher_macos
- sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88
+ sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
url: "https://pub.dev"
source: hosted
- version: "3.0.7"
+ version: "3.1.0"
url_launcher_platform_interface:
dependency: transitive
description:
name: url_launcher_platform_interface
- sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618"
+ sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50"
url: "https://pub.dev"
source: hosted
- version: "2.1.5"
+ version: "2.2.0"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
- sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5"
+ sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2"
url: "https://pub.dev"
source: hosted
- version: "2.0.20"
+ version: "2.2.0"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
- sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069"
+ sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc"
url: "https://pub.dev"
source: hosted
- version: "3.0.8"
->>>>>>> Rebuildthescreen
+ version: "3.1.0"
uuid:
dependency: transitive
description:
name: uuid
-<<<<<<< HEAD
sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7
url: "https://pub.dev"
source: hosted
version: "4.1.0"
-=======
- sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
- url: "https://pub.dev"
- source: hosted
- version: "3.0.7"
->>>>>>> Rebuildthescreen
vector_math:
dependency: transitive
description:
@@ -1409,17 +1065,10 @@ packages:
dependency: "direct main"
description:
name: velocity_x
-<<<<<<< HEAD
- sha256: "16afc758004143b2f5f6955c39ac4a7381c367067ee9f005764182a4624a44cb"
- url: "https://pub.dev"
- source: hosted
- version: "4.1.0"
-=======
sha256: "41734c40f1609aaafa5337fd9a9e7e9aaf3464dce8ee2cad18be4226b184e5ca"
url: "https://pub.dev"
source: hosted
version: "4.1.1"
->>>>>>> Rebuildthescreen
vxstate:
dependency: transitive
description:
@@ -1432,12 +1081,6 @@ packages:
dependency: transitive
description:
name: watcher
-<<<<<<< HEAD
- sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.2"
-=======
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
url: "https://pub.dev"
source: hosted
@@ -1450,17 +1093,10 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
->>>>>>> Rebuildthescreen
win32:
dependency: transitive
description:
name: win32
-<<<<<<< HEAD
- sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
- url: "https://pub.dev"
- source: hosted
- version: "4.1.4"
-=======
sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
url: "https://pub.dev"
source: hosted
@@ -1473,7 +1109,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.2"
->>>>>>> Rebuildthescreen
xdg_directories:
dependency: transitive
description:
@@ -1486,17 +1121,10 @@ packages:
dependency: transitive
description:
name: xml
-<<<<<<< HEAD
- sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a"
- url: "https://pub.dev"
- source: hosted
- version: "5.4.1"
-=======
sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
url: "https://pub.dev"
source: hosted
version: "6.3.0"
->>>>>>> Rebuildthescreen
yaml:
dependency: transitive
description:
@@ -1506,10 +1134,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
-<<<<<<< HEAD
- dart: ">=2.19.0 <3.0.0"
- flutter: ">=3.7.0"
-=======
dart: ">=3.1.0 <4.0.0"
flutter: ">=3.13.0"
->>>>>>> Rebuildthescreen
diff --git a/pubspec.yaml b/pubspec.yaml
index 3cea371..c3b1488 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,27 +23,6 @@ environment:
dependencies:
cached_network_image: ^3.1.0
carousel_slider: ^4.0.0
-<<<<<<< HEAD
- cloud_firestore: ^4.9.2
- cupertino_icons: ^1.0.2
- date_format: ^2.0.4
- firebase_auth: ^4.10.0
- firebase_core: ^2.16.0
- firebase_messaging: ^14.6.8
- firebase_storage: ^11.2.7
- flutter:
- sdk: flutter
- flutter_native_splash: ^2.2.0+1
- font_awesome_flutter: ^10.4.0
- google_fonts: ^4.0.4
- google_sign_in: ^6.1.5
- image_picker: ^1.0.4
- intl: ^0.18.1
- permission_handler: ^11.0.0
- provider: ^6.0.0
- syncfusion_flutter_pdf: ^22.2.8
- velocity_x: ^4.1.0
-=======
cloud_firestore: ^4.9.3
cupertino_icons: ^1.0.2
date_format: ^2.0.4
@@ -65,7 +44,6 @@ dependencies:
firebase_messaging: ^14.6.9
syncfusion_flutter_pdfviewer: ^23.1.39
rflutter_alert: ^2.0.7
->>>>>>> Rebuildthescreen
dev_dependencies:
flutter_test:
From f6704727f27eb02065be5296e469f1aaf496a995 Mon Sep 17 00:00:00 2001
From: manasiPandey21
Date: Thu, 26 Oct 2023 23:34:09 +0530
Subject: [PATCH 22/22] Done changes in player form ui
---
lib/screens/player/forms/player_form.dart | 105 +++++++++++++---------
1 file changed, 63 insertions(+), 42 deletions(-)
diff --git a/lib/screens/player/forms/player_form.dart b/lib/screens/player/forms/player_form.dart
index dcf30c0..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,8 +110,6 @@ class _PlayerFormState extends State {
@override
Widget build(BuildContext context) {
return Scaffold(
- // backgroundColor: CustomColors.primaryColor,
-
body: SingleChildScrollView(
child: Container(
padding: EdgeInsets.only(top: 24),
@@ -119,15 +118,18 @@ class _PlayerFormState extends State {
child: Column(
children: [
Container(
- padding: EdgeInsets.all(15),
+ margin: EdgeInsets.only(top: 10),
+ padding: EdgeInsets.all(20),
width: double.infinity,
- child: Text(
- "Player Details Form",
- style: TextStyle(color: Colors.yellow, fontSize: 30),
+ child: Center(
+ child: Text(
+ "Player Registration",
+ style: TextStyle(color: Colors.yellow, fontSize: 30),
+ ),
),
),
SizedBox(
- height: 15,
+ height: 12,
),
Center(
child: GestureDetector(
@@ -137,22 +139,22 @@ class _PlayerFormState extends State {
child: ClipRRect(
borderRadius: BorderRadius.circular(200),
child: Container(
- width: 200,
- height: 200,
+ width: 150,
+ height: 150,
decoration: BoxDecoration(color: Colors.grey),
child: _image != null
? Image.file(
_image,
- width: 200.0,
- height: 200.0,
+ width: 150.0,
+ height: 150.0,
fit: BoxFit.fitHeight,
)
: Container(
decoration: BoxDecoration(color: Colors.white70),
- width: 200,
- height: 200,
+ width: 150,
+ height: 150,
child: Icon(
- Icons.camera_alt_rounded,
+ Icons.add_a_photo_rounded,
color: Colors.grey[800],
size: 35,
),
@@ -161,6 +163,7 @@ class _PlayerFormState extends State {
),
),
),
+
SizedBox(
height: 40,
),
@@ -176,11 +179,11 @@ class _PlayerFormState extends State {
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 14,
- color: Colors.yellow,
+ color: Colors.white,
),
decoration: InputDecoration(
hintText: "Enter Your Name",
- labelText: "Your Name",
+ labelText: "Name",
hintStyle: TextStyle(color: Colors.white54),
filled: true,
fillColor: CustomColors.taskez1,
@@ -209,6 +212,7 @@ class _PlayerFormState extends State {
}
return null;
},
+
),
SizedBox(
height: 40.0,
@@ -216,13 +220,14 @@ class _PlayerFormState extends State {
TextFormField(
cursorColor: CustomColors.primaryColor,
controller: studentIDcontroller,
+ keyboardType:TextInputType.number ,
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 14,
- color: Colors.yellow,
+ color: Colors.white,
),
decoration: InputDecoration(
- hintText: "Ex:-20195513",
+ hintText: " Ex:-20195513",
labelText: "Student ID",
hintStyle:
TextStyle(color: Colors.white54, fontSize: 16),
@@ -262,11 +267,11 @@ class _PlayerFormState extends State {
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 14,
- color: Colors.yellow,
+ 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.taskez1,
@@ -305,7 +310,7 @@ class _PlayerFormState extends State {
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 14,
- color: Colors.yellow,
+ color: Colors.white,
),
obscureText: false,
decoration: InputDecoration(
@@ -343,7 +348,7 @@ class _PlayerFormState extends State {
},
),
SizedBox(
- height: 40.0,
+ height: 25.0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -371,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),
@@ -386,13 +396,13 @@ 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.yellow,
@@ -412,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(),
@@ -427,7 +441,7 @@ class _PlayerFormState extends State {
],
),
SizedBox(
- height: 20.0,
+ height: 25.0,
),
TextFormField(
controller: streamURLcontroller,
@@ -435,7 +449,7 @@ class _PlayerFormState extends State {
style: TextStyle(
fontWeight: FontWeight.w400,
fontSize: 14,
- color: Colors.yellow,
+ color: Colors.white,
),
decoration: InputDecoration(
hintText:
@@ -526,7 +540,8 @@ class _PlayerFormState extends State {
),
)),
SizedBox(height: 20),
- ElevatedButton.icon(
+ ElevatedButton(
+
onPressed: () async {
await Provider.of(context, listen: false)
.signOut();
@@ -536,13 +551,18 @@ class _PlayerFormState extends State {
}), (route) => false);
},
style: ElevatedButton.styleFrom(
- primary: Colors.blueAccent),
- icon: Icon(Icons.arrow_forward),
- label: Text(
- 'Sign Out ?',
- style: TextStyle(
- color: Colors.white, fontWeight: FontWeight.bold),
- ),
+ 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),
+ ),
+ ),
),
],
),
@@ -554,4 +574,5 @@ class _PlayerFormState extends State {
),
);
}
+
}