From 8f5f1b8906fc2d7de4c16c8edad17f14a2eb469f Mon Sep 17 00:00:00 2001 From: Sagar <85388413+Sagar0-0@users.noreply.github.com> Date: Thu, 27 Mar 2025 00:42:19 +0530 Subject: [PATCH] Update dim button state on reset wallpaper. --- .../securesms/wallpaper/ChatWallpaperFragment.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java index 556c777c0e..4917e9dbae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java @@ -100,10 +100,7 @@ public class ChatWallpaperFragment extends Fragment { chatWallpaperDim.setVisibility(shouldDimInNightMode && ThemeUtil.isDarkTheme(requireContext()) ? View.VISIBLE : View.GONE); }); - viewModel.getEnableWallpaperControls().observe(getViewLifecycleOwner(), enableWallpaperControls -> { - dimInNightMode.setEnabled(enableWallpaperControls); - dimInNightMode.setAlpha(enableWallpaperControls ? 1 : 0.5f); - }); + viewModel.getEnableWallpaperControls().observe(getViewLifecycleOwner(), this::setDimInNightModeEnabled); chatWallpaperPreview.setOnClickListener(unused -> setWallpaper.performClick()); setWallpaper.setOnClickListener(unused -> SafeNavigation.safeNavigate(Navigation.findNavController(view), @@ -119,12 +116,14 @@ public class ChatWallpaperFragment extends Fragment { .setPositiveButton(R.string.ChatWallpaperFragment__reset_default_wallpaper, (dialog, which) -> { viewModel.setWallpaper(null); viewModel.setDimInDarkTheme(true); + setDimInNightModeEnabled(false); viewModel.saveWallpaperSelection(); dialog.dismiss(); }) .setNegativeButton(R.string.ChatWallpaperFragment__reset_all_wallpapers, (dialog, which) -> { viewModel.setWallpaper(null); viewModel.setDimInDarkTheme(true); + setDimInNightModeEnabled(false); viewModel.resetAllWallpaper(); dialog.dismiss(); }) @@ -211,6 +210,11 @@ public class ChatWallpaperFragment extends Fragment { viewModel.refreshChatColors(); } + private void setDimInNightModeEnabled(boolean enabled) { + dimInNightMode.setEnabled(enabled); + dimInNightMode.setAlpha(enabled ? 1 : 0.5f); + } + private void forceAspectRatioToScreenByAdjustingHeight(@NonNull View view) { DisplayMetrics displayMetrics = new DisplayMetrics(); requireActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);