sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
phyothandar
2021-09-10 12:09:21 +06:30
parent 5e672937b5 c06ae00b68
commit 5a313d641e
35 changed files with 187 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/profile/profile_currency_edit.dart
View File

@@ -1,6 +1,4 @@
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/localization/app_translations.dart';
import 'package:fcs/pages/main/model/language_model.dart';
import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
@@ -77,6 +75,7 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
value: Currency.USD,
groupValue: _currency,
onChanged: (Currency? value) {
if(value != null)
setState(() {
_currency = value!;
});
@@ -95,6 +94,7 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
value: Currency.MMK,
groupValue: _currency,
onChanged: (Currency? value) {
if(value != null)
setState(() {
_currency = value!;
});

2
lib/pages/profile/profile_edit.dart
View File

@@ -39,7 +39,7 @@ class _ProfileEditState extends State<ProfileEdit> {
cursorColor: primaryColor,
style: textStyle,
decoration: new InputDecoration(
labelText: AppTranslations.of(context).text("profile.name"),
labelText: AppTranslations.of(context)!.text("profile.name"),
labelStyle: languageModel.isEng ? labelStyle : labelStyleMM,
icon: Icon(
Icons.person,

6
lib/pages/profile/profile_page.dart
View File

@@ -1,9 +1,7 @@
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/domain/vo/privilege.dart';
import 'package:fcs/localization/transalation.dart';
import 'package:fcs/pages/delivery_address/delivery_address_list.dart';
import 'package:fcs/pages/delivery_address/delivery_address_row.dart';
import 'package:fcs/pages/delivery_address/model/delivery_address_model.dart';
import 'package:fcs/pages/main/model/language_model.dart';
import 'package:fcs/pages/main/model/main_model.dart';
@@ -11,7 +9,6 @@ import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/profile/profile_currency_edit.dart';
import 'package:fcs/pages/profile/profile_edit.dart';
import 'package:fcs/pages/staff/model/staff_model.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart';
@@ -20,7 +17,6 @@ import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:provider/provider.dart';
import '../../helpers/theme.dart';
@@ -35,7 +31,7 @@ class Profile extends StatefulWidget {
class _ProfileState extends State<Profile> {
GlobalKey key = GlobalKey();
bool _isLoading = false;
String selectedLanguage;
String? selectedLanguage ;
TextEditingController bizNameController = new TextEditingController();
static final List<String> languagesList = Translation().supportedLanguages;