Merge pull request #770 from cypherstack/ui

Make recovery screens scrollable for small desktop screens
This commit is contained in:
Diego Salazar 2024-02-23 11:36:11 -07:00 committed by GitHub
commit 61e620c77a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 55 additions and 46 deletions

View file

@ -45,48 +45,55 @@ class CreateOrRestoreWalletView extends StatelessWidget {
leading: AppBarBackButton(), leading: AppBarBackButton(),
trailing: ExitToMyStackButton(), trailing: ExitToMyStackButton(),
), ),
body: SizedBox( body: SingleChildScrollView(
width: 480, child: Center(
child: Column( // Center the content horizontally
crossAxisAlignment: CrossAxisAlignment.center, child: ConstrainedBox(
children: [ constraints: const BoxConstraints(maxWidth: 480),
const Spacer( child: Column(
flex: 10, crossAxisAlignment: CrossAxisAlignment.center,
children: [
/*const Spacer(
flex: 10,
),*/
CreateRestoreWalletTitle(
coin: entity.coin,
isDesktop: isDesktop,
),
const SizedBox(
height: 16,
),
SizedBox(
width: 324,
child: CreateRestoreWalletSubTitle(
isDesktop: isDesktop,
),
),
const SizedBox(
height: 32,
),
CoinImage(
coin: entity.coin,
width: isDesktop
? 324
: MediaQuery.of(context).size.width / 1.6,
height: isDesktop
? null
: MediaQuery.of(context).size.width / 1.6,
),
const SizedBox(
height: 32,
),
CreateWalletButtonGroup(
coin: entity.coin,
isDesktop: isDesktop,
),
/*const Spacer(
flex: 15,
),*/
],
), ),
CreateRestoreWalletTitle( ),
coin: entity.coin,
isDesktop: isDesktop,
),
const SizedBox(
height: 16,
),
SizedBox(
width: 324,
child: CreateRestoreWalletSubTitle(
isDesktop: isDesktop,
),
),
const SizedBox(
height: 32,
),
CoinImage(
coin: entity.coin,
width:
isDesktop ? 324 : MediaQuery.of(context).size.width / 1.6,
height:
isDesktop ? null : MediaQuery.of(context).size.width / 1.6,
),
const SizedBox(
height: 32,
),
CreateWalletButtonGroup(
coin: entity.coin,
isDesktop: isDesktop,
),
const Spacer(
flex: 15,
),
],
), ),
), ),
); );

View file

@ -726,12 +726,13 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
color: Theme.of(context).extension<StackColors>()!.background, color: Theme.of(context).extension<StackColors>()!.background,
child: Padding( child: Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Column( child: SingleChildScrollView(
child: Column(
children: [ children: [
if (isDesktop) /*if (isDesktop)
const Spacer( const Spacer(
flex: 10, flex: 10,
), ),*/
if (!isDesktop) if (!isDesktop)
Text( Text(
widget.walletName, widget.walletName,
@ -1060,10 +1061,10 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
}, },
), ),
), ),
if (isDesktop) /*if (isDesktop)
const Spacer( const Spacer(
flex: 15, flex: 15,
), ),*/
if (!isDesktop) if (!isDesktop)
Expanded( Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
@ -1174,6 +1175,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
), ),
), ),
), ),
),
); );
} }
} }