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

voip merge conflicts resolve

Browse Source
development_aamir
Sikander Saleem 2 years ago
parent f6f7d02833
commit 3702bac7c2
6 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File

8
lib/main.dart
Unescape Escape View File

@ -9,6 +9,7 @@ import 'package:mohem_flutter_app/classes/consts.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/generated/codegen_loader.g.dart'; import 'package:mohem_flutter_app/generated/codegen_loader.g.dart';
import 'package:mohem_flutter_app/models/post_params_model.dart'; import 'package:mohem_flutter_app/models/post_params_model.dart';
import 'package:mohem_flutter_app/provider/chat_call_provider.dart';
import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; import 'package:mohem_flutter_app/provider/chat_provider_model.dart';
import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart'; import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
import 'package:mohem_flutter_app/provider/eit_provider_model.dart'; import 'package:mohem_flutter_app/provider/eit_provider_model.dart';
@ -75,9 +76,9 @@ Future<void> main() async {
ChangeNotifierProvider<MarathonProvider>( ChangeNotifierProvider<MarathonProvider>(
create: (_) => MarathonProvider(), create: (_) => MarathonProvider(),
), ),
// ChangeNotifierProvider<ChatCallProvider>( ChangeNotifierProvider<ChatCallProvider>(
// create: (_) => ChatCallProvider(), create: (_) => ChatCallProvider(),
// ), ),
], ],
child: const MyApp(), child: const MyApp(),
), ),
@ -120,6 +121,7 @@ class MyApp extends StatelessWidget {
}, },
theme: AppTheme.getTheme( theme: AppTheme.getTheme(
EasyLocalization.of(context)?.locale.languageCode == "ar", EasyLocalization.of(context)?.locale.languageCode == "ar",
), ),
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
localizationsDelegates: delegates, localizationsDelegates: delegates,

2
lib/theme/app_theme.dart
Unescape Escape View File

