icing/monorepo
4
0
Fork 0
Code Pull Requests 1 Actions Packages Releases Activity

Compare commits

base: icing:6de0da949de80116763ec483b7b87922c9a05d50
Branches Tags
icing:dev
icing:callPageV2
icing:Protocol_00
icing:real-voicemail
icing:rework-app
icing:accessibility-page
icing:about-page
icing:new-callpage
icing:addCallpageUI
icing:fix-favorites
icing:fix-infinite-loading
icing:WIP-PhoneCalls
icing:compil-settings
icing:fixToogleFavorite
icing:privacy-mode
icing:poc_sym_encryption
icing:audio_record
icing:doc
icing:contact-modal-block-number
icing:SafeArea
icing:visual-voicemail
icing:test-mirror
icing:voicemail
icing:sorting
icing:fix-minSdkVersion
icing:merge_bartosz
..
compare: icing:82caca32765812d9bbff0612e31a34ceb774fba7
Branches Tags
icing:callPageV2
icing:dev
icing:Protocol_00
icing:real-voicemail
icing:rework-app
icing:accessibility-page
icing:about-page
icing:new-callpage
icing:addCallpageUI
icing:fix-favorites
icing:fix-infinite-loading
icing:WIP-PhoneCalls
icing:compil-settings
icing:fixToogleFavorite
icing:privacy-mode
icing:poc_sym_encryption
icing:audio_record
icing:doc
icing:contact-modal-block-number
icing:SafeArea
icing:visual-voicemail
icing:test-mirror
icing:voicemail
icing:sorting
icing:fix-minSdkVersion
icing:merge_bartosz

No commits in common. "6de0da949de80116763ec483b7b87922c9a05d50" and "82caca32765812d9bbff0612e31a34ceb774fba7" have entirely different histories.
6de0da949d ... 82caca3276

3 changed files with 104 additions and 149 deletions
Show Stats Expand all files Collapse all files

231
dialer/lib/features/composition/composition.dart
View File

