From cc4f5c06150adbcbbf12ff3830d43c08e6f11392 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 27 Aug 2020 10:34:45 +0300 Subject: [PATCH] updates --- lib/config/config.dart | 2 +- lib/pages/conference/conference_button_bar.dart | 6 ------ lib/pages/conference/conference_page.dart | 4 ++-- lib/pages/conference/widgets/circle_button.dart | 2 +- lib/pages/landing/landing_page.dart | 11 +++++++---- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 3c7c7cd3..306d0df2 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,7 +5,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; const MAX_SMALL_SCREEN = 660; -const BASE_URL = 'https://uat.hmgwebservices.com/Services'; +const BASE_URL = 'https://hmgwebservices.com/Services'; const GET_PROJECT = '/Lists.svc/REST/GetProject'; diff --git a/lib/pages/conference/conference_button_bar.dart b/lib/pages/conference/conference_button_bar.dart index 720732ea..d9abd212 100644 --- a/lib/pages/conference/conference_button_bar.dart +++ b/lib/pages/conference/conference_button_bar.dart @@ -231,12 +231,6 @@ class _ConferenceButtonBarState extends State with AfterLay key: Key('switch-camera-button'), onPressed: () => _onPressed(widget.onSwitchCamera), ), - CircleButton( - child: const Icon(Icons.person_add, color: Colors.white), - key: Key('add-person-button'), - onPressed: () => _onPressed(widget.onPersonAdd), - onLongPress: () => _onPressed(widget.onPersonRemove), - ), ], ), ); diff --git a/lib/pages/conference/conference_page.dart b/lib/pages/conference/conference_page.dart index 3ae404c5..60ffb0d5 100644 --- a/lib/pages/conference/conference_page.dart +++ b/lib/pages/conference/conference_page.dart @@ -142,7 +142,7 @@ class _ConferencePageState extends State { height: 10, ), Text( - 'Connecting to the room...', + 'Connecting to the call...', style: TextStyle(color: Colors.white), ), ], @@ -324,7 +324,7 @@ class _ConferencePageState extends State { height: 40, child: Center( child: Text( - 'Waiting for another participant to connect to the room...', + 'Waiting for another participant to connect to the call...', key: Key('text-wait'), textAlign: TextAlign.center, style: TextStyle(color: Colors.white), diff --git a/lib/pages/conference/widgets/circle_button.dart b/lib/pages/conference/widgets/circle_button.dart index cc4248df..37702c29 100644 --- a/lib/pages/conference/widgets/circle_button.dart +++ b/lib/pages/conference/widgets/circle_button.dart @@ -79,7 +79,7 @@ class _CircleButtonState extends State { width: size, height: size, decoration: BoxDecoration( - color: (widget.color ?? Theme.of(context).primaryColor).withAlpha(200), + color: (widget.color ?? Colors.blue).withAlpha(200), borderRadius: BorderRadius.all( Radius.circular(widget.radius), ), diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 0e3ff95c..ee4c1e54 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -129,10 +129,13 @@ class _LandingPageState extends State with WidgetsBindingObserver { if (!isPageNavigated) { isPageNavigated = true; Navigator.push( - context, - MaterialPageRoute( - builder: (context) => IncomingCall( - incomingCallData: LandingPage.incomingCallData))); + context, + MaterialPageRoute( + builder: (context) => IncomingCall( + incomingCallData: LandingPage.incomingCallData))) + .then((value) { + isPageNavigated = false; + }); } } else { print("Is Call Not Found");