dm1sh/another-widget
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Correct merge mistake: viewModel.showPreview.observe invoked twice

Browse Source
This commit is contained in:
azuo 2021-09-30 22:06:38 +08:00
parent 94b1eec757
commit 5dcf0afe02
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
View File

@ -100,10 +100,6 @@ class MainFragment : Fragment() {
} }
private fun subscribeUi(viewModel: MainViewModel) { private fun subscribeUi(viewModel: MainViewModel) {
viewModel.showPreview.observe(viewLifecycleOwner) {
binding.preview.visibility = if (it) View.VISIBLE else View.GONE
}
viewModel.showWallpaper.observe(viewLifecycleOwner) { viewModel.showWallpaper.observe(viewLifecycleOwner) {
if (it) { if (it) {
val wallpaper = requireActivity().getCurrentWallpaper() val wallpaper = requireActivity().getCurrentWallpaper()

1
app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
View File

@ -31,6 +31,7 @@ import com.tommasoberlose.anotherwidget.receivers.WidgetClickListenerReceiver
import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
import com.tommasoberlose.anotherwidget.utils.convertDpToPixel import com.tommasoberlose.anotherwidget.utils.convertDpToPixel
import com.tommasoberlose.anotherwidget.utils.isDarkTheme import com.tommasoberlose.anotherwidget.utils.isDarkTheme
import com.tommasoberlose.anotherwidget.utils.toPixel
import java.text.DateFormat import java.text.DateFormat
import java.util.* import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit