Skip to content

Commit 4e4923c

Browse files
Nallu-SwamiNallu-Swami
authored
Merge branch 'drowsy-coder:master' into master
2 parents 2ad4825 + 5b47749 commit 4e4923c

File tree

15 files changed

+283
-89
lines changed

15 files changed

+283
-89
lines changed

‎assets/images/commu.jpeg

89.6 KB
Loading

‎assets/images/commu.png

356 KB
Loading

‎assets/images/digitalsec.png

29.3 KB
Loading

‎assets/images/idea.png

25 KB
Loading

‎assets/images/mental.png

82.3 KB
Loading

‎assets/images/opport.png

22.4 KB
Loading

‎lib/core/common/post_card.dart

+9
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ class PostCard extends ConsumerWidget {
6363
blurRadius: 4,
6464
),
6565
],
66+
gradient: LinearGradient(
67+
colors: [
68+
Colors.black,
69+
Colors.grey[900]!,
70+
Colors.blueGrey[900]!,
71+
],
72+
begin: Alignment.topLeft,
73+
end: Alignment.bottomRight,
74+
),
6675
),
6776
child: Column(
6877
children: [

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

+159-21
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,58 @@
11
import 'package:animated_text_kit/animated_text_kit.dart';
2+
import 'package:carousel_slider/carousel_slider.dart';
23
import 'package:femunity/core/common/loader.dart';
3-
import 'package:femunity/core/constants/constants.dart';
44
import 'package:femunity/features/auth/controller/auth_controller.dart';
55
import 'package:flutter/material.dart';
66
import 'package:flutter_riverpod/flutter_riverpod.dart';
7-
import 'package:carousel_slider/carousel_slider.dart';
87

98
import '../../../core/common/sign_in_button.dart';
109

1110
class LoginScreen extends ConsumerWidget {
12-
const LoginScreen({super.key});
11+
const LoginScreen({Key? key});
12+
1313
void signInAsGuest(WidgetRef ref, BuildContext context) {
1414
ref.read(authControllerProvider.notifier).signInAsGuest(context);
1515
}
1616

1717
@override
1818
Widget build(BuildContext context, WidgetRef ref) {
1919
final isLoading = ref.watch(authControllerProvider);
20+
2021
return Scaffold(
2122
body: isLoading
2223
? const Loader()
2324
: SafeArea(
24-
child: Stack(
25+
child: Stack(
2526
children: [
27+
Container(
28+
decoration: const BoxDecoration(
29+
gradient: LinearGradient(
30+
colors: [
31+
Colors.pink,
32+
Colors.orange,
33+
Colors.yellow,
34+
],
35+
begin: Alignment.topLeft,
36+
end: Alignment.bottomRight,
37+
),
38+
),
39+
),
2640
Column(
2741
crossAxisAlignment: CrossAxisAlignment.center,
2842
children: [
29-
const SizedBox(
30-
height: 15,
31-
),
43+
const SizedBox(height: 40),
3244
SizedBox(
33-
height: 30,
45+
height: 100,
3446
child: DefaultTextStyle(
3547
style: const TextStyle(
3648
fontFamily: 'FutureLight',
37-
fontSize: 29,
49+
fontSize: 27,
50+
fontWeight: FontWeight.bold,
3851
color: Colors.white,
3952
shadows: [
4053
Shadow(
4154
blurRadius: 7.0,
42-
color: Colors.white,
55+
color: Colors.black,
4356
offset: Offset(0, 0),
4457
),
4558
],
@@ -48,29 +61,154 @@ class LoginScreen extends ConsumerWidget {
4861
repeatForever: true,
4962
animatedTexts: [
5063
FlickerAnimatedText('Unleash your power'),
51-
FlickerAnimatedText('Connect with your community'),
64+
FlickerAnimatedText(
65+
'Connect with your community'),
5266
],
5367
),
5468
),
5569
),
56-
SizedBox(
57-
width: 400.0,
58-
child: TextLiquidFill(
59-
text: 'Femunity',
60-
waveColor: const Color(0xFFff48a5),
61-
textStyle: const TextStyle(
70+
const SizedBox(height: 20),
71+
Image.asset(
72+
'assets/images/logo.png',
73+
width: 200,
74+
height: 100,
75+
// Adjust the width and height as needed
76+
),
77+
const SizedBox(
78+
width: 300,
79+
child: Text(
80+
'Femunity',
81+
style: TextStyle(
6282
fontFamily: 'AlBrush',
63-
fontSize: 79.50,
83+
fontSize: 70,
84+
fontWeight: FontWeight.bold,
85+
color: Colors.white,
86+
shadows: [
87+
Shadow(
88+
blurRadius: 5.0,
89+
color: Colors.black,
90+
offset: Offset(0, 0),
91+
),
92+
],
6493
),
65-
boxHeight: 150.0,
94+
textAlign: TextAlign.center,
95+
),
96+
),
97+
const SizedBox(height: 40),
98+
CarouselSlider(
99+
options: CarouselOptions(
100+
height: 200,
101+
autoPlay: true,
102+
autoPlayInterval: const Duration(seconds: 3),
103+
autoPlayCurve: Curves.fastOutSlowIn,
104+
enlargeCenterPage: true,
105+
scrollDirection: Axis.horizontal,
106+
),
107+
items: const [
108+
SliderCard(
109+
image: 'assets/images/commu.png',
110+
title: 'Discover new communities',
111+
description:
112+
'Find communities of like-minded women to connect with and support each other.',
113+
),
114+
SliderCard(
115+
image: 'assets/images/idea.png',
116+
title: 'Share your thoughts and ideas',
117+
description:
118+
'Post links, text, and image-based posts to start discussions and share your thoughts and ideas with others.',
119+
),
120+
SliderCard(
121+
image: 'assets/images/mental.png',
122+
title: 'Care for physical & mental health',
123+
description:
124+
'Learn more about physical & mental health.',
125+
),
126+
SliderCard(
127+
image: 'assets/images/opport.png',
128+
title: 'Get opportunities to grow',
129+
description:
130+
'Explore opportunities for personal and professional growth.',
131+
),
132+
SliderCard(
133+
image: 'assets/images/digitalsec.png',
134+
title: 'Stay Digitally Secure',
135+
description:
136+
'Learn how to stay safe and secure in the digital world.',
137+
),
138+
],
139+
),
140+
const SizedBox(height: 100),
141+
Padding(
142+
padding: const EdgeInsets.symmetric(horizontal: 20),
143+
child: Column(
144+
children: const [
145+
SignInButton(),
146+
],
66147
),
67148
),
68-
const SignInButton(),
69149
],
70150
),
71151
],
72152
),
153+
),
154+
);
155+
}
156+
}
157+
158+
class SliderCard extends StatelessWidget {
159+
final String image;
160+
final String title;
161+
final String description;
162+
163+
const SliderCard({
164+
required this.image,
165+
required this.title,
166+
required this.description,
167+
Key? key,
168+
}) : super(key: key);
169+
170+
@override
171+
Widget build(BuildContext context) {
172+
return Container(
173+
width: 270,
174+
margin: const EdgeInsets.symmetric(horizontal: 10),
175+
child: Card(
176+
elevation: 10,
177+
shape: RoundedRectangleBorder(
178+
borderRadius: BorderRadius.circular(10),
179+
),
180+
color: Colors.white.withOpacity(0.7),
181+
child: SingleChildScrollView(
182+
child: Column(
183+
children: [
184+
Image.asset(
185+
image,
186+
height: 110,
187+
width: 110,
188+
),
189+
// const SizedBox(height: 10),
190+
Text(
191+
title,
192+
style: const TextStyle(
193+
fontWeight: FontWeight.bold,
194+
fontSize: 16,
195+
color: Colors.black,
196+
decoration: TextDecoration.underline,
197+
),
198+
),
199+
const SizedBox(height: 5),
200+
Text(
201+
description,
202+
style: TextStyle(
203+
fontSize: 12,
204+
color: Colors.grey[900],
205+
),
206+
textAlign: TextAlign.center,
207+
),
208+
],
73209
),
210+
),
211+
),
74212
);
75213
}
76-
}
214+
}

‎lib/features/home/drawer/list_of_communities.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CommunityListDrawer extends ConsumerWidget {
2525
final user = ref.watch(userProvider)!;
2626
final isGuest = !user.isAuthenticated;
2727
return Drawer(
28-
backgroundColor: Colors.black,
28+
backgroundColor: Colors.grey[980],
2929
child: SafeArea(
3030
child: Column(
3131
crossAxisAlignment: CrossAxisAlignment.stretch,

‎lib/features/home/drawer/profile_drawer.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ProfileDrawer extends ConsumerWidget {
3232
Widget build(BuildContext context, WidgetRef ref) {
3333
final user = ref.watch(userProvider)!;
3434
return Drawer(
35-
backgroundColor: Colors.black,
35+
backgroundColor: Colors.grey[980],
3636
child: SafeArea(
3737
child: Column(
3838
crossAxisAlignment: CrossAxisAlignment.start,
@@ -127,7 +127,7 @@ class ProfileDrawer extends ConsumerWidget {
127127
Padding(
128128
padding: const EdgeInsets.all(20),
129129
child: Text(
130-
'Version 1.9.0',
130+
'Version 1.9.8',
131131
style: TextStyle(
132132
fontFamily: 'Montserrat',
133133
fontSize: 16,

‎lib/features/posts/screens/Digital Safety/safe_screen2.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class _SexualHarassmentScreenState extends State<SexualHarassmentScreen> {
8585
'Contact Authorities',
8686
'If the harassment involves serious threats, explicit content involving minors, or poses a significant risk, contact law enforcement agencies to report the incident.',
8787
Icons.phone,
88-
'tel:911',
88+
'https://cybercrime.gov.in/webform/FAQ.aspx',
8989
),
9090
buildStepCard(
9191
context,

‎lib/features/posts/screens/add_posts_screen.dart

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:femunity/theme/pallate.dart';
21
import 'package:flutter/material.dart';
32
import 'package:flutter_riverpod/flutter_riverpod.dart';
43
import 'package:routemaster/routemaster.dart';
@@ -12,7 +11,7 @@ class AddPostsScreen extends ConsumerWidget {
1211

1312
@override
1413
Widget build(BuildContext context, WidgetRef ref) {
15-
final currentTheme = ref.watch(themeNotifierProvider);
14+
// final currentTheme = ref.watch(themeNotifierProvider);
1615
return Column(
1716
mainAxisAlignment: MainAxisAlignment.center,
1817
crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -30,7 +29,11 @@ class AddPostsScreen extends ConsumerWidget {
3029
elevation: 16,
3130
child: const SizedBox(
3231
height: 120,
33-
child: Icon(Icons.image_outlined, size: 40),
32+
child: Icon(
33+
Icons.image_outlined,
34+
size: 40,
35+
color: Colors.pink,
36+
),
3437
),
3538
),
3639
),
@@ -51,7 +54,7 @@ class AddPostsScreen extends ConsumerWidget {
5154
Icons.text_fields_outlined,
5255
size: 40,
5356
color: Theme.of(context).brightness == Brightness.dark
54-
? null // keep the default color for dark mode
57+
? Colors.green // keep the default color for dark mode
5558
: Colors.blue, // set color to blue in light mode
5659
),
5760
),
@@ -70,7 +73,11 @@ class AddPostsScreen extends ConsumerWidget {
7073
elevation: 16,
7174
child: const SizedBox(
7275
height: 120,
73-
child: Icon(Icons.link_outlined, size: 40),
76+
child: Icon(
77+
Icons.link_outlined,
78+
size: 40,
79+
color: Colors.lightBlue,
80+
),
7481
),
7582
),
7683
)

0 commit comments

Comments
 (0)