modularization done 2

uumair327 · Mar 31, 2024 · 48ed1a9
1 parent db747bf
commit 48ed1a9
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 8 deletions.
diff --git a/lib/android_firebase_options.dart → ...ase_options/android_firebase_options.dart b/lib/android_firebase_options.dart → ...ase_options/android_firebase_options.dart
@@ -1,6 +1,6 @@
 import 'package:firebase_core/firebase_core.dart';
 
-final FirebaseOptions androidFirebaseOptions = FirebaseOptions(
+const FirebaseOptions androidFirebaseOptions = FirebaseOptions(
   apiKey: 'AIzaSyBiK-huaMXXmnI4M0LxYNtH5NasP1o1iHQ',
   appId: '1:331315801686:android:28c596f9e2e592e17595f7',
   messagingSenderId: '331315801686',

diff --git a/lib/firebase_options.dart → lib/firebase_options/firebase_options.dart b/lib/firebase_options.dart → lib/firebase_options/firebase_options.dart
diff --git a/lib/ios_firebase_options.dart → ...irebase_options/ios_firebase_options.dart b/lib/ios_firebase_options.dart → ...irebase_options/ios_firebase_options.dart
@@ -1,6 +1,6 @@
 import 'package:firebase_core/firebase_core.dart';
 
-final FirebaseOptions iosFirebaseOptions = FirebaseOptions(
+const FirebaseOptions iosFirebaseOptions = FirebaseOptions(
   apiKey: 'AIzaSyDwCbSP-Qw1bRg5BvVco5x0VqxoBMAtLgs',
   appId: '1:331315801686:ios:3e6128afd380d53a7595f7',
   messagingSenderId: '331315801686',

diff --git a/lib/web_firebase_options.dart → ...irebase_options/web_firebase_options.dart b/lib/web_firebase_options.dart → ...irebase_options/web_firebase_options.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,8 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
-import 'package:guardiancare/firebase_options.dart';
-import 'package:guardiancare/screens/loginpage/login_page.dart';
+import 'package:guardiancare/firebase_options/firebase_options.dart';
+import 'package:guardiancare/screens/login/login_page.dart';
 import 'package:guardiancare/screens/pages/pages.dart';
 
 void main() async {

diff --git a/...ens/emergency/emergency_contact_card.dart → lib/models/emergency_contact_card.dart b/...ens/emergency/emergency_contact_card.dart → lib/models/emergency_contact_card.dart
diff --git a/lib/screens/forum/forum_post.dart → lib/models/forum_post.dart b/lib/screens/forum/forum_post.dart → lib/models/forum_post.dart
diff --git a/lib/screens/account/account.dart b/lib/screens/account/account.dart
@@ -1,7 +1,7 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:guardiancare/screens/emergency/emergency_contact_page.dart';
-import 'package:guardiancare/screens/loginpage/login_page.dart';
+import 'package:guardiancare/screens/login/login_page.dart';
 import 'package:guardiancare/screens/Report/report_page.dart';
 
 class Account extends StatelessWidget {

diff --git a/lib/screens/emergency/emergency_contact_page.dart b/lib/screens/emergency/emergency_contact_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'emergency_contact_card.dart';
+import '../../models/emergency_contact_card.dart';
 
 class EmergencyContactPage extends StatelessWidget {
   const EmergencyContactPage({super.key});

diff --git a/lib/screens/forum/forum_page.dart b/lib/screens/forum/forum_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'forum_post.dart';
+import 'package:guardiancare/models/forum_post.dart';
 import 'law_descripiton_page.dart';
 
 class ForumPage extends StatelessWidget {

diff --git a/lib/screens/homepage/home_page.dart b/lib/screens/homepage/home_page.dart
@@ -5,9 +5,11 @@ import 'package:guardiancare/screens/account/account.dart';
 import 'package:guardiancare/screens/emergency/emergency_contact_page.dart';
 import 'package:guardiancare/screens/learn/learn.dart';
 import 'package:guardiancare/screens/quizpage/quiz_page.dart';
-import 'package:guardiancare/screens/search%20page/search_page.dart';
+import 'package:guardiancare/screens/search/search_page.dart';
 import 'package:http/http.dart' as http;
+// ignore: unused_import
 import 'package:guardiancare/screens/utils/circular_button.dart';
+// ignore: unused_import
 import 'package:guardiancare/screens/utils/shimmer_item.dart';
 import 'package:shimmer/shimmer.dart';
 import 'package:webview_flutter/webview_flutter.dart';

diff --git a/lib/screens/homepage/main.dart b/lib/screens/homepage/main.dart
diff --git a/lib/screens/learn/learn.dart b/lib/screens/learn/learn.dart
@@ -11,6 +11,7 @@ class VideoPage extends StatefulWidget {
 }
 
 class _VideoPageState extends State<VideoPage> {
+  // ignore: unused_field
   final FirebaseAuth _auth = FirebaseAuth.instance;
   late List<String> categories;
   String? selectedCategory;

diff --git a/lib/screens/loginpage/login_page.dart → lib/screens/login/login_page.dart b/lib/screens/loginpage/login_page.dart → lib/screens/login/login_page.dart
@@ -11,6 +11,7 @@ class LoginPage extends StatefulWidget {
 
 class _LoginPageState extends State<LoginPage> {
   final FirebaseAuth _auth = FirebaseAuth.instance;
+  // ignore: unused_field
   User? _user;
 
   @override

diff --git a/lib/screens/quizpage/question_list.dart b/lib/screens/quizpage/question_list.dart