@ -5,8 +5,10 @@ import 'package:mohem_flutter_app/theme/colors.dart';
class AppTheme { class AppTheme {
static ThemeData getTheme(isArabic) => ThemeData( static ThemeData getTheme(isArabic) => ThemeData(
useMaterial3: false,
fontFamily: isArabic ? 'Cairo' : 'Poppins', fontFamily: isArabic ? 'Cairo' : 'Poppins',
primarySwatch: Colors.red, primarySwatch: Colors.red,
visualDensity: VisualDensity.adaptivePlatformDensity, visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.light, brightness: Brightness.light,
pageTransitionsTheme: const PageTransitionsTheme( pageTransitionsTheme: const PageTransitionsTheme(

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

@ -95,34 +95,34 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
showHomeButton: false, showHomeButton: false,
showTyping: true, showTyping: true,
chatUser: params!.chatUser, chatUser: params!.chatUser,
actions: [ // actions: [
// if (Platform.isAndroid) // // if (Platform.isAndroid)
SvgPicture.asset("assets/icons/chat/call.svg", width: 21, height: 23).onPress(() async { // SvgPicture.asset("assets/icons/chat/call.svg", width: 21, height: 23).onPress(() async {
Future<PermissionStatus> micPer = Permission.microphone.request(); // Future<PermissionStatus> micPer = Permission.microphone.request();
if (await micPer.isGranted) { // if (await micPer.isGranted) {
makeCall(callType: "AUDIO"); // makeCall(callType: "AUDIO");
} else { // } else {
Permission.microphone.request().isGranted.then((value) { // Permission.microphone.request().isGranted.then((value) {
makeCall(callType: "AUDIO"); // makeCall(callType: "AUDIO");
}); // });
} // }
}), // }),
// if (Platform.isAndroid) // // if (Platform.isAndroid)
24.width, // 24.width,
// if (Platform.isAndroid) // // if (Platform.isAndroid)
SvgPicture.asset("assets/icons/chat/video_call.svg", width: 21, height: 18).onPress(() async { // SvgPicture.asset("assets/icons/chat/video_call.svg", width: 21, height: 18).onPress(() async {
Future<PermissionStatus> camPer = Permission.camera.request(); // Future<PermissionStatus> camPer = Permission.camera.request();
if (await camPer.isGranted) { // if (await camPer.isGranted) {
makeCall(callType: "VIDEO"); // makeCall(callType: "VIDEO");
} else { // } else {
Permission.camera.request().isGranted.then((value) { // Permission.camera.request().isGranted.then((value) {
makeCall(callType: "VIDEO"); // makeCall(callType: "VIDEO");
}); // });
} // }
}), // }),
// if (Platform.isAndroid) // // if (Platform.isAndroid)
21.width, // 21.width,
], // ],
), ),
body: SafeArea( body: SafeArea(
child: Consumer<ChatProviderModel>( child: Consumer<ChatProviderModel>(

1
lib/ui/login/login_screen.dart
Unescape Escape View File

@ -411,6 +411,7 @@ class _LoginScreenState extends State<LoginScreen> with WidgetsBindingObserver {
if (!isIncomingCall) { if (!isIncomingCall) {
if (isAppOpenBySystem!) checkFirebaseToken(); if (isAppOpenBySystem!) checkFirebaseToken();
} }
Utils.hideLoading(context);
}); });
} }

8
lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
Unescape Escape View File

@ -8,6 +8,7 @@ import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:image_picker/image_picker.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/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@ -16,7 +17,7 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart'; import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:share/share.dart'; import 'package:share_plus/share_plus.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
class OffersAndDiscountsDetails extends StatefulWidget { class OffersAndDiscountsDetails extends StatefulWidget {
@ -125,9 +126,10 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
Uint8List pngBytes = byteData!.buffer.asUint8List(); Uint8List pngBytes = byteData!.buffer.asUint8List();
Directory tempDir = await getTemporaryDirectory(); Directory tempDir = await getTemporaryDirectory();
File file = await File('${tempDir.path}/${DateTime.now().toString()}.png').create(); String fileName = "${DateTime.now().toString()}.png";
File file = await File('${tempDir.path}/$fileName').create();
await file.writeAsBytes(pngBytes); await file.writeAsBytes(pngBytes);
await Share.shareFiles([(file.path)], text: AppState().isArabic(context) ? getOffersList[0].titleAr : getOffersList[0].titleEn); await Share.shareXFiles([XFile(file.path)], text: AppState().isArabic(context) ? getOffersList[0].titleAr : getOffersList[0].titleEn);
} catch (ex) { } catch (ex) {
debugPrint(ex.toString()); debugPrint(ex.toString());
} }

6
pubspec.yaml
Unescape Escape View File

@ -46,7 +46,7 @@ dependencies:
sizer: ^2.0.15 sizer: ^2.0.15
local_auth: ^2.1.6 local_auth: ^2.1.6
fluttertoast: ^8.0.8 fluttertoast: ^8.0.8
syncfusion_flutter_calendar: ^19.4.48 syncfusion_flutter_calendar: ^20.1.58
# flutter_calendar_carousel: ^2.1.0 # flutter_calendar_carousel: ^2.1.0
pie_chart: ^5.1.0 pie_chart: ^5.1.0
shared_preferences: ^2.0.12 shared_preferences: ^2.0.12
@ -71,7 +71,7 @@ dependencies:
qr_code_scanner: ^1.0.1 qr_code_scanner: ^1.0.1
# qr_flutter: ^4.0.0 # qr_flutter: ^4.0.0
url_launcher: ^6.0.15 url_launcher: ^6.0.15
share: 2.0.4 share_plus: ^4.5.3
flutter_rating_bar: ^4.0.1 flutter_rating_bar: ^4.0.1
auto_size_text: ^3.0.0 auto_size_text: ^3.0.0
pull_to_refresh: ^2.0.0 pull_to_refresh: ^2.0.0
@ -87,7 +87,7 @@ dependencies:
#Chat #Chat
signalr_netcore: ^1.3.3 signalr_netcore: ^1.3.3
logging: ^1.0.1 logging: ^1.0.1
swipe_to: ^1.0.2 swipe_to: ^1.0.5
#flutter_webrtc: ^0.9.34 #flutter_webrtc: ^0.9.34
flutter_webrtc: ^0.9.37 flutter_webrtc: ^0.9.37
draggable_widget: ^2.0.0 draggable_widget: ^2.0.0

Write Preview
Loading…
Cancel
Save