Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-29 21:55:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow default node deletion if other nodes exist

Browse source
This commit is contained in:
julian 2022-11-25 14:28:53 -06:00
parent 05bdc8c52f
commit 276d08d22f
5 changed files with 94 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/models/node_model.dart
View file

@ -1,4 +1,5 @@
import 'package:hive/hive.dart';
import 'package:stackwallet/utilities/default_nodes.dart';
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
part 'type_adaptors/node_model.g.dart';
@ -84,7 +85,7 @@ class NodeModel {
return map;
}
bool get isDefault => id.startsWith("default_");
bool get isDefault => id.startsWith(DefaultNodes.defaultNodeIdPrefix);
@override
String toString() {

7
lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
View file

@ -432,7 +432,12 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
style: STextStyles.navBarTitle(context),
),
actions: [
if (viewType == AddEditNodeViewType.edit)
if (viewType == AddEditNodeViewType.edit &&
ref
.watch(nodeServiceChangeNotifierProvider
.select((value) => value.getNodesFor(coin)))
.length >
1)
Padding(
padding: const EdgeInsets.only(
top: 10,

124
lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
View file

@ -10,7 +10,6 @@ import 'package:stackwallet/providers/global/secure_store_provider.dart';
import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/test_epic_box_connection.dart';
@ -178,6 +177,11 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
final node = ref.watch(nodeServiceChangeNotifierProvider
.select((value) => value.getNodeById(id: nodeId)));
final nodesForCoin = ref.watch(nodeServiceChangeNotifierProvider
.select((value) => value.getNodesFor(coin)));
final canDelete = nodesForCoin.length > 1;
return ConditionalParent(
condition: !isDesktop,
builder: (child) => Background(
@ -201,44 +205,43 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
style: STextStyles.navBarTitle(context),
),
actions: [
if (!nodeId.startsWith("default"))
Padding(
padding: const EdgeInsets.only(
top: 10,
bottom: 10,
right: 10,
),
child: AspectRatio(
aspectRatio: 1,
child: AppBarIconButton(
key: const Key("nodeDetailsEditNodeAppBarButtonKey"),
size: 36,
shadows: const [],
// if (!nodeId.startsWith(DefaultNodes.defaultNodeIdPrefix))
Padding(
padding: const EdgeInsets.only(
top: 10,
bottom: 10,
right: 10,
),
child: AspectRatio(
aspectRatio: 1,
child: AppBarIconButton(
key: const Key("nodeDetailsEditNodeAppBarButtonKey"),
size: 36,
shadows: const [],
color:
Theme.of(context).extension<StackColors>()!.background,
icon: SvgPicture.asset(
Assets.svg.pencil,
color: Theme.of(context)
.extension<StackColors>()!
.background,
icon: SvgPicture.asset(
Assets.svg.pencil,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
width: 20,
height: 20,
),
onPressed: () {
Navigator.of(context).pushNamed(
AddEditNodeView.routeName,
arguments: Tuple4(
AddEditNodeViewType.edit,
coin,
nodeId,
popRouteName,
),
);
},
.accentColorDark,
width: 20,
height: 20,
),
onPressed: () {
Navigator.of(context).pushNamed(
AddEditNodeView.routeName,
arguments: Tuple4(
AddEditNodeViewType.edit,
coin,
nodeId,
popRouteName,
),
);
},
),
),
),
],
),
body: Padding(
@ -315,7 +318,7 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
const SizedBox(
height: 22,
),
if (isDesktop)
if (isDesktop && canDelete)
SizedBox(
height: 56,
child: _desktopReadOnly
@ -345,7 +348,7 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
],
),
),
if (isDesktop && !_desktopReadOnly)
if (isDesktop && !_desktopReadOnly && canDelete)
const SizedBox(
height: 45,
),
@ -366,22 +369,41 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
),
if (isDesktop)
Expanded(
child: !nodeId.startsWith("default")
? PrimaryButton(
label: _desktopReadOnly ? "Edit" : "Save",
buttonHeight: ButtonHeight.l,
onPressed: () async {
final shouldSave = _desktopReadOnly == false;
setState(() {
_desktopReadOnly = !_desktopReadOnly;
});
child:
// !nodeId.startsWith(DefaultNodes.defaultNodeIdPrefix)
// ?
PrimaryButton(
label: _desktopReadOnly ? "Edit" : "Save",
buttonHeight: ButtonHeight.l,
onPressed: () async {
final shouldSave = _desktopReadOnly == false;
setState(() {
_desktopReadOnly = !_desktopReadOnly;
});
if (shouldSave) {
// todo save node
}
},
)
: Container(),
if (shouldSave) {
final editedNode = node!.copyWith(
host: ref.read(nodeFormDataProvider).host,
port: ref.read(nodeFormDataProvider).port,
name: ref.read(nodeFormDataProvider).name,
useSSL: ref.read(nodeFormDataProvider).useSSL,
loginName: ref.read(nodeFormDataProvider).login,
isFailover:
ref.read(nodeFormDataProvider).isFailover,
);
await ref
.read(nodeServiceChangeNotifierProvider)
.edit(
editedNode,
ref.read(nodeFormDataProvider).password,
true,
);
}
},
)
// : Container()
,
),
],
),

17
lib/widgets/node_card.dart
View file

@ -306,7 +306,7 @@ class _NodeCardState extends ConsumerState<NodeCard> {
width: isDesktop ? 40 : 24,
height: isDesktop ? 40 : 24,
decoration: BoxDecoration(
color: _node.name == DefaultNodes.defaultName
color: _node.id.startsWith(DefaultNodes.defaultNodeIdPrefix)
? Theme.of(context)
.extension<StackColors>()!
.buttonBackSecondary
@ -321,13 +321,14 @@ class _NodeCardState extends ConsumerState<NodeCard> {
Assets.svg.node,
height: isDesktop ? 18 : 11,
width: isDesktop ? 20 : 14,
color: _node.name == DefaultNodes.defaultName
? Theme.of(context)
.extension<StackColors>()!
.accentColorDark
: Theme.of(context)
.extension<StackColors>()!
.infoItemIcons,
color:
_node.id.startsWith(DefaultNodes.defaultNodeIdPrefix)
? Theme.of(context)
.extension<StackColors>()!
.accentColorDark
: Theme.of(context)
.extension<StackColors>()!
.infoItemIcons,
),
),
),

6
lib/widgets/node_options_sheet.dart
View file

@ -234,7 +234,8 @@ class NodeOptionsSheet extends ConsumerWidget {
width: 32,
height: 32,
decoration: BoxDecoration(
color: node.name == DefaultNodes.defaultName
color: node.id
.startsWith(DefaultNodes.defaultNodeIdPrefix)
? Theme.of(context)
.extension<StackColors>()!
.textSubtitle4
@ -249,7 +250,8 @@ class NodeOptionsSheet extends ConsumerWidget {
Assets.svg.node,
height: 15,
width: 19,
color: node.name == DefaultNodes.defaultName
color: node.id.startsWith(
DefaultNodes.defaultNodeIdPrefix)
? Theme.of(context)
.extension<StackColors>()!
.accentColorDark