From 0b333171266fdaac0981dce599322cf44b78dea9 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 22 Apr 2022 08:13:38 +0530 Subject: [PATCH 1/8] update emphasis color value for day mode --- presentation/src/main/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml index 2eb68b3d4..b9d566340 100644 --- a/presentation/src/main/res/values/colors.xml +++ b/presentation/src/main/res/values/colors.xml @@ -80,7 +80,7 @@ #FF5D5D #e0e0e0 #383838 - #DE000000 + #61FFFFFF -- GitLab From aa7248ec316b4a5099d24d6854076fd4ab83027b Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 22 Apr 2022 08:29:33 +0530 Subject: [PATCH 2/8] update scheduled add fab button color value --- .../moez/QKSMS/feature/scheduled/ScheduledActivity.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 4aa113e18..bdce36e93 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -32,7 +32,10 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setTint import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.collapsing_toolbar.* +import kotlinx.android.synthetic.main.main_activity.* import kotlinx.android.synthetic.main.scheduled_activity.* +import kotlinx.android.synthetic.main.scheduled_activity.compose +import kotlinx.android.synthetic.main.scheduled_activity.empty import javax.inject.Inject @@ -80,8 +83,12 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { sampleMessage.setBackgroundTint(ContextCompat.getColor(this, R.color.tools_theme)) sampleMessage.setTextColor(ContextCompat.getColor(this, R.color.white)) - compose.setTint(ContextCompat.getColor(this, R.color.tools_theme)) - compose.setBackgroundTint(ContextCompat.getColor(this, R.color.colorPrimaryDark)) + + // Set the FAB compose icon color + compose.setTint(ContextCompat.getColor(this, R.color.colorPrimaryDark)) + //set the FAB background color + compose.setBackgroundTint(ContextCompat.getColor(this, R.color.tools_theme)) + } -- GitLab From 83b87ad38125f184c298796ef3a8b68a9c061b88 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 22 Apr 2022 08:33:19 +0530 Subject: [PATCH 3/8] update backup now button color value --- .../java/com/moez/QKSMS/feature/backup/BackupController.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt index 491f27e30..817902041 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt @@ -108,9 +108,12 @@ class BackupController : QkController( progressBar.indeterminateTintList = ColorStateList.valueOf(ContextCompat.getColor(progressBar.context, R.color.tools_theme)) progressBar.progressTintList = ColorStateList.valueOf(ContextCompat.getColor(progressBar.context, R.color.tools_theme)) - fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.tools_theme)) - fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.tools_theme)) +// fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.tools_theme)) +// fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.tools_theme)) + fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark)) + fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark)) + fab.setBackgroundTint(ContextCompat.getColor(fabIcon.context, R.color.tools_theme)) // Make the list titles bold linearLayout.children -- GitLab From 96d083ba14c9e0cd8ffbbc4ba6a84d662f96d634 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 22 Apr 2022 08:37:17 +0530 Subject: [PATCH 4/8] update all screen menu icon color as emphasis --- .../src/main/res/menu/blocked_messages.xml | 4 ++-- presentation/src/main/res/menu/compose.xml | 7 ++++--- presentation/src/main/res/menu/main.xml | 18 +++++++++--------- presentation/src/main/res/menu/qkreply.xml | 6 +++--- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/presentation/src/main/res/menu/blocked_messages.xml b/presentation/src/main/res/menu/blocked_messages.xml index f938ba89e..d857fa19f 100644 --- a/presentation/src/main/res/menu/blocked_messages.xml +++ b/presentation/src/main/res/menu/blocked_messages.xml @@ -24,7 +24,7 @@ android:icon="@drawable/ic_delete_white_24dp" android:title="@string/main_menu_delete" android:visible="false" - app:iconTint="@color/tools_theme" + app:iconTint="@color/emphasis" app:showAsAction="ifRoom" /> diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index 9c4a21c33..8fdc3610c 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -24,6 +24,7 @@ android:icon="@drawable/ic_person_add_black_24dp" android:title="@string/menu_add_person" android:visible="false" + app:iconTint="@color/emphasis" app:showAsAction="always" /> \ No newline at end of file diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml index f8ba10aa7..cccc81ba8 100644 --- a/presentation/src/main/res/menu/qkreply.xml +++ b/presentation/src/main/res/menu/qkreply.xml @@ -23,14 +23,14 @@ android:id="@+id/read" android:icon="@drawable/ic_check_white_24dp" android:title="@string/qkreply_menu_read" - app:iconTint="@color/tools_theme" + app:iconTint="@color/emphasis" app:showAsAction="ifRoom" /> Date: Fri, 22 Apr 2022 16:13:12 +0530 Subject: [PATCH 5/8] update value for menu icon --- .../moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt | 2 ++ presentation/src/main/res/drawable/ic_star_black_24dp.xml | 2 +- presentation/src/main/res/values/colors.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt index 4c17fab58..f0c8ea711 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt @@ -30,6 +30,7 @@ import com.moez.QKSMS.common.base.QkViewHolder import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.forwardTouches import com.moez.QKSMS.common.util.extensions.setTint + import com.moez.QKSMS.extensions.associateByNotNull import com.moez.QKSMS.model.Contact import com.moez.QKSMS.model.ContactGroup @@ -65,6 +66,7 @@ class ComposeItemAdapter @Inject constructor( val layoutInflater = LayoutInflater.from(parent.context) val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false) + view.icon.clearColorFilter() view.icon.setColorFilter(ContextCompat.getColor(parent.context, R.color.emphasis)); view.index.setTextColor(ContextCompat.getColor(parent.context, R.color.emphasis)) diff --git a/presentation/src/main/res/drawable/ic_star_black_24dp.xml b/presentation/src/main/res/drawable/ic_star_black_24dp.xml index a1b975f41..90050ef51 100644 --- a/presentation/src/main/res/drawable/ic_star_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_star_black_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml index b9d566340..7e9c4408a 100644 --- a/presentation/src/main/res/values/colors.xml +++ b/presentation/src/main/res/values/colors.xml @@ -80,7 +80,7 @@ #FF5D5D #e0e0e0 #383838 - #61FFFFFF + #99000000 -- GitLab From 28f5018c053229a4da60878c0f1c820f291f93a3 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 22 Apr 2022 16:39:32 +0530 Subject: [PATCH 6/8] Code refine - remove commented codes --- .../main/java/com/moez/QKSMS/feature/backup/BackupController.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt index 817902041..b51cad3a6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt @@ -108,8 +108,6 @@ class BackupController : QkController( progressBar.indeterminateTintList = ColorStateList.valueOf(ContextCompat.getColor(progressBar.context, R.color.tools_theme)) progressBar.progressTintList = ColorStateList.valueOf(ContextCompat.getColor(progressBar.context, R.color.tools_theme)) -// fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.tools_theme)) -// fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.tools_theme)) fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark)) fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark)) -- GitLab From 0ab7394af2932d5e8ae41835a51fceb2bfbc55dc Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Mon, 25 Apr 2022 10:21:18 +0530 Subject: [PATCH 7/8] update and manage emphasis color in menu, star and other --- .../compose/editing/ComposeItemAdapter.kt | 4 +--- .../main/res/drawable/ic_people_black_24dp.xml | 2 +- .../src/main/res/drawable/ic_star_black_24dp.xml | 2 +- .../src/main/res/menu/blocked_messages.xml | 4 ++-- presentation/src/main/res/menu/compose.xml | 16 ++++++++-------- presentation/src/main/res/menu/main.xml | 16 ++++++++-------- presentation/src/main/res/menu/qkreply.xml | 6 +++--- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt index f0c8ea711..8bdf14200 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt @@ -66,9 +66,7 @@ class ComposeItemAdapter @Inject constructor( val layoutInflater = LayoutInflater.from(parent.context) val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false) - view.icon.clearColorFilter() - view.icon.setColorFilter(ContextCompat.getColor(parent.context, R.color.emphasis)); - view.index.setTextColor(ContextCompat.getColor(parent.context, R.color.emphasis)) + view.index.setTextColor(ContextCompat.getColor(parent.context, R.color.emphasis)) view.numbers.setRecycledViewPool(numbersViewPool) view.numbers.adapter = PhoneNumberAdapter() diff --git a/presentation/src/main/res/drawable/ic_people_black_24dp.xml b/presentation/src/main/res/drawable/ic_people_black_24dp.xml index 91306539f..c1535c5b8 100644 --- a/presentation/src/main/res/drawable/ic_people_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_people_black_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/drawable/ic_star_black_24dp.xml b/presentation/src/main/res/drawable/ic_star_black_24dp.xml index 90050ef51..61c6406d5 100644 --- a/presentation/src/main/res/drawable/ic_star_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_star_black_24dp.xml @@ -22,6 +22,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/presentation/src/main/res/menu/blocked_messages.xml b/presentation/src/main/res/menu/blocked_messages.xml index d857fa19f..c9e06c5b4 100644 --- a/presentation/src/main/res/menu/blocked_messages.xml +++ b/presentation/src/main/res/menu/blocked_messages.xml @@ -24,7 +24,7 @@ android:icon="@drawable/ic_delete_white_24dp" android:title="@string/main_menu_delete" android:visible="false" - app:iconTint="@color/emphasis" + app:showAsAction="ifRoom" /> diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index 8fdc3610c..791f15d58 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -24,7 +24,7 @@ android:icon="@drawable/ic_person_add_black_24dp" android:title="@string/menu_add_person" android:visible="false" - app:iconTint="@color/emphasis" + app:showAsAction="always" /> \ No newline at end of file diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml index 5dc212770..5a01b2b6c 100644 --- a/presentation/src/main/res/menu/main.xml +++ b/presentation/src/main/res/menu/main.xml @@ -25,7 +25,7 @@ android:icon="@lineageos.platform:drawable/ic_archive" android:title="@string/main_menu_archive" android:visible="false" - app:iconTint="@color/emphasis" + app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml index cccc81ba8..1f187a1fc 100644 --- a/presentation/src/main/res/menu/qkreply.xml +++ b/presentation/src/main/res/menu/qkreply.xml @@ -23,14 +23,14 @@ android:id="@+id/read" android:icon="@drawable/ic_check_white_24dp" android:title="@string/qkreply_menu_read" - app:iconTint="@color/emphasis" + app:showAsAction="ifRoom" /> Date: Mon, 25 Apr 2022 10:48:13 +0530 Subject: [PATCH 8/8] refine code --- presentation/src/main/res/menu/blocked_messages.xml | 2 -- presentation/src/main/res/menu/compose.xml | 8 -------- presentation/src/main/res/menu/main.xml | 9 --------- presentation/src/main/res/menu/qkreply.xml | 3 --- 4 files changed, 22 deletions(-) diff --git a/presentation/src/main/res/menu/blocked_messages.xml b/presentation/src/main/res/menu/blocked_messages.xml index c9e06c5b4..82f2c01f2 100644 --- a/presentation/src/main/res/menu/blocked_messages.xml +++ b/presentation/src/main/res/menu/blocked_messages.xml @@ -24,7 +24,6 @@ android:icon="@drawable/ic_delete_white_24dp" android:title="@string/main_menu_delete" android:visible="false" - app:showAsAction="ifRoom" /> diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index 791f15d58..3d0dac325 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -24,7 +24,6 @@ android:icon="@drawable/ic_person_add_black_24dp" android:title="@string/menu_add_person" android:visible="false" - app:showAsAction="always" /> \ No newline at end of file diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml index 5a01b2b6c..58eaca6f2 100644 --- a/presentation/src/main/res/menu/main.xml +++ b/presentation/src/main/res/menu/main.xml @@ -25,7 +25,6 @@ android:icon="@lineageos.platform:drawable/ic_archive" android:title="@string/main_menu_archive" android:visible="false" - app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml index 1f187a1fc..bd19151ba 100644 --- a/presentation/src/main/res/menu/qkreply.xml +++ b/presentation/src/main/res/menu/qkreply.xml @@ -23,14 +23,12 @@ android:id="@+id/read" android:icon="@drawable/ic_check_white_24dp" android:title="@string/qkreply_menu_read" - app:showAsAction="ifRoom" />