From 8ee3b3b55708e9763c1b0899f3484cbc23fad970 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 11 Aug 2020 09:21:31 +0300 Subject: [PATCH] family files. --- lib/config/localized_values.dart | 7 +++ lib/pages/family/my-family.dart | 51 +++++++++++++++++++ lib/routes.dart | 5 +- .../authentication/auth_provider.dart | 3 +- lib/uitl/translations_delegate_base.dart | 3 ++ lib/widgets/drawer/app_drawer_widget.dart | 26 ++++++++++ 6 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 lib/pages/family/my-family.dart diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 635e12a5..69356729 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -154,4 +154,11 @@ const Map> localizedValues = { "ksa": {"en": "KSA", "ar": "السعودية"}, "dubai": {"en": "Dubai", "ar": "دبي"}, "enter-email": {"en": "Enter Email", "ar": "ادخل البريد الالكتروني"}, + "family": {"en": "My Family", "ar": "عائلتي"}, + "family-title": {"en": "My Family Files", "ar": "ملفات العائلة"}, + "add-new-member": {"en": "Add Family Member", "ar": "إضافة عضو جديد"}, + "sent-requests": {"en": "Sent Requests", "ar": "الطلبات المرسلة"}, + "recieved-requests": {"en": "Recieved Requests", "ar": "الطلبات المستلمة"}, + "manage-files": {"en": "Manage Family Files", "ar": "إدارة ملفات العائلة"}, + // "my-family": {"en": "MY FAMILY", "ar": "عائلتي"}, }; diff --git a/lib/pages/family/my-family.dart b/lib/pages/family/my-family.dart new file mode 100644 index 00000000..9d1a39e9 --- /dev/null +++ b/lib/pages/family/my-family.dart @@ -0,0 +1,51 @@ +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/config/size_config.dart'; +import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart'; +import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:diplomaticquarterapp/routes.dart'; + +class MyFamily extends StatefulWidget { + @override + _MyFamily createState() => _MyFamily(); +} + +class _MyFamily extends State { + bool isLoading = true; + @override + void initState() { + isLoading = true; + // checkUser(context); + super.initState(); + } + + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: TranslationBase.of(context).myFamilyFiles, + isShowAppBar: true, + body: SingleChildScrollView( + padding: EdgeInsets.all(20), + child: Stack( + children: [ + TabBar( + tabs: [ + Tab(icon: Icon(Icons.directions_car)), + Tab(icon: Icon(Icons.directions_transit)), + ], + ), + TabBarView( + children: [ + Icon(Icons.directions_car), + Icon(Icons.directions_transit), + ], + ) + ], + ))); + } +} diff --git a/lib/routes.dart b/lib/routes.dart index 2c68ed21..d4e38a9a 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/pages/family/my-family.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/login/confirm-login.dart'; import 'package:diplomaticquarterapp/pages/login/forgot-password.dart'; @@ -19,6 +20,7 @@ const String FORGOT_PASSWORD = 'forgot-password'; const String REGISTER = 'register'; const String CONFIRM_LOGIN = 'confrim-login'; const String REGISTER_INFO = 'register-info'; +const String MY_FAMILIY = 'my-family'; var routes = { // ROOT: (_) => RootPage(), HOME: (_) => LandingPage(), @@ -28,5 +30,6 @@ var routes = { FORGOT_PASSWORD: (_) => ForgotPassword(), REGISTER: (_) => Register(), CONFIRM_LOGIN: (_) => ConfirmLogin(), - REGISTER_INFO: (_) => RegisterInfo() + REGISTER_INFO: (_) => RegisterInfo(), + MY_FAMILIY: (_) => MyFamily() }; diff --git a/lib/services/authentication/auth_provider.dart b/lib/services/authentication/auth_provider.dart index f74fb056..8cd134e8 100644 --- a/lib/services/authentication/auth_provider.dart +++ b/lib/services/authentication/auth_provider.dart @@ -231,7 +231,8 @@ class AuthProvider with ChangeNotifier { neRequest.patientOutSA = neRequest.zipCode == '966' ? 0 : 1; neRequest.projectOutSA = neRequest.zipCode == '966' ? 0 : 1; neRequest.isDentalAllowedBackend = false; - neRequest.forRegisteration = neRequest.isRegister; + neRequest.forRegisteration = + neRequest.isRegister != null ? neRequest.isRegister : false; neRequest.isRegister = false; dynamic localRes; try { diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index f2282cd3..71d1699f 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -191,6 +191,9 @@ class TranslationBase { String get ksa => localizedValues['ksa'][locale.languageCode]; String get dubai => localizedValues['dubai'][locale.languageCode]; String get enterEmail => localizedValues['enter-email'][locale.languageCode]; + String get family => localizedValues['family'][locale.languageCode]; + String get myFamilyFiles => + localizedValues['family-title'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 3d856574..c9d281ce 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -122,6 +122,32 @@ class _AppDrawerState extends State { user != null ? Column( children: [ + InkWell( + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + DrawerItem( + TranslationBase.of(context).family, + Icons.group, + textColor: Colors.red, + iconColor: Colors.red, + ), + Padding( + padding: EdgeInsets.only( + bottom: 10, right: 30), + child: Icon( + Icons.chevron_right, + color: Colors.red, + )) + ], + ), + onTap: () { + Navigator.of(context).pushNamed( + MY_FAMILIY, + ); + }, + ), InkWell( child: DrawerItem( TranslationBase.of(context)