mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Color nav bar to match unmute in release note channel.

fork-5.53.8
Cody Henthorne 2022-08-08 14:17:28 -04:00
rodzic 5164a44ee8
commit 756b926f6f
2 zmienionych plików z 7 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
Wyświetl plik

@ -2161,7 +2161,9 @@ public class ConversationParentFragment extends Fragment
int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorOnSurface); int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorOnSurface);
toolbar.setTitleTextColor(toolbarTextAndIconColor); toolbar.setTitleTextColor(toolbarTextAndIconColor);
setToolbarActionItemTint(toolbar, 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); fragment.onWallpaperChanged(chatWallpaper);
messageRequestBottomView.setWallpaperEnabled(chatWallpaper != null); messageRequestBottomView.setWallpaperEnabled(chatWallpaper != null);
@ -2719,8 +2721,10 @@ public class ConversationParentFragment extends Fragment
unmuteBanner.setVisibility(View.VISIBLE); unmuteBanner.setVisibility(View.VISIBLE);
unmuteBanner.findViewById(R.id.conversation_activity_unmute_button) unmuteBanner.findViewById(R.id.conversation_activity_unmute_button)
.setOnClickListener(v -> handleUnmuteNotifications()); .setOnClickListener(v -> handleUnmuteNotifications());
WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorSurface2));
} else if (releaseChannelUnmute.resolved()) { } else if (releaseChannelUnmute.resolved()) {
releaseChannelUnmute.get().setVisibility(View.GONE); releaseChannelUnmute.get().setVisibility(View.GONE);
WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorBackground));
} }
} else { } else {
boolean inactivePushGroup = isPushGroupConversation() && !recipient.isActiveGroup(); boolean inactivePushGroup = isPushGroupConversation() && !recipient.isActiveGroup();

2
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
Wyświetl plik

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