Merge pull request #1 from EpitechPromo2026/flo
feat: searchbar permanent
This commit is contained in:
commit
4359057c1d
@ -1,4 +1,5 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_contacts/flutter_contacts.dart';
|
||||||
|
|
||||||
class CompositionPage extends StatefulWidget {
|
class CompositionPage extends StatefulWidget {
|
||||||
const CompositionPage({super.key});
|
const CompositionPage({super.key});
|
||||||
@ -9,80 +10,228 @@ class CompositionPage extends StatefulWidget {
|
|||||||
|
|
||||||
class _CompositionPageState extends State<CompositionPage> {
|
class _CompositionPageState extends State<CompositionPage> {
|
||||||
String dialedNumber = "";
|
String dialedNumber = "";
|
||||||
|
List<Contact> _allContacts = [];
|
||||||
|
List<Contact> _filteredContacts = [];
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_fetchContacts();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _fetchContacts() async {
|
||||||
|
if (await FlutterContacts.requestPermission()) {
|
||||||
|
_allContacts = await FlutterContacts.getContacts(withProperties: true);
|
||||||
|
_filteredContacts = _allContacts;
|
||||||
|
setState(() {});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _filterContacts() {
|
||||||
|
setState(() {
|
||||||
|
_filteredContacts = _allContacts.where((contact) {
|
||||||
|
final phoneMatch = contact.phones.any((phone) =>
|
||||||
|
phone.number.replaceAll(RegExp(r'\D'), '').contains(dialedNumber));
|
||||||
|
final nameMatch = contact.displayName
|
||||||
|
.toLowerCase()
|
||||||
|
.contains(dialedNumber.toLowerCase());
|
||||||
|
return phoneMatch || nameMatch;
|
||||||
|
}).toList();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void _onNumberPress(String number) {
|
void _onNumberPress(String number) {
|
||||||
setState(() {
|
setState(() {
|
||||||
dialedNumber += number;
|
dialedNumber += number;
|
||||||
|
_filterContacts();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void _onDeletePress() {
|
void _onDeletePress() {
|
||||||
setState(() {
|
setState(() {
|
||||||
if (dialedNumber.isNotEmpty) {
|
if (dialedNumber.isNotEmpty) {
|
||||||
dialedNumber = dialedNumber.substring(0, dialedNumber.length - 1);
|
dialedNumber = dialedNumber.substring(0, dialedNumber.length - 1);
|
||||||
|
_filterContacts();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onClearPress() {
|
||||||
|
setState(() {
|
||||||
|
dialedNumber = "";
|
||||||
|
_filteredContacts = _allContacts;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Placeholder function for adding contact
|
||||||
|
void addContact(String number) {
|
||||||
|
// This function is empty for now
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Colors.black,
|
backgroundColor: Colors.black,
|
||||||
body: Column(
|
body: Stack(
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Column(
|
||||||
flex: 1,
|
children: [
|
||||||
child: Center(
|
// Top half: Display contacts matching dialed number
|
||||||
child: Text(
|
Expanded(
|
||||||
dialedNumber,
|
flex: 2,
|
||||||
style: const TextStyle(
|
child:
|
||||||
fontSize: 32,
|
Container(
|
||||||
color: Colors.white,
|
padding: const EdgeInsets.only(top: 42.0, left: 16.0, right: 16.0, bottom: 16.0),
|
||||||
letterSpacing: 2.0,
|
color: Colors.black,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: ListView(
|
||||||
|
children: _filteredContacts.isNotEmpty
|
||||||
|
? _filteredContacts.map((contact) {
|
||||||
|
return ListTile(
|
||||||
|
title: Text(
|
||||||
|
contact.displayName,
|
||||||
|
style: const TextStyle(color: Colors.white),
|
||||||
|
),
|
||||||
|
subtitle: contact.phones.isNotEmpty
|
||||||
|
? Text(
|
||||||
|
contact.phones.first.number,
|
||||||
|
style: const TextStyle(color: Colors.grey),
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
trailing: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
// Call button
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(Icons.phone, color: Colors.green[300], size: 20),
|
||||||
|
onPressed: () {
|
||||||
|
print('Calling ${contact.displayName}');
|
||||||
|
},
|
||||||
|
),
|
||||||
|
// Text button
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(Icons.message, color: Colors.blue[300], size: 20),
|
||||||
|
onPressed: () {
|
||||||
|
print('Texting ${contact.displayName}');
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
onTap: () {
|
||||||
|
// Handle contact selection if needed
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}).toList()
|
||||||
|
: [Center(child: Text('No contacts found', style: TextStyle(color: Colors.white)))],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
),
|
// Bottom half: Dialpad and Dialed number display with erase button
|
||||||
Expanded(
|
Expanded(
|
||||||
flex: 3,
|
flex: 2,
|
||||||
child: Padding(
|
child: Container(
|
||||||
padding: const EdgeInsets.all(16.0),
|
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
||||||
child: GridView.builder(
|
child: Column(
|
||||||
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
crossAxisCount: 3,
|
children: [
|
||||||
mainAxisSpacing: 10,
|
// Display dialed number with erase button
|
||||||
crossAxisSpacing: 10,
|
Row(
|
||||||
childAspectRatio: 1,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Align(
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: Text(
|
||||||
|
dialedNumber,
|
||||||
|
style: const TextStyle(fontSize: 24, color: Colors.white),
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
onPressed: _onClearPress,
|
||||||
|
icon: const Icon(Icons.backspace, color: Colors.white),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
|
||||||
|
// Dialpad
|
||||||
|
Expanded(
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
|
children: [
|
||||||
|
_buildDialButton('1'),
|
||||||
|
_buildDialButton('2'),
|
||||||
|
_buildDialButton('3'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
|
children: [
|
||||||
|
_buildDialButton('4'),
|
||||||
|
_buildDialButton('5'),
|
||||||
|
_buildDialButton('6'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
|
children: [
|
||||||
|
_buildDialButton('7'),
|
||||||
|
_buildDialButton('8'),
|
||||||
|
_buildDialButton('9'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
|
children: [
|
||||||
|
_buildDialButton('*'),
|
||||||
|
_buildDialButton('0'),
|
||||||
|
_buildDialButton('#'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
itemCount: 12,
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
if (index < 9) {
|
|
||||||
|
|
||||||
return _buildDialButton((index + 1).toString());
|
|
||||||
} else if (index == 9) {
|
|
||||||
|
|
||||||
return const SizedBox.shrink();
|
|
||||||
} else if (index == 10) {
|
|
||||||
|
|
||||||
return _buildDialButton('0');
|
|
||||||
} else {
|
|
||||||
|
|
||||||
return _buildDeleteButton();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
),
|
|
||||||
|
// Add Contact Button with empty function call
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: 20.0),
|
||||||
|
child: FloatingActionButton(
|
||||||
|
backgroundColor: Colors.blue,
|
||||||
|
onPressed: () {
|
||||||
|
addContact(dialedNumber);
|
||||||
|
},
|
||||||
|
child: const Icon(Icons.person_add, color: Colors.white),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
Padding(
|
// Top Row with Back Arrow
|
||||||
padding: const EdgeInsets.only(bottom: 20.0),
|
Positioned(
|
||||||
child: FloatingActionButton(
|
top: 40.0,
|
||||||
backgroundColor: Colors.green,
|
left: 16.0,
|
||||||
|
child: IconButton(
|
||||||
|
icon: const Icon(Icons.arrow_back, color: Colors.white),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
Navigator.pop(context);
|
||||||
},
|
},
|
||||||
child: const Icon(Icons.phone, color: Colors.white),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@ -90,14 +239,13 @@ class _CompositionPageState extends State<CompositionPage> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Widget _buildDialButton(String number) {
|
Widget _buildDialButton(String number) {
|
||||||
return ElevatedButton(
|
return ElevatedButton(
|
||||||
onPressed: () => _onNumberPress(number),
|
onPressed: () => _onNumberPress(number),
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
backgroundColor: Colors.black,
|
backgroundColor: Colors.black,
|
||||||
shape: const CircleBorder(),
|
shape: const CircleBorder(),
|
||||||
padding: const EdgeInsets.all(20),
|
padding: const EdgeInsets.all(16),
|
||||||
),
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
number,
|
number,
|
||||||
@ -108,21 +256,4 @@ class _CompositionPageState extends State<CompositionPage> {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Widget _buildDeleteButton() {
|
|
||||||
return ElevatedButton(
|
|
||||||
onPressed: _onDeletePress,
|
|
||||||
style: ElevatedButton.styleFrom(
|
|
||||||
backgroundColor: Colors.black,
|
|
||||||
shape: const CircleBorder(),
|
|
||||||
padding: const EdgeInsets.all(20),
|
|
||||||
),
|
|
||||||
child: const Icon(
|
|
||||||
Icons.backspace,
|
|
||||||
color: Colors.white,
|
|
||||||
size: 24,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -3,17 +3,43 @@ import 'package:dialer/features/contacts/contact_page.dart';
|
|||||||
import 'package:dialer/features/favorites/favorites_page.dart';
|
import 'package:dialer/features/favorites/favorites_page.dart';
|
||||||
import 'package:dialer/features/history/history_page.dart';
|
import 'package:dialer/features/history/history_page.dart';
|
||||||
import 'package:dialer/features/composition/composition.dart';
|
import 'package:dialer/features/composition/composition.dart';
|
||||||
|
import 'package:flutter_contacts/flutter_contacts.dart';
|
||||||
|
|
||||||
class _MyHomePageState extends State<MyHomePage>
|
class _MyHomePageState extends State<MyHomePage>
|
||||||
with SingleTickerProviderStateMixin {
|
with SingleTickerProviderStateMixin {
|
||||||
late TabController _tabController;
|
late TabController _tabController;
|
||||||
final SearchController _searchController = SearchController();
|
List<Contact> _allContacts = [];
|
||||||
|
List<Contact> _contactSuggestions = [];
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_tabController = TabController(length: 3, vsync: this, initialIndex: 1);
|
_tabController = TabController(length: 3, vsync: this, initialIndex: 1);
|
||||||
_tabController.addListener(_handleTabIndex);
|
_tabController.addListener(_handleTabIndex);
|
||||||
|
_fetchContacts();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _fetchContacts() async {
|
||||||
|
if (await FlutterContacts.requestPermission()) {
|
||||||
|
_allContacts = await FlutterContacts.getContacts(withProperties: true);
|
||||||
|
setState(() {});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onSearchChanged(String query) {
|
||||||
|
print("Search query: $query");
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
if (query.isEmpty) {
|
||||||
|
_contactSuggestions = List.from(_allContacts);
|
||||||
|
} else {
|
||||||
|
_contactSuggestions = _allContacts.where((contact) {
|
||||||
|
return contact.displayName
|
||||||
|
.toLowerCase()
|
||||||
|
.contains(query.toLowerCase());
|
||||||
|
}).toList();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@ -27,10 +53,6 @@ class _MyHomePageState extends State<MyHomePage>
|
|||||||
setState(() {});
|
setState(() {});
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onSearchChanged(String query) {
|
|
||||||
// Use this method to manage search actions if needed
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
@ -40,15 +62,14 @@ class _MyHomePageState extends State<MyHomePage>
|
|||||||
// Persistent Search Bar
|
// Persistent Search Bar
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.only(
|
padding: const EdgeInsets.only(
|
||||||
top: 24.0, // Outside top padding
|
top: 24.0,
|
||||||
bottom: 10.0, // Outside bottom padding
|
bottom: 10.0,
|
||||||
left: 16.0, // Outside left padding
|
left: 16.0,
|
||||||
right: 16.0, // Outside right padding
|
right: 16.0,
|
||||||
),
|
),
|
||||||
child: Container(
|
child: Container(
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: const Color.fromARGB(
|
color: const Color.fromARGB(255, 30, 30, 30),
|
||||||
255, 30, 30, 30), // Background of the SearchBar
|
|
||||||
borderRadius: BorderRadius.circular(12.0),
|
borderRadius: BorderRadius.circular(12.0),
|
||||||
border: Border(
|
border: Border(
|
||||||
top: BorderSide(color: Colors.grey.shade800, width: 1),
|
top: BorderSide(color: Colors.grey.shade800, width: 1),
|
||||||
@ -63,15 +84,15 @@ class _MyHomePageState extends State<MyHomePage>
|
|||||||
controller: controller,
|
controller: controller,
|
||||||
padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
|
padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
|
||||||
EdgeInsets.only(
|
EdgeInsets.only(
|
||||||
top: 10.0, // Inside top padding
|
top: 6.0,
|
||||||
bottom: 10.0, // Inside bottom padding
|
bottom: 6.0,
|
||||||
left: 16.0, // Inside left padding
|
left: 16.0,
|
||||||
right: 16.0, // Inside right padding
|
right: 16.0,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
onChanged: _onSearchChanged,
|
|
||||||
onTap: () {
|
onTap: () {
|
||||||
controller.openView();
|
controller.openView();
|
||||||
|
_onSearchChanged('');
|
||||||
},
|
},
|
||||||
backgroundColor: MaterialStateProperty.all(
|
backgroundColor: MaterialStateProperty.all(
|
||||||
const Color.fromARGB(255, 30, 30, 30)),
|
const Color.fromARGB(255, 30, 30, 30)),
|
||||||
@ -91,18 +112,21 @@ class _MyHomePageState extends State<MyHomePage>
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
viewOnChanged: (query) {
|
||||||
|
_onSearchChanged(query);
|
||||||
|
},
|
||||||
suggestionsBuilder:
|
suggestionsBuilder:
|
||||||
(BuildContext context, SearchController controller) {
|
(BuildContext context, SearchController controller) {
|
||||||
return List<ListTile>.generate(5, (int index) {
|
return _contactSuggestions.map((contact) {
|
||||||
final String item = 'Suggestion $index';
|
|
||||||
return ListTile(
|
return ListTile(
|
||||||
title: Text(item),
|
key: ValueKey(contact.id),
|
||||||
|
title: Text(contact.displayName,
|
||||||
|
style: const TextStyle(color: Colors.white)),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// Close the search view and select suggestion
|
controller.closeView(contact.displayName);
|
||||||
controller.closeView(item);
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
});
|
}).toList();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
Loading…
Reference in New Issue
Block a user