Merge branch 'main' into main

This commit is contained in:
Omar Hatem
2023-01-19 16:10:17 +02:00
committed by GitHub
27 changed files with 767 additions and 56 deletions
+4 -2
View File
@@ -21,7 +21,8 @@ class LanguageService {
'it': 'Italiano (Italian)',
'th': 'ภาษาไทย (Thai)',
'ar': 'العربية (Arabic)',
'tr': 'Türkçe (Turkish)'
'tr': 'Türkçe (Turkish)',
'my': 'မြန်မာ (Burmese)',
};
static const Map<String, String> localeCountryCode = {
@@ -42,7 +43,8 @@ class LanguageService {
'it': 'ita',
'th': 'tha',
'ar': 'sau',
'tr': 'tur'
'tr': 'tur',
'my': 'mmr',
};
static final list = <String, String> {};
@@ -73,7 +73,7 @@ class ConnectionSyncPage extends BasePage {
builder: (BuildContext context) {
return AlertWithTwoActions(
alertTitle: S.of(context).change_current_node_title,
alertContent: S.of(context).change_current_node(node.uriRaw),
alertContent: nodeListViewModel.getAlertContent(node.uriRaw),
leftButtonText: S.of(context).cancel,
rightButtonText: S.of(context).change,
actionLeftButton: () => Navigator.of(context).pop(),
@@ -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)),
@@ -1,3 +1,4 @@
import 'package:cake_wallet/generated/i18n.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
import 'package:cw_core/wallet_base.dart';
@@ -30,6 +31,10 @@ abstract class NodeListViewModelBase with Store {
return node;
}
String getAlertContent(String uri) =>
S.current.change_current_node(uri) +
'${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + S.current.orbot_running_alert : ''}';
final ObservableList<Node> nodes;
final SettingsStore settingsStore;
final WalletBase wallet;