From 959049891c5077a99eabdb648af48ad67928699b Mon Sep 17 00:00:00 2001 From: M M Arif Date: Sat, 11 Mar 2023 08:59:11 +0000 Subject: [PATCH] Hide notification count when no notification available (#1258) Closes #1251 Co-authored-by: M M Arif Co-authored-by: qwerty287 Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1258 Reviewed-by: qwerty287 --- .../mian/gitnex/activities/MainActivity.java | 23 +++++++++++++++---- .../main/res/layout/badge_notification.xml | 5 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index 566c1237..d04a96e7 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -874,11 +874,24 @@ public class MainActivity extends BaseActivity if (response.code() == 200) { assert notificationCount != null; - notificationCounter = - navNotifications - .getActionView() - .findViewById(R.id.counterBadgeNotification); - notificationCounter.setText(String.valueOf(notificationCount.getNew())); + if (notificationCount.getNew() > 0) { + + navNotifications + .getActionView() + .findViewById(R.id.counterBadgeNotification) + .setVisibility(View.VISIBLE); + notificationCounter = + navNotifications + .getActionView() + .findViewById(R.id.counterBadgeNotification); + notificationCounter.setText( + String.valueOf(notificationCount.getNew())); + } else { + navNotifications + .getActionView() + .findViewById(R.id.counterBadgeNotification) + .setVisibility(View.GONE); + } } } diff --git a/app/src/main/res/layout/badge_notification.xml b/app/src/main/res/layout/badge_notification.xml index 7d68e627..8554cd85 100644 --- a/app/src/main/res/layout/badge_notification.xml +++ b/app/src/main/res/layout/badge_notification.xml @@ -15,7 +15,8 @@ android:paddingStart="@dimen/dimen4dp" android:paddingEnd="@dimen/dimen4dp" android:singleLine="true" - android:textColor="@color/colorWhite" - android:textSize="@dimen/dimen12sp"/> + android:textColor="?attr/primaryTextColor" + android:textSize="@dimen/dimen12sp" + android:visibility="gone" />