diff --git a/.env.example b/.env.example deleted file mode 100644 index f929060..0000000 --- a/.env.example +++ /dev/null @@ -1 +0,0 @@ -GENIUS_SCAN_LICENCE_KEY= \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 13be2ee..aaab592 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -29,12 +29,12 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "tech.josharsh.paper" - minSdkVersion 19 + minSdkVersion 23 targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/lib/components/center_next_button.dart b/lib/components/center_next_button.dart index bf4973c..82e43dc 100644 --- a/lib/components/center_next_button.dart +++ b/lib/components/center_next_button.dart @@ -8,8 +8,10 @@ import 'package:flutter_dotenv/flutter_dotenv.dart' as DotEnv; class CenterNextButton extends StatelessWidget { final AnimationController animationController; final VoidCallback onNextClick; + final VoidCallback onbackClick; const CenterNextButton( - {Key? key, required this.animationController, required this.onNextClick}) + // {Key? key, required this.animationController, required this.onNextClick}) + {Key? key, required this.animationController, required this.onNextClick, required this.onbackClick}) : super(key: key); @override @@ -75,7 +77,7 @@ class CenterNextButton extends StatelessWidget { bottom: 38 - (38 * _signUpMoveAnimation.value)), child: Container( height: 58, - width: 58 + (200 * _signUpMoveAnimation.value), + width: 85 + (200 * _signUpMoveAnimation.value), decoration: BoxDecoration( borderRadius: BorderRadius.circular( 8 + 32 * (1 - _signUpMoveAnimation.value)), @@ -130,11 +132,29 @@ class CenterNextButton extends StatelessWidget { ) : InkWell( key: ValueKey('next button'), - onTap: onNextClick, + // onTap: onNextClick, child: Padding( - padding: EdgeInsets.all(16.0), - child: Icon(Icons.arrow_forward_ios_rounded, - color: Colors.white), + padding: EdgeInsets.all(0.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: + [GestureDetector( + onTap: onbackClick, + child: Icon( + Icons.arrow_back_ios_rounded, + color: Colors.white + ), + ), + SizedBox(width: 5,), + GestureDetector( + onTap: onNextClick, + child: Icon( + Icons.arrow_forward_ios_rounded, + color: Colors.white + ), + ), + ], + ), ), ), ), diff --git a/lib/components/relax_view.dart b/lib/components/relax_view.dart index afa0e76..6d99e39 100644 --- a/lib/components/relax_view.dart +++ b/lib/components/relax_view.dart @@ -54,7 +54,7 @@ class RelaxView extends StatelessWidget { ); final _relaxAnimation = - Tween(begin: Offset(0, -2), end: Offset(0, 0)).animate( + Tween(begin: Offset(0, -2), end: Offset(0, 1)).animate( CurvedAnimation( parent: animationController, curve: Interval( @@ -88,7 +88,7 @@ class RelaxView extends StatelessWidget { position: _textAnimation, child: Padding( padding: - EdgeInsets.only(left: 64, right: 64, top: 16), + EdgeInsets.only(left: 64, right: 64, top: 80), child: Text( "Paper uses intelligent sense to automatically highlight the document so that you can frame it correctly.", textAlign: TextAlign.center, @@ -99,7 +99,7 @@ class RelaxView extends StatelessWidget { SlideTransition( position: _imageAnimation, child: Container( - constraints: BoxConstraints(maxWidth: 650, maxHeight: 450), + constraints: BoxConstraints(maxWidth: 650, maxHeight: 400), child: Image.asset( 'assets/introduction_animation/relax_image.gif', fit: BoxFit.contain, diff --git a/lib/components/splash_view.dart b/lib/components/splash_view.dart index c08ae84..7250a56 100644 --- a/lib/components/splash_view.dart +++ b/lib/components/splash_view.dart @@ -36,14 +36,14 @@ class _SplashViewState extends State { ), ), Padding( - padding: EdgeInsets.only(top: 8.0, bottom: 8.0), + padding: EdgeInsets.only(top: 0.0, bottom: 8.0), child: Text( "Paper", style: TextStyle(fontSize: 35.0, fontWeight: FontWeight.bold, color:Color(0xff132137)), ), ), Padding( - padding: EdgeInsets.only(left: 64, right: 64,top: 8.0, bottom: 8.0), + padding: EdgeInsets.only(left: 64, right: 64), child: Text( "Paper helps you scan your documents on the go using your phone", style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold), @@ -51,11 +51,11 @@ class _SplashViewState extends State { ), ), SizedBox( - height: 48, + height: 80, ), Padding( padding: EdgeInsets.only( - bottom: MediaQuery.of(context).padding.bottom + 16), + bottom: MediaQuery.of(context).padding.bottom), child: InkWell( onTap: () { widget.animationController.animateTo(0.2); diff --git a/lib/introduction_animation_screen.dart b/lib/introduction_animation_screen.dart index 36132af..f15fd87 100644 --- a/lib/introduction_animation_screen.dart +++ b/lib/introduction_animation_screen.dart @@ -64,6 +64,7 @@ class _IntroductionAnimationScreenState CenterNextButton( animationController: _animationController!, onNextClick: _onNextClick, + onbackClick: _onBackClick, ), ], ), diff --git a/lib/main.dart b/lib/main.dart index 65b5748..5fe9ad0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -89,6 +89,7 @@ class _IntroductionAnimationScreenState CenterNextButton( animationController: _animationController!, onNextClick: _onNextClick, + onbackClick: _onBackClick, ), ], ), diff --git a/pubspec.lock b/pubspec.lock index 297e972..420c30d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" animations: dependency: "direct main" description: @@ -28,7 +35,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -42,14 +49,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -57,13 +64,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" + cloud_firestore: + dependency: "direct main" + description: + name: cloud_firestore + url: "https://pub.dartlang.org" + source: hosted + version: "3.5.0" + cloud_firestore_platform_interface: + dependency: transitive + description: + name: cloud_firestore_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "5.7.6" + cloud_firestore_web: + dependency: transitive + description: + name: cloud_firestore_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.9" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" crypto: dependency: transitive description: @@ -84,7 +112,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -92,11 +120,60 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.2" + firebase_auth: + dependency: "direct main" + description: + name: firebase_auth + url: "https://pub.dartlang.org" + source: hosted + version: "3.11.0" + firebase_auth_platform_interface: + dependency: transitive + description: + name: firebase_auth_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "6.10.0" + firebase_auth_web: + dependency: transitive + description: + name: firebase_auth_web + url: "https://pub.dartlang.org" + source: hosted + version: "4.6.0" + firebase_core: + dependency: transitive + description: + name: firebase_core + url: "https://pub.dartlang.org" + source: hosted + version: "1.24.0" + firebase_core_platform_interface: + dependency: transitive + description: + name: firebase_core_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "4.5.1" + firebase_core_web: + dependency: transitive + description: + name: firebase_core_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.3" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" + flutter_dotenv: + dependency: "direct main" + description: + name: flutter_dotenv + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.2" flutter_genius_scan: dependency: "direct main" description: @@ -123,6 +200,11 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" font_awesome_flutter: dependency: "direct main" description: @@ -130,6 +212,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "9.1.0" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.1" image: dependency: transitive description: @@ -144,20 +233,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.17.0" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" open_file: dependency: "direct main" description: @@ -171,7 +274,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" petitparser: dependency: transitive description: @@ -179,6 +282,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.1.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" sky_engine: dependency: transitive description: flutter @@ -190,7 +300,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -225,7 +335,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.9" typed_data: dependency: transitive description: @@ -239,7 +349,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" xml: dependency: transitive description: @@ -255,5 +365,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=1.12.13+hotfix.5" diff --git a/pubspec.yaml b/pubspec.yaml index efbef9b..e58b788 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,6 +25,8 @@ dependencies: sdk: flutter open_file: ^3.1.0 flutter_dotenv: ^5.0.2 + cloud_firestore: ^3.5.0 + firebase_auth: ^3.11.0 flutter_genius_scan: version: 4.0.8