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

Enable 'dim in dark theme' by default.

fork-5.53.8
Alex Hart 2021-01-22 09:13:12 -04:00
rodzic b95083fe92
commit dbac9bf9f6
2 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
Wyświetl plik

@ -85,7 +85,7 @@ public class ChatWallpaperFragment extends Fragment {
R.string.ChatWallpaperFragment__clear, R.string.ChatWallpaperFragment__clear,
() -> { () -> {
viewModel.setWallpaper(null); viewModel.setWallpaper(null);
viewModel.setDimInDarkTheme(false); viewModel.setDimInDarkTheme(true);
viewModel.saveWallpaperSelection(); viewModel.saveWallpaperSelection();
}); });
}); });
@ -95,7 +95,7 @@ public class ChatWallpaperFragment extends Fragment {
R.string.ChatWallpaperFragment__reset, R.string.ChatWallpaperFragment__reset,
() -> { () -> {
viewModel.setWallpaper(null); viewModel.setWallpaper(null);
viewModel.setDimInDarkTheme(false); viewModel.setDimInDarkTheme(true);
viewModel.resetAllWallpaper(); viewModel.resetAllWallpaper();
}); });
}); });

4
app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperViewModel.java
Wyświetl plik

@ -32,7 +32,7 @@ public class ChatWallpaperViewModel extends ViewModel {
this.recipientId = recipientId; this.recipientId = recipientId;
ChatWallpaper currentWallpaper = repository.getCurrentWallpaper(recipientId); ChatWallpaper currentWallpaper = repository.getCurrentWallpaper(recipientId);
dimInDarkTheme.setValue(currentWallpaper != null && currentWallpaper.getDimLevelForDarkTheme() > 0f); dimInDarkTheme.setValue(currentWallpaper == null || currentWallpaper.getDimLevelForDarkTheme() > 0f);
enableWallpaperControls.setValue(hasClearableWallpaper()); enableWallpaperControls.setValue(hasClearableWallpaper());
wallpaper.setValue(Optional.fromNullable(currentWallpaper)); wallpaper.setValue(Optional.fromNullable(currentWallpaper));
} }
@ -65,7 +65,7 @@ public class ChatWallpaperViewModel extends ViewModel {
ChatWallpaper globalWallpaper = SignalStore.wallpaper().getWallpaper(); ChatWallpaper globalWallpaper = SignalStore.wallpaper().getWallpaper();
this.wallpaper.setValue(Optional.fromNullable(globalWallpaper)); this.wallpaper.setValue(Optional.fromNullable(globalWallpaper));
this.dimInDarkTheme.setValue(globalWallpaper != null && globalWallpaper.getDimLevelForDarkTheme() > 0); this.dimInDarkTheme.setValue(globalWallpaper == null || globalWallpaper.getDimLevelForDarkTheme() > 0);
} }
enableWallpaperControls.setValue(false); enableWallpaperControls.setValue(false);