Skip to content

Fix Pure Black theme regression with Material 3 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maximillions-dev wants to merge 2 commits into from
Closed

Fix Pure Black theme regression with Material 3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ddce1
fix(ui): update pureBlack theme to set surfaceContainer colors to black
maximillions-dev Feb 11, 2026
e8d1b74
fix(ui): update pureBlack theme to set surfaceContainer colors to black
maximillions-dev Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}

- name: Sign APK
if: ${{ secrets.KEYSTORE != '' }}
uses: ilharp/sign-android-release@v2.0.0
with:
releaseDir: app/build/outputs/apk/universal${{ matrix.variant == 'foss' && 'Foss' || 'Gms' }}/release/
Expand All @@ -67,7 +68,7 @@ jobs:
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: 35.0.0

- name: Move signed APK
- name: Move APK
run: |
OUTPUT_DIR="app/build/outputs/apk/universal${{ matrix.variant == 'foss' && 'Foss' || 'Gms' }}/release"
mkdir -p "$OUTPUT_DIR/out"
Expand All @@ -76,9 +77,27 @@ jobs:
else
TARGET_NAME="app-universal-release.apk"
fi
find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | xargs -I{} mv {} "$OUTPUT_DIR/out/$TARGET_NAME"

- name: Upload Signed APK
# Try to find signed APK first
SIGNED_APK=$(find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | head -n 1)

if [ -n "$SIGNED_APK" ]; then
echo "Found signed APK: $SIGNED_APK"
mv "$SIGNED_APK" "$OUTPUT_DIR/out/$TARGET_NAME"
else
# Fallback to unsigned APK
UNSIGNED_APK=$(find "$OUTPUT_DIR" -name "*-unsigned.apk" | head -n 1)
if [ -n "$UNSIGNED_APK" ]; then
echo "Found unsigned APK: $UNSIGNED_APK"
mv "$UNSIGNED_APK" "$OUTPUT_DIR/out/$TARGET_NAME"
else
echo "No APK found to move!"
ls -R "$OUTPUT_DIR"
exit 1
fi
fi

- name: Upload APK
uses: actions/upload-artifact@v6
with:
name: ${{ matrix.variant == 'gms' && 'app-universal-with-Google-Cast' || 'app-universal-release' }}
Expand Down
25 changes: 22 additions & 3 deletions .github/workflows/build_quick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}

- name: Sign APK
if: ${{ secrets.KEYSTORE != '' }}
uses: ilharp/sign-android-release@v2.0.0
with:
releaseDir: app/build/outputs/apk/universalFoss/release/
Expand All @@ -66,13 +67,31 @@ jobs:
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: 35.0.0

- name: Move signed APK
- name: Move APK
run: |
OUTPUT_DIR="app/build/outputs/apk/universalFoss/release"
mkdir -p "$OUTPUT_DIR/out"
find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | xargs -I{} mv {} "$OUTPUT_DIR/out/app-universal-test-release.apk"

- name: Upload Signed APK
# Try to find signed APK first
SIGNED_APK=$(find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | head -n 1)

if [ -n "$SIGNED_APK" ]; then
echo "Found signed APK: $SIGNED_APK"
mv "$SIGNED_APK" "$OUTPUT_DIR/out/app-universal-test-release.apk"
else
# Fallback to unsigned APK
UNSIGNED_APK=$(find "$OUTPUT_DIR" -name "*-unsigned.apk" | head -n 1)
if [ -n "$UNSIGNED_APK" ]; then
echo "Found unsigned APK: $UNSIGNED_APK"
mv "$UNSIGNED_APK" "$OUTPUT_DIR/out/app-universal-test-release.apk"
else
echo "No APK found to move!"
ls -R "$OUTPUT_DIR"
exit 1
fi
fi

- name: Upload APK
uses: actions/upload-artifact@v6
with:
name: app-universal-test-release
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/kotlin/com/metrolist/music/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,12 @@ fun Bitmap.extractGradientColors(): List<Color> {
fun ColorScheme.pureBlack(apply: Boolean) =
if (apply) copy(
surface = Color.Black,
background = Color.Black
background = Color.Black,
surfaceContainer = Color.Black,
surfaceContainerLow = Color.Black,
surfaceContainerLowest = Color.Black,
surfaceContainerHigh = Color.Black,
surfaceContainerHighest = Color.Black,
) else this

val ColorSaver = object : Saver<Color, Int> {
Expand Down