Merge branch 'move-source-graphics-to-dir'

9 files changed, 20 insertions, 16 deletions

diff --git a/README.md b/README.md
index 6cd340c687..cd3e192b4a 100644
--- a/README.md
+++ b/README.md
@@ -569,9 +569,9 @@ The GUI has a specific settings file that is configured for each user. The path
 Icons such as the logo and menubar icons are automatically generated. The source files are:
 | Path | Usage |
 |------|-------|
-| `dist-assets/icon.svg` | The logo icon used for e.g. application icon and in app logo |
-| `dist-assets/icon-mono.svg` | The logo icon used for the android notification icon |
-| `dist-assets/ios-icon.svg` | Logo icon used to generate the iOS application icon |
+| `graphics/icon.svg` | The logo icon used for e.g. application icon and in app logo |
+| `graphics/icon-mono.svg` | The logo icon used for the android notification icon |
+| `graphics/icon-ios.svg` | Logo icon used to generate the iOS application icon |
 | `gui/assets/images/*.svg` | Icons used to generate iOS icons and used in the desktop app |
 | `gui/assets/images/menubar icons/svg/*.svg` | The frames for the menubar icon |
 
diff --git a/android/generate-pngs.sh b/android/generate-pngs.sh
index 8477e12f96..1e2518c69c 100755
--- a/android/generate-pngs.sh
+++ b/android/generate-pngs.sh
@@ -10,6 +10,10 @@ fi
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIR"
 
+ICON_SVG_PATH="../graphics/icon.svg"
+# Icons used for notification and quick settings tile
+BLACK_MONO_ICON_PATH="../graphics/icon-mono.svg"
+
 # The following helper function converts an SVG image into a PNG image for a specific DPI
 #
 # Parameters:
@@ -67,28 +71,27 @@ function convert_image() {
 
 # 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"
+    convert_image "$ICON_SVG_PATH" "$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"
+    convert_image "$ICON_SVG_PATH" "$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"
+    convert_image "$ICON_SVG_PATH" "$dpi_size" "launch_logo"
 done
 
-# Icons used for notification and quick settings tile
-BLACK_MONO_ICON="../dist-assets/icon-mono.svg"
-WHITE_MONO_ICON="$(mktemp)"
+# The white icon is generated from the black one
+white_mono_icon_path="$(mktemp)"
 
-sed -e 's/\(\.st1{.*\);fill:#000000;/\1;fill:#FFFFFF;/' "$BLACK_MONO_ICON" > "$WHITE_MONO_ICON"
+sed -e 's/\(\.st1{.*\);fill:#000000;/\1;fill:#FFFFFF;/' "$BLACK_MONO_ICON_PATH" > "$white_mono_icon_path"
 
 for dpi_size in "mdpi-24" "hdpi-36" "xhdpi-48" "xxhdpi-72" "xxxhdpi-96"; do
-    convert_image "$BLACK_MONO_ICON" "$dpi_size" "small_logo_black"
-    convert_image "$WHITE_MONO_ICON" "$dpi_size" "small_logo_white"
+    convert_image "$BLACK_MONO_ICON_PATH" "$dpi_size" "small_logo_black"
+    convert_image "$white_mono_icon_path" "$dpi_size" "small_logo_white"
 done
 
-rm "$WHITE_MONO_ICON"
+rm "$white_mono_icon_path"
diff --git a/graphics/Android-feature-graphics.png b/graphics/Android-feature-graphics.png
new file mode 100755
index 0000000000..14504d0f5a
--- /dev/null
+++ b/graphics/Android-feature-graphics.png
diff --git a/graphics/Android-feature-graphics.psd b/graphics/Android-feature-graphics.psd
new file mode 100755
index 0000000000..27eca55710
--- /dev/null
+++ b/graphics/Android-feature-graphics.psd
diff --git a/dist-assets/ios-icon.svg b/graphics/icon-ios.svg
index b07b29bdb1..b07b29bdb1 100644
--- a/dist-assets/ios-icon.svg
+++ b/graphics/icon-ios.svg
diff --git a/dist-assets/icon-mono.svg b/graphics/icon-mono.svg
index d98f8c3f5d..d98f8c3f5d 100644
--- a/dist-assets/icon-mono.svg
+++ b/graphics/icon-mono.svg
diff --git a/dist-assets/icon.svg b/graphics/icon.svg
index 10096f2a47..10096f2a47 100644
--- a/dist-assets/icon.svg
+++ b/graphics/icon.svg
diff --git a/gui/scripts/build-logo-icons.sh b/gui/scripts/build-logo-icons.sh
index 0f0a803d4d..720fe3646a 100755
--- a/gui/scripts/build-logo-icons.sh
+++ b/gui/scripts/build-logo-icons.sh
@@ -27,8 +27,9 @@ fi
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIR"
 
+GRAPHICS_DIR="../../graphics"
 DIST_ASSETS_DIR="../../dist-assets"
-SVG_SOURCE_PATH="$DIST_ASSETS_DIR/icon.svg"
+SVG_SOURCE_PATH="$GRAPHICS_DIR/icon.svg"
 TMP_DIR=$(mktemp -d)
 TMP_ICO_DIR="$TMP_DIR/ico"
 TMP_ICONSET_DIR="$TMP_DIR/icon.iconset"
@@ -69,7 +70,7 @@ rm $sidebar_path
 rsvg-convert -o ../assets/images/icon-notification.png -w 128 -h 128 $SVG_SOURCE_PATH
 
 # GUI in app icon
-cp ../../dist-assets/icon.svg ../assets/images/logo-icon.svg
+cp "$SVG_SOURCE_PATH" ../assets/images/logo-icon.svg
 
 rmdir $TMP_DIR
 
diff --git a/ios/convert-assets.rb b/ios/convert-assets.rb
index 5c4d73ff32..266e52d777 100755
--- a/ios/convert-assets.rb
+++ b/ios/convert-assets.rb
@@ -10,7 +10,7 @@ XCASSETS_DIR = File.join(SCRIPT_DIR, "MullvadVPN/Assets.xcassets")
 XCASSETS_APPICON_DIR = File.join(XCASSETS_DIR, "AppIcon.appiconset")
 
 # graphical assets sources
-APPICON_PATH = File.join(ROOT_DIR, "dist-assets/ios-icon.svg")
+APPICON_PATH = File.join(ROOT_DIR, "graphics/icon-ios.svg")
 GRAPHICAL_ASSETS_DIR = File.join(ROOT_DIR, "gui/assets/images")
 ADDITIONAL_ASSETS_DIR = File.join(SCRIPT_DIR, "AdditionalAssets")