diff --git a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml index 4a0eb132..7353dbd1 100644 --- a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 4a0eb132..00000000 --- a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/presentation/src/debug/res/mipmap-hdpi/ic_launcher.png b/presentation/src/debug/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 06ba5001..00000000 Binary files a/presentation/src/debug/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/presentation/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index b31fd740..00000000 Binary files a/presentation/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/presentation/src/debug/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 59b67a34..00000000 Binary files a/presentation/src/debug/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-mdpi/ic_launcher.png b/presentation/src/debug/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index b6c41cd4..00000000 Binary files a/presentation/src/debug/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/presentation/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 6f85a129..00000000 Binary files a/presentation/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/presentation/src/debug/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 18359374..00000000 Binary files a/presentation/src/debug/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xhdpi/ic_launcher.png b/presentation/src/debug/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 8f7d27c2..00000000 Binary files a/presentation/src/debug/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/presentation/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index ea9a5fc9..00000000 Binary files a/presentation/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/presentation/src/debug/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 3b928c52..00000000 Binary files a/presentation/src/debug/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8db4eec8..00000000 Binary files a/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index bd6bc45d..00000000 Binary files a/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index cdb10637..00000000 Binary files a/presentation/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d3404092..00000000 Binary files a/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 2403cf92..00000000 Binary files a/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index aaaeac56..00000000 Binary files a/presentation/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/debug/res/values/ic_launcher_background.xml b/presentation/src/debug/res/values/ic_launcher_background.xml index 23e58742..e50a17c8 100644 --- a/presentation/src/debug/res/values/ic_launcher_background.xml +++ b/presentation/src/debug/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #F1C40F - + #F1C40F + \ No newline at end of file diff --git a/presentation/src/fdroidmain/res/drawable/ic_launcher_foreground.xml b/presentation/src/fdroidmain/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..0607f651 --- /dev/null +++ b/presentation/src/fdroidmain/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/presentation/src/fdroidmain/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/fdroidmain/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..7353dbd1 --- /dev/null +++ b/presentation/src/fdroidmain/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/fdroidmain/res/values/ic_launcher_background.xml b/presentation/src/fdroidmain/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..c5d5899f --- /dev/null +++ b/presentation/src/fdroidmain/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/presentation/src/fdroidmainDebug/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/fdroidmainDebug/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..7353dbd1 --- /dev/null +++ b/presentation/src/fdroidmainDebug/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/presentation/src/fdroidmainDebug/res/values/ic_launcher_background.xml b/presentation/src/fdroidmainDebug/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..e50a17c8 --- /dev/null +++ b/presentation/src/fdroidmainDebug/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #F1C40F + \ No newline at end of file diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadNotification.kt b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadNotification.kt index cfd8f00a..7630e0fd 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadNotification.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadNotification.kt @@ -39,7 +39,7 @@ class AutoUploadNotification(private val context: Context, private val amountOfP this.builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID) // .setContentTitle(context.getString(R.string.notification_auto_upload_title)) // - .setSmallIcon(R.drawable.background_splash_cryptomator) // + .setSmallIcon(R.drawable.ic_notification) // .setColor(getColor(R.color.colorPrimary)) // .addAction(cancelNowAction()) .setGroup(NOTIFICATION_GROUP_KEY) diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/OpenWritableFileNotification.kt b/presentation/src/main/java/org/cryptomator/presentation/service/OpenWritableFileNotification.kt index f36d6098..9594f440 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/service/OpenWritableFileNotification.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/service/OpenWritableFileNotification.kt @@ -35,7 +35,7 @@ class OpenWritableFileNotification(private val context: Context, private val uri this.builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID) // .setContentTitle(context.getString(R.string.notification_open_writable_file_title)) // .setContentText(context.getString(R.string.notification_open_writable_file_message)) // - .setSmallIcon(R.drawable.background_splash_cryptomator) // + .setSmallIcon(R.drawable.ic_notification) // .setColor(getColor(R.color.colorPrimary)) // .setGroup(NOTIFICATION_GROUP_KEY) .setOngoing(true) diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java b/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java index 1b90f1d1..3f0c6ab8 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java +++ b/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java @@ -52,7 +52,7 @@ class UnlockedNotification { } this.builder = new NotificationCompat.Builder(service, NOTIFICATION_CHANNEL_ID) // - .setSmallIcon(R.drawable.background_splash_cryptomator) // + .setSmallIcon(R.drawable.ic_notification) // .setColor(ResourceHelper.Companion.getColor(R.color.colorPrimary)) // .addAction(lockNowAction()) // .setGroup(NOTIFICATION_GROUP_KEY) // diff --git a/presentation/src/main/res/drawable-anydpi/ic_notification.xml b/presentation/src/main/res/drawable-anydpi/ic_notification.xml new file mode 100644 index 00000000..0b99d37a --- /dev/null +++ b/presentation/src/main/res/drawable-anydpi/ic_notification.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/presentation/src/main/res/drawable-hdpi/ic_notification.png b/presentation/src/main/res/drawable-hdpi/ic_notification.png new file mode 100644 index 00000000..c934b21d Binary files /dev/null and b/presentation/src/main/res/drawable-hdpi/ic_notification.png differ diff --git a/presentation/src/main/res/drawable-mdpi/ic_notification.png b/presentation/src/main/res/drawable-mdpi/ic_notification.png new file mode 100644 index 00000000..8d21ef31 Binary files /dev/null and b/presentation/src/main/res/drawable-mdpi/ic_notification.png differ diff --git a/presentation/src/main/res/drawable-xhdpi/ic_notification.png b/presentation/src/main/res/drawable-xhdpi/ic_notification.png new file mode 100644 index 00000000..bd1111b3 Binary files /dev/null and b/presentation/src/main/res/drawable-xhdpi/ic_notification.png differ diff --git a/presentation/src/main/res/drawable-xxhdpi/ic_notification.png b/presentation/src/main/res/drawable-xxhdpi/ic_notification.png new file mode 100644 index 00000000..7b662c8c Binary files /dev/null and b/presentation/src/main/res/drawable-xxhdpi/ic_notification.png differ diff --git a/presentation/src/main/res/drawable/background_splash.xml b/presentation/src/main/res/drawable/background_splash.xml index b8180bf1..fe8f5b65 100644 --- a/presentation/src/main/res/drawable/background_splash.xml +++ b/presentation/src/main/res/drawable/background_splash.xml @@ -1,9 +1,5 @@ - - - + diff --git a/presentation/src/main/res/drawable/ic_bot.xml b/presentation/src/main/res/drawable/ic_bot.xml new file mode 100644 index 00000000..dd6d9f34 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_bot.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/drawable/ic_launcher_foreground.xml b/presentation/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..6979bda7 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 4a0eb132..7353dbd1 100644 --- a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 4a0eb132..00000000 --- a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher.png b/presentation/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 74979acb..00000000 Binary files a/presentation/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index b31fd740..00000000 Binary files a/presentation/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 3466a1e1..00000000 Binary files a/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher.png b/presentation/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 455b917f..00000000 Binary files a/presentation/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 6f85a129..00000000 Binary files a/presentation/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 2ebc053e..00000000 Binary files a/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher.png b/presentation/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 9f9dd009..00000000 Binary files a/presentation/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index ea9a5fc9..00000000 Binary files a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 3134f0f7..00000000 Binary files a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.png b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index fec6a14c..00000000 Binary files a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index bd6bc45d..00000000 Binary files a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 469f6e26..00000000 Binary files a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index e94212c0..00000000 Binary files a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 2403cf92..00000000 Binary files a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index a626af31..00000000 Binary files a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/presentation/src/main/res/values/ic_launcher_background.xml b/presentation/src/main/res/values/ic_launcher_background.xml index f497ac4c..c5d5899f 100644 --- a/presentation/src/main/res/values/ic_launcher_background.xml +++ b/presentation/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #FFFFFF - + #FFFFFF + \ No newline at end of file