diff --git a/app/k9mail/src/debug/res/mipmap-hdpi/icon.png b/app/k9mail/src/debug/res/mipmap-hdpi/icon.png deleted file mode 100644 index 67b558087e..0000000000 Binary files a/app/k9mail/src/debug/res/mipmap-hdpi/icon.png and /dev/null differ diff --git a/app/k9mail/src/debug/res/mipmap-mdpi/icon.png b/app/k9mail/src/debug/res/mipmap-mdpi/icon.png deleted file mode 100644 index 9fceb468f4..0000000000 Binary files a/app/k9mail/src/debug/res/mipmap-mdpi/icon.png and /dev/null differ diff --git a/app/k9mail/src/debug/res/mipmap-xhdpi/icon.png b/app/k9mail/src/debug/res/mipmap-xhdpi/icon.png deleted file mode 100644 index 1157ecf00a..0000000000 Binary files a/app/k9mail/src/debug/res/mipmap-xhdpi/icon.png and /dev/null differ diff --git a/app/k9mail/src/debug/res/mipmap-xxhdpi/icon.png b/app/k9mail/src/debug/res/mipmap-xxhdpi/icon.png deleted file mode 100644 index 2e95b25f6a..0000000000 Binary files a/app/k9mail/src/debug/res/mipmap-xxhdpi/icon.png and /dev/null differ diff --git a/app/k9mail/src/debug/res/mipmap-xxxhdpi/icon.png b/app/k9mail/src/debug/res/mipmap-xxxhdpi/icon.png deleted file mode 100644 index 8154ffcf35..0000000000 Binary files a/app/k9mail/src/debug/res/mipmap-xxxhdpi/icon.png and /dev/null differ diff --git a/app/k9mail/src/debug/res/values/app_logo_colors.xml b/app/k9mail/src/debug/res/values/app_logo_colors.xml new file mode 100644 index 0000000000..7939c369b4 --- /dev/null +++ b/app/k9mail/src/debug/res/values/app_logo_colors.xml @@ -0,0 +1,8 @@ + + + #5917ff + #7a45ff + #531ad8 + + #e3d9ff + diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/LauncherShortcuts.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/LauncherShortcuts.java index 3d2775b1fe..8d8d4a174e 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/LauncherShortcuts.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/LauncherShortcuts.java @@ -41,7 +41,7 @@ public class LauncherShortcuts extends AccountList { displayName = account.getEmail(); } intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, displayName); - Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.mipmap.icon); + Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher); intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource); setResult(RESULT_OK, intent); diff --git a/app/ui/legacy/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/ui/legacy/src/main/res/drawable-v26/ic_launcher.xml similarity index 57% rename from app/ui/legacy/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/ui/legacy/src/main/res/drawable-v26/ic_launcher.xml index df4ae3c1a3..0ffce35477 100644 --- a/app/ui/legacy/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/ui/legacy/src/main/res/drawable-v26/ic_launcher.xml @@ -1,8 +1,8 @@ - + - + - \ No newline at end of file + diff --git a/app/ui/legacy/src/main/res/drawable/ic_app_logo.xml b/app/ui/legacy/src/main/res/drawable/ic_app_logo.xml new file mode 100644 index 0000000000..2977664bf8 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_app_logo.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/ui/legacy/src/main/res/layout/fragment_about.xml b/app/ui/legacy/src/main/res/layout/fragment_about.xml index d69c7e5873..8292c82dd0 100644 --- a/app/ui/legacy/src/main/res/layout/fragment_about.xml +++ b/app/ui/legacy/src/main/res/layout/fragment_about.xml @@ -17,7 +17,7 @@ android:layout_gravity="center" android:layout_margin="16dp" android:contentDescription="@null" - app:srcCompat="@mipmap/icon" /> + app:srcCompat="@drawable/ic_app_logo" /> - - @mipmap/ic_launcher - diff --git a/app/ui/legacy/src/main/res/values/app_logo_colors.xml b/app/ui/legacy/src/main/res/values/app_logo_colors.xml new file mode 100644 index 0000000000..9642c4fa2f --- /dev/null +++ b/app/ui/legacy/src/main/res/values/app_logo_colors.xml @@ -0,0 +1,8 @@ + + + #ff1744 + #ff4569 + #d81a3d + + #ffdae1 + diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml index d9acb45a68..1c2b159950 100644 --- a/app/ui/legacy/src/main/res/values/colors.xml +++ b/app/ui/legacy/src/main/res/values/colors.xml @@ -1,7 +1,5 @@ - #FFDAE1 - #444444 #888 diff --git a/app/ui/legacy/src/main/res/values/drawables.xml b/app/ui/legacy/src/main/res/values/drawables.xml index e5a393bafd..f5a91e6d53 100644 --- a/app/ui/legacy/src/main/res/values/drawables.xml +++ b/app/ui/legacy/src/main/res/values/drawables.xml @@ -1,4 +1,4 @@ - @mipmap/icon + @drawable/ic_app_logo diff --git a/images/K-9_Mail-no-shadows-debug.svg b/images/K-9_Mail-no-shadows-debug.svg new file mode 100644 index 0000000000..3468f33205 --- /dev/null +++ b/images/K-9_Mail-no-shadows-debug.svg @@ -0,0 +1,180 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/K-9_Mail-no-shadows.svg b/images/K-9_Mail-no-shadows.svg new file mode 100644 index 0000000000..11d59a4441 --- /dev/null +++ b/images/K-9_Mail-no-shadows.svg @@ -0,0 +1,180 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + +