Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

good_first_issue #3 #5

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.example

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 26 additions & 6 deletions lib/components/center_next_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)),
Expand Down Expand Up @@ -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
),
),
],
),
),
),
),
Expand Down
6 changes: 3 additions & 3 deletions lib/components/relax_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class RelaxView extends StatelessWidget {
);

final _relaxAnimation =
Tween<Offset>(begin: Offset(0, -2), end: Offset(0, 0)).animate(
Tween<Offset>(begin: Offset(0, -2), end: Offset(0, 1)).animate(
CurvedAnimation(
parent: animationController,
curve: Interval(
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions lib/components/splash_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,26 @@ class _SplashViewState extends State<SplashView> {
),
),
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),
textAlign: TextAlign.center,
),
),
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);
Expand Down
1 change: 1 addition & 0 deletions lib/introduction_animation_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class _IntroductionAnimationScreenState
CenterNextButton(
animationController: _animationController!,
onNextClick: _onNextClick,
onbackClick: _onBackClick,
),
],
),
Expand Down
1 change: 1 addition & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class _IntroductionAnimationScreenState
CenterNextButton(
animationController: _animationController!,
onNextClick: _onNextClick,
onbackClick: _onBackClick,
),
],
),
Expand Down
Loading