Updates for Final Release

drowsy-coder · drowsy-coder · commit 83fa1d2a4371 · 2023-03-19T16:06:42.000+05:30
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/assets/images/logo.png b/assets/images/logo.png
diff --git a/assets/images/text.png b/assets/images/text.png
diff --git a/lib/core/constants/constants.dart b/lib/core/constants/constants.dart
@@ -3,7 +3,6 @@ import 'package:femunity/features/posts/screens/add_posts_screen.dart';
 import 'package:flutter/material.dart';
 
 class Constants {
-  static const textPath = 'assets/images/text.png';
   static const logoPath = 'assets/images/logo.png';
   static const welcomePath = 'assets/images/text.png';
   static const googleLogo = 'assets/images/google.png';
diff --git a/lib/core/utils.dart b/lib/core/utils.dart
@@ -8,7 +8,7 @@ void showSnackBar(BuildContext context, String text) {
     ..hideCurrentSnackBar()
     ..showSnackBar(SnackBar(
       content: Text(text),
-      backgroundColor: const Color(0xFFffe9ec),
+      backgroundColor: const Color(0xFFAEC6CF),
     ));
 }
 
diff --git a/lib/features/communities/screens/add_mod_screen.dart b/lib/features/communities/screens/add_mod_screen.dart
@@ -63,16 +63,39 @@ class _AddModsScreenState extends ConsumerState<AddModsScreen> {
 
                 return ref.watch(getUserDataProvider(member)).when(
                       data: (userData) {
-                        return CheckboxListTile(
-                          value: isChecked,
-                          onChanged: (val) {
-                            if (val!) {
-                              addUid(member);
-                            } else {
-                              removeUid(member);
-                            }
-                          },
-                          title: Text(userData.name),
+                        return Container(
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(12),
+                            color:
+                                Theme.of(context).brightness == Brightness.dark
+                                    ? Colors.grey[900]
+                                    : Color(0xFFAEC6CF),
+                          ),
+                          margin: const EdgeInsets.symmetric(
+                              vertical: 4, horizontal: 16),
+                          child: CheckboxListTile(
+                            activeColor: Color(0xFFc779d0),
+                            checkColor: Colors.white,
+                            value: isChecked,
+                            onChanged: (val) {
+                              if (val!) {
+                                addUid(member);
+                              } else {
+                                removeUid(member);
+                              }
+                            },
+                            title: Text(
+                              userData.name,
+                              style: TextStyle(
+                                fontWeight: FontWeight.bold,
+                                fontSize: 16,
+                                color: Theme.of(context).brightness ==
+                                        Brightness.dark
+                                    ? Colors.white
+                                    : Colors.black,
+                              ),
+                            ),
+                          ),
                         );
                       },
                       error: (error, stackTrace) => ErrorText(
diff --git a/lib/features/communities/screens/edit_community_screen.dart b/lib/features/communities/screens/edit_community_screen.dart
@@ -64,7 +64,7 @@ class _EditCommunityScreenState extends ConsumerState<EditCommunityScreen> {
             appBar: AppBar(
               backgroundColor: Theme.of(context).brightness == Brightness.dark
                   ? Colors.grey[900]
-                  : Color(0xffffe9ec),
+                  : Color(0xffAEC6CF),
               title: Text(
                 'Edit Community',
                 style: Theme.of(context).textTheme.headline6?.copyWith(
diff --git a/lib/features/communities/screens/mod_tools_screen.dart b/lib/features/communities/screens/mod_tools_screen.dart
@@ -30,7 +30,7 @@ class ModToolsScreen extends StatelessWidget {
         centerTitle: false,
         backgroundColor: Theme.of(context).brightness == Brightness.dark
             ? Colors.grey[900]
-            : Color(0xffffe9ec),
+            : Color(0xffAEC6CF),
         // set the background color according to the current theme mode
         brightness: Theme.of(context).brightness,
         // set the brightness according to the current theme mode
diff --git a/lib/features/feed/feed_screen.dart b/lib/features/feed/feed_screen.dart
@@ -1,6 +1,7 @@
 import 'package:femunity/core/common/error_text.dart';
 import 'package:femunity/core/common/loader.dart';
 import 'package:femunity/core/common/post_card.dart';
+import 'package:femunity/core/constants/constants.dart';
 import 'package:femunity/features/auth/controller/auth_controller.dart';
 import 'package:femunity/features/communities/controller/community_controller.dart';
 import 'package:femunity/features/posts/controller/posts_controller.dart';
@@ -32,7 +33,7 @@ class FeedScreen extends ConsumerWidget {
                         elevation: 8,
                         color: Theme.of(context).brightness == Brightness.dark
                             ? Colors.grey[900]
-                            : Color(0xFFffe9ec),
+                            : Color(0xFFAEC6CF),
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.stretch,
                           children: [
@@ -78,18 +79,19 @@ class FeedScreen extends ConsumerWidget {
                         elevation: 8,
                         color: Theme.of(context).brightness == Brightness.dark
                             ? Colors.grey[900]
-                            : Color(0xFFffe9ec),
+                            : Color(0xFFAEC6CF),
                         child: InkWell(
-                          onTap: () => launch('https://youtube.com/'),
+                          onTap: () => launch(
+                              'https://www.youtube.com/watch?v=oN_uYKAApXs'),
                           child: Column(
                             crossAxisAlignment: CrossAxisAlignment.stretch,
                             children: [
                               ClipRRect(
                                 borderRadius: BorderRadius.vertical(
                                     top: Radius.circular(24)),
-                                child: Image.network(
-                                  'https://1000logos.net/wp-content/uploads/2017/05/Color-YouTube-logo.jpg',
-                                  height: 200,
+                                child: Image.asset(
+                                  Constants.logoPath,
+                                  height: 250,
                                   width: double.infinity,
                                   fit: BoxFit.cover,
                                 ),
diff --git a/lib/features/home/drawer/list_of_communities.dart b/lib/features/home/drawer/list_of_communities.dart
@@ -27,7 +27,7 @@ class CommunityListDrawer extends ConsumerWidget {
     return Drawer(
       backgroundColor: Theme.of(context).brightness == Brightness.dark
           ? Colors.grey[900] // set color for dark mode
-          : Color(0xFFffe9ec),
+          : Color(0xFFAEC6CF),
       child: SafeArea(
         child: Column(
           children: [
diff --git a/lib/features/home/drawer/profile_drawer.dart b/lib/features/home/drawer/profile_drawer.dart
@@ -32,7 +32,7 @@ class ProfileDrawer extends ConsumerWidget {
     return Drawer(
       backgroundColor: Theme.of(context).brightness == Brightness.dark
           ? Colors.grey[900] // set color for dark mode
-          : Color(0xFFffe9ec),
+          : Color(0xFFAEC6CF),
       child: SafeArea(
         child: Column(
           children: [
@@ -121,7 +121,7 @@ class ProfileDrawer extends ConsumerWidget {
             Padding(
               padding: const EdgeInsets.all(16),
               child: Text(
-                'Version 0.95.0',
+                'Version 1.00',
                 style: Theme.of(context).textTheme.caption,
               ),
             ),
diff --git a/lib/features/home/home_screen.dart b/lib/features/home/home_screen.dart
@@ -54,7 +54,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
       appBar: AppBar(
         backgroundColor: Theme.of(context).brightness == Brightness.dark
             ? Colors.grey[900] // set color for dark mode
-            : Color(0xFFffe9ec),
+            : Color(0xFFAEC6CF),
         title: Text(
           _title,
           style: TextStyle(color: textColor),
@@ -93,7 +93,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
               activeColor: currentTheme.iconTheme.color,
               backgroundColor: Theme.of(context).brightness == Brightness.dark
                   ? Colors.grey[900] // set color for dark mode
-                  : Color(0xFFffe9ec),
+                  : Color(0xFFAEC6CF),
               items: const [
                 BottomNavigationBarItem(icon: Icon(Icons.home), label: ''),
                 BottomNavigationBarItem(icon: Icon(Icons.add), label: ''),
diff --git a/lib/features/posts/screens/comment_screen.dart b/lib/features/posts/screens/comment_screen.dart
@@ -38,7 +38,7 @@ class _CommentsScreenState extends ConsumerState<CommentsScreen> {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
             content: Text("Your comment contains inappropriate language!"),
-            backgroundColor: Color(0xFFffe9ec)),
+            backgroundColor: Color(0xFFAEC6CF)),
       );
     } else {
       ref.read(postControllerProvider.notifier).addComment(
@@ -75,7 +75,7 @@ class _CommentsScreenState extends ConsumerState<CommentsScreen> {
                             color: Theme.of(context).brightness ==
                                     Brightness.dark
                                 ? Colors.grey[900] // set color for dark mode
-                                : Color(0xFFffe9ec),
+                                : Color(0xFFAEC6CF),
                           ),
                           child: Row(
                             children: [
diff --git a/lib/features/posts/screens/history_screen.dart b/lib/features/posts/screens/history_screen.dart
@@ -22,7 +22,7 @@ class _HistoryScreenState extends State<HistoryScreen> {
         ),
         backgroundColor: Theme.of(context).brightness == Brightness.dark
             ? Colors.grey[900] // set color for dark mode
-            : Color(0xFFffe9ec),
+            : Color(0xFFAEC6CF),
       ),
       body: StreamBuilder(
         stream: FirebaseFirestore.instance
@@ -62,7 +62,7 @@ class _HistoryScreenState extends State<HistoryScreen> {
                     elevation: 8,
                     color: Theme.of(context).brightness == Brightness.dark
                         ? Colors.grey[900] // set color for dark mode
-                        : Color(0xFFffe9ec),
+                        : Color(0xFFAEC6CF),
                     child: InkWell(
                       borderRadius: BorderRadius.circular(16.0),
                       onTap: () {
diff --git a/lib/features/posts/screens/resource_centre_screen.dart b/lib/features/posts/screens/resource_centre_screen.dart
@@ -55,7 +55,7 @@ class ResourceCentrePage extends StatelessWidget {
         ),
         backgroundColor: Theme.of(context).brightness == Brightness.dark
             ? Colors.grey[900] // set color for dark mode
-            : Color(0xFFffe9ec),
+            : Color(0xFFAEC6CF),
       ),
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -69,7 +69,7 @@ class ResourceCentrePage extends StatelessWidget {
             padding: const EdgeInsets.all(16.0),
             color: Theme.of(context).brightness == Brightness.dark
                 ? Colors.black // set color for dark mode
-                : Color(0xFFffe9ec),
+                : Color(0xFFAEC6CF),
             child: Column(
               children: [
                 Row(
@@ -175,13 +175,12 @@ class ResourceCentrePage extends StatelessWidget {
                                       await Geolocator.getCurrentPosition(
                                     desiredAccuracy: LocationAccuracy.high,
                                   );
-                                  // Open WhatsApp and prefill the message with the user's location
+                                  // Open the SMS app and prefill the message with the user's location
                                   String message =
                                       'I am in an Emergency at: https://www.google.com/maps/search/?api=1&query=${position.latitude},${position.longitude}&zoom=15&ll=${position.latitude},${position.longitude}&markers=color:blue%7Clabel:S%7C${position.latitude},${position.longitude}';
                                   String encodedMessage =
                                       Uri.encodeComponent(message);
-                                  String url =
-                                      'whatsapp://send?text=$encodedMessage';
+                                  String url = 'sms:?body=$encodedMessage';
                                   launchUrlString(url);
                                 },
                                 icon: Icon(
@@ -191,7 +190,7 @@ class ResourceCentrePage extends StatelessWidget {
                                       ? Colors.white
                                       : Colors.black,
                                 ),
-                                tooltip: 'Share location via WhatsApp',
+                                tooltip: 'Share location via SMS',
                               );
                             } else {
                               return IconButton(
@@ -204,13 +203,12 @@ class ResourceCentrePage extends StatelessWidget {
                                         await Geolocator.getCurrentPosition(
                                       desiredAccuracy: LocationAccuracy.high,
                                     );
-                                    // Open WhatsApp and prefill the message with the user's location
+                                    // Open the SMS app and prefill the message with the user's location
                                     String message =
                                         'I am in an Emergency at: https://www.google.com/maps/search/?api=1&query=${position.latitude},${position.longitude}&zoom=15&ll=${position.latitude},${position.longitude}&markers=color:blue%7Clabel:S%7C${position.latitude},${position.longitude}';
                                     String encodedMessage =
                                         Uri.encodeComponent(message);
-                                    String url =
-                                        'whatsapp://send?text=$encodedMessage';
+                                    String url = 'sms:?body=$encodedMessage';
                                     launchUrlString(url);
                                   }
                                 },
@@ -221,7 +219,7 @@ class ResourceCentrePage extends StatelessWidget {
                                       ? Colors.white
                                       : Colors.black,
                                 ),
-                                tooltip: 'Share location via WhatsApp',
+                                tooltip: 'Share location via SMS',
                               );
                             }
                           },
@@ -309,7 +307,7 @@ class ResourceCentrePage extends StatelessWidget {
                     ),
                     color: Theme.of(context).brightness == Brightness.dark
                         ? Colors.grey[900] // set color for dark mode
-                        : Color(0xFFffe9ec),
+                        : Color(0xFFAEC6CF),
                     shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(8.0),
                     ),
diff --git a/lib/features/posts/screens/tracking_screen.dart b/lib/features/posts/screens/tracking_screen.dart
@@ -84,13 +84,13 @@ class _PeriodTrackerScreenState extends State<PeriodTrackerScreen> {
         .then((value) => ScaffoldMessenger.of(context).showSnackBar(
               const SnackBar(
                 content: Text('Data saved successfully'),
-                backgroundColor: Color(0xFFffe9ec),
+                backgroundColor: Color(0xFFAEC6CF),
               ),
             ))
         .catchError((error) => ScaffoldMessenger.of(context).showSnackBar(
               SnackBar(
                 content: Text('Failed to save data: $error'),
-                backgroundColor: const Color(0xFFffe9ec),
+                backgroundColor: const Color(0xFFAEC6CF),
               ),
             ));
   }
@@ -154,7 +154,7 @@ class _PeriodTrackerScreenState extends State<PeriodTrackerScreen> {
         ),
         backgroundColor: Theme.of(context).brightness == Brightness.dark
             ? Colors.grey[900] // set color for dark mode
-            : const Color(0xFFffe9ec),
+            : const Color(0xFFAEC6CF),
         actions: [
           IconButton(
             icon: const Icon(Icons.history),
diff --git a/lib/features/user_profile/screens/edit_profie_screen.dart b/lib/features/user_profile/screens/edit_profie_screen.dart
@@ -88,7 +88,7 @@ class _EditProfileScreenState extends ConsumerState<EditProfileScreen> {
               centerTitle: false,
               backgroundColor: Theme.of(context).brightness == Brightness.dark
                   ? Colors.grey[900]
-                  : Color(0xffffe9ec),
+                  : Color(0xffAEC6CF),
               // set the background color according to the current theme mode
               brightness: Theme.of(context).brightness,
               // set the brightness according to the current theme mode
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.95.0
+version: 1.00.00
 
 environment:
   sdk: ">=2.19.2 <3.0.0"
@@ -89,7 +89,6 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/logo.png
-    - assets/images/text.png
     - assets/images/google.png
     - assets/images/gdsc.png
   #   - images/a_dot_burr.jpeg

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ void showSnackBar(BuildContext context, String text) {`
`8`	`8`	`..hideCurrentSnackBar()`
`9`	`9`	`..showSnackBar(SnackBar(`
`10`	`10`	`content: Text(text),`
`11`		`- backgroundColor: const Color(0xFFffe9ec),`
	`11`	`+ backgroundColor: const Color(0xFFAEC6CF),`
`12`	`12`	`));`
`13`	`13`	`}`
`14`	`14`