Skip to content

Commit 926f4df

Browse files
authored
Merge pull request #2260 from SatoshiPortal/2257-theme-delete-confirmation-dialog-is-unreadable-in-dark-theme-for-encrypted-vaults-in-google-drive
fix: correct dark theme colors in encrypted vault delete confirmation dialog
2 parents 6bdc22b + 8b518ab commit 926f4df

1 file changed

Lines changed: 36 additions & 32 deletions

File tree

lib/features/recoverbull_google_drive/ui/drive_vaults_list_page.dart

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -46,32 +46,35 @@ class DriveVaultsListPage extends StatelessWidget {
4646
height: 2.0,
4747
),
4848
Expanded(
49-
child:
50-
error != null
51-
? Center(child: Text(error.toTranslated(context)))
52-
: Padding(
53-
padding: const EdgeInsets.symmetric(horizontal: 16),
54-
child: SingleChildScrollView(
55-
child: Column(
56-
children: [
57-
if (!state.isLoading && driveMetadata.isEmpty)
58-
Center(child: Text(context.loc.recoverbullGoogleDriveNoBackupsFound)),
49+
child: error != null
50+
? Center(child: Text(error.toTranslated(context)))
51+
: Padding(
52+
padding: const EdgeInsets.symmetric(horizontal: 16),
53+
child: SingleChildScrollView(
54+
child: Column(
55+
children: [
56+
if (!state.isLoading && driveMetadata.isEmpty)
57+
Center(
58+
child: Text(
59+
context
60+
.loc
61+
.recoverbullGoogleDriveNoBackupsFound,
62+
),
63+
),
5964

60-
...List.generate(driveMetadata.length, (index) {
61-
final driveBackupMetadata = driveMetadata[index];
62-
return Padding(
63-
padding: const EdgeInsets.symmetric(
64-
vertical: 8,
65-
),
66-
child: _DriveFileMetadataItem(
67-
driveFileMetadata: driveBackupMetadata,
68-
),
69-
);
70-
}),
71-
],
72-
),
65+
...List.generate(driveMetadata.length, (index) {
66+
final driveBackupMetadata = driveMetadata[index];
67+
return Padding(
68+
padding: const EdgeInsets.symmetric(vertical: 8),
69+
child: _DriveFileMetadataItem(
70+
driveFileMetadata: driveBackupMetadata,
71+
),
72+
);
73+
}),
74+
],
7375
),
7476
),
77+
),
7578
),
7679
],
7780
),
@@ -93,8 +96,8 @@ class _DriveFileMetadataItem extends StatelessWidget {
9396
maxHeight: MediaQuery.of(context).size.height * 0.4,
9497
),
9598
decoration: BoxDecoration(
96-
color: context.appColors.onPrimary,
97-
borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
99+
color: context.appColors.onSecondary,
100+
borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
98101
),
99102
child: Padding(
100103
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
@@ -142,15 +145,18 @@ class _DriveFileMetadataItem extends StatelessWidget {
142145
maxHeight: MediaQuery.of(context).size.height * 0.5,
143146
),
144147
decoration: BoxDecoration(
145-
color: context.appColors.onPrimary,
146-
borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
148+
color: context.appColors.onSecondary,
149+
borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
147150
),
148151
child: Padding(
149152
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
150153
child: Column(
151154
mainAxisSize: .min,
152155
children: [
153-
BBText(context.loc.recoverbullGoogleDriveDeleteVaultTitle, style: context.font.headlineMedium),
156+
BBText(
157+
context.loc.recoverbullGoogleDriveDeleteVaultTitle,
158+
style: context.font.headlineMedium,
159+
),
154160
const Gap(16),
155161
BBText(
156162
context.loc.recoverbullGoogleDriveDeleteConfirmation,
@@ -201,10 +207,8 @@ class _DriveFileMetadataItem extends StatelessWidget {
201207
maxLines: 2,
202208
overflow: .ellipsis,
203209
),
204-
onTap:
205-
() => bloc.add(
206-
OnSelectDriveFileMetadata(fileMetadata: driveFileMetadata),
207-
),
210+
onTap: () =>
211+
bloc.add(OnSelectDriveFileMetadata(fileMetadata: driveFileMetadata)),
208212
onLongPress: () => _showActionsBottomSheet(context),
209213
enabled: !state.isLoading,
210214
);

0 commit comments

Comments
 (0)