Merge branch 'development_aamir' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into development_aamir

 Conflicts:
	lib/api/chat/chat_provider_model.dart
merge-requests/57/head
Aamir Muhammad 3 years ago
commit 5d132206ba

1
.gitignore vendored

@ -34,7 +34,6 @@ pubspec.lock
/build/
# Web related
lib/generated_plugin_registrant.dart
# Symbolication related
app.*.symbols

@ -40,7 +40,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Profile"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

@ -50,6 +50,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
{
"employeeNumber": int.parse(
AppState().memberInformationList!.eMPLOYEENUMBER.toString(),
//"210919"
),
"password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG"
},

@ -72,7 +72,7 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
actions: [
IconButton(
onPressed: () {
makeCall("AUDIO");
// makeCall("AUDIO");
},
icon: SvgPicture.asset(
"assets/icons/chat/call.svg",
@ -82,7 +82,7 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
),
IconButton(
onPressed: () {
makeCall("VIDEO");
// makeCall("VIDEO");
},
icon: SvgPicture.asset(
"assets/icons/chat/video_call.svg",

Loading…
Cancel
Save