diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt index 67e30c57..36534334 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt @@ -376,7 +376,7 @@ object NotificationUtils { val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color) // Build the pending intent for when the notification is clicked val openRoomIntent = buildOpenRoomIntent(context, roomInfo.roomId) - val smallIcon = if (roomInfo.shouldBing) R.drawable.icon_notif_important else R.drawable.logo_transparent + val smallIcon = R.drawable.ic_status_bar val channelID = if (roomInfo.shouldBing) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID return NotificationCompat.Builder(context, channelID) @@ -479,7 +479,7 @@ object NotificationUtils { fun buildSimpleEventNotification(context: Context, simpleNotifiableEvent: NotifiableEvent, largeIcon: Bitmap?, matrixId: String): Notification? { val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color) // Build the pending intent for when the notification is clicked - val smallIcon = if (simpleNotifiableEvent.noisy) R.drawable.icon_notif_important else R.drawable.logo_transparent + val smallIcon = R.drawable.ic_status_bar val channelID = if (simpleNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID @@ -611,7 +611,7 @@ object NotificationUtils { noisy: Boolean, lastMessageTimestamp: Long): Notification? { val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color) - val smallIcon = if (noisy) R.drawable.icon_notif_important else R.drawable.logo_transparent + val smallIcon = R.drawable.ic_status_bar return NotificationCompat.Builder(context, if (noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID) // used in compat < N, after summary is built based on child notifications diff --git a/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml new file mode 100644 index 00000000..be23738b --- /dev/null +++ b/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/vector/src/main/res/drawable-hdpi/ic_status_bar.png b/vector/src/main/res/drawable-hdpi/ic_status_bar.png new file mode 100644 index 00000000..b956b8b1 Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/ic_status_bar.png differ diff --git a/vector/src/main/res/drawable-hdpi/icon_notif_important.png b/vector/src/main/res/drawable-hdpi/icon_notif_important.png deleted file mode 100644 index b7cdc8d5..00000000 Binary files a/vector/src/main/res/drawable-hdpi/icon_notif_important.png and /dev/null differ diff --git a/vector/src/main/res/drawable-mdpi/ic_status_bar.png b/vector/src/main/res/drawable-mdpi/ic_status_bar.png new file mode 100644 index 00000000..2576e07f Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/ic_status_bar.png differ diff --git a/vector/src/main/res/drawable-mdpi/icon_notif_important.png b/vector/src/main/res/drawable-mdpi/icon_notif_important.png deleted file mode 100644 index 0cade478..00000000 Binary files a/vector/src/main/res/drawable-mdpi/icon_notif_important.png and /dev/null differ diff --git a/vector/src/main/res/drawable-nodpi/logo_login.png b/vector/src/main/res/drawable-nodpi/logo_login.png deleted file mode 100644 index 2f3d8b47..00000000 Binary files a/vector/src/main/res/drawable-nodpi/logo_login.png and /dev/null differ diff --git a/vector/src/main/res/drawable-v24/ic_launcher_foreground.xml b/vector/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21db..00000000 --- a/vector/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/vector/src/main/res/drawable-xhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xhdpi/ic_status_bar.png new file mode 100644 index 00000000..6586b2a0 Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/ic_status_bar.png differ diff --git a/vector/src/main/res/drawable-xhdpi/icon_notif_important.png b/vector/src/main/res/drawable-xhdpi/icon_notif_important.png deleted file mode 100644 index 25ee9847..00000000 Binary files a/vector/src/main/res/drawable-xhdpi/icon_notif_important.png and /dev/null differ diff --git a/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png new file mode 100644 index 00000000..a6930d53 Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png differ diff --git a/vector/src/main/res/drawable-xxhdpi/icon_notif_important.png b/vector/src/main/res/drawable-xxhdpi/icon_notif_important.png deleted file mode 100644 index a253d2d9..00000000 Binary files a/vector/src/main/res/drawable-xxhdpi/icon_notif_important.png and /dev/null differ diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png new file mode 100644 index 00000000..b99c095a Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png differ diff --git a/vector/src/main/res/drawable-xxxhdpi/icon_notif_important.png b/vector/src/main/res/drawable-xxxhdpi/icon_notif_important.png deleted file mode 100644 index 6877a84a..00000000 Binary files a/vector/src/main/res/drawable-xxxhdpi/icon_notif_important.png and /dev/null differ diff --git a/vector/src/main/res/drawable/ic_launcher_background.xml b/vector/src/main/res/drawable/ic_launcher_background.xml index d5fccc53..e6850c4b 100644 --- a/vector/src/main/res/drawable/ic_launcher_background.xml +++ b/vector/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:viewportWidth="108" + android:viewportHeight="108"> + diff --git a/vector/src/main/res/layout/activity_login.xml b/vector/src/main/res/layout/activity_login.xml index 5892ea04..73faed52 100644 --- a/vector/src/main/res/layout/activity_login.xml +++ b/vector/src/main/res/layout/activity_login.xml @@ -27,7 +27,8 @@ android:id="@+id/logoImageView" android:layout_width="wrap_content" android:layout_height="100dp" - android:src="@drawable/logo_login" /> + android:layout_gravity="center_horizontal" + android:src="@drawable/riot_splash_0_blue" /> - - + + \ No newline at end of file diff --git a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index c9ad5f98..eca70cfe 100644 --- a/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/vector/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher.png b/vector/src/main/res/mipmap-hdpi/ic_launcher.png index a3cc1503..90a6b597 100644 Binary files a/vector/src/main/res/mipmap-hdpi/ic_launcher.png and b/vector/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/vector/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index cab365e8..00000000 Binary files a/vector/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png index acf8ede1..5c205f30 100644 Binary files a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher.png b/vector/src/main/res/mipmap-mdpi/ic_launcher.png index 2581ebd5..b499d124 100644 Binary files a/vector/src/main/res/mipmap-mdpi/ic_launcher.png and b/vector/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/vector/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index f903a7cb..00000000 Binary files a/vector/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png index 9c553ec2..ac9d4d9b 100644 Binary files a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher.png index 28907dd8..5b393bca 100644 Binary files a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png and b/vector/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 06d0a09a..00000000 Binary files a/vector/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 6c3a26c2..269e47d3 100644 Binary files a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png index 1219af08..77c7c235 100644 Binary files a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 73d5cecb..00000000 Binary files a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 4f75c9d3..46c7034c 100644 Binary files a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 8b8e2e24..6ec8243e 100644 Binary files a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 29418268..00000000 Binary files a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 7393019b..5246c819 100644 Binary files a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/vector/src/main/res/values/ic_launcher_background.xml b/vector/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index 44bbd0b2..00000000 --- a/vector/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - #FEC6C7 - \ No newline at end of file