From 5dcf0afe0278ae99f38a39217fe1bea862fc8c19 Mon Sep 17 00:00:00 2001
From: azuo <azuo.lee@sohu.com>
Date: Thu, 30 Sep 2021 22:06:38 +0800
Subject: [PATCH] Correct merge mistake: viewModel.showPreview.observe invoked
 twice

---
 .../tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt | 4 ----
 .../tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
index a70929d..e9ddd3a 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
@@ -100,10 +100,6 @@ class MainFragment : Fragment() {
     }
 
     private fun subscribeUi(viewModel: MainViewModel) {
-        viewModel.showPreview.observe(viewLifecycleOwner) {
-            binding.preview.visibility = if (it) View.VISIBLE else View.GONE
-        }
-
         viewModel.showWallpaper.observe(viewLifecycleOwner) {
             if (it) {
                 val wallpaper = requireActivity().getCurrentWallpaper()
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
index 5ad6191..f13a53c 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
@@ -31,6 +31,7 @@ import com.tommasoberlose.anotherwidget.receivers.WidgetClickListenerReceiver
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.convertDpToPixel
 import com.tommasoberlose.anotherwidget.utils.isDarkTheme
+import com.tommasoberlose.anotherwidget.utils.toPixel
 import java.text.DateFormat
 import java.util.*
 import java.util.concurrent.TimeUnit