Skip to content

Commit 4034c02

Browse files
drowsy-coderdrowsy-coder
committed
Beautified me
1 parent 1ec3358 commit 4034c02

File tree

4 files changed

+381
-317
lines changed

4 files changed

+381
-317
lines changed

‎lib/features/auth/screens/login_screen.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class LoginScreen extends ConsumerWidget {
7474
SizedBox(
7575
width: 400.0,
7676
child: TextLiquidFill(
77-
text: 'FeminaPulse',
77+
text: 'Femunity',
7878
waveColor: Color(0xFFff48a5),
7979
textStyle: TextStyle(
8080
fontFamily: 'AlBrush',
@@ -102,9 +102,9 @@ class LoginScreen extends ConsumerWidget {
102102
autoPlayAnimationDuration: Duration(milliseconds: 800),
103103
),
104104
items: [
105-
'https://example.com/image1.jpg',
106-
'https://example.com/image2.jpg',
107-
'https://example.com/image3.jpg',
105+
// 'https://example.com/image1.jpg',
106+
// 'https://example.com/image2.jpg',
107+
// 'https://example.com/image3.jpg',
108108
].map((i) {
109109
return Builder(
110110
builder: (BuildContext context) {

‎lib/features/communities/screens/health_screen.dart

Lines changed: 103 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -9,129 +9,156 @@ class WellnessScreen extends StatelessWidget {
99
@override
1010
Widget build(BuildContext context) {
1111
return Scaffold(
12-
body: Center(
13-
child: Padding(
14-
padding: const EdgeInsets.all(25.0),
15-
child: Row(
16-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
17-
children: [
18-
Expanded(
19-
child: GestureDetector(
20-
onTap: () {
21-
Navigator.push(
22-
context,
23-
MaterialPageRoute(
24-
builder: (context) => PeriodTrackerScreen()),
25-
);
26-
},
27-
child: Card(
28-
shape: RoundedRectangleBorder(
29-
borderRadius: BorderRadius.circular(16.0),
30-
),
31-
color: Colors.pink,
32-
child: Padding(
33-
padding: const EdgeInsets.all(16.0),
12+
backgroundColor: Colors.black,
13+
body: SafeArea(
14+
child: Column(
15+
crossAxisAlignment: CrossAxisAlignment.start,
16+
children: [
17+
Padding(
18+
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 32),
19+
child: Text(
20+
'Wellness',
21+
style: TextStyle(
22+
fontSize: 32,
23+
fontWeight: FontWeight.bold,
24+
color: Colors.black,
25+
),
26+
),
27+
),
28+
Expanded(
29+
child: GridView.count(
30+
crossAxisCount: 2,
31+
padding: EdgeInsets.all(24),
32+
mainAxisSpacing: 32,
33+
crossAxisSpacing: 32,
34+
children: [
35+
GestureDetector(
36+
onTap: () {
37+
Navigator.push(
38+
context,
39+
MaterialPageRoute(
40+
builder: (context) => PeriodTrackerScreen()),
41+
);
42+
},
43+
child: Container(
44+
decoration: BoxDecoration(
45+
color: Colors.pink,
46+
borderRadius: BorderRadius.circular(16.0),
47+
),
3448
child: Column(
3549
mainAxisAlignment: MainAxisAlignment.center,
3650
children: [
3751
SizedBox(
3852
height: 48,
39-
child: const Icon(Icons.track_changes, size: 48),
53+
child: const Icon(Icons.track_changes, size: 48, color: Colors.white),
4054
),
41-
const SizedBox(height: 16),
42-
const Text(
43-
'M\nE\nN\nS\nT\nR\nU\nA\nL \n\nT\nR\nA\nC\nK\nE\nR',
55+
SizedBox(height: 16),
56+
Text(
57+
'Menstrual Tracker',
4458
style: TextStyle(
4559
fontSize: 18,
4660
fontWeight: FontWeight.bold,
61+
color: Colors.white,
4762
),
4863
),
4964
],
5065
),
5166
),
5267
),
53-
),
54-
),
55-
const SizedBox(width: 16),
56-
Expanded(
57-
child: GestureDetector(
58-
68+
GestureDetector(
5969
onTap: () {
60-
Navigator.push(
61-
context,
62-
MaterialPageRoute(
63-
builder: (context) => MindfulnessScreen()),
64-
);
65-
66-
},
67-
child: Card(
68-
shape: RoundedRectangleBorder(
69-
borderRadius: BorderRadius.circular(16.0),
70-
),
71-
color: Colors.purple,
72-
child: Padding(
73-
padding: const EdgeInsets.all(16.0),
70+
Navigator.push(
71+
context,
72+
MaterialPageRoute(
73+
builder: (context) => MindfulnessScreen()),
74+
);
75+
},
76+
child: Container(
77+
decoration: BoxDecoration(
78+
color: Colors.green,
79+
borderRadius: BorderRadius.circular(16.0),
80+
),
7481
child: Column(
7582
mainAxisAlignment: MainAxisAlignment.center,
7683
children: [
7784
SizedBox(
7885
height: 48,
79-
child: const Icon(Icons.spa, size: 48),
86+
child: const Icon(Icons.spa, size: 48, color: Colors.white),
8087
),
81-
const SizedBox(height: 16),
82-
const Text(
83-
'M\n I\nN\nD\nF\nU\nL\nN\nE\nS\nS',
88+
SizedBox(height: 16),
89+
Text(
90+
'Mindfulness',
8491
style: TextStyle(
8592
fontSize: 18,
8693
fontWeight: FontWeight.bold,
94+
color: Colors.white,
8795
),
8896
),
8997
],
9098
),
9199
),
92100
),
93-
),
94-
),
95-
const SizedBox(width: 16),
96-
Expanded(
97-
child: GestureDetector(
98-
onTap: () {
99-
Navigator.push(
100-
context,
101-
MaterialPageRoute(
102-
builder: (context) => JournalScreen()),
103-
);
104-
},
105-
child: Card(
106-
shape: RoundedRectangleBorder(
107-
borderRadius: BorderRadius.circular(16.0),
108-
),
109-
color: Colors.orange,
110-
child: Padding(
111-
padding: const EdgeInsets.all(16.0),
101+
GestureDetector(
102+
onTap: () {
103+
Navigator.push(
104+
context,
105+
MaterialPageRoute(
106+
builder: (context) => JournalScreen()),
107+
);
108+
},
109+
child: Container(
110+
decoration: BoxDecoration(
111+
color: Colors.deepPurple,
112+
borderRadius: BorderRadius.circular(16.0),
113+
),
112114
child: Column(
113115
mainAxisAlignment: MainAxisAlignment.center,
114116
children: [
115117
SizedBox(
116118
height: 48,
117-
child: const Icon(Icons.book, size: 48),
119+
child: const Icon(Icons.book, size: 48, color: Colors.white),
118120
),
119-
const SizedBox(height: 16),
120-
const Text(
121-
'J\nO\nU\nR\nN\nA\nL',
121+
SizedBox(height: 16),
122+
Text(
123+
'Journal',
122124
style: TextStyle(
123125
fontSize: 18,
124126
fontWeight: FontWeight.bold,
127+
color: Colors.white,
125128
),
126129
),
127130
],
128131
),
129132
),
130133
),
131-
),
134+
Container(
135+
decoration: BoxDecoration(
136+
color: Colors.orange,
137+
borderRadius: BorderRadius.circular(16.0),
138+
),
139+
child: Column(
140+
mainAxisAlignment: MainAxisAlignment.center,
141+
children: [
142+
SizedBox(
143+
height: 48,
144+
child: const Icon(Icons.music_note, size: 48, color: Colors.white),
145+
),
146+
SizedBox(height: 16),
147+
Text(
148+
'Music',
149+
style: TextStyle(
150+
fontSize: 18,
151+
fontWeight: FontWeight.bold,
152+
color: Colors.white,
153+
),
154+
),
155+
],
156+
),
157+
),
158+
],
132159
),
133-
],
134-
),
160+
),
161+
],
135162
),
136163
),
137164
);

0 commit comments

Comments
 (0)