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

WIP: callPageV2 #52

Draft
florian wants to merge 16 commits from callPageV2 into dev
pull from: callPageV2
merge into: icing:dev
Conversation 0 Commits 16 Files Changed 5 +89 -13
1 changed files with 89 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a078c139a - Show all commits

102
dialer/lib/services/call_service.dart
View File

@ -51,7 +51,12 @@ class CallService {
======= =======
======= =======
static String? _currentCallState; static String? _currentCallState;
<<<<<<< HEAD
>>>>>>> f491fb6 (fix: no screen stacking when making calls) >>>>>>> f491fb6 (fix: no screen stacking when making calls)
=======
static Map<String, dynamic>? _pendingCall;
static bool wasPhoneLocked = false;
>>>>>>> 6628dd6 (feat: merge call_service with callNotifications changes)
final ContactService _contactService = ContactService(); final ContactService _contactService = ContactService();
>>>>>>> acbccaa (feat: give parameters to callPage to avoid fetching when possible) >>>>>>> acbccaa (feat: give parameters to callPage to avoid fetching when possible)
>>>>>>> c2c646a (feat: give parameters to callPage to avoid fetching when possible) >>>>>>> c2c646a (feat: give parameters to callPage to avoid fetching when possible)
@ -60,11 +65,15 @@ class CallService {
CallService() { CallService() {
_channel.setMethodCallHandler((call) async { _channel.setMethodCallHandler((call) async {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
print('CallService: Received method ${call.method} with args ${call.arguments}'); print('CallService: Received method ${call.method} with args ${call.arguments}');
======= =======
print('CallService: Handling method call: ${call.method}'); print('CallService: Handling method call: ${call.method}');
>>>>>>> ec1779b (callNotifications and various fix related to calls (#49)) >>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
=======
print('CallService: Received method ${call.method} with args ${call.arguments}');
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
switch (call.method) { switch (call.method) {
case "callAdded": case "callAdded":
final phoneNumber = call.arguments["callId"] as String; final phoneNumber = call.arguments["callId"] as String;
@ -80,11 +89,14 @@ class CallService {
await _fetchContactInfo(currentPhoneNumber!); await _fetchContactInfo(currentPhoneNumber!);
print('CallService: Call added, number: $currentPhoneNumber, state: $state'); print('CallService: Call added, number: $currentPhoneNumber, state: $state');
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
_handleCallState(state); _handleCallState(state);
======= =======
======= =======
>>>>>>> 9e76148 (fix: no screen stacking when making calls) >>>>>>> 9e76148 (fix: no screen stacking when making calls)
=======
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
if (state == "ringing") { if (state == "ringing") {
_handleIncomingCall(phoneNumber); _handleIncomingCall(phoneNumber);
} else { } else {
@ -121,7 +133,19 @@ class CallService {
print('CallService: State changed to $state'); print('CallService: State changed to $state');
_handleCallState(context, state); _handleCallState(context, state);
>>>>>>> f491fb6 (fix: no screen stacking when making calls) >>>>>>> f491fb6 (fix: no screen stacking when making calls)
<<<<<<< HEAD
>>>>>>> 9e76148 (fix: no screen stacking when making calls) >>>>>>> 9e76148 (fix: no screen stacking when making calls)
=======
=======
_handleCallState(state);
break;
case "callStateChanged":
final state = call.arguments["state"] as String;
wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
print('CallService: State changed to $state, wasPhoneLocked: $wasPhoneLocked');
_handleCallState(state);
>>>>>>> 6628dd6 (feat: merge call_service with callNotifications changes)
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
break; break;
case "callEnded": case "callEnded":
case "callRemoved": case "callRemoved":
@ -147,10 +171,13 @@ class CallService {
final phoneNumber = call.arguments["phoneNumber"] as String; final phoneNumber = call.arguments["phoneNumber"] as String;
wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false; wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
currentPhoneNumber = phoneNumber; currentPhoneNumber = phoneNumber;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
await _fetchContactInfo(currentPhoneNumber!); await _fetchContactInfo(currentPhoneNumber!);
======= =======
>>>>>>> 3e2be8a (feat: fetch contact in makeGsmCall to show it in call) >>>>>>> 3e2be8a (feat: fetch contact in makeGsmCall to show it in call)
=======
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
print('CallService: Incoming call from notification: $phoneNumber, wasPhoneLocked: $wasPhoneLocked'); print('CallService: Incoming call from notification: $phoneNumber, wasPhoneLocked: $wasPhoneLocked');
_handleIncomingCall(phoneNumber); _handleIncomingCall(phoneNumber);
break; break;
@ -158,6 +185,9 @@ class CallService {
final phoneNumber = call.arguments["phoneNumber"] as String; final phoneNumber = call.arguments["phoneNumber"] as String;
wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false; wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
currentPhoneNumber = phoneNumber; currentPhoneNumber = phoneNumber;
=======
await _fetchContactInfo(currentPhoneNumber!);
>>>>>>> 6628dd6 (feat: merge call_service with callNotifications changes)
print('CallService: Incoming call from notification: $phoneNumber, wasPhoneLocked: $wasPhoneLocked'); print('CallService: Incoming call from notification: $phoneNumber, wasPhoneLocked: $wasPhoneLocked');
_handleIncomingCall(phoneNumber); _handleIncomingCall(phoneNumber);
break; break;
@ -214,6 +244,7 @@ class CallService {
return number.replaceAll(RegExp(r'[\s\-\(\)]'), ''); return number.replaceAll(RegExp(r'[\s\-\(\)]'), '');
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
Future<void> _fetchContactInfo(String phoneNumber) async { Future<void> _fetchContactInfo(String phoneNumber) async {
if (currentDisplayName != null && currentThumbnail != null) return; // Already set if (currentDisplayName != null && currentThumbnail != null) return; // Already set
@ -243,11 +274,16 @@ class CallService {
return number.replaceAll(RegExp(r'[\s\-\(\)]'), ''); return number.replaceAll(RegExp(r'[\s\-\(\)]'), '');
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
======= =======
>>>>>>> ec1779b (callNotifications and various fix related to calls (#49)) >>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
======= =======
>>>>>>> 3e2be8a (feat: fetch contact in makeGsmCall to show it in call) >>>>>>> 3e2be8a (feat: fetch contact in makeGsmCall to show it in call)
=======
=======
>>>>>>> 6628dd6 (feat: merge call_service with callNotifications changes)
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
void _handleIncomingCall(String phoneNumber) { void _handleIncomingCall(String phoneNumber) {
final context = navigatorKey.currentContext; final context = navigatorKey.currentContext;
if (context == null) { if (context == null) {
@ -255,8 +291,36 @@ class CallService {
_pendingCall = {"phoneNumber": phoneNumber}; _pendingCall = {"phoneNumber": phoneNumber};
Future.delayed(Duration(milliseconds: 500), () => _checkPendingCall()); Future.delayed(Duration(milliseconds: 500), () => _checkPendingCall());
} else { } else {
<<<<<<< HEAD
======= =======
void _handleCallState(BuildContext context, String state) { void _handleCallState(BuildContext context, String state) {
=======
_navigateToIncomingCallPage(context);
}
}
void _checkPendingCall() {
if (_pendingCall != null) {
final context = navigatorKey.currentContext;
if (context != null) {
print('CallService: Processing queued call: ${_pendingCall!["phoneNumber"]}');
currentPhoneNumber = _pendingCall!["phoneNumber"];
_navigateToIncomingCallPage(context);
_pendingCall = null;
} else {
print('CallService: Context still null, retrying...');
Future.delayed(Duration(milliseconds: 500), () => _checkPendingCall());
}
}
}
void _handleCallState(String state) {
final context = navigatorKey.currentContext;
if (context == null) {
print('CallService: Navigator context is null, cannot navigate');
return;
}
>>>>>>> 6628dd6 (feat: merge call_service with callNotifications changes)
if (_currentCallState == state) { if (_currentCallState == state) {
print('CallService: State $state already handled, skipping'); print('CallService: State $state already handled, skipping');
return; return;
@ -264,7 +328,7 @@ class CallService {
_currentCallState = state; _currentCallState = state;
if (state == "disconnected" || state == "disconnecting") { if (state == "disconnected" || state == "disconnecting") {
_closeCallPage(context); _closeCallPage();
} else if (state == "active" || state == "dialing") { } else if (state == "active" || state == "dialing") {
_navigateToCallPage(context); _navigateToCallPage(context);
} else if (state == "ringing") { } else if (state == "ringing") {
@ -366,7 +430,6 @@ class CallService {
).then((_) { ).then((_) {
print('CallService: CallPage popped'); print('CallService: CallPage popped');
_isCallPageVisible = false; _isCallPageVisible = false;
print('CallService: CallPage popped, _isCallPageVisible set to false');
}); });
_isCallPageVisible = true; _isCallPageVisible = true;
} }
@ -408,17 +471,20 @@ class CallService {
).then((_) { ).then((_) {
print('CallService: IncomingCallPage popped'); print('CallService: IncomingCallPage popped');
_isCallPageVisible = false; _isCallPageVisible = false;
print('CallService: IncomingCallPage popped, _isCallPageVisible set to false');
}); });
_isCallPageVisible = true; _isCallPageVisible = true;
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6628dd6 (feat: merge call_service with callNotifications changes)
void _closeCallPage() { void _closeCallPage() {
final context = navigatorKey.currentContext; final context = navigatorKey.currentContext;
if (context == null) { if (context == null) {
print('CallService: Cannot close page, context is null'); print('CallService: Cannot close page, context is null');
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
return; return;
} }
@ -428,8 +494,14 @@ class CallService {
======= =======
>>>>>>> ec1779b (callNotifications and various fix related to calls (#49)) >>>>>>> ec1779b (callNotifications and various fix related to calls (#49))
======= =======
=======
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
======= =======
void _closeCallPage(BuildContext context) { void _closeCallPage(BuildContext context) {
=======
return;
}
>>>>>>> 6628dd6 (feat: merge call_service with callNotifications changes)
print('CallService: Attempting to close call page. Visible: $_isCallPageVisible'); print('CallService: Attempting to close call page. Visible: $_isCallPageVisible');
if (!_isCallPageVisible) { if (!_isCallPageVisible) {
print('CallService: CallPage not visible, skipping pop'); print('CallService: CallPage not visible, skipping pop');
@ -437,7 +509,6 @@ class CallService {
>>>>>>> 9e76148 (fix: no screen stacking when making calls) >>>>>>> 9e76148 (fix: no screen stacking when making calls)
return; return;
} }
print('CallService: Closing call page, _isCallPageVisible: $_isCallPageVisible');
if (Navigator.canPop(context)) { if (Navigator.canPop(context)) {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
@ -468,7 +539,7 @@ class CallService {
} }
} }
Future<Map<String, dynamic>> makeGsmCall( Future<void> makeGsmCall(
BuildContext context, { BuildContext context, {
required String phoneNumber, required String phoneNumber,
String? displayName, String? displayName,
@ -499,8 +570,7 @@ class CallService {
print('CallService: Making GSM call to $phoneNumber'); print('CallService: Making GSM call to $phoneNumber');
final result = await _channel.invokeMethod('makeGsmCall', {"phoneNumber": phoneNumber}); final result = await _channel.invokeMethod('makeGsmCall', {"phoneNumber": phoneNumber});
print('CallService: makeGsmCall result: $result'); print('CallService: makeGsmCall result: $result');
final resultMap = Map<String, dynamic>.from(result as Map); if (result["status"] != "calling") {
if (resultMap["status"] != "calling") {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Failed to initiate call")), SnackBar(content: Text("Failed to initiate call")),
); );
@ -509,6 +579,7 @@ class CallService {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
_handleCallState("dialing"); _handleCallState("dialing");
======= =======
@ -525,39 +596,44 @@ class CallService {
======= =======
_handleCallState(context, "dialing"); _handleCallState(context, "dialing");
>>>>>>> 9e76148 (fix: no screen stacking when making calls) >>>>>>> 9e76148 (fix: no screen stacking when making calls)
=======
_handleCallState("dialing");
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
} catch (e) { } catch (e) {
print("CallService: Error making call: $e"); print("CallService: Error making call: $e");
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Error making call: $e")), SnackBar(content: Text("Error making call: $e")),
); );
return {"status": "error", "message": e.toString()}; rethrow;
} }
} }
Future<Map<String, dynamic>> hangUpCall(BuildContext context) async { Future<void> hangUpCall(BuildContext context) async {
try { try {
print('CallService: Hanging up call'); print('CallService: Hanging up call');
final result = await _channel.invokeMethod('hangUpCall'); final result = await _channel.invokeMethod('hangUpCall');
print('CallService: hangUpCall result: $result'); print('CallService: hangUpCall result: $result');
final resultMap = Map<String, dynamic>.from(result as Map); if (result["status"] != "ended") {
if (resultMap["status"] != "ended") {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Failed to end call")), SnackBar(content: Text("Failed to end call")),
); );
} else { } else {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
_closeCallPage(); _closeCallPage();
======= =======
_closeCallPage(context); _closeCallPage(context);
>>>>>>> 9e76148 (fix: no screen stacking when making calls) >>>>>>> 9e76148 (fix: no screen stacking when making calls)
=======
_closeCallPage();
>>>>>>> b3c8bf7 (feat: merge call_service with callNotifications changes)
} }
return resultMap;
} catch (e) { } catch (e) {
print("CallService: Error hanging up call: $e"); print("CallService: Error hanging up call: $e");
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Error hanging up call: $e")), SnackBar(content: Text("Error hanging up call: $e")),
); );
return {"status": "error", "message": e.toString()}; rethrow;
} }
} }
} }