Compare commits

..

No commits in common. "c46a43aa4e52f592b3589329d5f7686027997468" and "e6807b865b98a6481443294c23cabf0b44cccb59" have entirely different histories.

5 changed files with 35 additions and 65 deletions

View File

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

View File

@ -19,15 +19,12 @@ class ContactState extends StatefulWidget {
class _ContactStateState extends State<ContactState> {
final ContactService _contactService = ContactService();
List<Contact> _allContacts = [];
List<Contact> _favoriteContacts = [];
List<Contact> _contacts = [];
bool _loading = true;
double _scrollOffset = 0.0;
Contact? _selfContact = Contact();
// Getters for all contacts and favorites
List<Contact> get contacts => _allContacts;
List<Contact> get favoriteContacts => _favoriteContacts;
List<Contact> get contacts => _contacts;
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() async {
setState(() => _loading = true);
try {
List<Contact> contacts = await _contactService.fetchContacts();
_processContacts(contacts);
} finally {
setState(() => _loading = false);
}
}
Future<void> fetchContacts({bool onlyStarred = false}) async {
List<Contact> contacts = onlyStarred
? await _contactService.fetchFavoriteContacts()
: await _contactService.fetchContacts();
// Fetch only favorite contacts
Future<void> fetchFavoriteContacts() async {
setState(() => _loading = true);
try {
List<Contact> contacts = await _contactService.fetchFavoriteContacts();
setState(() => _favoriteContacts = contacts);
} finally {
setState(() => _loading = false);
}
}
debugPrint(
"Fetched ${contacts.length} ${onlyStarred ? 'favorite' : ''} contacts");
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;
_favoriteContacts =
contacts.where((contact) => contact.isStarred).toList();
_contacts = contacts;
_loading = false;
_selfContact = _selfContact;
});
}
@ -111,7 +96,6 @@ class _ContactStateState extends State<ContactState> {
}
}
class _InheritedContactState extends InheritedWidget {
final _ContactStateState data;

View File

@ -11,13 +11,8 @@ import 'share_own_qr.dart';
class AlphabetScrollPage extends StatefulWidget {
final double scrollOffset;
final List<Contact> contacts;
const AlphabetScrollPage({
super.key,
required this.scrollOffset,
required this.contacts,
});
const AlphabetScrollPage({super.key, required this.scrollOffset});
@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 selfContact = ContactState.of(context).selfContact;
final contactState = ContactState.of(context);
final contacts = contactState.contacts;
final selfContact = contactState.selfContact;
final contactState = ContactState.of(context);
final contacts = contactState.contacts;

View File

@ -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 {
const FavoritesPage({super.key});
class FavoritePage extends StatefulWidget {
const FavoritePage({super.key});
@override
_FavoritesPageState createState() => _FavoritesPageState();
_FavoritePageState createState() => _FavoritePageState();
}
class _FavoritesPageState extends State<FavoritesPage> {
@override
void initState() {
super.initState();
}
class _FavoritePageState extends State<FavoritePage> {
@override
Widget build(BuildContext context) {
final contactState = ContactState.of(context);
return Scaffold(
body: contactState.loading
? const LoadingIndicatorWidget()
: AlphabetScrollPage(
scrollOffset: contactState.scrollOffset,
contacts:
contactState.favoriteContacts, // Use only favorites here
),
backgroundColor: Colors.black,
body: Center( // Center the text within the body
child: Text(
"Hello",
style: TextStyle(color: Colors.white), // Change text color for visibility
),
),
);
}
}

View File

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