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

merge material 3

Browse Source
This commit is contained in:
tzw
2024-01-25 17:40:35 +06:30
parent 18053cbe3c
commit 991ecd7ae6
70 changed files with 572 additions and 1377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,7 @@
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:fcs/pages/main/util.dart';
@@ -41,27 +40,11 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
return LocalProgress(
inAsyncCall: _loading,
child: Scaffold(
appBar: AppBar(
centerTitle: true,
title: LocalText(
context,
"profile.edit.currency.title",
fontSize: 20,
color: primaryColor,
),
backgroundColor: Colors.white,
shadowColor: Colors.transparent,
leading: IconButton(
icon: Icon(
CupertinoIcons.back,
size: 35,
color: primaryColor,
),
onPressed: () {
Navigator.of(context).pop();
},
),
),
appBar: LocalAppBar(
labelKey: 'profile.edit.currency.title',
backgroundColor: Colors.white,
labelColor: primaryColor,
arrowColor: primaryColor),
body: Column(
children: <Widget>[
InkWell(
@@ -75,10 +58,10 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
value: Currency.USD,
groupValue: _currency,
onChanged: (Currency? value) {
if(value != null)
setState(() {
_currency = value;
});
if (value != null)
setState(() {
_currency = value;
});
},
),
),
@@ -94,10 +77,10 @@ class _ProfileCurrencyEditState extends State<ProfileCurrencyEdit> {
value: Currency.MMK,
groupValue: _currency,
onChanged: (Currency? value) {
if(value != null)
setState(() {
_currency = value;
});
if (value != null)
setState(() {
_currency = value;
});
},
),
),

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

@@ -2,9 +2,8 @@ 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/local_app_bar.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:fcs/pages/main/util.dart';
@@ -58,27 +57,11 @@ class _ProfileEditState extends State<ProfileEdit> {
return LocalProgress(
inAsyncCall: _loading,
child: Scaffold(
appBar: AppBar(
centerTitle: true,
title: LocalText(
context,
"profile.edit_title",
fontSize: 20,
color: primaryColor,
),
backgroundColor: Colors.white,
shadowColor: Colors.transparent,
leading: IconButton(
icon: Icon(
CupertinoIcons.back,
size: 35,
color: primaryColor,
),
onPressed: () {
Navigator.of(context).pop();
},
),
),
appBar: LocalAppBar(
labelKey: "profile.edit_title",
backgroundColor: Colors.white,
labelColor: primaryColor,
arrowColor: primaryColor),
body: Column(
children: <Widget>[
Expanded(child: name),

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

@@ -12,7 +12,7 @@ import 'package:fcs/pages/staff/model/staff_model.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';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -128,25 +128,11 @@ class _ProfileState extends State<Profile> {
inAsyncCall: _isLoading,
child: Scaffold(
key: key,
appBar: AppBar(
centerTitle: true,
leading: IconButton(
icon: Icon(
CupertinoIcons.back,
size: 35,
color: primaryColor,
),
onPressed: () => Navigator.of(context).pop(),
),
title: LocalText(
context,
"profile.title",
fontSize: 20,
color: primaryColor,
),
shadowColor: Colors.transparent,
backgroundColor: Colors.white,
),
appBar: LocalAppBar(
labelKey: "profile.title",
backgroundColor: Colors.white,
labelColor: primaryColor,
arrowColor: primaryColor),
body: Padding(
padding: const EdgeInsets.all(8.0),
child: ListView(