merge-update-with-lab-changes
haroon amjad 5 years ago
parent 5f1413a2ac
commit cc4f5c0615

@ -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';

@ -231,12 +231,6 @@ class _ConferenceButtonBarState extends State<ConferenceButtonBar> 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),
),
],
),
);

@ -142,7 +142,7 @@ class _ConferencePageState extends State<ConferencePage> {
height: 10,
),
Text(
'Connecting to the room...',
'Connecting to the call...',
style: TextStyle(color: Colors.white),
),
],
@ -324,7 +324,7 @@ class _ConferencePageState extends State<ConferencePage> {
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),

@ -79,7 +79,7 @@ class _CircleButtonState extends State<CircleButton> {
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),
),

@ -129,10 +129,13 @@ class _LandingPageState extends State<LandingPage> 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");

Loading…
Cancel
Save