This commit is contained in:
parent
e6807b865b
commit
c46a43aa4e
@ -17,8 +17,10 @@ class _ContactPageState extends State<ContactPage> {
|
|||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: contactState.loading
|
body: contactState.loading
|
||||||
? const LoadingIndicatorWidget()
|
? const LoadingIndicatorWidget()
|
||||||
// : ContactListWidget(contacts: contactState.contacts),
|
: AlphabetScrollPage(
|
||||||
: AlphabetScrollPage(scrollOffset: contactState.scrollOffset),
|
scrollOffset: contactState.scrollOffset,
|
||||||
|
contacts: contactState.contacts, // Use all contacts here
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,12 +19,15 @@ class ContactState extends StatefulWidget {
|
|||||||
|
|
||||||
class _ContactStateState extends State<ContactState> {
|
class _ContactStateState extends State<ContactState> {
|
||||||
final ContactService _contactService = ContactService();
|
final ContactService _contactService = ContactService();
|
||||||
List<Contact> _contacts = [];
|
List<Contact> _allContacts = [];
|
||||||
|
List<Contact> _favoriteContacts = [];
|
||||||
bool _loading = true;
|
bool _loading = true;
|
||||||
double _scrollOffset = 0.0;
|
double _scrollOffset = 0.0;
|
||||||
Contact? _selfContact = Contact();
|
Contact? _selfContact = Contact();
|
||||||
|
|
||||||
List<Contact> get contacts => _contacts;
|
// Getters for all contacts and favorites
|
||||||
|
List<Contact> get contacts => _allContacts;
|
||||||
|
List<Contact> get favoriteContacts => _favoriteContacts;
|
||||||
bool get loading => _loading;
|
bool get loading => _loading;
|
||||||
double get scrollOffset => _scrollOffset;
|
double get scrollOffset => _scrollOffset;
|
||||||
Contact? get selfContact => _selfContact;
|
Contact? get selfContact => _selfContact;
|
||||||
@ -32,9 +35,7 @@ class _ContactStateState extends State<ContactState> {
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
fetchContacts();
|
fetchContacts(); // Fetch all contacts by default
|
||||||
|
|
||||||
// Add listener for contact changes
|
|
||||||
FlutterContacts.addListener(_onContactChange);
|
FlutterContacts.addListener(_onContactChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,20 +43,33 @@ class _ContactStateState extends State<ContactState> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
// Remove listener
|
|
||||||
FlutterContacts.removeListener(_onContactChange);
|
FlutterContacts.removeListener(_onContactChange);
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> fetchContacts({bool onlyStarred = false}) async {
|
// Fetch all contacts
|
||||||
List<Contact> contacts = onlyStarred
|
Future<void> fetchContacts() async {
|
||||||
? await _contactService.fetchFavoriteContacts()
|
setState(() => _loading = true);
|
||||||
: await _contactService.fetchContacts();
|
try {
|
||||||
|
List<Contact> contacts = await _contactService.fetchContacts();
|
||||||
|
_processContacts(contacts);
|
||||||
|
} finally {
|
||||||
|
setState(() => _loading = false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
debugPrint(
|
// Fetch only favorite contacts
|
||||||
"Fetched ${contacts.length} ${onlyStarred ? 'favorite' : ''} contacts");
|
Future<void> fetchFavoriteContacts() async {
|
||||||
|
setState(() => _loading = true);
|
||||||
|
try {
|
||||||
|
List<Contact> contacts = await _contactService.fetchFavoriteContacts();
|
||||||
|
setState(() => _favoriteContacts = contacts);
|
||||||
|
} finally {
|
||||||
|
setState(() => _loading = false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Find selfContact before filtering
|
void _processContacts(List<Contact> contacts) {
|
||||||
_selfContact = contacts.firstWhere(
|
_selfContact = contacts.firstWhere(
|
||||||
(contact) => contact.displayName.toLowerCase() == "user",
|
(contact) => contact.displayName.toLowerCase() == "user",
|
||||||
orElse: () => Contact(),
|
orElse: () => Contact(),
|
||||||
@ -70,8 +84,9 @@ class _ContactStateState extends State<ContactState> {
|
|||||||
contacts.sort((a, b) => a.displayName.compareTo(b.displayName));
|
contacts.sort((a, b) => a.displayName.compareTo(b.displayName));
|
||||||
|
|
||||||
setState(() {
|
setState(() {
|
||||||
_contacts = contacts;
|
_allContacts = contacts;
|
||||||
_loading = false;
|
_favoriteContacts =
|
||||||
|
contacts.where((contact) => contact.isStarred).toList();
|
||||||
_selfContact = _selfContact;
|
_selfContact = _selfContact;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -96,6 +111,7 @@ class _ContactStateState extends State<ContactState> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class _InheritedContactState extends InheritedWidget {
|
class _InheritedContactState extends InheritedWidget {
|
||||||
final _ContactStateState data;
|
final _ContactStateState data;
|
||||||
|
|
||||||
|
@ -11,8 +11,13 @@ import 'share_own_qr.dart';
|
|||||||
|
|
||||||
class AlphabetScrollPage extends StatefulWidget {
|
class AlphabetScrollPage extends StatefulWidget {
|
||||||
final double scrollOffset;
|
final double scrollOffset;
|
||||||
|
final List<Contact> contacts;
|
||||||
|
|
||||||
const AlphabetScrollPage({super.key, required this.scrollOffset});
|
const AlphabetScrollPage({
|
||||||
|
super.key,
|
||||||
|
required this.scrollOffset,
|
||||||
|
required this.contacts,
|
||||||
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
_AlphabetScrollPageState createState() => _AlphabetScrollPageState();
|
_AlphabetScrollPageState createState() => _AlphabetScrollPageState();
|
||||||
@ -24,8 +29,7 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_scrollController =
|
_scrollController = ScrollController(initialScrollOffset: widget.scrollOffset);
|
||||||
ScrollController(initialScrollOffset: widget.scrollOffset);
|
|
||||||
_scrollController.addListener(_onScroll);
|
_scrollController.addListener(_onScroll);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,9 +77,8 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final contactState = ContactState.of(context);
|
final contacts = widget.contacts;
|
||||||
final contacts = contactState.contacts;
|
final selfContact = ContactState.of(context).selfContact;
|
||||||
final selfContact = contactState.selfContact;
|
|
||||||
|
|
||||||
final contactState = ContactState.of(context);
|
final contactState = ContactState.of(context);
|
||||||
final contacts = contactState.contacts;
|
final contacts = contactState.contacts;
|
||||||
|
@ -1,23 +1,32 @@
|
|||||||
|
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:flutter/material.dart';
|
||||||
|
import 'package:dialer/widgets/loading_indicator.dart';
|
||||||
|
|
||||||
class FavoritePage extends StatefulWidget {
|
class FavoritesPage extends StatefulWidget {
|
||||||
const FavoritePage({super.key});
|
const FavoritesPage({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
_FavoritePageState createState() => _FavoritePageState();
|
_FavoritesPageState createState() => _FavoritesPageState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _FavoritePageState extends State<FavoritePage> {
|
class _FavoritesPageState extends State<FavoritesPage> {
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
final contactState = ContactState.of(context);
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Colors.black,
|
body: contactState.loading
|
||||||
body: Center( // Center the text within the body
|
? const LoadingIndicatorWidget()
|
||||||
child: Text(
|
: AlphabetScrollPage(
|
||||||
"Hello",
|
scrollOffset: contactState.scrollOffset,
|
||||||
style: TextStyle(color: Colors.white), // Change text color for visibility
|
contacts:
|
||||||
),
|
contactState.favoriteContacts, // Use only favorites here
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -140,7 +140,7 @@ class _MyHomePageState extends State<MyHomePage>
|
|||||||
TabBarView(
|
TabBarView(
|
||||||
controller: _tabController,
|
controller: _tabController,
|
||||||
children: const [
|
children: const [
|
||||||
FavoritePage(),
|
FavoritesPage(),
|
||||||
HistoryPage(),
|
HistoryPage(),
|
||||||
ContactPage(),
|
ContactPage(),
|
||||||
SettingsPage(), // Add your SettingsPage here
|
SettingsPage(), // Add your SettingsPage here
|
||||||
|
Loading…
Reference in New Issue
Block a user