Skip to content

fix missing safearea wraps #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2025
+353 −354
Merged

fix missing safearea wraps #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 104 additions & 110 deletions ...es/add_wallet_views/restore_wallet_view/sub_widgets/mnemonic_word_count_select_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ import '../../../../utilities/constants.dart';
import '../../../../utilities/text_styles.dart';

class MnemonicWordCountSelectSheet extends ConsumerWidget {
const MnemonicWordCountSelectSheet({
super.key,
required this.lengthOptions,
});
const MnemonicWordCountSelectSheet({super.key, required this.lengthOptions});

final List<int> lengthOptions;

Expand All @@ -35,9 +32,7 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
child: Container(
decoration: BoxDecoration(
color: Theme.of(context).extension<StackColors>()!.popupBG,
borderRadius: const BorderRadius.vertical(
top: Radius.circular(20),
),
borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
),
child: Padding(
padding: const EdgeInsets.only(
Expand All @@ -46,116 +41,115 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
top: 10,
bottom: 0,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Center(
child: Container(
decoration: BoxDecoration(
color: Theme.of(context)
.extension<StackColors>()!
.textFieldDefaultBG,
borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius,
child: SafeArea(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Center(
child: Container(
decoration: BoxDecoration(
color:
Theme.of(
context,
).extension<StackColors>()!.textFieldDefaultBG,
borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius,
),
),
width: 60,
height: 4,
),
width: 60,
height: 4,
),
),
const SizedBox(
height: 36,
),
// Expanded(
// child: SingleChildScrollView(
// child:
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Phrase length",
style: STextStyles.pageTitleH2(context),
textAlign: TextAlign.left,
),
const SizedBox(
height: 16,
),
for (int i = 0; i < lengthOptions.length; i++)
Column(
children: [
GestureDetector(
onTap: () {
final state = ref
.read(mnemonicWordCountStateProvider.state)
.state;
if (state != lengthOptions[i]) {
ref
.read(mnemonicWordCountStateProvider.state)
.state = lengthOptions[i];
}
const SizedBox(height: 36),
// Expanded(
// child: SingleChildScrollView(
// child:
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Phrase length",
style: STextStyles.pageTitleH2(context),
textAlign: TextAlign.left,
),
const SizedBox(height: 16),
for (int i = 0; i < lengthOptions.length; i++)
Column(
children: [
GestureDetector(
onTap: () {
final state =
ref
.read(
mnemonicWordCountStateProvider.state,
)
.state;
if (state != lengthOptions[i]) {
ref
.read(mnemonicWordCountStateProvider.state)
.state = lengthOptions[i];
}

Navigator.of(context).pop();
},
child: Container(
color: Colors.transparent,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
// Column(
// mainAxisAlignment: MainAxisAlignment.start,
// children: [
SizedBox(
width: 20,
height: 20,
child: Radio(
activeColor: Theme.of(context)
.extension<StackColors>()!
.radioButtonIconEnabled,
value: lengthOptions[i],
groupValue: ref
.watch(
mnemonicWordCountStateProvider.state,
)
.state,
onChanged: (x) {
ref
.read(
mnemonicWordCountStateProvider
.state,
)
.state = lengthOptions[i];
Navigator.of(context).pop();
},
Navigator.of(context).pop();
},
child: Container(
color: Colors.transparent,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
// Column(
// mainAxisAlignment: MainAxisAlignment.start,
// children: [
SizedBox(
width: 20,
height: 20,
child: Radio(
activeColor:
Theme.of(context)
.extension<StackColors>()!
.radioButtonIconEnabled,
value: lengthOptions[i],
groupValue:
ref
.watch(
mnemonicWordCountStateProvider
.state,
)
.state,
onChanged: (x) {
ref
.read(
mnemonicWordCountStateProvider
.state,
)
.state = lengthOptions[i];
Navigator.of(context).pop();
},
),
),
),
// ],
// ),
const SizedBox(
width: 12,
),
Text(
"${lengthOptions[i]} words",
style: STextStyles.titleBold12(context),
textAlign: TextAlign.left,
),
],
// ],
// ),
const SizedBox(width: 12),
Text(
"${lengthOptions[i]} words",
style: STextStyles.titleBold12(context),
textAlign: TextAlign.left,
),
],
),
),
),
),
const SizedBox(
height: 16,
),
],
),
const SizedBox(
height: 8,
),
],
),
// ),
// )
],
const SizedBox(height: 16),
],
),
const SizedBox(height: 8),
],
),
// ),
// )
],
),
),
),
),
Expand Down
Loading
Loading