Skip to content

Commit

Permalink
bug-fix-ui-improve-v2-model
Browse files Browse the repository at this point in the history
  • Loading branch information
@ARYPROGRAMMER
ARYPROGRAMMER committed Sep 30, 2024
1 parent e969241 commit 2f04d1b
Show file tree
Hide file tree
Showing 10 changed files with 289 additions and 301 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ jobs:
uses: ncipollo/release-action@v1
with:
artifacts: "build/app/outputs/apk/release/*"
tag: v1.0.9
tag: v2.0.0
token: ${{ secrets.TOKEN }}
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

**APP STATUS** : ALL CORE FUNCTIONALITIES WORKING (Deployed NodeJs & Postgresql on Render)

**LATEST** : v2.0.0 ReImagines Major UI

**UPDATE** : **SUPERCHARGED FACE EMOTION DETECTOR** + ADDED AI CHATBOT SUPPORT (OLD) + SONG PLAYER UI CHANGED (OLD)

[DEMO LINK](https://vimeo.com/1013864504)
Expand Down
36 changes: 19 additions & 17 deletions lib/features/auth/presentation/auth/pages/signin.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/painting.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mental_health/features/auth/data/models/auth/signin_user_req.dart';
import 'package:mental_health/features/auth/domain/usecases/auth/signin.dart';
import 'package:mental_health/features/auth/presentation/auth/pages/signup.dart';
Expand All @@ -19,13 +18,16 @@ class SignIn extends StatelessWidget {
return Scaffold(
bottomNavigationBar: _signupText(context),
appBar: AppBar(
title: Image.asset(
"screenshots/logo.png",
height: 300,
width: 300,
backgroundColor: Colors.transparent,
title: Padding(
padding: const EdgeInsets.only(right: 41.0, top: 5),
child: Image.asset(
"screenshots/logo.png",
),
),
centerTitle: true,
),
backgroundColor: Colors.white,
body: SingleChildScrollView(
scrollDirection: Axis.vertical,
child: Padding(
Expand All @@ -39,7 +41,7 @@ class SignIn extends StatelessWidget {
const SizedBox(
height: 10,
),
Text(
const Text(
"Get In Your Mood",
style: TextStyle(
fontFamily: 't3',
Expand All @@ -48,7 +50,7 @@ class SignIn extends StatelessWidget {
fontWeight: FontWeight.bold),
),
const SizedBox(
height: 110,
height: 80,
),
_registerText(),
const SizedBox(
Expand All @@ -60,7 +62,7 @@ class SignIn extends StatelessWidget {
),
_password(context),
const SizedBox(
height: 80,
height: 90,
),
ElevatedButton(
style: ElevatedButton.styleFrom(backgroundColor: Colors.black),
Expand Down Expand Up @@ -89,7 +91,7 @@ class SignIn extends StatelessWidget {
style: TextStyle(
fontFamily: 't3',
color: Colors.white,
fontSize: 22,
fontSize: 17,
),
),
),
Expand All @@ -104,7 +106,7 @@ class SignIn extends StatelessWidget {
return const Text(
'Sign In',
style: TextStyle(
letterSpacing: 3,
letterSpacing: 1,
fontFamily: 't1',
color: Colors.green,
fontSize: 25,
Expand All @@ -119,10 +121,10 @@ class SignIn extends StatelessWidget {
decoration: const InputDecoration(
hintText: "Enter Email",
),
style: TextStyle(
style: const TextStyle(
fontFamily: 't3',
color: Colors.black,
fontSize: 20,
fontSize: 16,
fontWeight: FontWeight.bold),
);
}
Expand All @@ -133,17 +135,17 @@ class SignIn extends StatelessWidget {
decoration: const InputDecoration(
hintText: "Password",
),
style: TextStyle(
style: const TextStyle(
fontFamily: 't3',
color: Colors.black,
fontSize: 20,
fontSize: 16,
fontWeight: FontWeight.bold),
);
}

Widget _signupText(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(vertical: 30),
padding: const EdgeInsets.symmetric(vertical: 30),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand All @@ -152,7 +154,7 @@ class SignIn extends StatelessWidget {
style: TextStyle(
fontFamily: 't2',
color: Colors.red,
fontSize: 25,
fontSize: 20,
fontWeight: FontWeight.bold),
),
TextButton(
Expand All @@ -168,7 +170,7 @@ class SignIn extends StatelessWidget {
letterSpacing: 0,
fontFamily: 't2',
color: Colors.purple,
fontSize: 25,
fontSize: 20,
fontWeight: FontWeight.bold),
)),
],
Expand Down
49 changes: 25 additions & 24 deletions lib/features/auth/presentation/auth/pages/signup.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:ffi';

import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/painting.dart';
Expand All @@ -21,13 +19,16 @@ class Signup extends StatelessWidget {
return Scaffold(
bottomNavigationBar: _signinText(context),
appBar: AppBar(
title: Image.asset(
"screenshots/logo.png",
height: 300,
width: 300,
backgroundColor: Colors.transparent,
title: Padding(
padding: const EdgeInsets.only(right: 45.0, top: 5),
child: Image.asset(
"screenshots/logo.png",
),
),
centerTitle: true,
),
backgroundColor: Colors.white,
body: SingleChildScrollView(
scrollDirection: Axis.vertical,
child: Padding(
Expand All @@ -41,32 +42,32 @@ class Signup extends StatelessWidget {
const SizedBox(
height: 10,
),
Text(
const Text(
"Tune into your Mind",
style: TextStyle(
fontFamily: 't3',
color: Colors.black,
fontSize: 32,
fontSize: 30,
fontWeight: FontWeight.bold),
),
const SizedBox(
height: 110,
height: 80,
),
_registerText(),
const SizedBox(
height: 100,
height: 80,
),
_fullnamefield(context),
const SizedBox(
height: 60,
height: 30,
),
_emailfield(context),
const SizedBox(
height: 60,
height: 30,
),
_password(context),
const SizedBox(
height: 60,
height: 80,
),
ElevatedButton(
style: ElevatedButton.styleFrom(backgroundColor: Colors.black),
Expand Down Expand Up @@ -96,7 +97,7 @@ class Signup extends StatelessWidget {
style: TextStyle(
fontFamily: 't3',
color: Colors.white,
fontSize: 22,
fontSize: 17,
),
),
),
Expand All @@ -111,7 +112,7 @@ class Signup extends StatelessWidget {
return const Text(
'Register',
style: TextStyle(
letterSpacing: 3,
letterSpacing: 1,
fontFamily: 't1',
color: Colors.green,
fontSize: 25,
Expand All @@ -126,10 +127,10 @@ class Signup extends StatelessWidget {
decoration: const InputDecoration(
hintText: "Full Name",
).applyDefaults(Theme.of(context).inputDecorationTheme),
style: TextStyle(
style: const TextStyle(
fontFamily: 't3',
color: Colors.black,
fontSize: 20,
fontSize: 16,
fontWeight: FontWeight.bold),
);
}
Expand All @@ -140,10 +141,10 @@ class Signup extends StatelessWidget {
decoration: const InputDecoration(
hintText: "Enter Email",
),
style: TextStyle(
style: const TextStyle(
fontFamily: 't3',
color: Colors.black,
fontSize: 20,
fontSize: 16,
fontWeight: FontWeight.bold),
);
}
Expand All @@ -154,17 +155,17 @@ class Signup extends StatelessWidget {
decoration: const InputDecoration(
hintText: "Password",
),
style: TextStyle(
style: const TextStyle(
fontFamily: 't3',
color: Colors.black,
fontSize: 20,
fontSize: 16,
fontWeight: FontWeight.bold),
);
}

Widget _signinText(BuildContext context) {
return Padding(
padding: EdgeInsets.symmetric(vertical: 30),
padding: const EdgeInsets.symmetric(vertical: 30),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand All @@ -173,7 +174,7 @@ class Signup extends StatelessWidget {
style: TextStyle(
fontFamily: 't2',
color: Colors.green,
fontSize: 25,
fontSize: 20,
fontWeight: FontWeight.bold),
),
TextButton(
Expand All @@ -189,7 +190,7 @@ class Signup extends StatelessWidget {
letterSpacing: 0,
fontFamily: 't2',
color: Colors.purple,
fontSize: 25,
fontSize: 20,
fontWeight: FontWeight.bold),
)),
],
Expand Down
15 changes: 10 additions & 5 deletions lib/features/auth/presentation/auth/pages/signup_or_signin.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,13 @@ class SignupOrSignin extends StatelessWidget {
child: SvgPicture.asset("assets/bottom_pattern.svg"),
),
Align(
alignment: Alignment.topCenter,
child: Image.asset("screenshots/logo.png")),
alignment: Alignment.topCenter,
child: Image.asset(
"screenshots/logo.png",
width: 400,
height: 300,
),
),
Align(
alignment: Alignment.center,
child: Padding(
Expand All @@ -44,7 +49,7 @@ class SignupOrSignin extends StatelessWidget {
style: TextStyle(
fontFamily: 't3',
color: Colors.white,
fontSize: 35,
fontSize: 28,
letterSpacing: 0,
leadingDistribution:
TextLeadingDistribution.proportional),
Expand All @@ -57,13 +62,13 @@ class SignupOrSignin extends StatelessWidget {
style: TextStyle(
fontFamily: 't3',
color: Colors.white,
fontSize: 25,
fontSize: 20,
letterSpacing: 0,
leadingDistribution:
TextLeadingDistribution.proportional),
),
const SizedBox(
height: 200,
height: 100,
),
const Text(
"Mindful does everything you ever wished for from making you relaxed to give you future motivation",
Expand Down
Loading

0 comments on commit 2f04d1b

Please sign in to comment.