fixed black theme

This commit is contained in:
Thibault Deckers 2023-12-02 17:27:24 +01:00
parent b28abd225f
commit 10d62f267d
2 changed files with 28 additions and 78 deletions

View file

@ -192,17 +192,7 @@ class Themes {
static final _darkLabelColor = _darkThemeTypo.labelMedium!.color!; static final _darkLabelColor = _darkThemeTypo.labelMedium!.color!;
static const _darkOnSurface = Colors.white; static const _darkOnSurface = Colors.white;
static ThemeData darkTheme(Color accentColor, bool deviceInitialized) { static ThemeData _baseDarkTheme(ColorScheme colors, bool deviceInitialized) {
final colors = ColorScheme.fromSeed(
seedColor: accentColor,
brightness: Brightness.dark,
primary: accentColor,
onPrimary: _darkBodyColor,
secondary: accentColor,
onSecondary: _darkBodyColor,
onSurface: _darkOnSurface,
// onSurfaceVariant: Colors.red,
);
final textTheme = _darkThemeTypo; final textTheme = _darkThemeTypo;
return _baseTheme(colors, deviceInitialized).copyWith( return _baseTheme(colors, deviceInitialized).copyWith(
// TYPOGRAPHY & ICONOGRAPHY // TYPOGRAPHY & ICONOGRAPHY
@ -236,25 +226,37 @@ class Themes {
); );
} }
static ThemeData darkTheme(Color accentColor, bool deviceInitialized) {
final colors = ColorScheme.fromSeed(
seedColor: accentColor,
brightness: Brightness.dark,
primary: accentColor,
onPrimary: _darkBodyColor,
secondary: accentColor,
onSecondary: _darkBodyColor,
onSurface: _darkOnSurface,
);
return _baseDarkTheme(colors, deviceInitialized);
}
// black // black
static const _blackFirstLayer = Colors.black;
static const _blackSecondLayer = Color(0xFF212121); // aka `Colors.grey[900]`
static ThemeData blackTheme(Color accentColor, bool deviceInitialized) { static ThemeData blackTheme(Color accentColor, bool deviceInitialized) {
final baseTheme = darkTheme(accentColor, deviceInitialized); final colors = ColorScheme.fromSeed(
seedColor: accentColor,
brightness: Brightness.dark,
primary: accentColor,
onPrimary: _darkBodyColor,
secondary: accentColor,
onSecondary: _darkBodyColor,
onSurface: _darkOnSurface,
).copyWith(
background: Colors.black,
);
final baseTheme = _baseDarkTheme(colors, deviceInitialized);
return baseTheme.copyWith( return baseTheme.copyWith(
// `canvasColor` is used by `Drawer`, `DropdownButton` and `ExpansionTileCard`
canvasColor: _blackSecondLayer,
scaffoldBackgroundColor: _blackFirstLayer,
// `cardColor` is used by `ExpansionPanel`
cardColor: _blackSecondLayer,
dialogBackgroundColor: _blackSecondLayer,
appBarTheme: baseTheme.appBarTheme.copyWith( appBarTheme: baseTheme.appBarTheme.copyWith(
backgroundColor: _blackFirstLayer, backgroundColor: colors.background,
),
popupMenuTheme: baseTheme.popupMenuTheme.copyWith(
color: _blackSecondLayer,
), ),
); );
} }

View file

@ -646,24 +646,7 @@
], ],
"be": [ "be": [
"binEntriesConfirmationDialogMessage",
"deleteEntriesConfirmationDialogMessage",
"newVaultWarningDialogMessage",
"renameEntrySetPageInsertTooltip",
"renameEntrySetPagePreviewSectionTitle",
"renameProcessorCounter",
"renameProcessorName",
"deleteSingleAlbumConfirmationDialogMessage",
"deleteMultiAlbumConfirmationDialogMessage", "deleteMultiAlbumConfirmationDialogMessage",
"exportEntryDialogFormat",
"exportEntryDialogWidth",
"exportEntryDialogHeight",
"exportEntryDialogQuality",
"exportEntryDialogWriteMetadata",
"renameEntryDialogLabel",
"editEntryDialogCopyFromItem",
"editEntryDialogTargetFieldsHeader",
"editEntryDateDialogTitle",
"editEntryDateDialogSetCustom", "editEntryDateDialogSetCustom",
"editEntryDateDialogCopyField", "editEntryDateDialogCopyField",
"editEntryDateDialogExtractFromTitle", "editEntryDateDialogExtractFromTitle",
@ -837,7 +820,6 @@
"searchRatingSectionTitle", "searchRatingSectionTitle",
"searchMetadataSectionTitle", "searchMetadataSectionTitle",
"settingsPageTitle", "settingsPageTitle",
"settingsSystemDefault",
"settingsDefault", "settingsDefault",
"settingsDisabled", "settingsDisabled",
"settingsAskEverytime", "settingsAskEverytime",
@ -983,33 +965,7 @@
"settingsStorageAccessRevokeTooltip", "settingsStorageAccessRevokeTooltip",
"settingsAccessibilitySectionTitle", "settingsAccessibilitySectionTitle",
"settingsRemoveAnimationsTile", "settingsRemoveAnimationsTile",
"settingsRemoveAnimationsDialogTitle", "statsWithGps"
"settingsTimeToTakeActionTile",
"settingsAccessibilityShowPinchGestureAlternatives",
"settingsDisplaySectionTitle",
"settingsThemeBrightnessTile",
"settingsThemeBrightnessDialogTitle",
"settingsThemeColorHighlights",
"settingsThemeEnableDynamicColor",
"settingsDisplayRefreshRateModeTile",
"settingsDisplayRefreshRateModeDialogTitle",
"settingsDisplayUseTvInterface",
"settingsLanguageSectionTitle",
"settingsLanguageTile",
"settingsLanguagePageTitle",
"settingsCoordinateFormatTile",
"settingsCoordinateFormatDialogTitle",
"settingsUnitSystemTile",
"settingsUnitSystemDialogTitle",
"settingsScreenSaverPageTitle",
"settingsWidgetPageTitle",
"settingsWidgetShowOutline",
"settingsWidgetOpenPage",
"settingsWidgetDisplayedItem",
"settingsCollectionTile",
"statsPageTitle",
"statsWithGps",
"statsTopCountriesSectionTitle"
], ],
"bn": [ "bn": [
@ -2205,16 +2161,9 @@
"filePickerUseThisFolder" "filePickerUseThisFolder"
], ],
"cs": [
"entryActionCast",
"castDialogTitle"
],
"de": [ "de": [
"entryActionCast", "entryActionCast",
"overlayHistogramNone", "overlayHistogramNone",
"overlayHistogramRGB",
"overlayHistogramLuminance",
"castDialogTitle", "castDialogTitle",
"aboutDataUsageClearCache", "aboutDataUsageClearCache",
"settingsViewerShowHistogram" "settingsViewerShowHistogram"
@ -2337,7 +2286,6 @@
"menuActionSelect", "menuActionSelect",
"menuActionSelectAll", "menuActionSelectAll",
"menuActionSelectNone", "menuActionSelectNone",
"viewDialogSortSectionTitle",
"viewDialogLayoutSectionTitle", "viewDialogLayoutSectionTitle",
"viewDialogReverseSortOrder", "viewDialogReverseSortOrder",
"tileLayoutMosaic", "tileLayoutMosaic",