Работает функционал переключения валют, остались правки по ui

This commit is contained in:
Ivan Murashov
2017-09-11 16:43:13 +03:00
parent e492a3a146
commit bc092ca8f9
6 changed files with 82 additions and 29 deletions

View File

@@ -1,8 +1,7 @@
import 'package:checker/base/settings_base_state.dart';
import 'package:flutter/material.dart';
import 'package:checker/consts.dart';
import 'package:checker/strings.dart';
import 'package:checker/base/base_state.dart';
import 'package:checker/common.dart';
class CurrenciesScreen extends StatefulWidget {
@override State createState() => new _CurrenciesState();
@@ -10,6 +9,8 @@ class CurrenciesScreen extends StatefulWidget {
class _CurrenciesState extends SettingsBaseState<CurrenciesScreen> {
List<int> currencies = const [643, 840, 980];
@override
List<String> getOptions() {
@@ -20,8 +21,22 @@ class _CurrenciesState extends SettingsBaseState<CurrenciesScreen> {
return [ruble, dollar, hryvna];
}
@override
void getSelectedValue() {
helper.getCurrency().then((currency) {
setState(() {
selectedItem = currencies.indexOf(currency);
});
});
}
@override
String getTitle() {
return StringsLocalization.settings();
}
@override
saveOption() async {
await helper.saveCurrency(currencies[selectedItem]);
}
}

View File

@@ -2,6 +2,7 @@ import 'package:checker/base/settings_base_state.dart';
import 'package:flutter/material.dart';
import 'package:checker/consts.dart';
import 'package:checker/strings.dart';
import 'package:checker/common.dart';
class LanguagesScreen extends StatefulWidget {
@override State createState() => new _LanguagesState();
@@ -18,4 +19,19 @@ class _LanguagesState extends SettingsBaseState<LanguagesScreen> {
String getTitle() {
return StringsLocalization.locale();
}
@override
void saveOption() {
// helper.sa(languages[selectedItem]);
}
@override
void getSelectedValue() {
helper.getLocale().then((locale) {
setState(() {
print(selectedItem);
selectedItem = getOptions().indexOf(getLocaleTitle(locale));
});
});
}
}

View File

@@ -203,29 +203,31 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
String url = user['purchases_url'];
var body = {
'doc_id': result,
'curr_iso_code': '643',
'commit': 'true',
'sum_total': sumTotal
};
helper.getCurrency().then((currency) {
var body = {
'doc_id': result,
'curr_iso_code': currency.toString(),
'commit': 'true',
'sum_total': sumTotal
};
var headers = {
'DM-Authorization': 'dmapptoken $appToken',
'Authorization': 'dmtoken ${token}'
};
var headers = {
'DM-Authorization': 'dmapptoken $appToken',
'Authorization': 'dmtoken ${token}'
};
httpClient.post(url, body: body, headers: headers).then((response) {
httpClient.post(url, body: body, headers: headers).then((response) {
print(response.body);
helper.close().then((_) {
Navigator.of(context).pop();
pushRouteReplacement(context, new PurchaseSuccessScreen(sumTotal, user['first_name'] == null ? '' : user['first_name']));
print(response.body);
helper.close().then((_) {
Navigator.of(context).pop();
pushRouteReplacement(context, new PurchaseSuccessScreen(sumTotal, user['first_name'] == null ? '' : user['first_name']));
});
}).catchError((error) {
purchaseInProgress = false;
print(error.toString());
});
}).catchError((error) {
purchaseInProgress = false;
print(error.toString());
});
});
}