diff --git a/GNUmakefile b/GNUmakefile index f2381100..3f2902c9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -927,25 +927,25 @@ out/res/layout_activity_main.xml.flat: src/android/res/layout/activity_main.xml @echo "[aapt2] $@" @$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ src/android/res/layout/activity_main.xml -out/res/drawable_icon.xml.flat: src/android/res/drawable/icon.xml +out/res/drawable_%.xml.flat: src/android/res/drawable/%.xml @mkdir -p $(dir $@) @echo "[aapt2] $@" - @$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ src/android/res/drawable/icon.xml + @$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ $(<) -out/apk/res.apk out/gen/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml +out/apk/res.apk out/gen/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat out/res/drawable_logo.xml.flat src/android/AndroidManifest.xml @echo [aapt2 link] res.apk @mkdir -p out/apk/ - @$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat \ + @$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat out/res/drawable_logo.xml.flat \ --min-sdk-version $(ANDROID_MIN_SDK_VERSION) \ --target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \ --manifest src/android/AndroidManifest.xml \ -o out/apk/res.apk \ --java out/gen/ -out/apk/res.fdroid.apk out/gen_fdroid/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml +out/apk/res.fdroid.apk out/gen_fdroid/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon_fdroid.xml.flat out/res/drawable_logo.xml.flat src/android/AndroidManifest.xml @echo [aapt2 link] res.fdroid.apk @mkdir -p out/apk/ - @$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat \ + @$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon_fdroid.xml.flat out/res/drawable_logo.xml.flat \ --min-sdk-version $(ANDROID_MIN_SDK_VERSION) \ --target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \ --rename-manifest-package com.unprompted.tildefriends.fdroid \ diff --git a/src/android/res/drawable/icon.xml b/src/android/res/drawable/icon.xml index 44898aa5..cca16199 100644 --- a/src/android/res/drawable/icon.xml +++ b/src/android/res/drawable/icon.xml @@ -1,55 +1,16 @@ - - - - - - - - - - - + + + + + + + + + diff --git a/src/android/res/drawable/icon_fdroid.xml b/src/android/res/drawable/icon_fdroid.xml new file mode 100644 index 00000000..b08f597e --- /dev/null +++ b/src/android/res/drawable/icon_fdroid.xml @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/src/android/res/drawable/logo.xml b/src/android/res/drawable/logo.xml new file mode 100644 index 00000000..e4a5ea5c --- /dev/null +++ b/src/android/res/drawable/logo.xml @@ -0,0 +1,51 @@ + + + + + + + + + + +