Gif Loader & My Family Fixes

merge-update-with-lab-changes
Aamir Muhammad 2 years ago
parent d459600f22
commit 542864c89c

@ -20,8 +20,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/'; // var BASE_URL = 'http://10.50.100.198:2018/';
// var BASE_URL = 'https://uat.hmgwebservices.com/'; var BASE_URL = 'https://uat.hmgwebservices.com/';
var BASE_URL = 'https://hmgwebservices.com/'; //var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';

@ -91,7 +91,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
imagesInfo: imagesInfo, imagesInfo: imagesInfo,
showNewAppBar: true, showNewAppBar: true,
showNewAppBarTitle: true, showNewAppBarTitle: true,
onTap: widget.isAppbarVisible == false ? widget.onBackClick!() : null, onTap: widget.isAppbarVisible == false ? widget.onBackClick : null,
icon: "assets/images/new/bottom_nav/family_files.svg", icon: "assets/images/new/bottom_nav/family_files.svg",
description: TranslationBase.of(context).familyInfo, description: TranslationBase.of(context).familyInfo,
body: Column( body: Column(
@ -462,7 +462,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
// .then((value) => loginAfter(value, context)); // .then((value) => loginAfter(value, context));
// Utils.showProgressDialog(context); // Utils.showProgressDialog(context);
this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser).then((value) => loginAfter(value, context)).catchError((err) { this.familyFileProvider.silentLoggin(user, mainUser: user).then((value) {
loginAfter(value, context);
}).catchError((err) {
print("err:$err"); print("err:$err");
AppToast.showErrorToast(message: err.toString()); AppToast.showErrorToast(message: err.toString());
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -484,7 +486,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
} }
this.sharedPref.setString(BLOOD_TYPE, bloodType); this.sharedPref.setString(BLOOD_TYPE, bloodType);
this.sharedPref.setString(APP_LANGUAGE, currentLang); this.sharedPref.setString(APP_LANGUAGE, currentLang);
this.sharedPref.setInt(LAST_LOGIN, loginType); this.sharedPref.setInt(LAST_LOGIN, loginType ?? 1);
await this.sharedPref.setObject(MAIN_USER, mainUser); await this.sharedPref.setObject(MAIN_USER, mainUser);
await this.sharedPref.setObject(USER_PROFILE, result.list); await this.sharedPref.setObject(USER_PROFILE, result.list);
await this.sharedPref.setObject(FAMILY_FILE, familyFile); await this.sharedPref.setObject(FAMILY_FILE, familyFile);
@ -535,11 +537,10 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
checkUserData() async { checkUserData() async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) { if (await this.sharedPref.getObject(USER_PROFILE) != null) {
var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
// var data2 = AuthenticatedUser.fromJson(await this.sharedPref.getObject(MAIN_USER));
await getFamilyFiles(); await getFamilyFiles();
setState(() {
this.user = data; this.user = data;
//setState(() {}); });
} }
} }
@ -582,7 +583,6 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
} catch (ex) { } catch (ex) {
familySharedRecords = GetAllSharedRecordsByStatusResponse(getAllSharedRecordsByStatusList: []); familySharedRecords = GetAllSharedRecordsByStatusResponse(getAllSharedRecordsByStatusList: []);
} }
} }
Future getUserViewRequest() async { Future getUserViewRequest() async {

@ -237,7 +237,7 @@ class FamilyFilesProvider with ChangeNotifier {
Future<dynamic> silentLoggin(GetAllSharedRecordsByStatusList switchUser, {onSuccess, mainUser}) async { Future<dynamic> silentLoggin(GetAllSharedRecordsByStatusList switchUser, {onSuccess, mainUser}) async {
Map<String, dynamic> request = {}; Map<String, dynamic> request = {};
if (mainUser == true) { if (mainUser == true) {
var currentUser = AuthenticatedUser.fromJson(await sharedPref.getObject(MAIN_USER)); var currentUser = AuthenticatedUser.fromJson(await sharedPref.getObject(MAIN_USER) ?? "");
request['PatientOutSA'] = currentUser.outSA; //currentUser.outSA; //? 1 : 0; request['PatientOutSA'] = currentUser.outSA; //currentUser.outSA; //? 1 : 0;
request['LoginType'] = await sharedPref.getInt(LAST_LOGIN) ?? 1; request['LoginType'] = await sharedPref.getInt(LAST_LOGIN) ?? 1;
@ -247,7 +247,7 @@ class FamilyFilesProvider with ChangeNotifier {
// request['SuperUser'] = currentUser.patientID; //currentUser.PatientID; // request['SuperUser'] = currentUser.patientID; //currentUser.PatientID;
request['PatientIdentificationID'] = ''; request['PatientIdentificationID'] = '';
request['IsSilentLogin'] = true; request['IsSilentLogin'] = true;
request['DeviceToken'] = await sharedPref.getString(PUSH_TOKEN); request['DeviceToken'] = await sharedPref.getString(PUSH_TOKEN ?? "");
request['PatientID'] = currentUser.patientID; //['PatientID']; request['PatientID'] = currentUser.patientID; //['PatientID'];
request['ZipCode'] = currentUser.outSA == 1 ? "971" : "966"; request['ZipCode'] = currentUser.outSA == 1 ? "971" : "966";
request['activationCode'] = '0000'; request['activationCode'] = '0000';
@ -287,7 +287,7 @@ class FamilyFilesProvider with ChangeNotifier {
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
throw error; throw error;
}, body: request); }, body: request);
sharedPref.setString(BLOOD_TYPE, localRes['PatientBloodType']); sharedPref.setString(BLOOD_TYPE, localRes['PatientBloodType'] ?? "");
return Future.value(localRes); return Future.value(localRes);
} catch (error) { } catch (error) {
print(error); print(error);

@ -1,5 +1,5 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter_gif/flutter_gif.dart'; import 'package:gif_view/gif_view.dart';
class GifLoaderContainer extends StatefulWidget { class GifLoaderContainer extends StatefulWidget {
@override @override
@ -7,15 +7,16 @@ class GifLoaderContainer extends StatefulWidget {
} }
class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProviderStateMixin { class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProviderStateMixin {
late FlutterGifController controller; late GifController controller;
@override @override
void initState() { void initState() {
controller = FlutterGifController(vsync: this); controller = GifController();
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
try { try {
controller.repeat(min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true); controller = GifController(autoPlay: true, onFinish: () {}, loop: true);
// controller.repeat(min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true);
} catch (ex) {} } catch (ex) {}
}); });
super.initState(); super.initState();
@ -33,9 +34,10 @@ class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProv
//progress-loading.gif //progress-loading.gif
child: Container( child: Container(
// margin: EdgeInsets.only(bottom: 40), // margin: EdgeInsets.only(bottom: 40),
child: GifImage( child: GifView.asset(
'assets/images/progress-loading-red.gif',
controller: controller, controller: controller,
image: AssetImage("assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"), // image: AssetImage("assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"),
), ),
)); ));
} }

@ -45,7 +45,7 @@ class BottomNavigationItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 15, height: 10,
), ),
icon == "assets/images/new/bottom_nav/help.svg" ? Container( icon == "assets/images/new/bottom_nav/help.svg" ? Container(
child: SvgPicture.asset(icon!, height: 20, width: 20, fit: BoxFit.cover), child: SvgPicture.asset(icon!, height: 20, width: 20, fit: BoxFit.cover),
@ -81,7 +81,7 @@ class BottomNavigationItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 15, height: 11,
), ),
Container( Container(
child: SvgPicture.asset(icon!, height: 20, width: 20, fit: BoxFit.cover, color: currentIndex == index child: SvgPicture.asset(icon!, height: 20, width: 20, fit: BoxFit.cover, color: currentIndex == index
@ -105,7 +105,7 @@ class BottomNavigationItem extends StatelessWidget {
), ),
Positioned( Positioned(
right: 18.0, right: 18.0,
bottom: 28.0, bottom: 27.0,
child: badge_import.Badge( child: badge_import.Badge(
badgeStyle: badge_import.BadgeStyle( badgeStyle: badge_import.BadgeStyle(
shape: badge_import.BadgeShape.circle, shape: badge_import.BadgeShape.circle,
@ -131,7 +131,7 @@ class BottomNavigationItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 15, height: 10,
), ),
Container( Container(
child: SvgPicture.asset(icon!, height: 20, width: 20, fit: BoxFit.cover), child: SvgPicture.asset(icon!, height: 20, width: 20, fit: BoxFit.cover),

@ -1,3 +1,5 @@
import 'dart:convert';
import 'package:barcode_scan2/barcode_scan2.dart'; import 'package:barcode_scan2/barcode_scan2.dart';
import 'package:diplomaticquarterapp/analytics/google-analytics.dart'; import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
@ -42,6 +44,7 @@ import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
// import 'package:flutter_amazonpaymentservices/environment_type.dart'; // import 'package:flutter_amazonpaymentservices/environment_type.dart';
// import 'package:flutter_amazonpaymentservices/flutter_amazonpaymentservices.dart'; // import 'package:flutter_amazonpaymentservices/flutter_amazonpaymentservices.dart';
@ -332,7 +335,12 @@ class _AppDrawerState extends State<AppDrawer> {
InkWell( InkWell(
child: DrawerItem(TranslationBase.of(context).arabicChange, child: DrawerItem(TranslationBase.of(context).arabicChange,
Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.only(left: 3, right: 3, top: 3, bottom: projectProvider!.isArabic ? 3 : 0)), Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.only(left: 3, right: 3, top: 3, bottom: projectProvider!.isArabic ? 3 : 0)),
isImageIcon: true, bottomLine: false, letterSpacing: -0.84, fontSize: 14, fontHeight: projectProvider!.isArabic ? 1 : 0.8, projectProvider: projectProvider), isImageIcon: true,
bottomLine: false,
letterSpacing: -0.84,
fontSize: 14,
fontHeight: projectProvider!.isArabic ? 1 : 0.8,
projectProvider: projectProvider),
onTap: () { onTap: () {
sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL); sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
sharedPref.remove(CLINICS_LIST); sharedPref.remove(CLINICS_LIST);
@ -657,9 +665,10 @@ class _AppDrawerState extends State<AppDrawer> {
} }
switchUser(user, context) { switchUser(user, context) {
GetAllSharedRecordsByStatusList switchUser = GetAllSharedRecordsByStatusList.fromJson(jsonDecode(jsonEncode(user)));
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
sharedPref.remove(BLOOD_TYPE); sharedPref.remove(BLOOD_TYPE);
this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser).then((value) { this.familyFileProvider.silentLoggin(switchUser, mainUser: user is AuthenticatedUser).then((value) {
// GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
// Navigator.of(context).pop(); // Navigator.of(context).pop();
loginAfter(value, context, user is AuthenticatedUser); loginAfter(value, context, user is AuthenticatedUser);
@ -691,7 +700,7 @@ class _AppDrawerState extends State<AppDrawer> {
// result.list.cRSVerificationStatus = result['CRSVerificationStatus']; // result.list.cRSVerificationStatus = result['CRSVerificationStatus'];
this.sharedPref.setString(APP_LANGUAGE, currentLang); this.sharedPref.setString(APP_LANGUAGE, currentLang);
this.sharedPref.setString(BLOOD_TYPE, bloodType); this.sharedPref.setString(BLOOD_TYPE, bloodType);
this.sharedPref.setInt(LAST_LOGIN, loginType); this.sharedPref.setInt(LAST_LOGIN, loginType ?? 1);
await this.sharedPref.setObject(MAIN_USER, mainUser); await this.sharedPref.setObject(MAIN_USER, mainUser);
await this.sharedPref.setObject(USER_PROFILE, result.list); await this.sharedPref.setObject(USER_PROFILE, result.list);
await this.sharedPref.setObject(FAMILY_FILE, familyFile); await this.sharedPref.setObject(FAMILY_FILE, familyFile);

@ -73,8 +73,9 @@ dependencies:
#GIF image #GIF image
# flutter_gifimage: ^1.0.1 # flutter_gifimage: ^1.0.1
flutter_gif: ^0.0.4 #flutter_gif: any
photo_view: any photo_view: any
gif_view: ^0.3.1
# flutter_webrtc: any # flutter_webrtc: any
# UI Reqs # UI Reqs
@ -135,7 +136,7 @@ dependencies:
native_device_orientation: ^1.0.0 native_device_orientation: ^1.0.0
wakelock: ^0.6.2 wakelock: ^0.6.2
after_layout: ^1.1.0 after_layout: ^1.1.0
cached_network_image: ^3.1.0+1 cached_network_image: ^3.3.0
flutter_tts: ^3.6.1 flutter_tts: ^3.6.1
vibration: ^1.7.3 vibration: ^1.7.3
flutter_nfc_kit: ^3.3.1 flutter_nfc_kit: ^3.3.1

Loading…
Cancel
Save