diff options
Diffstat (limited to 'android')
18 files changed, 83 insertions, 2 deletions
diff --git a/android/generate-pngs.sh b/android/generate-pngs.sh new file mode 100755 index 0000000000..2c71e3ef39 --- /dev/null +++ b/android/generate-pngs.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash + +set -eu + +if ! command -v rsvg-convert > /dev/null; then + echo >&2 "rsvg-convert (librsvg) is required to run this script" + exit 1 +fi + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd "$SCRIPT_DIR" + +# The following helper function converts an SVG image into a PNG image for a specific DPI +# +# Parameters: +# 1. Path to source SVG image +# 2. DPI config, a string with two parameters separated by a '-' +# a. the DPI specification, as the suffix of the output directory (e.g., mdpi, xxhdpi) +# b. the size of the generated PNG image +# 3. (optional) The destination image name, if not specified it is assumed to be the same as the +# input image name, with any '-'s replaced with '_'s +# 4. (optional) Destination directory type, either 'drawable' (the default) or 'mipmap' +# +# Examples: +# +# The following will generate a 50 by 50 image in android/src/main/res/drawable-hdpi/my_image.png +# +# convert_image /tmp/my-image.svg hdpi-50 +# +# The following will generate a 50 by 50 image in android/src/main/res/drawable-mdpi/other_image.png +# +# convert_image /tmp/my-other-image.svg mdpi-50 other_image +# +# The following will generate a 50 by 50 image in android/src/main/res/mipmap-xxhdpi/my_icon.png +# +# convert_image /tmp/my-final-image.svg xxhdpi-50 my_icon mipmap +function convert_image() { + if (( $# < 2 )); then + echo "Too few arguments passed to 'convert_image'" >&2 + exit 1 + fi + + local source_image="$1" + local dpi_config="$2" + + if (( $# >= 3 )); then + local destination_image="$3" + else + local destination_image="$(basename "$source_image" .svg | sed -e 's/-/_/g')" + fi + + if (( $# >= 4 )); then + local destination_dir="$4" + else + local destination_dir="drawable" + fi + + local dpi="$(echo "$dpi_config" | cut -f1 -d'-')" + local size="$(echo "$dpi_config" | cut -f2 -d'-')" + + local dpi_dir="./src/main/res/${destination_dir}-${dpi}" + + echo "$source_image -> ($size x $size) ${dpi_dir}/${destination_image}.png" + mkdir -p "$dpi_dir" + rsvg-convert "$source_image" -w "$size" -h "$size" -o "${dpi_dir}/${destination_image}.png" +} + +# Launcher icon +for dpi_size in "mdpi-48" "hdpi-72" "xhdpi-96" "xxhdpi-144" "xxxhdpi-192"; do + convert_image "../dist-assets/icon.svg" "$dpi_size" "ic_launcher" "mipmap" +done + +# Logo used in some GUI areas +for dpi_size in "mdpi-50" "hdpi-75" "xhdpi-100" "xxhdpi-150" "xxxhdpi-200"; do + convert_image "../dist-assets/icon.svg" "$dpi_size" "logo_icon" +done + +# Large logo used in the launch screen +for dpi_size in "mdpi-120" "hdpi-180" "xhdpi-240" "xxhdpi-360" "xxxhdpi-480"; do + convert_image "../dist-assets/icon.svg" "$dpi_size" "launch_logo" +done diff --git a/android/src/main/res/drawable-hdpi/launch_logo.png b/android/src/main/res/drawable-hdpi/launch_logo.png Binary files differindex 542ba7986f..4b9b739061 100644 --- a/android/src/main/res/drawable-hdpi/launch_logo.png +++ b/android/src/main/res/drawable-hdpi/launch_logo.png diff --git a/android/src/main/res/drawable-hdpi/logo_icon.png b/android/src/main/res/drawable-hdpi/logo_icon.png Binary files differindex 1701158506..fef2b8ce1f 100644 --- a/android/src/main/res/drawable-hdpi/logo_icon.png +++ b/android/src/main/res/drawable-hdpi/logo_icon.png diff --git a/android/src/main/res/drawable-mdpi/launch_logo.png b/android/src/main/res/drawable-mdpi/launch_logo.png Binary files differindex 2ee89ae828..bb9d166f6c 100644 --- a/android/src/main/res/drawable-mdpi/launch_logo.png +++ b/android/src/main/res/drawable-mdpi/launch_logo.png diff --git a/android/src/main/res/drawable-mdpi/logo_icon.png b/android/src/main/res/drawable-mdpi/logo_icon.png Binary files differindex 4d7b2af4e0..08f807d7a3 100644 --- a/android/src/main/res/drawable-mdpi/logo_icon.png +++ b/android/src/main/res/drawable-mdpi/logo_icon.png diff --git a/android/src/main/res/drawable-xhdpi/launch_logo.png b/android/src/main/res/drawable-xhdpi/launch_logo.png Binary files differindex c68c053832..876cb32f32 100644 --- a/android/src/main/res/drawable-xhdpi/launch_logo.png +++ b/android/src/main/res/drawable-xhdpi/launch_logo.png diff --git a/android/src/main/res/drawable-xhdpi/logo_icon.png b/android/src/main/res/drawable-xhdpi/logo_icon.png Binary files differindex 975ba02b3c..28ed381da3 100644 --- a/android/src/main/res/drawable-xhdpi/logo_icon.png +++ b/android/src/main/res/drawable-xhdpi/logo_icon.png diff --git a/android/src/main/res/drawable-xxhdpi/launch_logo.png b/android/src/main/res/drawable-xxhdpi/launch_logo.png Binary files differindex 1604009282..3ea8cbe15a 100644 --- a/android/src/main/res/drawable-xxhdpi/launch_logo.png +++ b/android/src/main/res/drawable-xxhdpi/launch_logo.png diff --git a/android/src/main/res/drawable-xxhdpi/logo_icon.png b/android/src/main/res/drawable-xxhdpi/logo_icon.png Binary files differindex 5a27e27631..0be79bef01 100644 --- a/android/src/main/res/drawable-xxhdpi/logo_icon.png +++ b/android/src/main/res/drawable-xxhdpi/logo_icon.png diff --git a/android/src/main/res/drawable-xxxhdpi/launch_logo.png b/android/src/main/res/drawable-xxxhdpi/launch_logo.png Binary files differindex 8a72edd366..7d3ec88895 100644 --- a/android/src/main/res/drawable-xxxhdpi/launch_logo.png +++ b/android/src/main/res/drawable-xxxhdpi/launch_logo.png diff --git a/android/src/main/res/drawable-xxxhdpi/logo_icon.png b/android/src/main/res/drawable-xxxhdpi/logo_icon.png Binary files differindex 5476db715c..eb7a150208 100644 --- a/android/src/main/res/drawable-xxxhdpi/logo_icon.png +++ b/android/src/main/res/drawable-xxxhdpi/logo_icon.png diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index f6a8f7f96b..52d418a639 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -11,7 +11,7 @@ android:gravity="center_vertical" android:background="@color/red" android:elevation="0.5dp"> - <ImageView android:layout_width="49dp" + <ImageView android:layout_width="50dp" android:layout_height="50dp" android:layout_marginLeft="12dp" android:layout_marginVertical="12dp" diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index af96d95315..dc52d47c4f 100644 --- a/android/src/main/res/layout/login.xml +++ b/android/src/main/res/layout/login.xml @@ -8,7 +8,7 @@ android:layout_weight="0" android:orientation="horizontal" android:gravity="center_vertical"> - <ImageView android:layout_width="49dp" + <ImageView android:layout_width="50dp" android:layout_height="50dp" android:layout_weight="0" android:layout_marginLeft="12dp" diff --git a/android/src/main/res/mipmap-hdpi/ic_launcher.png b/android/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differindex ecdaeebbe5..e69d754ff4 100644 --- a/android/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/android/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/android/src/main/res/mipmap-mdpi/ic_launcher.png b/android/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differindex 84aa8cf767..1d53dd86ac 100644 --- a/android/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/android/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differindex 8809e8615b..2164b759a6 100644 --- a/android/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/android/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex 623363c03a..c2f5a200c2 100644 --- a/android/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/android/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex c3c8f0f43d..922f83b1db 100644 --- a/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png |