@ -4,6 +4,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../../services/contact_service.dart'; import '../../services/contact_service.dart';
import '../../services/obfuscate_service.dart'; import '../../services/obfuscate_service.dart';
import '../../services/call_service.dart'; import '../../services/call_service.dart';
import '../contacts/widgets/add_contact_button.dart';
class CompositionPage extends StatefulWidget { class CompositionPage extends StatefulWidget {
const CompositionPage({super.key}); const CompositionPage({super.key});
@ -17,7 +18,11 @@ class _CompositionPageState extends State<CompositionPage> {
List<Contact> _allContacts = []; List<Contact> _allContacts = [];
List<Contact> _filteredContacts = []; List<Contact> _filteredContacts = [];
final ContactService _contactService = ContactService(); final ContactService _contactService = ContactService();
// Instantiate the ObfuscateService
final ObfuscateService _obfuscateService = ObfuscateService(); final ObfuscateService _obfuscateService = ObfuscateService();
// Instantiate the CallService
final CallService _callService = CallService(); final CallService _callService = CallService();
@override @override
@ -35,13 +40,8 @@ class _CompositionPageState extends State<CompositionPage> {
void _filterContacts() { void _filterContacts() {
setState(() { setState(() {
_filteredContacts = _allContacts.where((contact) { _filteredContacts = _allContacts.where((contact) {
bool phoneMatch = contact.phones.any((phone) { final phoneMatch = contact.phones.any((phone) =>
final rawPhoneNumber = phone.number; phone.number.replaceAll(RegExp(r'\D'), '').contains(dialedNumber));
final strippedPhoneNumber = rawPhoneNumber.replaceAll(RegExp(r'\D'), '');
final strippedDialedNumber = dialedNumber.replaceAll(RegExp(r'\D'), '');
return rawPhoneNumber.contains(dialedNumber) ||
strippedPhoneNumber.contains(strippedDialedNumber);
});
final nameMatch = contact.displayName final nameMatch = contact.displayName
.toLowerCase() .toLowerCase()
.contains(dialedNumber.toLowerCase()); .contains(dialedNumber.toLowerCase());
@ -57,13 +57,6 @@ class _CompositionPageState extends State<CompositionPage> {
}); });
} }
void _onPlusPress() {
setState(() {
dialedNumber += '+';
_filterContacts();
});
}
void _onDeletePress() { void _onDeletePress() {
setState(() { setState(() {
if (dialedNumber.isNotEmpty) { if (dialedNumber.isNotEmpty) {
@ -80,6 +73,7 @@ class _CompositionPageState extends State<CompositionPage> {
}); });
} }
// Function to call a contact's number using the CallService
void _makeCall(String phoneNumber) async { void _makeCall(String phoneNumber) async {
try { try {
await _callService.makeGsmCall(context, phoneNumber: phoneNumber); await _callService.makeGsmCall(context, phoneNumber: phoneNumber);
@ -88,12 +82,10 @@ class _CompositionPageState extends State<CompositionPage> {
}); });
} catch (e) { } catch (e) {
debugPrint("Error making call: $e"); debugPrint("Error making call: $e");
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Failed to make call: $e')),
);
} }
} }
// Function to send an SMS to a contact's number
void _launchSms(String phoneNumber) async { void _launchSms(String phoneNumber) async {
final uri = Uri(scheme: 'sms', path: phoneNumber); final uri = Uri(scheme: 'sms', path: phoneNumber);
if (await canLaunchUrl(uri)) { if (await canLaunchUrl(uri)) {
@ -103,20 +95,6 @@ class _CompositionPageState extends State<CompositionPage> {
} }
} }
void _addContact() async {
if (await FlutterContacts.requestPermission()) {
final newContact = Contact()
..phones = [Phone(dialedNumber.isNotEmpty ? dialedNumber : '')];
final updatedContact = await FlutterContacts.openExternalInsert(newContact);
if (updatedContact != null) {
_fetchContacts();
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Contact added successfully!')),
);
}
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -125,6 +103,7 @@ class _CompositionPageState extends State<CompositionPage> {
children: [ children: [
Column( Column(
children: [ children: [
// Top half: Display contacts matching dialed number
Expanded( Expanded(
flex: 2, flex: 2,
child: Container( child: Container(
@ -136,51 +115,57 @@ class _CompositionPageState extends State<CompositionPage> {
children: [ children: [
Expanded( Expanded(
child: ListView( child: ListView(
children: [ children: _filteredContacts.isNotEmpty
..._filteredContacts.map((contact) { ? _filteredContacts.map((contact) {
final phoneNumber = contact.phones.isNotEmpty final phoneNumber = contact.phones.isNotEmpty
? contact.phones.first.number ? contact.phones.first.number
: 'No phone number'; : 'No phone number';
return ListTile( return ListTile(
title: Text( title: Text(
_obfuscateService.obfuscateData(contact.displayName), _obfuscateService.obfuscateData(contact.displayName),
style: const TextStyle(color: Colors.white), style: const TextStyle(color: Colors.white),
),
subtitle: Text(
_obfuscateService.obfuscateData(phoneNumber),
style: const TextStyle(color: Colors.grey),
),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
icon: Icon(Icons.phone, color: Colors.green[300], size: 20),
onPressed: () => _makeCall(phoneNumber),
),
IconButton(
icon: Icon(Icons.message, color: Colors.blue[300], size: 20),
onPressed: () => _launchSms(phoneNumber),
),
],
),
onTap: () {},
);
}).toList(),
ListTile(
title: const Text(
'Add a contact',
style: TextStyle(color: Colors.white),
), ),
trailing: Icon(Icons.add, color: Colors.grey[600]), subtitle: Text(
onTap: _addContact, _obfuscateService.obfuscateData(phoneNumber),
), style: const TextStyle(color: Colors.grey),
], ),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
// Call button (Now using CallService)
IconButton(
icon: Icon(Icons.phone,
color: Colors.green[300],
size: 20),
onPressed: () {
_makeCall(phoneNumber); // Make a call using CallService
},
),
// Message button
IconButton(
icon: Icon(Icons.message,
color: Colors.blue[300],
size: 20),
onPressed: () {
_launchSms(phoneNumber);
},
),
],
),
onTap: () {
// Handle contact selection if needed
},
);
}).toList()
: [],
), ),
), ),
], ],
), ),
), ),
), ),
// Bottom half: Dialpad and Dialed number display with erase button
Expanded( Expanded(
flex: 2, flex: 2,
child: Container( child: Container(
@ -188,6 +173,7 @@ class _CompositionPageState extends State<CompositionPage> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
// Display dialed number with erase button
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -196,57 +182,61 @@ class _CompositionPageState extends State<CompositionPage> {
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
dialedNumber, dialedNumber,
style: const TextStyle(fontSize: 24, color: Colors.white), style: const TextStyle(
fontSize: 24, color: Colors.white),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
), ),
GestureDetector( IconButton(
onTap: _onDeletePress, onPressed: _onClearPress,
onLongPress: _onClearPress, icon: const Icon(Icons.backspace,
child: const Padding( color: Colors.white),
padding: EdgeInsets.all(8.0),
child: Icon(Icons.backspace, color: Colors.white),
),
), ),
], ],
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
// Dialpad
Expanded( Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [ children: [
_buildDialButton('1', Colors.white), _buildDialButton('1'),
_buildDialButton('2', Colors.white), _buildDialButton('2'),
_buildDialButton('3', Colors.white), _buildDialButton('3'),
], ],
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [ children: [
_buildDialButton('4', Colors.white), _buildDialButton('4'),
_buildDialButton('5', Colors.white), _buildDialButton('5'),
_buildDialButton('6', Colors.white), _buildDialButton('6'),
], ],
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [ children: [
_buildDialButton('7', Colors.white), _buildDialButton('7'),
_buildDialButton('8', Colors.white), _buildDialButton('8'),
_buildDialButton('9', Colors.white), _buildDialButton('9'),
], ],
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [ children: [
_buildDialButton('*', const Color.fromRGBO(117, 117, 117, 1)), _buildDialButton('*'),
_buildDialButtonWithPlus('0'), _buildDialButton('0'),
_buildDialButton('#', const Color.fromRGBO(117, 117, 117, 1)), _buildDialButton('#'),
], ],
), ),
], ],
@ -259,28 +249,26 @@ class _CompositionPageState extends State<CompositionPage> {
), ),
], ],
), ),
// Add Contact Button
Positioned( Positioned(
bottom: 20.0, bottom: 20.0,
left: 0, left: 0,
right: 0, right: 0,
child: Center( child: Center(
child: ElevatedButton( child: AddContactButton(),
onPressed: dialedNumber.isNotEmpty ? () => _makeCall(dialedNumber) : null,
style: ElevatedButton.styleFrom(
backgroundColor: Colors.green[700],
shape: const CircleBorder(),
padding: const EdgeInsets.all(20),
),
child: const Icon(Icons.phone, color: Colors.white, size: 30),
),
), ),
), ),
// Top Row with Back Arrow
Positioned( Positioned(
top: 40.0, top: 40.0,
left: 16.0, left: 16.0,
child: IconButton( child: IconButton(
icon: const Icon(Icons.arrow_back, color: Colors.white), icon: const Icon(Icons.arrow_back, color: Colors.white),
onPressed: () => Navigator.pop(context), onPressed: () {
Navigator.pop(context);
},
), ),
), ),
], ],
@ -288,7 +276,7 @@ class _CompositionPageState extends State<CompositionPage> {
); );
} }
Widget _buildDialButton(String number, Color textColor) { Widget _buildDialButton(String number) {
return ElevatedButton( return ElevatedButton(
onPressed: () => _onNumberPress(number), onPressed: () => _onNumberPress(number),
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
@ -298,38 +286,11 @@ class _CompositionPageState extends State<CompositionPage> {
), ),
child: Text( child: Text(
number, number,
style: TextStyle(fontSize: 24, color: textColor), style: const TextStyle(
fontSize: 24,
color: Colors.white,
),
), ),
); );
} }
Widget _buildDialButtonWithPlus(String number) {
return Stack(
alignment: Alignment.center,
children: [
GestureDetector(
onLongPress: _onPlusPress,
child: ElevatedButton(
onPressed: () => _onNumberPress(number),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.black,
shape: const CircleBorder(),
padding: const EdgeInsets.all(16),
),
child: Text(
number,
style: const TextStyle(fontSize: 24, color: Colors.white),
),
),
),
Positioned(
bottom: 8,
child: Text(
'+',
style: TextStyle(fontSize: 12, color: Colors.grey[600]),
),
),
],
);
}
} }

