This commit is contained in:
Ivan Murashov
2018-03-10 02:41:53 +03:00
parent bd1e0ec17f
commit 60f506a08d
6 changed files with 31 additions and 35 deletions

View File

@@ -188,7 +188,6 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
height: buttonHeight,
child: new FlatButton(
child: new Text(title, style: new TextStyle(color: textColor)),
// FIXME: onPressed: () => startScanner(context, app, helper)),
onPressed: () => Navigator.of(context).pop(true)),
decoration: new BoxDecoration(
border: new Border.all(

View File

@@ -122,8 +122,7 @@ class PurchaseSuccessScreenState<T> extends BaseState<PurchaseSuccessScreen> {
getScanButton() {
String title = StringsLocalization.scan();
// FIXME: return buildRaisedButton(title, () => startScanner(context, app, helper));
return buildRaisedButton(title, () => print('startScanner'));
return buildRaisedButton(title, () => Navigator.of(context).pop(true));
}
@@ -149,7 +148,8 @@ class PurchaseSuccessScreenState<T> extends BaseState<PurchaseSuccessScreen> {
)
)
))
]);
]
);
}
getMessageTitle() {

View File

@@ -43,6 +43,9 @@ class SettingsState extends BaseState<SettingsScreen> {
@override Widget build(BuildContext ctx) {
helper.getSettings(true).then((info) {
setState(() {
print('currency: ${info['currency']}');
print('locale: ${info['locale']}');
print('token: ${info['token']}');
menuItems[0].title = StringsLocalization.currency();
menuItems[1].title = StringsLocalization.locale();
menuItems[2].title = StringsLocalization.logout();

View File

@@ -78,6 +78,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
/// Запуск следующего экрана приложения.
showNextScreen() async {
String token = await helper.getToken();
// В случае, если в приложении отсутствует токен,