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

resolve merge conflicts

Browse source
This commit is contained in:
ryleedavis 2023-09-18 15:51:00 -06:00
parent 2d20d0856d
commit e5800d4ec2
1 changed files with 97 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/pages_desktop_specific/settings/settings_menu/tor_settings/tor_settings.dart
View file

@ -284,10 +284,9 @@ class _TorSettingsState extends ConsumerState<TorSettings> {
), ),
Padding( Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
child: Expanded(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -337,13 +336,13 @@ class _TorSettingsState extends ConsumerState<TorSettings> {
children: [ children: [
Text( Text(
"What is Tor killswitch?", "What is Tor killswitch?",
style: STextStyles style:
.desktopH2(context), STextStyles.desktopH2(
context),
), ),
DesktopDialogCloseButton( DesktopDialogCloseButton(
onPressedOverride: () => onPressedOverride: () =>
Navigator.of( Navigator.of(context)
context)
.pop(true), .pop(true),
), ),
], ],
@ -373,14 +372,11 @@ class _TorSettingsState extends ConsumerState<TorSettings> {
); );
}, },
), ),
],
),
), ),
], ],
), ),
Padding( const Spacer(),
padding: const EdgeInsets.only(right: 8.0), SizedBox(
child: SizedBox(
height: 20, height: 20,
width: 40, width: 40,
child: DraggableSwitchButton( child: DraggableSwitchButton(
@ -395,12 +391,12 @@ class _TorSettingsState extends ConsumerState<TorSettings> {
}, },
), ),
), ),
const SizedBox(
height: 10,
), ),
], ],
), ),
), ),
const SizedBox(
height: 10,
), ),
], ],
), ),