diff --git a/alternative_package.sh b/alternative_package.sh index e13eb7792f..d33382b7f8 100755 --- a/alternative_package.sh +++ b/alternative_package.sh @@ -12,41 +12,36 @@ if [ -z "$package_add" ] || [ -z "$name_add" ]; then fi logo_replace_color() { - file="$1" - color1="$2" - color2="$3" - # color 600 - sed -i "s|#7CB342|$color1|gi" "$file" - # color 200 - sed -i "s|#C5E1A5|$color2|gi" "$file" + local file="$1" + local color_shell="$2" + local color_shell_dark="$3" + # shell color + sed -i "s|#199834|$color_shell|gi" "$file" + sed -i "s|#044204|$color_shell_dark|gi" "$file" } logo_alternative() { - color1="$1" - color2="$2" - logo_replace_color "$mydir/graphics/ic_launcher_round.svg" "$color1" "$color2" - logo_replace_color "$mydir/graphics/ic_launcher.svg" "$color1" "$color2" - logo_replace_color "$mydir/graphics/riot_splash_0_green.svg" "$color1" "$color2" - logo_replace_color "$mydir/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml" "$color1" "$color2" + logo_replace_color "$mydir/graphics/ic_launcher_foreground_sc.svg" "$@" + logo_replace_color "$mydir/graphics/ic_launcher_sc.svg" "$@" "$mydir/graphics/icon_gen.sh" } case "$package_add" in "a") # cyan - logo_alternative "#00ACC1" "#80DEEA" + logo_alternative "#00ACC1" "#006064" ;; "b") # orange - logo_alternative "#FB8C00" "#FFCC80" + logo_alternative "#FB8C00" "#E65100" ;; "c") # purple - logo_alternative "#5E35B1" "#B39DDB" + logo_alternative "#5E35B1" "#311B92" ;; "d") # red - logo_alternative "#E53935" "#EF9A9A" + logo_alternative "#E53935" "#B71C1C" ;; esac diff --git a/graphics/ic_launcher.svg b/graphics/ic_launcher.svg deleted file mode 100644 index 95e216f06e..0000000000 --- a/graphics/ic_launcher.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/graphics/ic_launcher_foreground_sc.svg b/graphics/ic_launcher_foreground_sc.svg new file mode 100644 index 0000000000..9ea8a73719 --- /dev/null +++ b/graphics/ic_launcher_foreground_sc.svg @@ -0,0 +1,824 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/ic_launcher_round.svg b/graphics/ic_launcher_round.svg deleted file mode 100644 index c5feb1480b..0000000000 --- a/graphics/ic_launcher_round.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/graphics/ic_launcher_round_tmp.svg b/graphics/ic_launcher_round_tmp.svg deleted file mode 100644 index 4b4da372fa..0000000000 --- a/graphics/ic_launcher_round_tmp.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/ic_launcher_sc.svg b/graphics/ic_launcher_sc.svg new file mode 100644 index 0000000000..8ad1d37867 --- /dev/null +++ b/graphics/ic_launcher_sc.svg @@ -0,0 +1,824 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/ic_launcher_work.svg b/graphics/ic_launcher_work.svg new file mode 100644 index 0000000000..f7c8e541aa --- /dev/null +++ b/graphics/ic_launcher_work.svg @@ -0,0 +1,926 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh index 9291c874c3..071158dc1a 100755 --- a/graphics/icon_gen.sh +++ b/graphics/icon_gen.sh @@ -23,20 +23,25 @@ dpi=96 base_folder="$mydir/../vector/src/main/res/drawable" -file="$mydir/riot_splash_0_green.svg" +cp "$mydir/ic_launcher_sc.svg" "$mydir/riot_splash_sc.svg" +file="$mydir/riot_splash_sc.svg" export_files +rm "$mydir/riot_splash_sc.svg" -cp "$mydir/ic_launcher.svg" "$mydir/riotx_logo.svg" -file="$mydir/riotx_logo.svg" +dpi=48 +cp "$mydir/ic_launcher_sc.svg" "$mydir/element_logo_sc.svg" +file="$mydir/element_logo_sc.svg" export_files -rm "$mydir/riotx_logo.svg" +rm "$mydir/element_logo_sc.svg" base_folder="$mydir/../vector/src/main/res/mipmap" dpi=24 # 96/4 -file="$mydir/ic_launcher.svg" +file="$mydir/ic_launcher_sc.svg" export_files -file="$mydir/ic_launcher_round.svg" + +dpi=48 # 96/2 +file="$mydir/ic_launcher_foreground_sc.svg" export_files diff --git a/graphics/model.png b/graphics/model.png new file mode 100644 index 0000000000..ada28c41f5 Binary files /dev/null and b/graphics/model.png differ diff --git a/graphics/riot_splash_0_green.svg b/graphics/riot_splash_0_green.svg deleted file mode 100644 index 19108415ec..0000000000 --- a/graphics/riot_splash_0_green.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index fca2c24208..aca68ab15c 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -40,10 +40,9 @@ @@ -270,4 +269,4 @@ - \ No newline at end of file + diff --git a/vector/src/main/res/drawable-hdpi/element_logo_sc.png b/vector/src/main/res/drawable-hdpi/element_logo_sc.png new file mode 100644 index 0000000000..0797cb4fe9 Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/element_logo_sc.png differ diff --git a/vector/src/main/res/drawable-hdpi/riot_splash_sc.png b/vector/src/main/res/drawable-hdpi/riot_splash_sc.png new file mode 100644 index 0000000000..e25a9ac8ca Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/riot_splash_sc.png differ diff --git a/vector/src/main/res/drawable-mdpi/element_logo_sc.png b/vector/src/main/res/drawable-mdpi/element_logo_sc.png new file mode 100644 index 0000000000..74268284db Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/element_logo_sc.png differ diff --git a/vector/src/main/res/drawable-mdpi/riot_splash_sc.png b/vector/src/main/res/drawable-mdpi/riot_splash_sc.png new file mode 100644 index 0000000000..aa2139a2fc Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/riot_splash_sc.png differ diff --git a/vector/src/main/res/drawable-xhdpi/element_logo_sc.png b/vector/src/main/res/drawable-xhdpi/element_logo_sc.png new file mode 100644 index 0000000000..aa2139a2fc Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/element_logo_sc.png differ diff --git a/vector/src/main/res/drawable-xhdpi/riot_splash_sc.png b/vector/src/main/res/drawable-xhdpi/riot_splash_sc.png new file mode 100644 index 0000000000..f4f18620cc Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/riot_splash_sc.png differ diff --git a/vector/src/main/res/drawable-xxhdpi/element_logo_sc.png b/vector/src/main/res/drawable-xxhdpi/element_logo_sc.png new file mode 100644 index 0000000000..e25a9ac8ca Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/element_logo_sc.png differ diff --git a/vector/src/main/res/drawable-xxhdpi/riot_splash_sc.png b/vector/src/main/res/drawable-xxhdpi/riot_splash_sc.png new file mode 100644 index 0000000000..d07b3183df Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/riot_splash_sc.png differ diff --git a/vector/src/main/res/drawable-xxxhdpi/element_logo_sc.png b/vector/src/main/res/drawable-xxxhdpi/element_logo_sc.png new file mode 100644 index 0000000000..f4f18620cc Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/element_logo_sc.png differ diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_splash_sc.png b/vector/src/main/res/drawable-xxxhdpi/riot_splash_sc.png new file mode 100644 index 0000000000..5be480e42c Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/riot_splash_sc.png differ diff --git a/vector/src/main/res/drawable/riot_animated_logo.xml b/vector/src/main/res/drawable/riot_animated_logo.xml index 638b1b1ceb..a3f946424c 100644 --- a/vector/src/main/res/drawable/riot_animated_logo.xml +++ b/vector/src/main/res/drawable/riot_animated_logo.xml @@ -2,15 +2,15 @@ \ No newline at end of file diff --git a/vector/src/main/res/drawable/splash.xml b/vector/src/main/res/drawable/splash.xml index 5acc22075b..256477c5e2 100644 --- a/vector/src/main/res/drawable/splash.xml +++ b/vector/src/main/res/drawable/splash.xml @@ -5,13 +5,13 @@ android:opacity="opaque"> - + + android:src="@drawable/riot_splash_sc" /> - \ No newline at end of file + diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml index 541b75e7c7..40f280b474 100644 --- a/vector/src/main/res/layout/dialog_disclaimer_content.xml +++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml @@ -31,7 +31,7 @@ + android:src="@drawable/element_logo_sc" /> diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml index 2a43ece5ec..d2c591f583 100644 --- a/vector/src/main/res/layout/fragment_login_splash.xml +++ b/vector/src/main/res/layout/fragment_login_splash.xml @@ -22,7 +22,7 @@ android:id="@+id/loginSplashLogo" android:layout_width="64dp" android:layout_height="64dp" - android:src="@drawable/element_logo_green" + android:src="@drawable/element_logo_sc" android:transitionName="loginLogoTransition" app:layout_constraintBottom_toTopOf="@+id/logoType" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/layout/item_login_header.xml b/vector/src/main/res/layout/item_login_header.xml index d033c4f9f9..2c70153fdd 100644 --- a/vector/src/main/res/layout/item_login_header.xml +++ b/vector/src/main/res/layout/item_login_header.xml @@ -6,4 +6,4 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="32dp" android:importantForAccessibility="no" - android:src="@drawable/element_logo_green" /> + android:src="@drawable/element_logo_sc" /> diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_background_sc.xml b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_background_sc.xml new file mode 100644 index 0000000000..dec825db51 --- /dev/null +++ b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_background_sc.xml @@ -0,0 +1,10 @@ + + + diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml new file mode 100644 index 0000000000..8dda2bd207 --- /dev/null +++ b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png b/vector/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png new file mode 100644 index 0000000000..231a1f40c2 Binary files /dev/null and b/vector/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png differ diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_sc.png b/vector/src/main/res/mipmap-hdpi/ic_launcher_sc.png new file mode 100644 index 0000000000..b20c7bfe11 Binary files /dev/null and b/vector/src/main/res/mipmap-hdpi/ic_launcher_sc.png differ diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png b/vector/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png new file mode 100644 index 0000000000..5c831f2caf Binary files /dev/null and b/vector/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png differ diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_sc.png b/vector/src/main/res/mipmap-mdpi/ic_launcher_sc.png new file mode 100644 index 0000000000..6a14655273 Binary files /dev/null and b/vector/src/main/res/mipmap-mdpi/ic_launcher_sc.png differ diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png new file mode 100644 index 0000000000..8d3998d0e7 Binary files /dev/null and b/vector/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png differ diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_sc.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher_sc.png new file mode 100644 index 0000000000..74268284db Binary files /dev/null and b/vector/src/main/res/mipmap-xhdpi/ic_launcher_sc.png differ diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png new file mode 100644 index 0000000000..a7b35f7fa3 Binary files /dev/null and b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png differ diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png new file mode 100644 index 0000000000..0797cb4fe9 Binary files /dev/null and b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png differ diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png new file mode 100644 index 0000000000..3f7962654c Binary files /dev/null and b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png differ diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png new file mode 100644 index 0000000000..aa2139a2fc Binary files /dev/null and b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png differ diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml index 2213bf87da..9df26c2492 100644 --- a/vector/src/main/res/values/styles_login.xml +++ b/vector/src/main/res/values/styles_login.xml @@ -16,7 +16,7 @@ @id/loginLogo 60dp 60dp - @drawable/element_logo_green + @drawable/element_logo_sc no parent parent