From f32e491c72b83f9efed8c67ebd1a5aaa2286054e Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 2 Dec 2022 23:57:57 -0800 Subject: [PATCH 1/2] Adds in themable icon, with beta variant --- graphics/beta/ic_launcher_monochrome_sc.xml | 39 +++++++++++++++++++ graphics/ic_launcher_monochrome_sc.xml | 39 +++++++++++++++++++ graphics/icon_gen.sh | 8 ++++ .../ic_launcher_monochrome_sc.xml | 39 +++++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher_sc.xml | 1 + 5 files changed, 126 insertions(+) create mode 100644 graphics/beta/ic_launcher_monochrome_sc.xml create mode 100644 graphics/ic_launcher_monochrome_sc.xml create mode 100644 vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_monochrome_sc.xml diff --git a/graphics/beta/ic_launcher_monochrome_sc.xml b/graphics/beta/ic_launcher_monochrome_sc.xml new file mode 100644 index 0000000000..3376769231 --- /dev/null +++ b/graphics/beta/ic_launcher_monochrome_sc.xml @@ -0,0 +1,39 @@ + + + + + + + + diff --git a/graphics/ic_launcher_monochrome_sc.xml b/graphics/ic_launcher_monochrome_sc.xml new file mode 100644 index 0000000000..7e1c7589e5 --- /dev/null +++ b/graphics/ic_launcher_monochrome_sc.xml @@ -0,0 +1,39 @@ + + + + + + + + diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh index cf71cbad80..ac6318522c 100755 --- a/graphics/icon_gen.sh +++ b/graphics/icon_gen.sh @@ -1,4 +1,5 @@ #!/bin/bash +# note: this requires inkscape to be on the path, for svg -> png conversions mydir="$(dirname "$(realpath "$0")")" @@ -43,10 +44,17 @@ file="$mydir/ic_launcher_sc.svg" export_files + dpi=48 # 96/2 file="$mydir/ic_launcher_foreground_sc.svg" export_files +# As this is just for API > 33, we don't need to export to png mipmaps, we can just directly use the drawable +monochrome_file_name="ic_launcher_monochrome_sc.xml" +monochrome_input_file="$mydir/$monochrome_file_name" +monochrome_output_dir="$mydir/../vector-app/src/main/res/drawable-anydpi-v26" +cp "$monochrome_input_file" "$monochrome_output_dir/$monochrome_file_name" + inkscape "$mydir/feature_image.svg" --export-filename="$mydir/../fastlane/metadata/android/en-US/images/featureGraphic.png" -C --export-dpi=96 inkscape "$mydir/store_icon.svg" --export-filename="$mydir/../fastlane/metadata/android/en-US/images/icon.png" -C --export-dpi=96 diff --git a/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_monochrome_sc.xml b/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_monochrome_sc.xml new file mode 100644 index 0000000000..7e1c7589e5 --- /dev/null +++ b/vector-app/src/main/res/drawable-anydpi-v26/ic_launcher_monochrome_sc.xml @@ -0,0 +1,39 @@ + + + + + + + + diff --git a/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml b/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml index d91ea03322..e620e3daf4 100644 --- a/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml +++ b/vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml @@ -2,4 +2,5 @@ + From 86f39e52e740af9b98da2a78b13f6930428c39be Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Dec 2022 01:40:05 -0800 Subject: [PATCH 2/2] Adds in source SVGs for monochrome icons --- graphics/beta/ic_launcher_monochrome_sc.svg | 2410 ++++++++++++++++++ graphics/ic_launcher_monochrome_sc.svg | 2437 +++++++++++++++++++ graphics/icon_gen.sh | 5 +- 3 files changed, 4851 insertions(+), 1 deletion(-) create mode 100644 graphics/beta/ic_launcher_monochrome_sc.svg create mode 100644 graphics/ic_launcher_monochrome_sc.svg diff --git a/graphics/beta/ic_launcher_monochrome_sc.svg b/graphics/beta/ic_launcher_monochrome_sc.svg new file mode 100644 index 0000000000..2b6b3f2e31 --- /dev/null +++ b/graphics/beta/ic_launcher_monochrome_sc.svg @@ -0,0 +1,2410 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/ic_launcher_monochrome_sc.svg b/graphics/ic_launcher_monochrome_sc.svg new file mode 100644 index 0000000000..cddaf89e4a --- /dev/null +++ b/graphics/ic_launcher_monochrome_sc.svg @@ -0,0 +1,2437 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh index ac6318522c..e213b60e7c 100755 --- a/graphics/icon_gen.sh +++ b/graphics/icon_gen.sh @@ -50,7 +50,10 @@ file="$mydir/ic_launcher_foreground_sc.svg" export_files -# As this is just for API > 33, we don't need to export to png mipmaps, we can just directly use the drawable +## As this is just for API > 33, we don't need to export to png mipmaps, we can just directly use the drawable +# note that the monochrome svgs are also in this directory and could be directly converted to png mipmaps in the same +# way as ic_launcher_foreground_sc.svg above, but we're sticking with manually imported svg -> xml drawables +# for now to ensure high fidelity and sidestep issues with reproducibility of icon generation monochrome_file_name="ic_launcher_monochrome_sc.xml" monochrome_input_file="$mydir/$monochrome_file_name" monochrome_output_dir="$mydir/../vector-app/src/main/res/drawable-anydpi-v26"