From 7ab6af2a851867034aa55c84ba5df868b742ed34 Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Mon, 13 Jul 2020 18:10:17 +0530 Subject: [PATCH 1/2] UI update --- ...ck_24dp.xml => ic_translate_blue_24dp.xml} | 2 +- .../java/com/moez/QKSMS/util/Preferences.kt | 2 +- .../common/util/NotificationManagerImpl.kt | 2 +- .../QKSMS/common/widget/PreferenceView.kt | 1 - .../ConversationItemTouchCallback.kt | 2 +- .../settings/swipe/SwipeActionsPresenter.kt | 2 +- presentation/src/main/res/drawable/ic_add.xml | 9 +++++ .../src/main/res/drawable/ic_archive.xml | 9 +++++ .../res/drawable/ic_av_timer_black_24dp.xml | 27 ------------- .../res/drawable/ic_av_timer_blue_24dp.xml | 27 +++++++++++++ .../src/main/res/drawable/ic_backup.xml | 9 +++++ .../src/main/res/drawable/ic_block.xml | 9 +++++ .../main/res/drawable/ic_block_blue_24dp.xml | 9 +++++ ..._white_24dp.xml => ic_check_blue_24dp.xml} | 2 +- ...ck_24dp.xml => ic_clear_all_blue_24dp.xml} | 2 +- ...k_24dp.xml => ic_color_lens_blue_24dp.xml} | 2 +- .../src/main/res/drawable/ic_delete.xml | 9 +++++ .../src/main/res/drawable/ic_event.xml | 9 +++++ .../drawable/ic_format_size_black_24dp.xml | 27 ------------- .../res/drawable/ic_format_size_blue_24dp.xml | 37 ++++++++++++++++++ .../src/main/res/drawable/ic_help.xml | 9 +++++ .../src/main/res/drawable/ic_inbox.xml | 9 +++++ ...o_black_24dp.xml => ic_info_blue_24dp.xml} | 2 +- .../drawable/ic_invert_colors_black_24dp.xml | 27 ------------- .../drawable/ic_invert_colors_blue_24dp.xml | 9 +++++ .../src/main/res/drawable/ic_invite.xml | 9 +++++ .../src/main/res/drawable/ic_notification.xml | 9 +++++ .../drawable/ic_notifications_black_24dp.xml | 27 ------------- .../drawable/ic_notifications_blue_24dp.xml | 27 +++++++++++++ .../res/drawable/ic_palette_blue_24dp.xml | 9 +++++ ...ic_photo_size_select_actual_blue_24dp.xml} | 2 +- .../src/main/res/drawable/ic_plus.xml | 9 +++++ .../src/main/res/drawable/ic_send.xml | 9 +++++ .../src/main/res/drawable/ic_settings.xml | 9 +++++ ...k_24dp.xml => ic_short_text_blue_24dp.xml} | 2 +- ...k_24dp.xml => ic_smartphone_blue_24dp.xml} | 2 +- ...c_black_24dp.xml => ic_sync_blue_24dp.xml} | 2 +- .../main/res/drawable/ic_title_black_24dp.xml | 27 ------------- .../main/res/drawable/ic_title_blue_24dp.xml | 27 +++++++++++++ .../layout/blocking_manager_list_option.xml | 2 +- .../src/main/res/layout/compose_activity.xml | 5 +-- .../layout/conversation_info_controller.xml | 10 ++--- .../src/main/res/layout/drawer_view.xml | 18 ++++----- .../src/main/res/layout/main_activity.xml | 2 +- .../src/main/res/layout/qkreply_activity.xml | 2 +- .../main/res/layout/qksms_plus_activity.xml | 4 +- .../main/res/layout/settings_controller.xml | 28 ++++++------- .../src/main/res/layout/theme_list_item.xml | 2 +- presentation/src/main/res/menu/compose.xml | 2 +- presentation/src/main/res/menu/qkreply.xml | 2 +- presentation/src/main/res/values/colors.xml | 2 +- test_layout.zip | Bin 0 -> 12471 bytes 52 files changed, 314 insertions(+), 189 deletions(-) rename android-smsmms/src/main/res/drawable/{ic_translate_black_24dp.xml => ic_translate_blue_24dp.xml} (97%) create mode 100644 presentation/src/main/res/drawable/ic_add.xml create mode 100644 presentation/src/main/res/drawable/ic_archive.xml delete mode 100644 presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_av_timer_blue_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_backup.xml create mode 100644 presentation/src/main/res/drawable/ic_block.xml create mode 100644 presentation/src/main/res/drawable/ic_block_blue_24dp.xml rename presentation/src/main/res/drawable/{ic_check_white_24dp.xml => ic_check_blue_24dp.xml} (96%) rename presentation/src/main/res/drawable/{ic_clear_all_black_24dp.xml => ic_clear_all_blue_24dp.xml} (96%) rename presentation/src/main/res/drawable/{ic_color_lens_black_24dp.xml => ic_color_lens_blue_24dp.xml} (97%) create mode 100644 presentation/src/main/res/drawable/ic_delete.xml create mode 100644 presentation/src/main/res/drawable/ic_event.xml delete mode 100644 presentation/src/main/res/drawable/ic_format_size_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_format_size_blue_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_help.xml create mode 100644 presentation/src/main/res/drawable/ic_inbox.xml rename presentation/src/main/res/drawable/{ic_info_black_24dp.xml => ic_info_blue_24dp.xml} (96%) delete mode 100644 presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_invert_colors_blue_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_invite.xml create mode 100644 presentation/src/main/res/drawable/ic_notification.xml delete mode 100644 presentation/src/main/res/drawable/ic_notifications_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_notifications_blue_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_palette_blue_24dp.xml rename presentation/src/main/res/drawable/{ic_photo_size_select_actual_black_24dp.xml => ic_photo_size_select_actual_blue_24dp.xml} (96%) create mode 100644 presentation/src/main/res/drawable/ic_plus.xml create mode 100644 presentation/src/main/res/drawable/ic_send.xml create mode 100644 presentation/src/main/res/drawable/ic_settings.xml rename presentation/src/main/res/drawable/{ic_short_text_black_24dp.xml => ic_short_text_blue_24dp.xml} (96%) rename presentation/src/main/res/drawable/{ic_smartphone_black_24dp.xml => ic_smartphone_blue_24dp.xml} (96%) rename presentation/src/main/res/drawable/{ic_sync_black_24dp.xml => ic_sync_blue_24dp.xml} (97%) delete mode 100644 presentation/src/main/res/drawable/ic_title_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_title_blue_24dp.xml create mode 100644 test_layout.zip diff --git a/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml b/android-smsmms/src/main/res/drawable/ic_translate_blue_24dp.xml similarity index 97% rename from android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml rename to android-smsmms/src/main/res/drawable/ic_translate_blue_24dp.xml index f01877277..738e0587b 100644 --- a/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml +++ b/android-smsmms/src/main/res/drawable/ic_translate_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt index 5e73c2896..1bcf4c6be 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -119,7 +119,7 @@ class Preferences @Inject constructor(context: Context, private val rxPrefs: RxS } fun theme(threadId: Long = 0): Preference { - val default = rxPrefs.getInteger("theme", 0xFF0097A7.toInt()) + val default = rxPrefs.getInteger("theme", 0xFF0087EC.toInt()) return when (threadId) { 0L -> default diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt index 487b358af..635aba573 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt @@ -226,7 +226,7 @@ class NotificationManagerImpl @Inject constructor( Preferences.NOTIFICATION_ACTION_READ -> { val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId) val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, intent, PendingIntent.FLAG_UPDATE_CURRENT) - NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi) + NotificationCompat.Action.Builder(R.drawable.ic_check_blue_24dp, actionLabels[action], pi) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build() } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index 4e1a724c7..65a0d15b1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -72,7 +72,6 @@ class PreferenceView @JvmOverloads constructor( orientation = HORIZONTAL gravity = Gravity.CENTER_VERTICAL - icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary) context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run { title = getString(R.styleable.PreferenceView_title) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt index 7b834c3c8..a6d0062c7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt @@ -150,7 +150,7 @@ class ConversationItemTouchCallback @Inject constructor( Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_black_24dp Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp - Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp + Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_blue_24dp Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp else -> null } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt index f895b5ae5..300b3a529 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt @@ -73,7 +73,7 @@ class SwipeActionsPresenter @Inject constructor( Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_black_24dp Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp - Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp + Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_blue_24dp Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp else -> 0 } diff --git a/presentation/src/main/res/drawable/ic_add.xml b/presentation/src/main/res/drawable/ic_add.xml new file mode 100644 index 000000000..469f72665 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_add.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_archive.xml b/presentation/src/main/res/drawable/ic_archive.xml new file mode 100644 index 000000000..aac7af5b8 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_archive.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml b/presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml deleted file mode 100644 index e1787230e..000000000 --- a/presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_av_timer_blue_24dp.xml b/presentation/src/main/res/drawable/ic_av_timer_blue_24dp.xml new file mode 100644 index 000000000..e27bb1903 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_av_timer_blue_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/drawable/ic_backup.xml b/presentation/src/main/res/drawable/ic_backup.xml new file mode 100644 index 000000000..bc66d72ef --- /dev/null +++ b/presentation/src/main/res/drawable/ic_backup.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_block.xml b/presentation/src/main/res/drawable/ic_block.xml new file mode 100644 index 000000000..e9ae35136 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_block.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_block_blue_24dp.xml b/presentation/src/main/res/drawable/ic_block_blue_24dp.xml new file mode 100644 index 000000000..5dae52bad --- /dev/null +++ b/presentation/src/main/res/drawable/ic_block_blue_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_check_white_24dp.xml b/presentation/src/main/res/drawable/ic_check_blue_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_check_white_24dp.xml rename to presentation/src/main/res/drawable/ic_check_blue_24dp.xml index ef211c1f1..b51828512 100644 --- a/presentation/src/main/res/drawable/ic_check_white_24dp.xml +++ b/presentation/src/main/res/drawable/ic_check_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_clear_all_black_24dp.xml b/presentation/src/main/res/drawable/ic_clear_all_blue_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_clear_all_black_24dp.xml rename to presentation/src/main/res/drawable/ic_clear_all_blue_24dp.xml index a9c72ce6f..d4152c386 100644 --- a/presentation/src/main/res/drawable/ic_clear_all_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_clear_all_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_color_lens_black_24dp.xml b/presentation/src/main/res/drawable/ic_color_lens_blue_24dp.xml similarity index 97% rename from presentation/src/main/res/drawable/ic_color_lens_black_24dp.xml rename to presentation/src/main/res/drawable/ic_color_lens_blue_24dp.xml index 2979b3a06..6ae160ecc 100644 --- a/presentation/src/main/res/drawable/ic_color_lens_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_color_lens_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_delete.xml b/presentation/src/main/res/drawable/ic_delete.xml new file mode 100644 index 000000000..585335492 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_event.xml b/presentation/src/main/res/drawable/ic_event.xml new file mode 100644 index 000000000..4ef66cc15 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_event.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_format_size_black_24dp.xml b/presentation/src/main/res/drawable/ic_format_size_black_24dp.xml deleted file mode 100644 index 82c4792ac..000000000 --- a/presentation/src/main/res/drawable/ic_format_size_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_format_size_blue_24dp.xml b/presentation/src/main/res/drawable/ic_format_size_blue_24dp.xml new file mode 100644 index 000000000..c6d6ff1de --- /dev/null +++ b/presentation/src/main/res/drawable/ic_format_size_blue_24dp.xml @@ -0,0 +1,37 @@ + + + + + + + + + diff --git a/presentation/src/main/res/drawable/ic_help.xml b/presentation/src/main/res/drawable/ic_help.xml new file mode 100644 index 000000000..c02516958 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_help.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_inbox.xml b/presentation/src/main/res/drawable/ic_inbox.xml new file mode 100644 index 000000000..5110414c4 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_inbox.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_info_black_24dp.xml b/presentation/src/main/res/drawable/ic_info_blue_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_info_black_24dp.xml rename to presentation/src/main/res/drawable/ic_info_blue_24dp.xml index 36ed4eaf4..6249cfcb2 100644 --- a/presentation/src/main/res/drawable/ic_info_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_info_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml b/presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml deleted file mode 100644 index c3bc64e3a..000000000 --- a/presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_invert_colors_blue_24dp.xml b/presentation/src/main/res/drawable/ic_invert_colors_blue_24dp.xml new file mode 100644 index 000000000..9d78d2b97 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_invert_colors_blue_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_invite.xml b/presentation/src/main/res/drawable/ic_invite.xml new file mode 100644 index 000000000..7ce096a04 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_invite.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_notification.xml b/presentation/src/main/res/drawable/ic_notification.xml new file mode 100644 index 000000000..5840f53e0 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_notification.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_notifications_black_24dp.xml b/presentation/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index fcc373d06..000000000 --- a/presentation/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_notifications_blue_24dp.xml b/presentation/src/main/res/drawable/ic_notifications_blue_24dp.xml new file mode 100644 index 000000000..c00c74edb --- /dev/null +++ b/presentation/src/main/res/drawable/ic_notifications_blue_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/drawable/ic_palette_blue_24dp.xml b/presentation/src/main/res/drawable/ic_palette_blue_24dp.xml new file mode 100644 index 000000000..9caa5ebb3 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_palette_blue_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_photo_size_select_actual_black_24dp.xml b/presentation/src/main/res/drawable/ic_photo_size_select_actual_blue_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_photo_size_select_actual_black_24dp.xml rename to presentation/src/main/res/drawable/ic_photo_size_select_actual_blue_24dp.xml index d7c900379..67ced21ca 100644 --- a/presentation/src/main/res/drawable/ic_photo_size_select_actual_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_photo_size_select_actual_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_plus.xml b/presentation/src/main/res/drawable/ic_plus.xml new file mode 100644 index 000000000..b74732d4f --- /dev/null +++ b/presentation/src/main/res/drawable/ic_plus.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_send.xml b/presentation/src/main/res/drawable/ic_send.xml new file mode 100644 index 000000000..914fda10e --- /dev/null +++ b/presentation/src/main/res/drawable/ic_send.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_settings.xml b/presentation/src/main/res/drawable/ic_settings.xml new file mode 100644 index 000000000..a1884f020 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_short_text_black_24dp.xml b/presentation/src/main/res/drawable/ic_short_text_blue_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_short_text_black_24dp.xml rename to presentation/src/main/res/drawable/ic_short_text_blue_24dp.xml index cc092d480..9a9e0f18a 100644 --- a/presentation/src/main/res/drawable/ic_short_text_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_short_text_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_smartphone_black_24dp.xml b/presentation/src/main/res/drawable/ic_smartphone_blue_24dp.xml similarity index 96% rename from presentation/src/main/res/drawable/ic_smartphone_black_24dp.xml rename to presentation/src/main/res/drawable/ic_smartphone_blue_24dp.xml index 821a72449..9e48d584a 100644 --- a/presentation/src/main/res/drawable/ic_smartphone_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_smartphone_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_sync_black_24dp.xml b/presentation/src/main/res/drawable/ic_sync_blue_24dp.xml similarity index 97% rename from presentation/src/main/res/drawable/ic_sync_black_24dp.xml rename to presentation/src/main/res/drawable/ic_sync_blue_24dp.xml index b6347f01d..f7367c47e 100644 --- a/presentation/src/main/res/drawable/ic_sync_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_sync_blue_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_title_black_24dp.xml b/presentation/src/main/res/drawable/ic_title_black_24dp.xml deleted file mode 100644 index 6db01c458..000000000 --- a/presentation/src/main/res/drawable/ic_title_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_title_blue_24dp.xml b/presentation/src/main/res/drawable/ic_title_blue_24dp.xml new file mode 100644 index 000000000..4ba2896dc --- /dev/null +++ b/presentation/src/main/res/drawable/ic_title_blue_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/layout/blocking_manager_list_option.xml b/presentation/src/main/res/layout/blocking_manager_list_option.xml index 06d4f8274..e6b0e2853 100644 --- a/presentation/src/main/res/layout/blocking_manager_list_option.xml +++ b/presentation/src/main/res/layout/blocking_manager_list_option.xml @@ -24,5 +24,5 @@ android:background="?attr/selectableItemBackground" android:orientation="vertical" android:padding="16dp" - android:src="@drawable/ic_info_black_24dp" + android:src="@drawable/ic_info_blue_24dp" android:tint="?android:attr/textColorTertiary" /> diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index bc3f37315..ec585fd42 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -336,8 +336,8 @@ android:contentDescription="@string/compose_send_cd" android:elevation="4dp" android:padding="10dp" - android:src="@drawable/ic_send_black_24dp" android:tint="?android:textColorSecondary" + android:src="@drawable/ic_send" app:layout_constraintBottom_toBottomOf="@id/messageBackground" app:layout_constraintEnd_toEndOf="@id/messageBackground" tools:backgroundTint="@color/tools_theme" /> @@ -560,11 +560,10 @@ android:layout_height="44dp" android:layout_marginStart="8dp" android:layout_marginBottom="8dp" - android:background="@drawable/circle" + android:background="@drawable/ic_plus" android:contentDescription="@string/compose_attach_cd" android:elevation="4dp" android:padding="10dp" - android:src="@drawable/ic_add_black_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" tools:backgroundTint="@color/tools_theme" diff --git a/presentation/src/main/res/layout/conversation_info_controller.xml b/presentation/src/main/res/layout/conversation_info_controller.xml index 40670ba94..326168354 100644 --- a/presentation/src/main/res/layout/conversation_info_controller.xml +++ b/presentation/src/main/res/layout/conversation_info_controller.xml @@ -62,35 +62,35 @@ android:id="@+id/notifications" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_notifications_black_24dp" + app:icon="@drawable/ic_notifications_blue_24dp" app:title="@string/info_notifications" /> + tools:tint="@color/tools_theme" + android:src="@drawable/ic_inbox"/> diff --git a/presentation/src/main/res/layout/qkreply_activity.xml b/presentation/src/main/res/layout/qkreply_activity.xml index 5939a51a5..235f3c725 100644 --- a/presentation/src/main/res/layout/qkreply_activity.xml +++ b/presentation/src/main/res/layout/qkreply_activity.xml @@ -152,7 +152,7 @@ android:contentDescription="@string/compose_send_cd" android:elevation="4dp" android:padding="10dp" - android:src="@drawable/ic_send_black_24dp" + android:src="@drawable/ic_send" android:tint="?android:textColorSecondary" app:layout_constraintBottom_toBottomOf="@id/message" app:layout_constraintEnd_toEndOf="parent" diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index 3045c3670..0d66abc38 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -189,7 +189,7 @@ android:id="@+id/delayed" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_av_timer_black_24dp" + app:icon="@drawable/ic_av_timer_blue_24dp" app:summary="@string/qksms_plus_delayed_summary" app:title="@string/qksms_plus_delayed_title" /> @@ -197,7 +197,7 @@ android:id="@+id/night" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_invert_colors_black_24dp" + app:icon="@drawable/ic_invert_colors_blue_24dp" app:summary="@string/qksms_plus_night_summary" app:title="@string/qksms_plus_night_title" /> diff --git a/presentation/src/main/res/layout/settings_controller.xml b/presentation/src/main/res/layout/settings_controller.xml index b270d38f3..e42a92f0e 100644 --- a/presentation/src/main/res/layout/settings_controller.xml +++ b/presentation/src/main/res/layout/settings_controller.xml @@ -41,7 +41,7 @@ android:id="@+id/theme" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_color_lens_black_24dp" + app:icon="@drawable/ic_color_lens_blue_24dp" app:title="@string/settings_theme_title" app:widget="@layout/settings_theme_widget" /> @@ -49,7 +49,7 @@ android:id="@+id/night" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_invert_colors_black_24dp" + app:icon="@drawable/ic_invert_colors_blue_24dp" app:title="@string/settings_night_title" tools:summary="Automatic" /> @@ -81,14 +81,14 @@ android:id="@+id/textSize" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_format_size_black_24dp" + app:icon="@drawable/ic_format_size_blue_24dp" app:title="@string/settings_text_size_title" /> @@ -107,7 +107,7 @@ android:id="@+id/notifications" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_notifications_black_24dp" + app:icon="@drawable/ic_notifications_blue_24dp" app:title="@string/settings_notifications_title" /> @@ -131,7 +131,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="visible" - app:icon="@drawable/ic_clear_all_black_24dp" + app:icon="@drawable/ic_clear_all_blue_24dp" app:summary="@string/settings_swipe_actions_summary" app:title="@string/settings_swipe_actions" /> @@ -139,7 +139,7 @@ android:id="@+id/delivery" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_check_white_24dp" + app:icon="@drawable/ic_check_blue_24dp" app:summary="@string/settings_delivery_summary" app:title="@string/settings_delivery_title" app:widget="@layout/settings_switch_widget" /> @@ -148,14 +148,14 @@ android:id="@+id/signature" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_short_text_black_24dp" + app:icon="@drawable/ic_short_text_blue_24dp" app:title="@string/settings_signature_title" /> @@ -164,7 +164,7 @@ android:id="@+id/mobileOnly" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_smartphone_black_24dp" + app:icon="@drawable/ic_smartphone_blue_24dp" app:summary="@string/settings_mobile_summary" app:title="@string/settings_mobile_title" app:widget="@layout/settings_switch_widget" /> @@ -174,7 +174,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="visible" - app:icon="@drawable/ic_photo_size_select_actual_black_24dp" + app:icon="@drawable/ic_photo_size_select_actual_blue_24dp" app:title="@string/settings_mms_size_title" tools:summary="100KB" /> @@ -189,7 +189,7 @@ android:id="@+id/sync" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_sync_black_24dp" + app:icon="@drawable/ic_sync_blue_24dp" app:summary="@string/settings_sync_summary" app:title="@string/settings_sync_title" /> @@ -208,7 +208,7 @@ android:id="@+id/about" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_info_black_24dp" + app:icon="@drawable/ic_info_blue_24dp" app:title="@string/settings_about_title"/> diff --git a/presentation/src/main/res/layout/theme_list_item.xml b/presentation/src/main/res/layout/theme_list_item.xml index da05ee17d..6dcf6b0ec 100644 --- a/presentation/src/main/res/layout/theme_list_item.xml +++ b/presentation/src/main/res/layout/theme_list_item.xml @@ -35,7 +35,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center" - android:src="@drawable/ic_check_white_24dp" + android:src="@drawable/ic_check_blue_24dp" tools:tint="@color/textPrimaryDark" /> \ No newline at end of file diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index 85d05b57f..5d578dd24 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -36,7 +36,7 @@ diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml index c8777c861..2822df6f7 100644 --- a/presentation/src/main/res/menu/qkreply.xml +++ b/presentation/src/main/res/menu/qkreply.xml @@ -22,7 +22,7 @@ diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml index 118135319..40577e6f4 100644 --- a/presentation/src/main/res/values/colors.xml +++ b/presentation/src/main/res/values/colors.xml @@ -67,5 +67,5 @@ #383838 - #00838F + #0087EC diff --git a/test_layout.zip b/test_layout.zip new file mode 100644 index 0000000000000000000000000000000000000000..8d3e690f2720dfb5f278ba8f0fc638e6ba56acc3 GIT binary patch literal 12471 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 Date: Fri, 17 Jul 2020 11:54:12 +0530 Subject: [PATCH 2/2] UI update Change ActionBarDrawableToggle icon Change 'send' icon color --- .../moez/QKSMS/feature/main/MainActivity.kt | 25 ++++++++++--------- .../src/main/res/drawable/ic_drawer_icon.xml | 9 +++++++ .../src/main/res/layout/compose_activity.xml | 1 - .../src/main/res/layout/main_activity.xml | 1 + 4 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_drawer_icon.xml diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 4f26995cf..0d5188db6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -23,12 +23,10 @@ import android.animation.ObjectAnimator import android.app.AlertDialog import android.content.Intent import android.content.res.ColorStateList +import android.os.Build import android.os.Bundle -import android.view.Gravity -import android.view.Menu -import android.view.MenuItem -import android.view.View -import android.view.ViewStub +import android.view.* +import androidx.annotation.RequiresApi import androidx.appcompat.app.ActionBarDrawerToggle import androidx.core.app.ActivityCompat import androidx.core.view.GravityCompat @@ -44,13 +42,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.androidxcompat.drawerOpen import com.moez.QKSMS.common.base.QkThemedActivity -import com.moez.QKSMS.common.util.extensions.autoScrollToStart -import com.moez.QKSMS.common.util.extensions.dismissKeyboard -import com.moez.QKSMS.common.util.extensions.resolveThemeColor -import com.moez.QKSMS.common.util.extensions.scrapViews -import com.moez.QKSMS.common.util.extensions.setBackgroundTint -import com.moez.QKSMS.common.util.extensions.setTint -import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.common.util.extensions.* import com.moez.QKSMS.feature.blocking.BlockingDialog import com.moez.QKSMS.feature.changelog.ChangelogDialog import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback @@ -120,6 +112,7 @@ class MainActivity : QkThemedActivity(), MainView { private val syncing by lazy { findViewById(R.id.syncing) } private val backPressedSubject: Subject = PublishSubject.create() + @RequiresApi(Build.VERSION_CODES.M) override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) @@ -127,6 +120,14 @@ class MainActivity : QkThemedActivity(), MainView { viewModel.bindView(this) onNewIntentIntent.onNext(intent) + toggle.isDrawerIndicatorEnabled=false + toggle.setToolbarNavigationClickListener{ + drawerLayout.openDrawer(GravityCompat.START) + } + toggle.setHomeAsUpIndicator(R.drawable.ic_drawer_icon) + toggle.drawerArrowDrawable.color = getColor(R.color.tools_theme); + + (snackbar as? ViewStub)?.setOnInflateListener { _, _ -> snackbarButton.clicks().autoDisposable(scope()).subscribe(snackbarButtonIntent) } diff --git a/presentation/src/main/res/drawable/ic_drawer_icon.xml b/presentation/src/main/res/drawable/ic_drawer_icon.xml new file mode 100644 index 000000000..0818935ee --- /dev/null +++ b/presentation/src/main/res/drawable/ic_drawer_icon.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index ec585fd42..e76f2dc4f 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -336,7 +336,6 @@ android:contentDescription="@string/compose_send_cd" android:elevation="4dp" android:padding="10dp" - android:tint="?android:textColorSecondary" android:src="@drawable/ic_send" app:layout_constraintBottom_toBottomOf="@id/messageBackground" app:layout_constraintEnd_toEndOf="@id/messageBackground" diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml index b93d1f53d..b439140cd 100644 --- a/presentation/src/main/res/layout/main_activity.xml +++ b/presentation/src/main/res/layout/main_activity.xml @@ -37,6 +37,7 @@ android:focusableInTouchMode="true" app:contentInsetStartWithNavigation="0dp" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> -- GitLab