Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-22 02:36:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Color nav bar to match unmute in release note channel.

Browse Source
This commit is contained in:
Cody Henthorne
2022-08-08 14:17:28 -04:00
parent 5164a44ee8
commit 756b926f6f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -2161,7 +2161,9 @@ public class ConversationParentFragment extends Fragment
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 @@ public class ConversationParentFragment extends Fragment
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();

2
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -1046,6 +1046,8 @@ public class Recipient {
public @Nullable ChatWallpaper getWallpaper() {
if (wallpaper != null) {
return wallpaper;
} else if (isReleaseNotes()) {
return null;
} else {
return SignalStore.wallpaper().getWallpaper();
}