This commit is contained in:
Matthew Fosse 2024-01-04 13:48:57 -05:00
parent e407a6d385
commit 56e026e422
3 changed files with 35 additions and 37 deletions

View file

@ -106,23 +106,24 @@ class ConnectionSyncPage extends BasePage {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: Radius.circular(25), topRight: Radius.circular(25)), topLeft: Radius.circular(25), topRight: Radius.circular(25)),
color: Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedBackgroundColor, color: Theme.of(context)
.extension<SyncIndicatorTheme>()!
.notSyncedBackgroundColor,
), ),
); );
}), }),
Observer(builder: (context) { TorStatus(
return TorStatus( torViewModel: dashboardViewModel.torViewModel,
torViewModel: dashboardViewModel.torViewModel, decoration: BoxDecoration(
decoration: BoxDecoration( borderRadius: BorderRadius.only(
borderRadius: BorderRadius.only( bottomLeft: Radius.circular(25), bottomRight: Radius.circular(25)),
bottomLeft: Radius.circular(25), bottomRight: Radius.circular(25)), color:
color: Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedBackgroundColor, Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedBackgroundColor,
), ),
title: S.current.tor_status, title: S.current.tor_status,
isSelected: false, isSelected: false,
onTap: (context) {}, onTap: (context) {},
); ),
}),
]), ]),
), ),
], ],

View file

@ -5,6 +5,7 @@ import 'package:cake_wallet/src/widgets/standard_list.dart';
import 'package:cake_wallet/view_model/settings/tor_view_model.dart'; import 'package:cake_wallet/view_model/settings/tor_view_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cake_wallet/themes/extensions/filter_theme.dart'; import 'package:cake_wallet/themes/extensions/filter_theme.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
class TorStatus extends StandardListRow { class TorStatus extends StandardListRow {
TorStatus( TorStatus(
@ -19,23 +20,25 @@ class TorStatus extends StandardListRow {
@override @override
Widget buildTrailing(BuildContext context) { Widget buildTrailing(BuildContext context) {
Color? color; return Observer(builder: (context) {
String? text; Color? color;
switch (torViewModel.torConnectionStatus) { String? text;
case TorConnectionStatus.connected: switch (torViewModel.torConnectionStatus) {
color = Palette.green; case TorConnectionStatus.connected:
text = S.current.connected; color = Palette.green;
break; text = S.current.connected;
case TorConnectionStatus.connecting: break;
color = Colors.amber; case TorConnectionStatus.connecting:
text = S.current.connecting; color = Colors.amber;
break; text = S.current.connecting;
case TorConnectionStatus.disconnected: break;
color = Palette.red; case TorConnectionStatus.disconnected:
text = S.current.disconnected; color = Palette.red;
break; text = S.current.disconnected;
} break;
return NodeIndicator(color: color, text: text); }
return NodeIndicator(color: color, text: text);
});
} }
} }

View file

@ -25,12 +25,6 @@ abstract class TorViewModelBase with Store {
@action @action
void setTorConnectionMode(TorConnectionMode mode) => _settingsStore.torConnectionMode = mode; void setTorConnectionMode(TorConnectionMode mode) => _settingsStore.torConnectionMode = mode;
// @computed
// bool get isTorConnected =>
// (_settingsStore.torConnectionMode == TorConnectionMode.enabled ||
// _settingsStore.torConnectionMode == TorConnectionMode.onionOnly) &&
// (Tor.instance.port != -1);
@computed @computed
TorConnectionStatus get torConnectionStatus { TorConnectionStatus get torConnectionStatus {