16
dialer/lib/features/history/history_page.dart
View File

@ -37,7 +37,7 @@ class HistoryPage extends StatefulWidget {
} }
class _HistoryPageState extends State<HistoryPage> class _HistoryPageState extends State<HistoryPage>
with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
List<History> histories = []; List<History> histories = [];
bool loading = true; bool loading = true;
int? _expandedIndex; int? _expandedIndex;
@ -47,13 +47,10 @@ class _HistoryPageState extends State<HistoryPage>
// Create a MethodChannel instance. // Create a MethodChannel instance.
static const MethodChannel _channel = MethodChannel('com.example.calllog'); static const MethodChannel _channel = MethodChannel('com.example.calllog');
@override
bool get wantKeepAlive => true; // Preserve state when switching pages
@override @override
void didChangeDependencies() { void didChangeDependencies() {
super.didChangeDependencies(); super.didChangeDependencies();
if (loading && histories.isEmpty) { if (loading) {
_buildHistories(); _buildHistories();
} }
} }
@ -152,9 +149,9 @@ class _HistoryPageState extends State<HistoryPage>
List<Contact> contacts = contactState.contacts; List<Contact> contacts = contactState.contacts;
List<History> callHistories = []; List<History> callHistories = [];
// Process each log entry with intermittent yields to avoid freezing. // Process each log entry.
for (int i = 0; i < nativeLogs.length; i++) { for (var entry in nativeLogs) {
final entry = nativeLogs[i]; // Each entry is a Map with keys: number, type, date, duration.
final String number = entry['number'] ?? ''; final String number = entry['number'] ?? '';
if (number.isEmpty) continue; if (number.isEmpty) continue;
@ -200,8 +197,6 @@ class _HistoryPageState extends State<HistoryPage>
callHistories callHistories
.add(History(matchedContact, callDate, callType, callStatus, 1)); .add(History(matchedContact, callDate, callType, callStatus, 1));
// Yield every 10 iterations to avoid blocking the UI.
if (i % 10 == 0) await Future.delayed(Duration(milliseconds: 1));
} }
// Sort histories by most recent. // Sort histories by most recent.
@ -277,7 +272,6 @@ class _HistoryPageState extends State<HistoryPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); // required due to AutomaticKeepAliveClientMixin
final contactState = ContactState.of(context); final contactState = ContactState.of(context);
if (loading || contactState.loading) { if (loading || contactState.loading) {

2
dialer/lib/features/home/home_page.dart
View File

@ -23,7 +23,7 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_tabController = TabController(length: 4, vsync: this, initialIndex: 2); _tabController = TabController(length: 4, vsync: this, initialIndex: 1);
_tabController.addListener(_handleTabIndex); _tabController.addListener(_handleTabIndex);
_searchBarController = SearchController(); _searchBarController = SearchController();
_searchBarController.addListener(() { _searchBarController.addListener(() {