From b58d310f94dd7f65e640e09338f16c0a8da38f41 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Fri, 15 Dec 2023 12:56:49 +0530 Subject: [PATCH 01/17] + Adds: the updated icons for bottom nav --- .../src/main/res/drawable/ic_home_selected.xml | 10 ++++++++++ .../src/main/res/drawable/ic_me_bottom_nav.xml | 16 ++++++++++++++++ .../res/drawable/ic_notifications_selected.xml | 16 ++++++++++++++++ .../src/main/res/drawable/ic_reader_selected.xml | 10 ++++++++++ 4 files changed, 52 insertions(+) create mode 100644 WordPress/src/main/res/drawable/ic_home_selected.xml create mode 100644 WordPress/src/main/res/drawable/ic_me_bottom_nav.xml create mode 100644 WordPress/src/main/res/drawable/ic_notifications_selected.xml create mode 100644 WordPress/src/main/res/drawable/ic_reader_selected.xml diff --git a/WordPress/src/main/res/drawable/ic_home_selected.xml b/WordPress/src/main/res/drawable/ic_home_selected.xml new file mode 100644 index 000000000000..ebb265d2b33b --- /dev/null +++ b/WordPress/src/main/res/drawable/ic_home_selected.xml @@ -0,0 +1,10 @@ + + + diff --git a/WordPress/src/main/res/drawable/ic_me_bottom_nav.xml b/WordPress/src/main/res/drawable/ic_me_bottom_nav.xml new file mode 100644 index 000000000000..66095ca7b424 --- /dev/null +++ b/WordPress/src/main/res/drawable/ic_me_bottom_nav.xml @@ -0,0 +1,16 @@ + + + + diff --git a/WordPress/src/main/res/drawable/ic_notifications_selected.xml b/WordPress/src/main/res/drawable/ic_notifications_selected.xml new file mode 100644 index 000000000000..bd76281a15bf --- /dev/null +++ b/WordPress/src/main/res/drawable/ic_notifications_selected.xml @@ -0,0 +1,16 @@ + + + + diff --git a/WordPress/src/main/res/drawable/ic_reader_selected.xml b/WordPress/src/main/res/drawable/ic_reader_selected.xml new file mode 100644 index 000000000000..1273fc2c2ff3 --- /dev/null +++ b/WordPress/src/main/res/drawable/ic_reader_selected.xml @@ -0,0 +1,10 @@ + + + From 0ea926d580c06a1482730a62b8857b4811d6ebc7 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Fri, 15 Dec 2023 12:57:40 +0530 Subject: [PATCH 02/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20logic=20for?= =?UTF-8?q?=20showing=20the=20icons=20to=20use=20the=20updated=20icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/ui/main/WPMainNavigationView.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index beca76c4484c..16902ace4477 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -124,9 +124,9 @@ class WPMainNavigationView @JvmOverloads constructor( customView.id = R.id.bottom_nav_notifications_button // identify view for QuickStart } - if (i == getPosition(ME)) { - loadGravatar(imgIcon, accountStore.account?.avatarUrl.orEmpty()) - } +// if (i == getPosition(ME)) { +// loadGravatar(imgIcon, accountStore.account?.avatarUrl.orEmpty()) +// } itemView.addView(customView) } @@ -298,10 +298,10 @@ class WPMainNavigationView @JvmOverloads constructor( @DrawableRes private fun getDrawableResForPosition(position: Int): Int { return when (getPageTypeOrNull(position)) { - MY_SITE -> R.drawable.ic_my_sites_white_24dp - READER -> R.drawable.ic_reader_white_24dp - NOTIFS -> R.drawable.ic_bell_white_24dp - else -> R.drawable.ic_user_primary_white_24 + MY_SITE -> R.drawable.ic_home_selected + READER -> R.drawable.ic_reader_selected + NOTIFS -> R.drawable.ic_notifications_selected + else -> R.drawable.ic_me_bottom_nav } } From 4bf4027c8ea4cb0f4199ef2a7ca9eb29b66de76e Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Fri, 15 Dec 2023 12:58:37 +0530 Subject: [PATCH 03/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20logic=20to?= =?UTF-8?q?=20remove=20title=20in=20bttom=20nav=20temporarily?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/ui/main/WPMainNavigationView.kt | 20 -------- WordPress/src/main/res/layout/navbar_item.xml | 50 +++++++------------ 2 files changed, 17 insertions(+), 53 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index 16902ace4477..b05bf48d2344 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -8,7 +8,6 @@ import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.widget.ImageView -import android.widget.TextView import androidx.annotation.DrawableRes import androidx.annotation.IdRes import androidx.annotation.StringRes @@ -44,7 +43,6 @@ import org.wordpress.android.ui.reader.ReaderFragment import org.wordpress.android.util.AniUtils import org.wordpress.android.util.AniUtils.Duration import org.wordpress.android.util.AppLog -import org.wordpress.android.util.extensions.getColorStateListFromAttribute import org.wordpress.android.util.image.ImageManager import org.wordpress.android.util.image.ImageType import javax.inject.Inject @@ -112,9 +110,7 @@ class WPMainNavigationView @JvmOverloads constructor( val itemView = menuView.getChildAt(i) as BottomNavigationItemView val customView: View = inflater.inflate(R.layout.navbar_item, menuView, false) - val txtLabel = customView.findViewById(R.id.nav_label) val imgIcon = customView.findViewById(R.id.nav_icon) - txtLabel.text = getTitleForPosition(i) customView.contentDescription = getContentDescriptionForPosition(i) imgIcon.setImageResource(getDrawableResForPosition(i)) if (i == getPosition(READER)) { @@ -247,13 +243,9 @@ class WPMainNavigationView @JvmOverloads constructor( private fun updateCurrentPosition(position: Int) { // remove the title and selected state from the previously selected item if (prevPosition > -1) { - setTitleViewSelected(prevPosition, false) setImageViewSelected(prevPosition, false) } - // set the title and selected state from the newly selected item - setTitleViewSelected(position, true) - setImageViewSelected(position, true) if (jetpackFeatureRemovalPhaseHelper.shouldRemoveJetpackFeatures()) @@ -287,14 +279,6 @@ class WPMainNavigationView @JvmOverloads constructor( } } - private fun setTitleViewSelected(position: Int, isSelected: Boolean) { - getTitleViewForPosition(position)?.setTextColor( - context.getColorStateListFromAttribute( - if (isSelected) R.attr.wpColorNavBar else R.attr.wpColorOnSurfaceMedium - ) - ) - } - @DrawableRes private fun getDrawableResForPosition(position: Int): Int { return when (getPageTypeOrNull(position)) { @@ -338,10 +322,6 @@ class WPMainNavigationView @JvmOverloads constructor( } } - private fun getTitleViewForPosition(position: Int): TextView? { - return getItemView(position)?.findViewById(R.id.nav_label) - } - private fun getImageViewForPosition(position: Int): ImageView? { val itemView = getItemView(position) return itemView?.findViewById(R.id.nav_icon) diff --git a/WordPress/src/main/res/layout/navbar_item.xml b/WordPress/src/main/res/layout/navbar_item.xml index 0f2ea08363d4..64a01fad56c7 100644 --- a/WordPress/src/main/res/layout/navbar_item.xml +++ b/WordPress/src/main/res/layout/navbar_item.xml @@ -8,39 +8,23 @@ android:gravity="center" android:orientation="vertical"> - + - + - - - - - From b16933ed8f466ccaa5b387ba89dfaf9fb8c132ed Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Fri, 15 Dec 2023 12:58:56 +0530 Subject: [PATCH 04/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20size=20of=20?= =?UTF-8?q?the=20bottom=20nav=20icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WordPress/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index 7d0a903e6682..63d74a3e9c3c 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -67,7 +67,7 @@ 0dp - 24dp + 32dp 12dp From 50d57bb553a2a3bcd8270b44dd22c623b0806d29 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Fri, 15 Dec 2023 12:59:15 +0530 Subject: [PATCH 05/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20color=20of?= =?UTF-8?q?=20the=20selected=20items=20in=20the=20bottom=20nav?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WordPress/src/main/res/drawable/nav_bar_button_selector.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml index 003c854c0051..3abea180b9ac 100644 --- a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml +++ b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml @@ -2,7 +2,7 @@ - - + + From 42ce7f2acd077a306d9b594e06d631da458bd83d Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Fri, 22 Dec 2023 16:02:49 +0530 Subject: [PATCH 06/17] =?UTF-8?q?Revert=20"=E2=86=91=20Updates:=20the=20lo?= =?UTF-8?q?gic=20to=20remove=20title=20in=20bttom=20nav=20temporarily"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4bf4027c8ea4cb0f4199ef2a7ca9eb29b66de76e. --- .../android/ui/main/WPMainNavigationView.kt | 20 ++++++++ WordPress/src/main/res/layout/navbar_item.xml | 50 ++++++++++++------- 2 files changed, 53 insertions(+), 17 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index b05bf48d2344..16902ace4477 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -8,6 +8,7 @@ import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.widget.ImageView +import android.widget.TextView import androidx.annotation.DrawableRes import androidx.annotation.IdRes import androidx.annotation.StringRes @@ -43,6 +44,7 @@ import org.wordpress.android.ui.reader.ReaderFragment import org.wordpress.android.util.AniUtils import org.wordpress.android.util.AniUtils.Duration import org.wordpress.android.util.AppLog +import org.wordpress.android.util.extensions.getColorStateListFromAttribute import org.wordpress.android.util.image.ImageManager import org.wordpress.android.util.image.ImageType import javax.inject.Inject @@ -110,7 +112,9 @@ class WPMainNavigationView @JvmOverloads constructor( val itemView = menuView.getChildAt(i) as BottomNavigationItemView val customView: View = inflater.inflate(R.layout.navbar_item, menuView, false) + val txtLabel = customView.findViewById(R.id.nav_label) val imgIcon = customView.findViewById(R.id.nav_icon) + txtLabel.text = getTitleForPosition(i) customView.contentDescription = getContentDescriptionForPosition(i) imgIcon.setImageResource(getDrawableResForPosition(i)) if (i == getPosition(READER)) { @@ -243,9 +247,13 @@ class WPMainNavigationView @JvmOverloads constructor( private fun updateCurrentPosition(position: Int) { // remove the title and selected state from the previously selected item if (prevPosition > -1) { + setTitleViewSelected(prevPosition, false) setImageViewSelected(prevPosition, false) } + // set the title and selected state from the newly selected item + setTitleViewSelected(position, true) + setImageViewSelected(position, true) if (jetpackFeatureRemovalPhaseHelper.shouldRemoveJetpackFeatures()) @@ -279,6 +287,14 @@ class WPMainNavigationView @JvmOverloads constructor( } } + private fun setTitleViewSelected(position: Int, isSelected: Boolean) { + getTitleViewForPosition(position)?.setTextColor( + context.getColorStateListFromAttribute( + if (isSelected) R.attr.wpColorNavBar else R.attr.wpColorOnSurfaceMedium + ) + ) + } + @DrawableRes private fun getDrawableResForPosition(position: Int): Int { return when (getPageTypeOrNull(position)) { @@ -322,6 +338,10 @@ class WPMainNavigationView @JvmOverloads constructor( } } + private fun getTitleViewForPosition(position: Int): TextView? { + return getItemView(position)?.findViewById(R.id.nav_label) + } + private fun getImageViewForPosition(position: Int): ImageView? { val itemView = getItemView(position) return itemView?.findViewById(R.id.nav_icon) diff --git a/WordPress/src/main/res/layout/navbar_item.xml b/WordPress/src/main/res/layout/navbar_item.xml index 64a01fad56c7..0f2ea08363d4 100644 --- a/WordPress/src/main/res/layout/navbar_item.xml +++ b/WordPress/src/main/res/layout/navbar_item.xml @@ -8,23 +8,39 @@ android:gravity="center" android:orientation="vertical"> - + - + + + + + + From 8a753161f17d4483c3332d4d8392854f26c71c58 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Tue, 2 Jan 2024 20:24:42 +0530 Subject: [PATCH 07/17] Reverts: commenting out avatar rendering --- .../org/wordpress/android/ui/main/WPMainNavigationView.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index 16902ace4477..c5f59fe8d71f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -124,9 +124,9 @@ class WPMainNavigationView @JvmOverloads constructor( customView.id = R.id.bottom_nav_notifications_button // identify view for QuickStart } -// if (i == getPosition(ME)) { -// loadGravatar(imgIcon, accountStore.account?.avatarUrl.orEmpty()) -// } + if (i == getPosition(ME)) { + loadGravatar(imgIcon, accountStore.account?.avatarUrl.orEmpty()) + } itemView.addView(customView) } From 5184f5eda0b64c02e82ae0270fc1c3c93ea04732 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Tue, 2 Jan 2024 20:38:46 +0530 Subject: [PATCH 08/17] Reverts: the nav selector color --- WordPress/src/main/res/drawable/nav_bar_button_selector.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml index 3abea180b9ac..505046fbd95a 100644 --- a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml +++ b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml @@ -2,7 +2,7 @@ - + From c1d3c03da3110e54a34475800537027c06612f3e Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Tue, 2 Jan 2024 20:39:55 +0530 Subject: [PATCH 09/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20bottom=20nav?= =?UTF-8?q?=20icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/ic_home_selected.xml | 15 +++++++----- .../drawable/ic_notifications_selected.xml | 14 +++++------ .../main/res/drawable/ic_reader_selected.xml | 24 +++++++++++++++---- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/WordPress/src/main/res/drawable/ic_home_selected.xml b/WordPress/src/main/res/drawable/ic_home_selected.xml index ebb265d2b33b..f1bfc31acb80 100644 --- a/WordPress/src/main/res/drawable/ic_home_selected.xml +++ b/WordPress/src/main/res/drawable/ic_home_selected.xml @@ -1,10 +1,13 @@ - + + + + diff --git a/WordPress/src/main/res/drawable/ic_notifications_selected.xml b/WordPress/src/main/res/drawable/ic_notifications_selected.xml index bd76281a15bf..19103ae2fdd6 100644 --- a/WordPress/src/main/res/drawable/ic_notifications_selected.xml +++ b/WordPress/src/main/res/drawable/ic_notifications_selected.xml @@ -1,16 +1,14 @@ diff --git a/WordPress/src/main/res/drawable/ic_reader_selected.xml b/WordPress/src/main/res/drawable/ic_reader_selected.xml index 1273fc2c2ff3..d3d5e70339f8 100644 --- a/WordPress/src/main/res/drawable/ic_reader_selected.xml +++ b/WordPress/src/main/res/drawable/ic_reader_selected.xml @@ -1,10 +1,24 @@ + android:pathData="M2.2,16.477C1.695,16.166 1.589,15.548 1.919,15.045C3.193,13.105 4.469,11.167 5.748,9.231C6.002,8.847 6.275,8.476 6.603,8.15C7.604,7.153 8.842,6.949 10.17,7.11C10.692,7.173 11.033,7.655 10.982,8.138C10.929,8.645 10.508,9.028 9.983,9.041C9.722,9.047 9.459,9.051 9.198,9.041C8.582,9.017 8.08,9.255 7.656,9.685C7.264,10.083 6.963,10.549 6.661,11.014C6.061,11.933 5.465,12.855 4.869,13.777C4.82,13.852 4.669,14.038 4.669,14.038H4.67" + android:fillColor="#999999"/> + + + + From a749fca947d7ce57d8e4366e2d14e9958b6dd4da Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 11:15:44 +0530 Subject: [PATCH 10/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20me=20bottom?= =?UTF-8?q?=20nav=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/ic_me_bottom_nav.xml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/WordPress/src/main/res/drawable/ic_me_bottom_nav.xml b/WordPress/src/main/res/drawable/ic_me_bottom_nav.xml index 66095ca7b424..8393c3ffa1e3 100644 --- a/WordPress/src/main/res/drawable/ic_me_bottom_nav.xml +++ b/WordPress/src/main/res/drawable/ic_me_bottom_nav.xml @@ -1,16 +1,16 @@ - - + android:width="32dp" + android:height="32dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + From 838f95b026e6178eee68f7ad5905aeb0d8ef1eca Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 11:16:17 +0530 Subject: [PATCH 11/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20home=20selec?= =?UTF-8?q?ted=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/ic_home_selected.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/WordPress/src/main/res/drawable/ic_home_selected.xml b/WordPress/src/main/res/drawable/ic_home_selected.xml index f1bfc31acb80..12fd0afa8638 100644 --- a/WordPress/src/main/res/drawable/ic_home_selected.xml +++ b/WordPress/src/main/res/drawable/ic_home_selected.xml @@ -1,13 +1,12 @@ - - - - + android:viewportHeight="32" + android:viewportWidth="32"> + + + + From 1c0f6f9cd52c7282f8f569b4d298baaae71c98bf Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 16:29:01 +0530 Subject: [PATCH 12/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20me=20selecte?= =?UTF-8?q?d=20icon=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/wordpress/android/ui/main/WPMainNavigationView.kt | 2 ++ WordPress/src/main/res/values/dimens.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index c5f59fe8d71f..d265255adaba 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -13,6 +13,7 @@ import androidx.annotation.DrawableRes import androidx.annotation.IdRes import androidx.annotation.StringRes import androidx.core.content.res.ResourcesCompat +import androidx.core.view.setPadding import androidx.core.widget.ImageViewCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager @@ -138,6 +139,7 @@ class WPMainNavigationView @JvmOverloads constructor( AppLog.d(AppLog.T.MAIN, "Attempted to load an empty Gravatar URL!") return } + imgIcon.setPadding(resources.getDimensionPixelSize(R.dimen.navbar_me_icon_padding)) AppLog.d(AppLog.T.MAIN, meGravatarLoader.constructGravatarUrl(avatarUrl)) imgIcon.let { meGravatarLoader.load( diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index 63d74a3e9c3c..7636a6d3efca 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -773,4 +773,5 @@ 7dp 4dp 24dp + 6dp From 62d0ee6d291852d4786ed206889385e4e49fa571 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 16:38:18 +0530 Subject: [PATCH 13/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20me=20selecte?= =?UTF-8?q?d=20icon=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WordPress/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index 7636a6d3efca..6dba1b57bc6b 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -773,5 +773,5 @@ 7dp 4dp 24dp - 6dp + 4dp From 710fb39ecc5e2eb663d54f8dd2011c8c82b7baab Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 18:04:02 +0530 Subject: [PATCH 14/17] =?UTF-8?q?=E2=86=91=20Updates:=20the=20selected=20a?= =?UTF-8?q?nd=20unselected=20state=20me=20icon=20in=20nav=20bar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/ui/main/WPMainNavigationView.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index d265255adaba..dde6821de16c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -1,6 +1,8 @@ package org.wordpress.android.ui.main import android.content.Context +import android.graphics.ColorMatrix +import android.graphics.ColorMatrixColorFilter import android.graphics.drawable.BitmapDrawable import android.util.AttributeSet import android.view.HapticFeedbackConstants @@ -73,6 +75,9 @@ class WPMainNavigationView @JvmOverloads constructor( MaterialR.dimen.material_emphasis_disabled ) + val disabledColorFilter = ColorMatrixColorFilter(ColorMatrix().apply { setSaturation(0f) }) + val enabledColorFilter = ColorMatrixColorFilter(ColorMatrix().apply { setSaturation(1f) }) + @Inject lateinit var meGravatarLoader: MeGravatarLoader @@ -131,6 +136,10 @@ class WPMainNavigationView @JvmOverloads constructor( itemView.addView(customView) } + if(getMainPageIndex() != getPosition(ME)) { + setImageViewSelected(getPosition(ME), false) + } + currentPosition = getMainPageIndex() } @@ -284,6 +293,13 @@ class WPMainNavigationView @JvmOverloads constructor( private fun setImageViewSelected(position: Int, isSelected: Boolean) { getImageViewForPosition(position)?.let { + if(position == getPosition(ME)) { + if(!isSelected){ + it.colorFilter = disabledColorFilter + } else + it.colorFilter = enabledColorFilter + } + it.isSelected = isSelected it.alpha = if (isSelected) 1f else unselectedButtonAlpha } From fb00f5c82a678eb9b399acdd1b88b6f43712b566 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 23:28:17 +0530 Subject: [PATCH 15/17] + Adds: pop animation to bottom nav icons --- .../wordpress/android/ui/main/WPMainNavigationView.kt | 5 +++++ WordPress/src/main/res/anim/bottom_nav_icon_pop.xml | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 WordPress/src/main/res/anim/bottom_nav_icon_pop.xml diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index dde6821de16c..57138416e919 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt @@ -9,6 +9,7 @@ import android.view.HapticFeedbackConstants import android.view.LayoutInflater import android.view.MenuItem import android.view.View +import android.view.animation.AnimationUtils import android.widget.ImageView import android.widget.TextView import androidx.annotation.DrawableRes @@ -302,6 +303,10 @@ class WPMainNavigationView @JvmOverloads constructor( it.isSelected = isSelected it.alpha = if (isSelected) 1f else unselectedButtonAlpha + if(it.isSelected) { + val pop = AnimationUtils.loadAnimation(it.context, R.anim.bottom_nav_icon_pop) + it.startAnimation(pop) + } } } diff --git a/WordPress/src/main/res/anim/bottom_nav_icon_pop.xml b/WordPress/src/main/res/anim/bottom_nav_icon_pop.xml new file mode 100644 index 000000000000..27815dc4c318 --- /dev/null +++ b/WordPress/src/main/res/anim/bottom_nav_icon_pop.xml @@ -0,0 +1,11 @@ + + From ed3147993980a4040abbbac0d8da9f1944d37fd9 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 23:29:01 +0530 Subject: [PATCH 16/17] * Fixes: the badge icon on the notifications to be on the right --- WordPress/src/main/res/layout/navbar_item.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/res/layout/navbar_item.xml b/WordPress/src/main/res/layout/navbar_item.xml index 0f2ea08363d4..25c59568c473 100644 --- a/WordPress/src/main/res/layout/navbar_item.xml +++ b/WordPress/src/main/res/layout/navbar_item.xml @@ -18,6 +18,8 @@ android:layout_width="@dimen/bottom_nav_bar_icon_size" android:layout_height="@dimen/bottom_nav_bar_icon_size" android:layout_gravity="center" + android:layout_marginEnd="4dp" + android:layout_marginStart="4dp" android:importantForAccessibility="no" app:tint="@drawable/nav_bar_button_selector" tools:src="@drawable/ic_create_white_24dp" /> @@ -26,7 +28,7 @@ android:id="@+id/nav_badge" android:layout_width="@dimen/bottom_nav_bar_badge_size" android:layout_height="@dimen/bottom_nav_bar_badge_size" - android:layout_gravity="top" + android:layout_gravity="top|end" android:background="@drawable/bg_nav_badge" android:visibility="gone" tools:visibility="visible" /> From da60b590fb870a4ba3efe5e0cd5c90b09f191c66 Mon Sep 17 00:00:00 2001 From: Ajesh R Pai Date: Wed, 3 Jan 2024 23:30:45 +0530 Subject: [PATCH 17/17] - Reverts: the position of badge from right to left --- WordPress/src/main/res/layout/navbar_item.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/layout/navbar_item.xml b/WordPress/src/main/res/layout/navbar_item.xml index 25c59568c473..a41da5929983 100644 --- a/WordPress/src/main/res/layout/navbar_item.xml +++ b/WordPress/src/main/res/layout/navbar_item.xml @@ -28,7 +28,7 @@ android:id="@+id/nav_badge" android:layout_width="@dimen/bottom_nav_bar_badge_size" android:layout_height="@dimen/bottom_nav_bar_badge_size" - android:layout_gravity="top|end" + android:layout_gravity="top" android:background="@drawable/bg_nav_badge" android:visibility="gone" tools:visibility="visible" />