Merge branches 'Amjad_search' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
commit
1c2cba3726
@ -0,0 +1,7 @@
|
|||||||
|
const Map<String, Map<String, String>> localizedValues = {
|
||||||
|
'dashboardScreenToolbarTitle': {'ar': 'الرئيسة', 'en': 'Home'},
|
||||||
|
'settings': {'en': 'Settings', 'ar': 'الاعدادات'},
|
||||||
|
'language': {'en': 'App Language', 'ar': 'لغة التطبيق'},
|
||||||
|
'lanEnglish': {'en': 'English', 'ar': 'English'},
|
||||||
|
'lanArabic': {'en': 'العربية', 'ar': 'العربية'}
|
||||||
|
};
|
@ -1,3 +1,4 @@
|
|||||||
final TOKEN = 'token';
|
final TOKEN = 'token';
|
||||||
final PROJECT_ID="projectID";
|
final PROJECT_ID="projectID";
|
||||||
final SLECTED_PATIENT_TYPE="slectedPatientType";
|
final SLECTED_PATIENT_TYPE="slectedPatientType";
|
||||||
|
final APP_Language = "language";
|
@ -1,25 +0,0 @@
|
|||||||
// GENERATED FILE, do not edit!
|
|
||||||
import 'package:i18n/i18n.dart' as i18n;
|
|
||||||
|
|
||||||
String get _languageCode => 'en';
|
|
||||||
String get _localeName => 'en';
|
|
||||||
|
|
||||||
String _plural(int count, {String zero, String one, String two, String few, String many, String other}) =>
|
|
||||||
i18n.plural(count, _languageCode, zero:zero, one:one, two:two, few:few, many:many, other:other);
|
|
||||||
String _ordinal(int count, {String zero, String one, String two, String few, String many, String other}) =>
|
|
||||||
i18n.ordinal(count, _languageCode, zero:zero, one:one, two:two, few:few, many:many, other:other);
|
|
||||||
String _cardinal(int count, {String zero, String one, String two, String few, String many, String other}) =>
|
|
||||||
i18n.cardinal(count, _languageCode, zero:zero, one:one, two:two, few:few, many:many, other:other);
|
|
||||||
|
|
||||||
class Ar {
|
|
||||||
const Ar();
|
|
||||||
ButtonAr get button => ButtonAr(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
class ButtonAr {
|
|
||||||
final Ar _parent;
|
|
||||||
const ButtonAr(this._parent);
|
|
||||||
String get save => "حفظ";
|
|
||||||
String get load => "تحميل";
|
|
||||||
}
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
button:
|
|
||||||
save: حفظ
|
|
||||||
load: تحميل
|
|
@ -1,25 +0,0 @@
|
|||||||
// GENERATED FILE, do not edit!
|
|
||||||
import 'package:i18n/i18n.dart' as i18n;
|
|
||||||
|
|
||||||
String get _languageCode => 'en';
|
|
||||||
String get _localeName => 'en';
|
|
||||||
|
|
||||||
String _plural(int count, {String zero, String one, String two, String few, String many, String other}) =>
|
|
||||||
i18n.plural(count, _languageCode, zero:zero, one:one, two:two, few:few, many:many, other:other);
|
|
||||||
String _ordinal(int count, {String zero, String one, String two, String few, String many, String other}) =>
|
|
||||||
i18n.ordinal(count, _languageCode, zero:zero, one:one, two:two, few:few, many:many, other:other);
|
|
||||||
String _cardinal(int count, {String zero, String one, String two, String few, String many, String other}) =>
|
|
||||||
i18n.cardinal(count, _languageCode, zero:zero, one:one, two:two, few:few, many:many, other:other);
|
|
||||||
|
|
||||||
class En {
|
|
||||||
const En();
|
|
||||||
ButtonEn get button => ButtonEn(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
class ButtonEn {
|
|
||||||
final En _parent;
|
|
||||||
const ButtonEn(this._parent);
|
|
||||||
String get save => "Save";
|
|
||||||
String get load => "Load";
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
|||||||
button:
|
|
||||||
save: Save
|
|
||||||
load: Load
|
|
||||||
|
|
@ -1,18 +1,23 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
import 'package:doctor_app_flutter/config/config.dart';
|
import 'package:doctor_app_flutter/config/config.dart';
|
||||||
|
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
|
||||||
|
|
||||||
import '../interceptor/http_interceptor.dart';
|
import '../interceptor/http_interceptor.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:http/http.dart';
|
import 'package:http/http.dart';
|
||||||
import 'package:http_interceptor/http_client_with_interceptor.dart';
|
import 'package:http_interceptor/http_client_with_interceptor.dart';
|
||||||
|
|
||||||
const GET_PROJECTS =
|
const GET_PROJECTS = BASE_URL + 'Lists.svc/REST/GetProjectForDoctorAPP';
|
||||||
BASE_URL+'Lists.svc/REST/GetProjectForDoctorAPP';
|
|
||||||
|
class HospitalProvider with ChangeNotifier {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class ProjectsProvider with ChangeNotifier {
|
|
||||||
Client client =
|
Client client =
|
||||||
HttpClientWithInterceptor.build(interceptors: [HttpInterceptor()]);
|
HttpClientWithInterceptor.build(interceptors: [HttpInterceptor()]);
|
||||||
|
|
||||||
Future<Map> getProjectsList() async {
|
Future<Map> getProjectsList() async {
|
||||||
const url = GET_PROJECTS;
|
const url = GET_PROJECTS;
|
||||||
var info = {
|
var info = {
|
@ -0,0 +1,43 @@
|
|||||||
|
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
|
||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
|
||||||
|
class ProjectProvider with ChangeNotifier{
|
||||||
|
|
||||||
|
DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
|
||||||
|
Locale _appLocale;
|
||||||
|
String currentLanguage = 'ar';
|
||||||
|
bool _isArabic = false;
|
||||||
|
|
||||||
|
Locale get appLocal => _appLocale;
|
||||||
|
|
||||||
|
bool get isArabic => _isArabic;
|
||||||
|
|
||||||
|
ProjectProvider(){
|
||||||
|
loadSharedPrefLanguage ();
|
||||||
|
}
|
||||||
|
void loadSharedPrefLanguage() async {
|
||||||
|
currentLanguage = await sharedPref.getString(APP_Language);
|
||||||
|
_appLocale = Locale(currentLanguage ?? 'ar');
|
||||||
|
_isArabic = currentLanguage != null
|
||||||
|
? currentLanguage == 'ar' ? true : false
|
||||||
|
: false;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
void changeLanguage(String lan) {
|
||||||
|
if (lan != "en" && currentLanguage != lan) {
|
||||||
|
_appLocale = Locale("ar");
|
||||||
|
_isArabic = true;
|
||||||
|
currentLanguage = 'ar';
|
||||||
|
sharedPref.setString(APP_Language, 'ar');
|
||||||
|
} else if (lan != "ar" && currentLanguage != lan) {
|
||||||
|
_appLocale = Locale("en");
|
||||||
|
_isArabic = false;
|
||||||
|
currentLanguage = 'en';
|
||||||
|
sharedPref.setString(APP_Language, 'en');
|
||||||
|
}
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,11 +1,65 @@
|
|||||||
|
import 'package:doctor_app_flutter/providers/project_provider.dart';
|
||||||
|
import 'package:doctor_app_flutter/providers/hospital_provider.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
||||||
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
|
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hexcolor/hexcolor.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
class SettingsScreen extends StatelessWidget {
|
class SettingsScreen extends StatelessWidget {
|
||||||
|
|
||||||
|
ProjectProvider projectsProvider;
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
projectsProvider = Provider.of(context);
|
||||||
return AppScaffold(
|
return AppScaffold(
|
||||||
appBarTitle: "SETTINS",
|
appBarTitle: TranslationBase.of(context).settings.toUpperCase(),
|
||||||
body: Container(),
|
body: ListView(
|
||||||
|
children: [
|
||||||
|
AppText(TranslationBase.of(context).language.toUpperCase(),fontSize: 18,margin: 5,fontWeight: FontWeight.bold,),
|
||||||
|
Container(
|
||||||
|
margin: EdgeInsets.symmetric(horizontal: 10,vertical: 10),
|
||||||
|
height: 50,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
border: Border.all(color: Colors.grey[600],width: 2.0),
|
||||||
|
borderRadius: BorderRadius.circular(8.0)
|
||||||
|
),
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(7.0),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: InkWell(
|
||||||
|
onTap: () { projectsProvider.changeLanguage('en'); },
|
||||||
|
child: AnimatedContainer(
|
||||||
|
duration: Duration(milliseconds: 350),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: !projectsProvider.isArabic ? Hexcolor('#58434F') : Colors.transparent,
|
||||||
|
border: Border(right: BorderSide(color: Colors.grey[200], width: 2.0))
|
||||||
|
),
|
||||||
|
child: Center(child: AppText(TranslationBase.of(context).lanEnglish, color: !projectsProvider.isArabic ? Colors.white : Colors.grey[500]))
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: InkWell(
|
||||||
|
onTap: (){projectsProvider.changeLanguage('ar');},
|
||||||
|
child: AnimatedContainer(
|
||||||
|
duration: Duration(milliseconds: 350),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: projectsProvider.isArabic ? Hexcolor('#58434F') : Colors.transparent,
|
||||||
|
border: Border(right: BorderSide(color: Colors.grey[200], width: 2.0))
|
||||||
|
),
|
||||||
|
child: Center(child: AppText(TranslationBase.of(context).lanArabic, color: projectsProvider.isArabic ? Colors.white : Colors.grey[500],))
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -0,0 +1,43 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:doctor_app_flutter/config/localized_values.dart';
|
||||||
|
import 'package:flutter/foundation.dart' show SynchronousFuture;
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class TranslationBase {
|
||||||
|
TranslationBase(this.locale);
|
||||||
|
|
||||||
|
final Locale locale;
|
||||||
|
|
||||||
|
static TranslationBase of(BuildContext context) {
|
||||||
|
return Localizations.of<TranslationBase>(context, TranslationBase);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
String get dashboardScreenToolbarTitle => localizedValues['dashboardScreenToolbarTitle'][locale.languageCode];
|
||||||
|
|
||||||
|
String get settings => localizedValues['settings'][locale.languageCode];
|
||||||
|
|
||||||
|
String get language => localizedValues['language'][locale.languageCode];
|
||||||
|
|
||||||
|
String get lanEnglish => localizedValues['lanEnglish'][locale.languageCode];
|
||||||
|
|
||||||
|
String get lanArabic => localizedValues['lanArabic'][locale.languageCode];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {
|
||||||
|
const TranslationBaseDelegate();
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool isSupported(Locale locale) => ['en', 'ar'].contains(locale.languageCode);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<TranslationBase> load(Locale locale) {
|
||||||
|
return SynchronousFuture<TranslationBase>(TranslationBase(locale));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool shouldReload(TranslationBaseDelegate old) => false;
|
||||||
|
}
|
Loading…
Reference in New Issue