diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de0136e..16194a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,13 +2,13 @@ image: openjdk:18-jdk-bullseye before_script: - apt --quiet update --yes - - apt --quiet install --yes wget tar unzip perl p7zip-full + - apt --quiet install --yes wget tar unzip perl p7zip-full imagemagick pngquant BleedingEdge: interruptible: true stage: build script: | - StartDir="$(pwd)" + StartDir="$(pwd)" mkdir -p ../AndroidSdk cd ../AndroidSdk wget -O BuildTools.zip https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip @@ -16,7 +16,6 @@ BleedingEdge: yes A | unzip BuildTools.zip || true yes A | unzip Platform.zip || true cd "$StartDir" - sh ./tools/Build.sh artifacts: paths: diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 14d02a9..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index b4989b6..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index ed28f77..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index b026ead..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png deleted file mode 100644 index aa3125d..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png index aa3125d..cc07fdd 100644 Binary files a/app/src/main/res/drawable/ic_launcher.png and b/app/src/main/res/drawable/ic_launcher.png differ diff --git a/tools/Build.sh b/tools/Build.sh index 065a192..b7ecc82 100755 --- a/tools/Build.sh +++ b/tools/Build.sh @@ -7,5 +7,7 @@ mv ./java ./src cp -r ../tools/tiny-android-template/* ./ echo "${SecEncodedKeystore}" | base64 --decode > ./Keystore.jks +sh ../tools/BuildAssets.sh + perl ./link.pl bash ./make.sh diff --git a/tools/BuildAssets.sh b/tools/BuildAssets.sh new file mode 100755 index 0000000..3cebc1c --- /dev/null +++ b/tools/BuildAssets.sh @@ -0,0 +1,22 @@ +#!/bin/sh +Img=ic_launcher.png + +cd ./res + +for Dpi in m h xh xxh xxxh +do + mkdir -p ./drawable-${Dpi}dpi +done + +convert ./drawable/$Img -resize 48x48 ./drawable-mdpi/$Img +convert ./drawable/$Img -resize 72x72 ./drawable-hdpi/$Img +convert ./drawable/$Img -resize 96x96 ./drawable-xhdpi/$Img +convert ./drawable/$Img -resize 144x144 ./drawable-xxhdpi/$Img +convert ./drawable/$Img -resize 192x192 ./drawable-xxxhdpi/$Img + +for Dpi in m h xh xxh xxxh +do + pngquant -v --strip --speed=1 --force -o ./drawable-${Dpi}dpi/$Img ./drawable-${Dpi}dpi/$Img +done + +cd ..