empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Do not hook up check changed listener until after view state is restored.

Browse source
This commit is contained in:
Alex Hart 2022-02-24 10:56:05 -04:00
parent f4002850bb
commit 765185952e
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
View file

@ -37,9 +37,10 @@ import java.util.Collections;
public class ChatWallpaperFragment extends Fragment { public class ChatWallpaperFragment extends Fragment {
private boolean isSettingDimFromViewModel; private boolean isSettingDimFromViewModel;
private ChatWallpaperViewModel viewModel; private ChatWallpaperViewModel viewModel;
private SwitchCompat dimInNightMode;
@Override @Override
public @NonNull View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public @NonNull View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@ -50,18 +51,19 @@ public class ChatWallpaperFragment extends Fragment {
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
viewModel = ViewModelProviders.of(requireActivity()).get(ChatWallpaperViewModel.class); viewModel = ViewModelProviders.of(requireActivity()).get(ChatWallpaperViewModel.class);
AvatarImageView portrait = view.findViewById(R.id.chat_wallpaper_preview_top_bar_portrait); AvatarImageView portrait = view.findViewById(R.id.chat_wallpaper_preview_top_bar_portrait);
Toolbar toolbar = view.findViewById(R.id.toolbar); Toolbar toolbar = view.findViewById(R.id.toolbar);
ImageView chatWallpaperPreview = view.findViewById(R.id.chat_wallpaper_preview_background); ImageView chatWallpaperPreview = view.findViewById(R.id.chat_wallpaper_preview_background);
View setWallpaper = view.findViewById(R.id.chat_wallpaper_set_wallpaper); View setWallpaper = view.findViewById(R.id.chat_wallpaper_set_wallpaper);
SwitchCompat dimInNightMode = view.findViewById(R.id.chat_wallpaper_dark_theme_dims_wallpaper); View chatWallpaperDim = view.findViewById(R.id.chat_wallpaper_dim);
View chatWallpaperDim = view.findViewById(R.id.chat_wallpaper_dim); TextView setChatColor = view.findViewById(R.id.chat_wallpaper_set_chat_color);
TextView setChatColor = view.findViewById(R.id.chat_wallpaper_set_chat_color); TextView resetChatColors = view.findViewById(R.id.chat_wallpaper_reset_chat_colors);
TextView resetChatColors = view.findViewById(R.id.chat_wallpaper_reset_chat_colors); ImageView sentBubble = view.findViewById(R.id.chat_wallpaper_preview_bubble_2);
ImageView sentBubble = view.findViewById(R.id.chat_wallpaper_preview_bubble_2); ColorizerView colorizerView = view.findViewById(R.id.colorizer);
ColorizerView colorizerView = view.findViewById(R.id.colorizer); TextView resetAllWallpaper = view.findViewById(R.id.chat_wallpaper_reset_all_wallpapers);
TextView resetAllWallpaper = view.findViewById(R.id.chat_wallpaper_reset_all_wallpapers); AppCompatImageView recvBubble = view.findViewById(R.id.chat_wallpaper_preview_bubble_1);
AppCompatImageView recvBubble = view.findViewById(R.id.chat_wallpaper_preview_bubble_1);
dimInNightMode = view.findViewById(R.id.chat_wallpaper_dark_theme_dims_wallpaper);
toolbar.setTitle(R.string.preferences__chat_color_and_wallpaper); toolbar.setTitle(R.string.preferences__chat_color_and_wallpaper);
toolbar.setNavigationOnClickListener(nav -> { toolbar.setNavigationOnClickListener(nav -> {
@ -173,12 +175,6 @@ public class ChatWallpaperFragment extends Fragment {
}); });
} }
dimInNightMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (!isSettingDimFromViewModel) {
viewModel.setDimInDarkTheme(isChecked);
}
});
viewModel.getCurrentChatColors().observe(getViewLifecycleOwner(), chatColors -> { viewModel.getCurrentChatColors().observe(getViewLifecycleOwner(), chatColors -> {
sentBubble.getDrawable().setColorFilter(chatColors.getChatBubbleColorFilter()); sentBubble.getDrawable().setColorFilter(chatColors.getChatBubbleColorFilter());
colorizerView.setBackground(chatColors.getChatBubbleMask()); colorizerView.setBackground(chatColors.getChatBubbleMask());
@ -193,6 +189,17 @@ public class ChatWallpaperFragment extends Fragment {
sentBubble.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> viewModel.refreshChatColors()); sentBubble.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> viewModel.refreshChatColors());
} }
@Override
public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
super.onViewStateRestored(savedInstanceState);
dimInNightMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (!isSettingDimFromViewModel) {
viewModel.setDimInDarkTheme(isChecked);
}
});
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();