Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-08 06:25:37 -05:00
Code Packages Releases Activity

Fix generic theme contrasts

Browse Source
This commit is contained in:
bbedward
2025-09-21 20:31:14 -04:00
parent a734d9b497
commit bd72cf3adf
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Common/StockThemes.js
View File

@@ -116,7 +116,7 @@ const StockThemes = {
name: "Blue", name: "Blue",
primary: "#42a5f5", primary: "#42a5f5",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#1976d2", primaryContainer: "#0d47a1",
secondary: "#8ab4f8", secondary: "#8ab4f8",
surface: "#1a1c1e", surface: "#1a1c1e",
surfaceText: "#e3e8ef", surfaceText: "#e3e8ef",
@@ -133,7 +133,7 @@ const StockThemes = {
name: "Deep Blue", name: "Deep Blue",
primary: "#0061a4", primary: "#0061a4",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#004881", primaryContainer: "#000000",
secondary: "#42a5f5", secondary: "#42a5f5",
surface: "#1a1c1e", surface: "#1a1c1e",
surfaceText: "#e3e8ef", surfaceText: "#e3e8ef",
@@ -167,7 +167,7 @@ const StockThemes = {
name: "Green", name: "Green",
primary: "#4caf50", primary: "#4caf50",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#388e3c", primaryContainer: "#1b5e20",
secondary: "#81c995", secondary: "#81c995",
surface: "#0f1411", surface: "#0f1411",
surfaceText: "#e1f5e3", surfaceText: "#e1f5e3",
@@ -184,7 +184,7 @@ const StockThemes = {
name: "Orange", name: "Orange",
primary: "#ff6d00", primary: "#ff6d00",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#e65100", primaryContainer: "#3e2723",
secondary: "#ffb74d", secondary: "#ffb74d",
surface: "#1c1410", surface: "#1c1410",
surfaceText: "#f5f1ea", surfaceText: "#f5f1ea",
@@ -201,7 +201,7 @@ const StockThemes = {
name: "Red", name: "Red",
primary: "#f44336", primary: "#f44336",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#d32f2f", primaryContainer: "#4a0e0e",
secondary: "#f28b82", secondary: "#f28b82",
surface: "#1c1011", surface: "#1c1011",
surfaceText: "#f5e8ea", surfaceText: "#f5e8ea",
@@ -218,7 +218,7 @@ const StockThemes = {
name: "Cyan", name: "Cyan",
primary: "#00bcd4", primary: "#00bcd4",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#0097a7", primaryContainer: "#004d5c",
secondary: "#4dd0e1", secondary: "#4dd0e1",
surface: "#0f1617", surface: "#0f1617",
surfaceText: "#e8f4f5", surfaceText: "#e8f4f5",
@@ -235,7 +235,7 @@ const StockThemes = {
name: "Pink", name: "Pink",
primary: "#e91e63", primary: "#e91e63",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#c2185b", primaryContainer: "#4a0e2f",
secondary: "#f8bbd9", secondary: "#f8bbd9",
surface: "#1a1014", surface: "#1a1014",
surfaceText: "#f3e8ee", surfaceText: "#f3e8ee",
@@ -252,7 +252,7 @@ const StockThemes = {
name: "Amber", name: "Amber",
primary: "#ffc107", primary: "#ffc107",
primaryText: "#000000", primaryText: "#000000",
primaryContainer: "#ff8f00", primaryContainer: "#4a3c00",
secondary: "#ffd54f", secondary: "#ffd54f",
surface: "#1a1710", surface: "#1a1710",
surfaceText: "#f3f0e8", surfaceText: "#f3f0e8",

16
Modules/TopBar/Battery.qml
View File

@@ -147,21 +147,7 @@ Rectangle {
text: `${BatteryService.batteryLevel}%` text: `${BatteryService.batteryLevel}%`
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: { color: Theme.surfaceText
if (!BatteryService.batteryAvailable) {
return Theme.surfaceText;
}
if (BatteryService.isLowBattery && !BatteryService.isCharging) {
return Theme.error;
}
if (BatteryService.isCharging) {
return Theme.primary;
}
return Theme.surfaceText;
}
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: BatteryService.batteryAvailable visible: BatteryService.batteryAvailable
} }