Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed black theme

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/theme/themes.dart
View file

@ -192,17 +192,7 @@ class Themes {
static final _darkLabelColor = _darkThemeTypo.labelMedium!.color!;
static const _darkOnSurface = Colors.white;
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,
// onSurfaceVariant: Colors.red,
);
static ThemeData _baseDarkTheme(ColorScheme colors, bool deviceInitialized) {
final textTheme = _darkThemeTypo;
return _baseTheme(colors, deviceInitialized).copyWith(
// 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
static const _blackFirstLayer = Colors.black;
static const _blackSecondLayer = Color(0xFF212121); // aka `Colors.grey[900]`
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(
// `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(
backgroundColor: _blackFirstLayer,
),
popupMenuTheme: baseTheme.popupMenuTheme.copyWith(
color: _blackSecondLayer,
backgroundColor: colors.background,
),
);
}

54
untranslated.json
View file

@ -646,24 +646,7 @@
],
"be": [
"binEntriesConfirmationDialogMessage",
"deleteEntriesConfirmationDialogMessage",
"newVaultWarningDialogMessage",
"renameEntrySetPageInsertTooltip",
"renameEntrySetPagePreviewSectionTitle",
"renameProcessorCounter",
"renameProcessorName",
"deleteSingleAlbumConfirmationDialogMessage",
"deleteMultiAlbumConfirmationDialogMessage",
"exportEntryDialogFormat",
"exportEntryDialogWidth",
"exportEntryDialogHeight",
"exportEntryDialogQuality",
"exportEntryDialogWriteMetadata",
"renameEntryDialogLabel",
"editEntryDialogCopyFromItem",
"editEntryDialogTargetFieldsHeader",
"editEntryDateDialogTitle",
"editEntryDateDialogSetCustom",
"editEntryDateDialogCopyField",
"editEntryDateDialogExtractFromTitle",
@ -837,7 +820,6 @@
"searchRatingSectionTitle",
"searchMetadataSectionTitle",
"settingsPageTitle",
"settingsSystemDefault",
"settingsDefault",
"settingsDisabled",
"settingsAskEverytime",
@ -983,33 +965,7 @@
"settingsStorageAccessRevokeTooltip",
"settingsAccessibilitySectionTitle",
"settingsRemoveAnimationsTile",
"settingsRemoveAnimationsDialogTitle",
"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"
"statsWithGps"
],
"bn": [
@ -2205,16 +2161,9 @@
"filePickerUseThisFolder"
],
"cs": [
"entryActionCast",
"castDialogTitle"
],
"de": [
"entryActionCast",
"overlayHistogramNone",
"overlayHistogramRGB",
"overlayHistogramLuminance",
"castDialogTitle",
"aboutDataUsageClearCache",
"settingsViewerShowHistogram"
@ -2337,7 +2286,6 @@
"menuActionSelect",
"menuActionSelectAll",
"menuActionSelectNone",
"viewDialogSortSectionTitle",
"viewDialogLayoutSectionTitle",
"viewDialogReverseSortOrder",
"tileLayoutMosaic",