Skip to content

Commit 2f04d1b

Browse files
ARYPROGRAMMERARYPROGRAMMER
committed
bug-fix-ui-improve-v2-model
1 parent e969241 commit 2f04d1b

File tree

10 files changed

+289
-301
lines changed

10 files changed

+289
-301
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ jobs:
2626
uses: ncipollo/release-action@v1
2727
with:
2828
artifacts: "build/app/outputs/apk/release/*"
29-
tag: v1.0.9
29+
tag: v2.0.0
3030
token: ${{ secrets.TOKEN }}

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

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

5+
**LATEST** : v2.0.0 ReImagines Major UI
6+
57
**UPDATE** : **SUPERCHARGED FACE EMOTION DETECTOR** + ADDED AI CHATBOT SUPPORT (OLD) + SONG PLAYER UI CHANGED (OLD)
68

79
[DEMO LINK](https://vimeo.com/1013864504)

‎lib/features/auth/presentation/auth/pages/signin.dart

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/cupertino.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter/painting.dart';
4-
import 'package:flutter_svg/flutter_svg.dart';
54
import 'package:mental_health/features/auth/data/models/auth/signin_user_req.dart';
65
import 'package:mental_health/features/auth/domain/usecases/auth/signin.dart';
76
import 'package:mental_health/features/auth/presentation/auth/pages/signup.dart';
@@ -19,13 +18,16 @@ class SignIn extends StatelessWidget {
1918
return Scaffold(
2019
bottomNavigationBar: _signupText(context),
2120
appBar: AppBar(
22-
title: Image.asset(
23-
"screenshots/logo.png",
24-
height: 300,
25-
width: 300,
21+
backgroundColor: Colors.transparent,
22+
title: Padding(
23+
padding: const EdgeInsets.only(right: 41.0, top: 5),
24+
child: Image.asset(
25+
"screenshots/logo.png",
26+
),
2627
),
2728
centerTitle: true,
2829
),
30+
backgroundColor: Colors.white,
2931
body: SingleChildScrollView(
3032
scrollDirection: Axis.vertical,
3133
child: Padding(
@@ -39,7 +41,7 @@ class SignIn extends StatelessWidget {
3941
const SizedBox(
4042
height: 10,
4143
),
42-
Text(
44+
const Text(
4345
"Get In Your Mood",
4446
style: TextStyle(
4547
fontFamily: 't3',
@@ -48,7 +50,7 @@ class SignIn extends StatelessWidget {
4850
fontWeight: FontWeight.bold),
4951
),
5052
const SizedBox(
51-
height: 110,
53+
height: 80,
5254
),
5355
_registerText(),
5456
const SizedBox(
@@ -60,7 +62,7 @@ class SignIn extends StatelessWidget {
6062
),
6163
_password(context),
6264
const SizedBox(
63-
height: 80,
65+
height: 90,
6466
),
6567
ElevatedButton(
6668
style: ElevatedButton.styleFrom(backgroundColor: Colors.black),
@@ -89,7 +91,7 @@ class SignIn extends StatelessWidget {
8991
style: TextStyle(
9092
fontFamily: 't3',
9193
color: Colors.white,
92-
fontSize: 22,
94+
fontSize: 17,
9395
),
9496
),
9597
),
@@ -104,7 +106,7 @@ class SignIn extends StatelessWidget {
104106
return const Text(
105107
'Sign In',
106108
style: TextStyle(
107-
letterSpacing: 3,
109+
letterSpacing: 1,
108110
fontFamily: 't1',
109111
color: Colors.green,
110112
fontSize: 25,
@@ -119,10 +121,10 @@ class SignIn extends StatelessWidget {
119121
decoration: const InputDecoration(
120122
hintText: "Enter Email",
121123
),
122-
style: TextStyle(
124+
style: const TextStyle(
123125
fontFamily: 't3',
124126
color: Colors.black,
125-
fontSize: 20,
127+
fontSize: 16,
126128
fontWeight: FontWeight.bold),
127129
);
128130
}
@@ -133,17 +135,17 @@ class SignIn extends StatelessWidget {
133135
decoration: const InputDecoration(
134136
hintText: "Password",
135137
),
136-
style: TextStyle(
138+
style: const TextStyle(
137139
fontFamily: 't3',
138140
color: Colors.black,
139-
fontSize: 20,
141+
fontSize: 16,
140142
fontWeight: FontWeight.bold),
141143
);
142144
}
143145

144146
Widget _signupText(BuildContext context) {
145147
return Padding(
146-
padding: EdgeInsets.symmetric(vertical: 30),
148+
padding: const EdgeInsets.symmetric(vertical: 30),
147149
child: Row(
148150
mainAxisAlignment: MainAxisAlignment.center,
149151
children: [
@@ -152,7 +154,7 @@ class SignIn extends StatelessWidget {
152154
style: TextStyle(
153155
fontFamily: 't2',
154156
color: Colors.red,
155-
fontSize: 25,
157+
fontSize: 20,
156158
fontWeight: FontWeight.bold),
157159
),
158160
TextButton(
@@ -168,7 +170,7 @@ class SignIn extends StatelessWidget {
168170
letterSpacing: 0,
169171
fontFamily: 't2',
170172
color: Colors.purple,
171-
fontSize: 25,
173+
fontSize: 20,
172174
fontWeight: FontWeight.bold),
173175
)),
174176
],

‎lib/features/auth/presentation/auth/pages/signup.dart

+25-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dart:ffi';
2-
31
import 'package:flutter/cupertino.dart';
42
import 'package:flutter/material.dart';
53
import 'package:flutter/painting.dart';
@@ -21,13 +19,16 @@ class Signup extends StatelessWidget {
2119
return Scaffold(
2220
bottomNavigationBar: _signinText(context),
2321
appBar: AppBar(
24-
title: Image.asset(
25-
"screenshots/logo.png",
26-
height: 300,
27-
width: 300,
22+
backgroundColor: Colors.transparent,
23+
title: Padding(
24+
padding: const EdgeInsets.only(right: 45.0, top: 5),
25+
child: Image.asset(
26+
"screenshots/logo.png",
27+
),
2828
),
2929
centerTitle: true,
3030
),
31+
backgroundColor: Colors.white,
3132
body: SingleChildScrollView(
3233
scrollDirection: Axis.vertical,
3334
child: Padding(
@@ -41,32 +42,32 @@ class Signup extends StatelessWidget {
4142
const SizedBox(
4243
height: 10,
4344
),
44-
Text(
45+
const Text(
4546
"Tune into your Mind",
4647
style: TextStyle(
4748
fontFamily: 't3',
4849
color: Colors.black,
49-
fontSize: 32,
50+
fontSize: 30,
5051
fontWeight: FontWeight.bold),
5152
),
5253
const SizedBox(
53-
height: 110,
54+
height: 80,
5455
),
5556
_registerText(),
5657
const SizedBox(
57-
height: 100,
58+
height: 80,
5859
),
5960
_fullnamefield(context),
6061
const SizedBox(
61-
height: 60,
62+
height: 30,
6263
),
6364
_emailfield(context),
6465
const SizedBox(
65-
height: 60,
66+
height: 30,
6667
),
6768
_password(context),
6869
const SizedBox(
69-
height: 60,
70+
height: 80,
7071
),
7172
ElevatedButton(
7273
style: ElevatedButton.styleFrom(backgroundColor: Colors.black),
@@ -96,7 +97,7 @@ class Signup extends StatelessWidget {
9697
style: TextStyle(
9798
fontFamily: 't3',
9899
color: Colors.white,
99-
fontSize: 22,
100+
fontSize: 17,
100101
),
101102
),
102103
),
@@ -111,7 +112,7 @@ class Signup extends StatelessWidget {
111112
return const Text(
112113
'Register',
113114
style: TextStyle(
114-
letterSpacing: 3,
115+
letterSpacing: 1,
115116
fontFamily: 't1',
116117
color: Colors.green,
117118
fontSize: 25,
@@ -126,10 +127,10 @@ class Signup extends StatelessWidget {
126127
decoration: const InputDecoration(
127128
hintText: "Full Name",
128129
).applyDefaults(Theme.of(context).inputDecorationTheme),
129-
style: TextStyle(
130+
style: const TextStyle(
130131
fontFamily: 't3',
131132
color: Colors.black,
132-
fontSize: 20,
133+
fontSize: 16,
133134
fontWeight: FontWeight.bold),
134135
);
135136
}
@@ -140,10 +141,10 @@ class Signup extends StatelessWidget {
140141
decoration: const InputDecoration(
141142
hintText: "Enter Email",
142143
),
143-
style: TextStyle(
144+
style: const TextStyle(
144145
fontFamily: 't3',
145146
color: Colors.black,
146-
fontSize: 20,
147+
fontSize: 16,
147148
fontWeight: FontWeight.bold),
148149
);
149150
}
@@ -154,17 +155,17 @@ class Signup extends StatelessWidget {
154155
decoration: const InputDecoration(
155156
hintText: "Password",
156157
),
157-
style: TextStyle(
158+
style: const TextStyle(
158159
fontFamily: 't3',
159160
color: Colors.black,
160-
fontSize: 20,
161+
fontSize: 16,
161162
fontWeight: FontWeight.bold),
162163
);
163164
}
164165

165166
Widget _signinText(BuildContext context) {
166167
return Padding(
167-
padding: EdgeInsets.symmetric(vertical: 30),
168+
padding: const EdgeInsets.symmetric(vertical: 30),
168169
child: Row(
169170
mainAxisAlignment: MainAxisAlignment.center,
170171
children: [
@@ -173,7 +174,7 @@ class Signup extends StatelessWidget {
173174
style: TextStyle(
174175
fontFamily: 't2',
175176
color: Colors.green,
176-
fontSize: 25,
177+
fontSize: 20,
177178
fontWeight: FontWeight.bold),
178179
),
179180
TextButton(
@@ -189,7 +190,7 @@ class Signup extends StatelessWidget {
189190
letterSpacing: 0,
190191
fontFamily: 't2',
191192
color: Colors.purple,
192-
fontSize: 25,
193+
fontSize: 20,
193194
fontWeight: FontWeight.bold),
194195
)),
195196
],

‎lib/features/auth/presentation/auth/pages/signup_or_signin.dart

+10-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ class SignupOrSignin extends StatelessWidget {
2121
child: SvgPicture.asset("assets/bottom_pattern.svg"),
2222
),
2323
Align(
24-
alignment: Alignment.topCenter,
25-
child: Image.asset("screenshots/logo.png")),
24+
alignment: Alignment.topCenter,
25+
child: Image.asset(
26+
"screenshots/logo.png",
27+
width: 400,
28+
height: 300,
29+
),
30+
),
2631
Align(
2732
alignment: Alignment.center,
2833
child: Padding(
@@ -44,7 +49,7 @@ class SignupOrSignin extends StatelessWidget {
4449
style: TextStyle(
4550
fontFamily: 't3',
4651
color: Colors.white,
47-
fontSize: 35,
52+
fontSize: 28,
4853
letterSpacing: 0,
4954
leadingDistribution:
5055
TextLeadingDistribution.proportional),
@@ -57,13 +62,13 @@ class SignupOrSignin extends StatelessWidget {
5762
style: TextStyle(
5863
fontFamily: 't3',
5964
color: Colors.white,
60-
fontSize: 25,
65+
fontSize: 20,
6166
letterSpacing: 0,
6267
leadingDistribution:
6368
TextLeadingDistribution.proportional),
6469
),
6570
const SizedBox(
66-
height: 200,
71+
height: 100,
6772
),
6873
const Text(
6974
"Mindful does everything you ever wished for from making you relaxed to give you future motivation",

0 commit comments

Comments
 (0)