Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Chat Fix

Browse Source
merge-requests/137/head
Aamir Muhammad 3 years ago
parent c8f9826266
commit 7152b0d57b
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
lib/api/chat/chat_api_client.dart
Unescape Escape View File

@ -38,8 +38,8 @@ class ChatApiClient {
print({ print({
"employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(), "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(),
"password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG", "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG",
"isMobile": true, // "isMobile": true,
"deviceToken": AppState().deviceNotificationToken // "deviceToken": AppState().deviceNotificationToken
}); });
if (!kReleaseMode) { if (!kReleaseMode) {
logger.i("login-res: " + response.body); logger.i("login-res: " + response.body);

2
lib/app_state/app_state.dart
Unescape Escape View File

@ -70,7 +70,7 @@ class AppState {
bool get getIsDemoMarathon => _isDemoMarathon; bool get getIsDemoMarathon => _isDemoMarathon;
final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 3.8, mobileType: Platform.isAndroid ? "android" : "ios"); final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 3.9, mobileType: Platform.isAndroid ? "android" : "ios");
void setPostParamsInitConfig() { void setPostParamsInitConfig() {
isAuthenticated = false; isAuthenticated = false;

22
lib/classes/notifications.dart
Unescape Escape View File

@ -1,13 +1,11 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/main.dart'; import 'package:mohem_flutter_app/main.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); //final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
class AppNotifications { class AppNotifications {
@ -19,21 +17,21 @@ class AppNotifications {
Future<void> requestPermissions() async { Future<void> requestPermissions() async {
if (Platform.isIOS) { if (Platform.isIOS) {
await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()?.requestPermissions(alert: true, badge: true, sound: true); // await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()?.requestPermissions(alert: true, badge: true, sound: true);
} else if (Platform.isAndroid) { } else if (Platform.isAndroid) {
AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>(); // AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
bool? granted = await androidImplementation?.requestPermission(); // bool? granted = await androidImplementation?.requestPermission();
if (granted == false) { // if (granted == false) {
print("-------------------- Permission Granted ------------------------"); // print("-------------------- Permission Granted ------------------------");
print(granted); // print(granted);
await Permission.notification.request(); // await Permission.notification.request();
} // }
} }
} }
Future<void> isAndroidPermGranted() async { Future<void> isAndroidPermGranted() async {
if (Platform.isAndroid) { if (Platform.isAndroid) {
bool granted = await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()?.areNotificationsEnabled() ?? false; // bool granted = await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()?.areNotificationsEnabled() ?? false;
} }
} }

1
lib/ui/chat/chat_detailed_screen.dart
Unescape Escape View File

@ -277,7 +277,6 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
), ),
onChanged: (String val) { onChanged: (String val) {
m.inputBoxDirection(val); m.inputBoxDirection(val);
m.userTypingInvoke(currentUser: AppState().chatDetails!.response!.id!, reciptUser: params!.chatUser!.id!); m.userTypingInvoke(currentUser: AppState().chatDetails!.response!.id!, reciptUser: params!.chatUser!.id!);
}, },
).expanded, ).expanded,

4
pubspec.yaml
Unescape Escape View File

@ -92,7 +92,7 @@ dependencies:
swipe_to: ^1.0.2 swipe_to: ^1.0.2
flutter_webrtc: ^0.9.16 flutter_webrtc: ^0.9.16
camera: ^0.10.0+4 camera: ^0.10.0+4
flutter_local_notifications: any #flutter_local_notifications: any
#Chat Voice Message Recoding & Play #Chat Voice Message Recoding & Play
audio_waveforms: ^0.1.5+1 audio_waveforms: ^0.1.5+1
@ -108,7 +108,7 @@ dependencies:
dependency_overrides: dependency_overrides:
firebase_core_platform_interface: 4.5.1 #firebase_core_platform_interface: 4.5.1
dev_dependencies: dev_dependencies:

Write Preview
Loading…
Cancel
Save