Skip to content

Commit

Permalink
Remove apk version from build script and regenerate icon sheets
Browse files Browse the repository at this point in the history
  • Loading branch information
williamd1k0 committed Apr 28, 2024
1 parent 161c751 commit ba6cda0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
VERSION := 0.9.0
APK_OUTPUTS := app/build/outputs/apk
ICONS_TARGET_DIR := app/src/main/res/drawable-nodpi
ICONS_SOURCE_DIR := assets/icons
Expand All @@ -7,17 +6,17 @@ ICONS_PNG := $(notdir ${ICONS_SOURCE})
ICONS_TARGETS := $(addprefix ${ICONS_TARGET_DIR}/,${ICONS_PNG})
SHEET_TILES := 8

debug: ${APK_OUTPUTS}/debug/PixelStyle-${VERSION}.apk
release: ${APK_OUTPUTS}/release/PixelStyle-${VERSION}.apk
debug: ${APK_OUTPUTS}/debug/PixelStyle.apk
release: ${APK_OUTPUTS}/release/PixelStyle.apk
sheets: assets/dev/all-xxl.png

${ICONS_TARGETS}: ${ICONS_SOURCE}
@magick $(addprefix ${ICONS_SOURCE_DIR}/,$(notdir $@)) -scale 1200% $@

${APK_OUTPUTS}/debug/PixelStyle-${VERSION}.apk: ${ICONS_TARGETS} app/src/main/res/xml/appfilter.xml
${APK_OUTPUTS}/debug/PixelStyle.apk: ${ICONS_TARGETS} app/src/main/res/xml/appfilter.xml
@./gradlew assembleDebug

${APK_OUTPUTS}/release/PixelStyle-${VERSION}.apk: ${ICONS_TARGETS} app/src/main/res/xml/appfilter.xml
${APK_OUTPUTS}/release/PixelStyle.apk: ${ICONS_TARGETS} app/src/main/res/xml/appfilter.xml
@./gradlew assembleRelease

assets/dev/all.png: ${ICONS_SOURCE}
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
// 修改生成 Apk 的文件名
android.applicationVariants.all { variant ->
variant.outputs.all { output ->
outputFileName = "PixelStyle-${defaultConfig.versionName}.apk"
outputFileName = "PixelStyle.apk"
}
}
}
Expand Down
Binary file modified assets/dev/all-xxl.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/dev/all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ba6cda0

Please sign in to comment.