Merge branch 'pr/663'

BitBoxSwiss · Nov 11, 2019 · 8d04598 · 8d04598
2 parents eb76883 + 6b0b34d
commit 8d04598
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 214 deletions.
diff --git a/docs/BUILD.md b/docs/BUILD.md
@@ -66,6 +66,9 @@ Within the Docker dev environment, build the Android App: `make android`
 The Android Sdk is assumed to be in `/opt/android-sdk`. Use `make android ANDROID_SDK_ROOT=...` to
 use a different Sdk location.
 
+To update the app icon, execute `frontends/android/mkicon.sh`.
+The script isn't run during `make android` build.
+
 Build artifacts:
 * `frontends/android/BitBox/app/build/outputs/apk/*`
 

diff --git a/frontends/android/BitBox/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/frontends/android/BitBox/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/frontends/android/BitBox/app/src/main/res/drawable/ic_launcher_background.xml b/frontends/android/BitBox/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/frontends/android/BitBox/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/frontends/android/BitBox/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-hdpi/ic_launcher.png b/frontends/android/BitBox/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/frontends/android/BitBox/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-mdpi/ic_launcher.png b/frontends/android/BitBox/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/frontends/android/BitBox/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/frontends/android/BitBox/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/frontends/android/BitBox/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/frontends/android/BitBox/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/frontends/android/BitBox/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/frontends/android/BitBox/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/frontends/android/BitBox/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/frontends/android/BitBox/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/frontends/android/mkicon.sh b/frontends/android/mkicon.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# This script requires convert tool from ImageMagick and optipng.
+# The output is nondeterministic.
+set -e
+
+thisdir=$(dirname ${0})
+source=${thisdir}/../qt/resources/app_icon_source.png
+res=${thisdir}/BitBox/app/src/main/res
+
+convert -resize 48x48 ${source} ${res}/mipmap-mdpi/ic_launcher.png
+convert -resize 72x72 ${source} ${res}/mipmap-hdpi/ic_launcher.png
+convert -resize 96x96 ${source} ${res}/mipmap-xhdpi/ic_launcher.png
+convert -resize 144x144 ${source} ${res}/mipmap-xxhdpi/ic_launcher.png
+convert -resize 192x192 ${source} ${res}/mipmap-xxxhdpi/ic_launcher.png
+
+find ${res} -name ic_launcher.png -exec optipng -quiet {} \;