Added the Share Food Cards Feature

shuence · Apr 30, 2024 · c6687c0 · c6687c0
1 parent 4ee67e3
commit c6687c0
Show file tree

Hide file tree

Showing 12 changed files with 968 additions and 494 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -56,7 +56,7 @@ class _MyAppState extends State<MyApp> {
           debugShowCheckedModeBanner: false,
           title: 'Spoon Share',
           theme: ThemeData(
-            colorScheme: ColorScheme.fromSeed(seedColor: Colors.orange),
+            colorScheme: ColorScheme.fromSeed(seedColor: const Color(0xffFF9F1C)),
             useMaterial3: true,
           ),
           home: const SplashScreen(),

diff --git a/lib/screens/auth/signin.dart b/lib/screens/auth/signin.dart
@@ -35,9 +35,6 @@ class _SignInScreenState extends State<SignInScreen> {
           child: Container(
             width: MediaQuery.of(context).size.width,
             height: MediaQuery.of(context).size.height + 10.h,
-            padding: EdgeInsets.only(
-              top: MediaQuery.of(context).padding.top,
-            ),
             clipBehavior: Clip.antiAlias,
             decoration: const BoxDecoration(color: Colors.white),
             child: Column(

diff --git a/lib/screens/auth/signup.dart b/lib/screens/auth/signup.dart
@@ -50,9 +50,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
           child: Container(
             width: ScreenUtil().screenWidth,
             height: 860.h,
-            padding: EdgeInsets.only(
-              top: MediaQuery.of(context).padding.top,
-            ),
             clipBehavior: Clip.antiAlias,
             decoration: const BoxDecoration(color: Colors.white),
             child: Column(

diff --git a/lib/screens/dashboard/dashboard_page.dart b/lib/screens/dashboard/dashboard_page.dart
@@ -38,7 +38,7 @@ class _DashboardPageState extends State<DashboardPage> {
       SingleChildScrollView(
         child: Container(
           width: MediaQuery.of(context).size.width,
-          height: MediaQuery.of(context).size.height - 80,
+          height: MediaQuery.of(context).size.height,
           padding: EdgeInsets.only(
             top: MediaQuery.of(context).padding.top,
           ),

diff --git a/lib/screens/home/home.dart b/lib/screens/home/home.dart
@@ -36,7 +36,9 @@ class HomeScreen extends StatelessWidget {
           _requestLocationPermissions(context);
           return const Scaffold(
             body: Center(
-              child: CircularProgressIndicator(),
+              child: CircularProgressIndicator(
+                color: Color(0xffFF9F1C),
+              ),
             ),
           );
         }

diff --git a/lib/screens/ngo/ngo_home.dart b/lib/screens/ngo/ngo_home.dart
@@ -85,7 +85,9 @@ class _NGOHomeScreenState extends State<NGOHomeScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       body: isLoading
-          ? const Center(child: CircularProgressIndicator())
+          ? const Center(child: CircularProgressIndicator(
+            color: const Color(0xFFFF9F1C),
+          ))
           : isVerified
               ? SingleChildScrollView(
                   child: _buildVerifiedContent(),

diff --git a/lib/screens/profile/settings_page.dart b/lib/screens/profile/settings_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:spoonshare/screens/auth/forgot_password.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:spoonshare/constants/app_colors.dart';
 import 'package:spoonshare/services/auth.dart';
@@ -29,7 +30,7 @@ class SettingPage extends StatelessWidget {
           },
         ),
       ),
-    body: Container(
+      body: Container(
         width: double.infinity,
         height: double.infinity,
         color: Colors.white,
@@ -40,36 +41,40 @@ class SettingPage extends StatelessWidget {
             ListTile(
               leading: const Icon(Icons.help),
               title: const Text('Help'),
-              onTap: () {
-                // Add onTap functionality (e.g., navigate to a help page within your app)
+              onTap: () async {
+                final url = Uri.parse('mailto:spoonshare7@gmail.com');
+                await launchUrl(url);
               },
             ),
             const Divider(),
             ListTile(
               leading: const Icon(Icons.lock),
               title: const Text('Change Password'),
               onTap: () {
-                // Implement change password functionality within your app.
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => ForgotPasswordScreen()),
+                );
               },
             ),
             const Divider(),
             ListTile(
-              leading: const Icon(Icons.library_books),
-              title: const Text('Privacy Policy'),
-              onTap: () async {
-                final url = Uri.parse('https://www.termsfeed.com/live/6c1ed152-889a-47e8-bd6b-0d6012626d40');
+                leading: const Icon(Icons.library_books),
+                title: const Text('Privacy Policy'),
+                onTap: () async {
+                  final url = Uri.parse(
+                      'https://www.termsfeed.com/live/6c1ed152-889a-47e8-bd6b-0d6012626d40');
                   await launchUrl(url);
-                }                
-            ),
+                }),
             const Divider(),
             ListTile(
-              leading: const Icon(Icons.report),
-              title: const Text('Report Problem'),
-              onTap: () async {
-                final url = Uri.parse('https://forms.gle/RegtZGpSot3w4GxA9');
+                leading: const Icon(Icons.report),
+                title: const Text('Report Problem'),
+                onTap: () async {
+                  final url = Uri.parse('https://forms.gle/RegtZGpSot3w4GxA9');
                   await launchUrl(url);
-                }
-            ),
+                }),
             const Divider(),
             ListTile(
               leading: const Icon(Icons.exit_to_app),