Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-09-29 01:41:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop frost ui bandaid

Browse source
This commit is contained in:
julian 2024-05-02 10:50:28 -06:00
parent 7276cd41f0
commit a858e4924c
5 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/frost_route_generator.dart
View file

@ -33,6 +33,7 @@ enum FrostInterruptionDialogType {
}
final pFrostCreateCurrentStep = StateProvider.autoDispose((ref) => 1);
final pFrostScaffoldCanPopDesktop = StateProvider.autoDispose((_) => false);
final pFrostScaffoldArgs = StateProvider<
({
({String walletName, FrostCurrency frostCurrency}) info,

4
lib/pages/add_wallet_views/frost_ms/new/select_new_frost_import_type_view.dart
View file

@ -193,6 +193,10 @@ class _SelectNewFrostImportTypeViewState
stepRoutes: FrostRouteGenerator.joinReshareStepRoutes,
onSuccess: () {
// successful completion of steps
ref.read(pFrostMultisigConfig.state).state = null;
ref.read(pFrostStartKeyGenData.state).state = null;
ref.read(pFrostSecretSharesData.state).state = null;
ref.read(pFrostScaffoldArgs.state).state = null;
},
frostInterruptionDialogType:
FrostInterruptionDialogType.resharing,

1
lib/pages/add_wallet_views/frost_ms/new/steps/frost_create_step_5.dart
View file

@ -180,6 +180,7 @@ class _FrostCreateStep5State extends ConsumerState<FrostCreateStep5> {
}
if (mounted) {
ref.read(pFrostScaffoldCanPopDesktop.notifier).state = true;
ref.read(pFrostScaffoldArgs)!.onSuccess();
}
} catch (e, s) {

34
lib/widgets/dialogs/frost/frost_step_qr_dialog.dart
View file

@ -14,6 +14,7 @@ import 'package:stackwallet/themes/stack_colors.dart';
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/conditional_parent.dart';
import 'package:stackwallet/widgets/desktop/secondary_button.dart';
import 'package:stackwallet/widgets/dialogs/simple_mobile_dialog.dart';
import 'package:stackwallet/widgets/rounded_container.dart';
@ -137,18 +138,27 @@ class _FrostStepQrDialogState extends State<FrostStepQrDialog> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Padding(
padding: const EdgeInsets.all(16),
child: AspectRatio(
aspectRatio: 1,
child: QrImageView(
data: widget.data,
padding: EdgeInsets.zero,
dataModuleStyle: QrDataModuleStyle(
dataModuleShape: QrDataModuleShape.square,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
ConditionalParent(
condition: Util.isDesktop,
builder: (child) => ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 360,
),
child: child,
),
child: Padding(
padding: const EdgeInsets.all(16),
child: AspectRatio(
aspectRatio: 1,
child: QrImageView(
data: widget.data,
padding: EdgeInsets.zero,
dataModuleStyle: QrDataModuleStyle(
dataModuleShape: QrDataModuleShape.square,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
),
),
),
),

5
lib/widgets/frost_scaffold.dart
View file

@ -41,7 +41,8 @@ class _FrostScaffoldState extends ConsumerState<FrostStepScaffold> {
}
Future<void> _requestPop(BuildContext context) async {
if (_requestPopLock) {
if (_requestPopLock ||
(Util.isDesktop && ref.read(pFrostScaffoldCanPopDesktop))) {
return;
}
_requestPopLock = true;
@ -98,7 +99,7 @@ class _FrostScaffoldState extends ConsumerState<FrostStepScaffold> {
@override
Widget build(BuildContext context) {
return PopScope(
canPop: false,
canPop: Util.isDesktop && ref.watch(pFrostScaffoldCanPopDesktop),
onPopInvoked: (_) => _requestPop(context),
child: Material(
child: ConditionalParent(