dialer/lib/features/contacts/contact_page.dart

@@ -17,10 +17,8 @@ class _ContactPageState extends State<ContactPage> {
     return Scaffold(
       body: contactState.loading
           ? const LoadingIndicatorWidget()
-          : AlphabetScrollPage(
+          // : ContactListWidget(contacts: contactState.contacts),
-              scrollOffset: contactState.scrollOffset,
+          : AlphabetScrollPage(scrollOffset: contactState.scrollOffset),
-              contacts: contactState.contacts, // Use all contacts here
-            ),
     );
   }
 }

dialer/lib/features/contacts/contact_state.dart

@@ -19,15 +19,12 @@ class ContactState extends StatefulWidget {
 
 class _ContactStateState extends State<ContactState> {
   final ContactService _contactService = ContactService();
-  List<Contact> _allContacts = [];
+  List<Contact> _contacts = [];
-  List<Contact> _favoriteContacts = [];
   bool _loading = true;
   double _scrollOffset = 0.0;
   Contact? _selfContact = Contact();
 
-  // Getters for all contacts and favorites
+  List<Contact> get contacts => _contacts;
-  List<Contact> get contacts => _allContacts;
-  List<Contact> get favoriteContacts => _favoriteContacts;
   bool get loading => _loading;
   double get scrollOffset => _scrollOffset;
   Contact? get selfContact => _selfContact;
@@ -35,7 +32,9 @@ class _ContactStateState extends State<ContactState> {
   @override
   void initState() {
     super.initState();
-    fetchContacts(); // Fetch all contacts by default
+    fetchContacts();
+
+    // Add listener for contact changes
     FlutterContacts.addListener(_onContactChange);
   }
 
@@ -43,33 +42,20 @@ class _ContactStateState extends State<ContactState> {
 
   @override
   void dispose() {
+    // Remove listener
     FlutterContacts.removeListener(_onContactChange);
     super.dispose();
   }
 
-  // Fetch all contacts
+  Future<void> fetchContacts({bool onlyStarred = false}) async {
-  Future<void> fetchContacts() async {
+    List<Contact> contacts = onlyStarred
-    setState(() => _loading = true);
+        ? await _contactService.fetchFavoriteContacts()
-    try {
+        : await _contactService.fetchContacts();
-      List<Contact> contacts = await _contactService.fetchContacts();
-      _processContacts(contacts);
-    } finally {
-      setState(() => _loading = false);
-    }
-  }
 
-  // Fetch only favorite contacts
+    debugPrint(
-  Future<void> fetchFavoriteContacts() async {
+        "Fetched ${contacts.length} ${onlyStarred ? 'favorite' : ''} contacts");
-    setState(() => _loading = true);
-    try {
-      List<Contact> contacts = await _contactService.fetchFavoriteContacts();
-      setState(() => _favoriteContacts = contacts);
-    } finally {
-      setState(() => _loading = false);
-    }
-  }
 
-  void _processContacts(List<Contact> contacts) {
+    // Find selfContact before filtering
     _selfContact = contacts.firstWhere(
       (contact) => contact.displayName.toLowerCase() == "user",
       orElse: () => Contact(),
@@ -84,9 +70,8 @@ class _ContactStateState extends State<ContactState> {
     contacts.sort((a, b) => a.displayName.compareTo(b.displayName));
 
     setState(() {
-      _allContacts = contacts;
+      _contacts = contacts;
-      _favoriteContacts =
+      _loading = false;
-          contacts.where((contact) => contact.isStarred).toList();
       _selfContact = _selfContact;
     });
   }
@@ -111,7 +96,6 @@ class _ContactStateState extends State<ContactState> {
   }
 }
 
-
 class _InheritedContactState extends InheritedWidget {
   final _ContactStateState data;
 

dialer/lib/features/contacts/widgets/alphabet_scroll_page.dart

@@ -11,13 +11,8 @@ import 'share_own_qr.dart';
 
 class AlphabetScrollPage extends StatefulWidget {
   final double scrollOffset;
-  final List<Contact> contacts;
 
-  const AlphabetScrollPage({
+  const AlphabetScrollPage({super.key, required this.scrollOffset});
-    super.key,
-    required this.scrollOffset,
-    required this.contacts,
-  });
 
   @override
   _AlphabetScrollPageState createState() => _AlphabetScrollPageState();
@@ -29,7 +24,8 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
   @override
   void initState() {
     super.initState();
-    _scrollController = ScrollController(initialScrollOffset: widget.scrollOffset);
+    _scrollController =
+        ScrollController(initialScrollOffset: widget.scrollOffset);
     _scrollController.addListener(_onScroll);
   }
 
@@ -77,8 +73,9 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
 
   @override
   Widget build(BuildContext context) {
-    final contacts = widget.contacts;
+    final contactState = ContactState.of(context);
-    final selfContact = ContactState.of(context).selfContact;
+    final contacts = contactState.contacts;
+    final selfContact = contactState.selfContact;
 
     final contactState = ContactState.of(context);
     final contacts = contactState.contacts;

dialer/lib/features/favorites/favorites_page.dart

@@ -1,32 +1,23 @@
-import 'package:dialer/features/contacts/contact_state.dart';
-import 'package:dialer/features/contacts/widgets/alphabet_scroll_page.dart';
 import 'package:flutter/material.dart';
-import 'package:dialer/widgets/loading_indicator.dart';
 
-class FavoritesPage extends StatefulWidget {
+class FavoritePage extends StatefulWidget {
-  const FavoritesPage({super.key});
+  const FavoritePage({super.key});
 
   @override
-  _FavoritesPageState createState() => _FavoritesPageState();
+  _FavoritePageState createState() => _FavoritePageState();
 }
 
-class _FavoritesPageState extends State<FavoritesPage> {
+class _FavoritePageState extends State<FavoritePage> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final contactState = ContactState.of(context);
     return Scaffold(
-      body: contactState.loading
+      backgroundColor: Colors.black,
-          ? const LoadingIndicatorWidget()
+      body: Center( // Center the text within the body
-          : AlphabetScrollPage(
+        child: Text(
-              scrollOffset: contactState.scrollOffset,
+          "Hello",
-              contacts:
+          style: TextStyle(color: Colors.white), // Change text color for visibility
-                  contactState.favoriteContacts, // Use only favorites here
+        ),
-            ),
+      ),
     );
   }
 }

dialer/lib/features/home/home_page.dart

@@ -140,7 +140,7 @@ class _MyHomePageState extends State<MyHomePage>
                 TabBarView(
                   controller: _tabController,
                   children: const [
-                    FavoritesPage(),
+                    FavoritePage(),
                     HistoryPage(),
                     ContactPage(),
                     SettingsPage(), // Add your SettingsPage here