Merge branch 'main' into CW-252-Add-notice-when-connecting-to-.onion-node

This commit is contained in:
Serhii
2023-01-13 15:43:29 +02:00
30 changed files with 1681 additions and 277 deletions
+6 -2
View File
@@ -18,7 +18,9 @@ class LanguageService {
'uk': 'Українська (Ukrainian)',
'zh': '中文 (Chinese)',
'hr': 'Hrvatski (Croatian)',
'it': 'Italiano (Italian)'
'it': 'Italiano (Italian)',
'th': 'ภาษาไทย (Thai)',
'ar': 'العربية (Arabic)'
};
static const Map<String, String> localeCountryCode = {
@@ -36,7 +38,9 @@ class LanguageService {
'uk': 'ukr',
'zh': 'chn',
'hr': 'hrv',
'it': 'ita'
'it': 'ita',
'th': 'tha',
'ar': 'sau'
};
static final list = <String, String> {};
+1 -1
View File
@@ -7,7 +7,7 @@ Future<String> presentQRScanner() async {
try {
final result = await BarcodeScanner.scan();
isQrScannerShown = false;
return result.rawContent;
return result.rawContent.trim();
} catch (e) {
isQrScannerShown = false;
rethrow;
@@ -72,10 +72,10 @@ class ContactListPage extends BasePage {
dividerThemeColor:
Theme.of(context).primaryTextTheme.caption!.decorationColor!,
sectionTitleBuilder: (_, int sectionIndex) {
var title = 'Contacts';
var title = S.current.contact_list_contacts;
if (sectionIndex == 0) {
title = 'My wallets';
title = S.current.contact_list_wallets;
}
return Container(
@@ -48,6 +48,8 @@ class CollapsibleSectionList extends SectionStandardList {
child: ListTileTheme(
contentPadding: EdgeInsets.only(right: 16,top:sectionIndex>0?26:0),
child: ExpansionTile(
textColor: themeColor,
iconColor: themeColor,
title: sectionTitleBuilder == null
? Container()
: Container(child: buildTitle(items, sectionIndex, context)),