Color nav bar to match unmute in release note channel.

signalapp · Aug 9, 2022 · 756b926 · 756b926
1 parent 5164a44
commit 756b926
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -2161,7 +2161,9 @@ private void updateWallpaper(@Nullable ChatWallpaper chatWallpaper) {
       int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorOnSurface);
       toolbar.setTitleTextColor(toolbarTextAndIconColor);
       setToolbarActionItemTint(toolbar, toolbarTextAndIconColor);
-      WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorBackground));
+      if (!releaseChannelUnmute.resolved()) {
+        WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorBackground));
+      }
     }
     fragment.onWallpaperChanged(chatWallpaper);
     messageRequestBottomView.setWallpaperEnabled(chatWallpaper != null);
@@ -2719,8 +2721,10 @@ private void setBlockedUserState(Recipient recipient, @NonNull ConversationSecur
         unmuteBanner.setVisibility(View.VISIBLE);
         unmuteBanner.findViewById(R.id.conversation_activity_unmute_button)
                     .setOnClickListener(v -> handleUnmuteNotifications());
+        WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorSurface2));
       } else if (releaseChannelUnmute.resolved()) {
         releaseChannelUnmute.get().setVisibility(View.GONE);
+        WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorBackground));
       }
     } else {
       boolean inactivePushGroup = isPushGroupConversation() && !recipient.isActiveGroup();

diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -1046,6 +1046,8 @@ public boolean supportsMessageRetries() {
   public @Nullable ChatWallpaper getWallpaper() {
     if (wallpaper != null) {
       return wallpaper;
+    } else if (isReleaseNotes()) {
+      return null;
     } else {
       return SignalStore.wallpaper().getWallpaper();
     }