Remove i18n package. Add xml files with strings to flutter assets. Create method for passing localized strings to channel.
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import 'package:checker/db.dart';
|
||||
import 'package:checker/strings.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
|
||||
import 'common.dart';
|
||||
|
||||
@@ -14,7 +13,7 @@ getCreateTokenRequest(Map httpBody) async {
|
||||
return httpClient.post(
|
||||
await getEndpoint() + 'tokens/?_dmapptoken=' + await getToken(),
|
||||
body: httpBody,
|
||||
headers: {'Accept-Language': Intl.defaultLocale});
|
||||
headers: {'Accept-Language': StringsLocalization.localeCode});
|
||||
}
|
||||
|
||||
// Проверка статуса токена. В ответе приходит параметр active, который может быть либо true, либо false,.
|
||||
@@ -25,21 +24,21 @@ getCheckTokenStatusRequest(String token) async {
|
||||
token +
|
||||
'?_dmapptoken=' +
|
||||
await getToken(),
|
||||
headers: {'Accept-Language': Intl.defaultLocale});
|
||||
headers: {'Accept-Language': StringsLocalization.localeCode});
|
||||
}
|
||||
|
||||
// Удаление токена на сервере.
|
||||
getDeleteTokenRequest(String token) async {
|
||||
return httpClient.delete(
|
||||
await getEndpoint() + 'tokens/' + token + '?_dmapptoken=' +
|
||||
await getToken(), headers: {'Accept-Language': Intl.defaultLocale});
|
||||
await getToken(), headers: {'Accept-Language': StringsLocalization.localeCode});
|
||||
}
|
||||
|
||||
getLoyaltyRequest(String endpoint, String token) async {
|
||||
var headers = {
|
||||
'DM-Authorization': 'dmapptoken ${await getToken()}',
|
||||
'Authorization': 'dmtoken ${token}',
|
||||
'Accept-Language': Intl.defaultLocale
|
||||
'Accept-Language': StringsLocalization.localeCode
|
||||
};
|
||||
|
||||
return httpClient.get(endpoint, headers: headers);
|
||||
@@ -50,7 +49,7 @@ getPurchaseRequest(String endpoint, Map body, String token) async {
|
||||
var headers = {
|
||||
'DM-Authorization': 'dmapptoken ${await getToken()}',
|
||||
'Authorization': 'dmtoken ${token}',
|
||||
'Accept-Language': Intl.defaultLocale
|
||||
'Accept-Language': StringsLocalization.localeCode
|
||||
};
|
||||
|
||||
return httpClient.post(endpoint, body: body, headers: headers);
|
||||
@@ -61,7 +60,7 @@ getCouponsRequest(String endpoint, String token) async {
|
||||
var headers = {
|
||||
'DM-Authorization': 'dmapptoken ${await getToken()}',
|
||||
'Authorization': 'dmtoken ${token}',
|
||||
'Accept-Language': Intl.defaultLocale
|
||||
'Accept-Language': StringsLocalization.localeCode
|
||||
};
|
||||
|
||||
print(headers);
|
||||
@@ -74,7 +73,7 @@ getUserByCard(String card, String token) async {
|
||||
var headers = {
|
||||
'DM-Authorization': 'dmapptoken ${await getToken()}',
|
||||
'Authorization': 'dmtoken ${token}',
|
||||
'Accept-Language': Intl.defaultLocale
|
||||
'Accept-Language': StringsLocalization.localeCode
|
||||
};
|
||||
|
||||
|
||||
@@ -89,7 +88,7 @@ getUserByPhone(String phone, String token) async {
|
||||
var headers = {
|
||||
'DM-Authorization': 'dmapptoken ${await getToken()}',
|
||||
'Authorization': 'dmtoken ${token}',
|
||||
'Accept-Language': Intl.defaultLocale
|
||||
'Accept-Language': StringsLocalization.localeCode
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user