Update the UI

app/src/main/java/com/tommasoberlose/anotherwidget/components/FixedFocusScrollView.kt

@@ -0,0 +1,24 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import android.widget.ScrollView
+
+
+class FixedFocusScrollView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0
+) : ScrollView(context, attrs, defStyle) {
+
+    var isScrollable = true
+
+    override fun scrollTo(x: Int, y: Int) {
+        if (isScrollable) {
+            super.scrollTo(x, y)
+        }
+    }
+}

app/src/main/java/com/tommasoberlose/anotherwidget/components/MenuItem.kt

@@ -0,0 +1,21 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.view.View
+import android.widget.CompoundButton
+
+class MenuItem (
+    val icon: Int,
+    val getIcon: (() -> Int)? = null,
+    val title: String,
+    val label: String = "",
+    val getLabel: (() -> String)? = null,
+    val isEnabled: (() -> Boolean) = fun (): Boolean { return true },
+    val onClick: View.OnClickListener? = null,
+    val onLongClick: View.OnLongClickListener? = null,
+    val showToggle: Boolean = false,
+    val toggleValue: (() -> Boolean) = fun (): Boolean { return false },
+    val onToggle: CompoundButton.OnCheckedChangeListener? = null,
+    val showPermission: (() -> Boolean) = fun (): Boolean { return false },
+    val onPermissionClickListener: View.OnClickListener? = null,
+    val render: ((view: View) -> Unit)? = null
+)

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt

@@ -24,7 +24,6 @@ import kotlin.collections.ArrayList
  */
 
 object CalendarHelper {
-
     fun updateEventList(context: Context) {
         val eventRepository = EventRepository(context)
         if (Preferences.showEvents) {

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt

@@ -74,6 +74,11 @@ class CalendarTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        show_all_day_toggle.isChecked = Preferences.calendarAllDay
+        show_declined_events_toggle.isChecked = Preferences.showDeclinedEvents
+        show_diff_time_toggle.isChecked = Preferences.showDiffTime
+        show_multiple_events_toggle.isChecked = Preferences.showNextEvent
+
         setupListener()
     }
 
@@ -82,6 +87,7 @@ class CalendarTabFragment : Fragment() {
         viewModel: MainViewModel
     ) {
         binding.isCalendarEnabled = Preferences.showEvents
+        binding.isDiffEnabled = Preferences.showDiffTime || !Preferences.showEvents
 
         viewModel.showEvents.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
@@ -92,8 +98,10 @@ class CalendarTabFragment : Fragment() {
                 } else {
                     CalendarHelper.removeEventUpdatesAndroidN(requireContext())
                 }
+                binding.isDiffEnabled = Preferences.showDiffTime || !it
             }
             checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.calendarAllDay.observe(viewLifecycleOwner, Observer {
@@ -101,14 +109,14 @@ class CalendarTabFragment : Fragment() {
                 all_day_label?.text =
                     if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
             }
-            checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.showDeclinedEvents.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_declined_events_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
             }
-            checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.secondRowInformation.observe(viewLifecycleOwner, Observer {
@@ -120,6 +128,7 @@ class CalendarTabFragment : Fragment() {
         viewModel.showDiffTime.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_diff_time_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+                binding.isDiffEnabled = it || !Preferences.showEvents
             }
         })
 
@@ -138,7 +147,7 @@ class CalendarTabFragment : Fragment() {
             maintainScrollPosition {
                 show_until_label?.text = getString(SettingsStringHelper.getShowUntilString(it))
             }
-            checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.showNextEvent.observe(viewLifecycleOwner, Observer {
@@ -222,7 +231,7 @@ class CalendarTabFragment : Fragment() {
 
                 dialog.addOnMultipleSelectItemListener { values ->
                     CalendarHelper.filterCalendar(calendarSelectorList.map { it.id }.filter { !values.contains(it) })
-                    checkReadEventsPermission()
+                    updateCalendar()
                 }.show()
             } else {
                 activity?.toast(getString(R.string.calendar_settings_list_error))
@@ -231,50 +240,54 @@ class CalendarTabFragment : Fragment() {
 
         action_show_all_day.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_all_day_title)).setSelectedValue(Preferences.calendarAllDay)
+                show_all_day_toggle.isChecked = !show_all_day_toggle.isChecked
-                    .addItem(getString(R.string.settings_visible), true)
+            }
-                    .addItem(getString(R.string.settings_not_visible), false)
+        }
-                    .addOnSelectItemListener { value ->
+
-                        Preferences.calendarAllDay = value
+        show_all_day_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    }.show()
+            if (Preferences.showEvents) {
+                Preferences.calendarAllDay = isChecked
             }
         }
 
         action_show_declined_events.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_declined_events_title)).setSelectedValue(Preferences.showDeclinedEvents)
+                show_declined_events_toggle.isChecked = !show_declined_events_toggle.isChecked
-                    .addItem(getString(R.string.settings_visible), true)
+            }
-                    .addItem(getString(R.string.settings_not_visible), false)
+        }
-                    .addOnSelectItemListener { value ->
+
-                        Preferences.showDeclinedEvents = value
+        show_declined_events_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    }.show()
+            if (Preferences.showEvents) {
+                Preferences.showDeclinedEvents = isChecked
             }
         }
 
         action_show_multiple_events.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_multiple_events_title)).setSelectedValue(Preferences.showNextEvent)
+                show_multiple_events_toggle.isChecked = !show_multiple_events_toggle.isChecked
-                    .addItem(getString(R.string.settings_visible), true)
+            }
-                    .addItem(getString(R.string.settings_not_visible), false)
+        }
-                    .addOnSelectItemListener { value ->
+
-                        Preferences.showNextEvent = value
+        show_multiple_events_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    }.show()
+            if (Preferences.showEvents) {
+                Preferences.showNextEvent = isChecked
             }
         }
 
         action_show_diff_time.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_diff_time_title)).setSelectedValue(Preferences.showDiffTime)
+                show_diff_time_toggle.isChecked = !show_diff_time_toggle.isChecked
-                    .addItem(getString(R.string.settings_visible), true)
+            }
-                    .addItem(getString(R.string.settings_not_visible), false)
+        }
-                    .addOnSelectItemListener { value ->
+
-                        Preferences.showDiffTime = value
+        show_diff_time_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    }.show()
+            if (Preferences.showEvents) {
+                Preferences.showDiffTime = isChecked
             }
         }
 
         action_widget_update_frequency.setOnClickListener {
-            if (Preferences.showEvents) {
+            if (Preferences.showEvents && Preferences.showDiffTime) {
                 BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_widget_update_frequency_title), message = getString(R.string.settings_widget_update_frequency_subtitle)).setSelectedValue(Preferences.widgetUpdateFrequency)
                     .addItem(getString(R.string.settings_widget_update_frequency_high), Constants.WidgetUpdateFrequency.HIGH.value)
                     .addItem(getString(R.string.settings_widget_update_frequency_default), Constants.WidgetUpdateFrequency.DEFAULT.value)
@@ -329,7 +342,6 @@ class CalendarTabFragment : Fragment() {
         if (activity?.checkGrantedPermission(Manifest.permission.READ_CALENDAR) == true) {
             show_events_label?.text = if (showEvents) getString(R.string.show_events_visible) else getString(R.string.show_events_not_visible)
             read_calendar_permission_alert?.isVisible = false
-            CalendarHelper.updateEventList(requireContext())
         } else {
             show_events_label?.text = if (showEvents) getString(R.string.description_permission_calendar) else getString(R.string.show_events_not_visible)
             read_calendar_permission_alert?.isVisible = showEvents
@@ -339,6 +351,12 @@ class CalendarTabFragment : Fragment() {
         }
     }
 
+    private fun updateCalendar() {
+        if (activity?.checkGrantedPermission(Manifest.permission.READ_CALENDAR) == true) {
+            CalendarHelper.updateEventList(requireContext())
+        }
+    }
+
     private fun requirePermission() {
         Dexter.withContext(requireContext())
             .withPermissions(
@@ -386,11 +404,11 @@ class CalendarTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt

@@ -21,6 +21,7 @@ import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetColorPicker
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
 import com.tommasoberlose.anotherwidget.databinding.FragmentClockSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -72,6 +73,8 @@ class ClockTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        ampm_indicator_toggle.isChecked = Preferences.showAMPMIndicator
+
         lifecycleScope.launch(Dispatchers.IO) {
             val lazyColors = requireContext().resources.getIntArray(R.array.material_colors)
             withContext(Dispatchers.Main) {
@@ -167,7 +170,11 @@ class ClockTabFragment : Fragment() {
         }
 
         action_clock_text_size.setOnClickListener {
-            val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.settings_clock_text_size_title)).setSelectedValue(Preferences.clockTextSize)
+            if (Preferences.showClock) {
+                val dialog = BottomSheetMenu<Float>(
+                    requireContext(),
+                    header = getString(R.string.settings_clock_text_size_title)
+                ).setSelectedValue(Preferences.clockTextSize)
                 (46 downTo 12).filter { it % 2 == 0 }.forEach {
                     dialog.addItem("${it}sp", it.toFloat())
                 }
@@ -175,24 +182,30 @@ class ClockTabFragment : Fragment() {
                     Preferences.clockTextSize = value
                 }.show()
             }
+        }
 
         action_ampm_indicator_size.setOnClickListener {
-            BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_ampm_indicator_title)).setSelectedValue(Preferences.showAMPMIndicator)
+            if (Preferences.showClock) {
-                .addItem(getString(R.string.settings_visible), true)
+                ampm_indicator_toggle.isChecked = !ampm_indicator_toggle.isChecked
-                .addItem(getString(R.string.settings_not_visible), false)
+            }
-                .addOnSelectItemListener { value ->
+        }
-                    Preferences.showAMPMIndicator = value
+
-                }.show()
+        ampm_indicator_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showClock) {
+                Preferences.showAMPMIndicator = isChecked
+            }
         }
 
         action_clock_text_color.setOnClickListener {
+            if (Preferences.showClock) {
                 BottomSheetColorPicker(requireContext(),
                     colors = colors,
                     header = getString(R.string.settings_font_color_title),
                     getSelected = ColorHelper::getClockFontColorRgb,
                     onColorSelected = { color: Int ->
                         val colorString = Integer.toHexString(color)
-                    Preferences.clockTextColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                        Preferences.clockTextColor =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
                     },
                     showAlphaSelector = true,
                     alpha = Preferences.clockTextAlpha.toIntValue(),
@@ -201,26 +214,47 @@ class ClockTabFragment : Fragment() {
                     }
                 ).show()
             }
+        }
 
         action_clock_bottom_margin_size.setOnClickListener {
-            BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_clock_bottom_margin_title)).setSelectedValue(Preferences.clockBottomMargin)
+            if (Preferences.showClock) {
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_none), Constants.ClockBottomMargin.NONE.value)
+                BottomSheetMenu<Int>(
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_small), Constants.ClockBottomMargin.SMALL.value)
+                    requireContext(),
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_medium), Constants.ClockBottomMargin.MEDIUM.value)
+                    header = getString(R.string.settings_clock_bottom_margin_title)
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_large), Constants.ClockBottomMargin.LARGE.value)
+                ).setSelectedValue(Preferences.clockBottomMargin)
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_none),
+                        Constants.ClockBottomMargin.NONE.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_small),
+                        Constants.ClockBottomMargin.SMALL.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_medium),
+                        Constants.ClockBottomMargin.MEDIUM.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_large),
+                        Constants.ClockBottomMargin.LARGE.value
+                    )
                     .addOnSelectItemListener { value ->
                         Preferences.clockBottomMargin = value
                     }.show()
             }
+        }
 
         action_clock_app.setOnClickListener {
             if (Preferences.showClock) {
-                startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java),
+                if (Preferences.showClock) {
+                    startActivityForResult(
+                        Intent(requireContext(), ChooseApplicationActivity::class.java),
                         RequestCode.CLOCK_APP_REQUEST_CODE.code
                     )
                 }
             }
         }
+    }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK && requestCode ==  RequestCode.CLOCK_APP_REQUEST_CODE.code) {
@@ -233,11 +267,11 @@ class ClockTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt

@@ -67,6 +67,8 @@ class GeneralTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        show_dividers_toggle.isChecked = Preferences.showDividers
+
         setupListener()
         lifecycleScope.launch(Dispatchers.IO) {
             val lazyColors = requireContext().resources.getIntArray(R.array.material_colors)
@@ -186,15 +188,6 @@ class GeneralTabFragment : Fragment() {
         })
     }
 
-    private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
-        callback.invoke()
-        lifecycleScope.launch {
-            delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
-        }
-    }
-
     private fun setupListener() {
         action_main_text_size.setOnClickListener {
             val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.title_main_text_size)).setSelectedValue(Preferences.textMainSize)
@@ -319,12 +312,11 @@ class GeneralTabFragment : Fragment() {
         }
 
         action_show_dividers.setOnClickListener {
-            BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_dividers_title)).setSelectedValue(Preferences.showDividers)
+            show_dividers_toggle.isChecked = !show_dividers_toggle.isChecked
-                .addItem(getString(R.string.settings_visible), true)
+        }
-                .addItem(getString(R.string.settings_not_visible), false)
+
-                .addOnSelectItemListener { value ->
+        show_dividers_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    Preferences.showDividers = value
+            Preferences.showDividers = isChecked
-                }.show()
         }
     }
 
@@ -346,4 +338,13 @@ class GeneralTabFragment : Fragment() {
         }
         super.onActivityResult(requestCode, resultCode, data)
     }
+
+    private fun maintainScrollPosition(callback: () -> Unit) {
+        scrollView.isScrollable = false
+        callback.invoke()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.isScrollable = true
+        }
+    }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GlanceTabFragment.kt

@@ -373,11 +373,11 @@ class GlanceTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt

@@ -65,6 +65,8 @@ class SettingsFragment : Fragment() {
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
 
+        subscribeUi(viewModel)
+
         return binding.root
     }
 
@@ -75,7 +77,8 @@ class SettingsFragment : Fragment() {
             Navigation.findNavController(it).popBackStack()
         }
 
-        subscribeUi(viewModel)
+        show_widget_preview_toggle.isChecked = Preferences.showPreview
+        show_wallpaper_toggle.isChecked = Preferences.showWallpaper
 
         setupListener()
 
@@ -120,44 +123,26 @@ class SettingsFragment : Fragment() {
     }
 
     private fun setupListener() {
-
         action_show_widget_preview.setOnClickListener {
-            maintainScrollPosition {
+            show_widget_preview_toggle.isChecked = !show_widget_preview_toggle.isChecked
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.action_show_widget_preview))
-                    .setSelectedValue(Preferences.showPreview)
-                    .addItem(
-                        getString(R.string.settings_visible),
-                        true
-                    )
-                    .addItem(
-                        getString(R.string.settings_not_visible),
-                        false
-                    )
-                    .addOnSelectItemListener { value ->
-                        Preferences.showPreview = value
-                    }.show()
         }
+
+        show_widget_preview_toggle.setOnCheckedChangeListener { _, isChecked ->
+            Preferences.showPreview = isChecked
         }
 
         action_show_wallpaper.setOnClickListener {
-            maintainScrollPosition {
+        }
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_title_show_wallpaper))
+
-                    .setSelectedValue(Preferences.showWallpaper && activity?.checkGrantedPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == true)
+        action_show_wallpaper.setOnClickListener {
-                    .addItem(
+            show_wallpaper_toggle.isChecked = !show_wallpaper_toggle.isChecked
-                        getString(R.string.settings_visible),
+        }
-                        true
+
-                    )
+        show_wallpaper_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    .addItem(
+            if (isChecked) {
-                        getString(R.string.settings_not_visible),
-                        false
-                    )
-                    .addOnSelectItemListener { value ->
-                        if (value) {
                 requirePermission()
             } else {
-                            Preferences.showWallpaper = value
+                Preferences.showWallpaper = isChecked
-                        }
-                    }.show()
             }
         }
 
@@ -211,11 +196,11 @@ class SettingsFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 
@@ -226,8 +211,8 @@ class SettingsFragment : Fragment() {
             ).withListener(object: MultiplePermissionsListener {
                 override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
                     report?.let {
-                        Preferences.showWallpaper = false
+                        show_wallpaper_toggle?.isChecked = false
-                        Preferences.showWallpaper = report.areAllPermissionsGranted()
+                        show_wallpaper_toggle?.isChecked = report.areAllPermissionsGranted()
                     }
                 }
                 override fun onPermissionRationaleShouldBeShown(

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt

@@ -133,7 +133,7 @@ class WeatherTabFragment : Fragment() {
         viewModel.weatherIconPack.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 label_weather_icon_pack?.text = getString(R.string.settings_weather_icon_pack_default).format((it + 1))
-                weather_icon_pack.setImageDrawable(ContextCompat.getDrawable(requireContext(), WeatherHelper.getWeatherIconResource("01d")))
+                weather_icon_pack.setImageDrawable(ContextCompat.getDrawable(requireContext(), WeatherHelper.getWeatherIconResource("02d")))
                 if (it == Constants.WeatherIconPack.MINIMAL.value) {
                     weather_icon_pack.setColorFilter(ContextCompat.getColor(requireContext(), R.color.colorPrimaryText))
                 } else {
@@ -303,11 +303,11 @@ class WeatherTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

app/src/main/res/drawable/round_cloud_circle.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM16.5,16L8,16c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3h0.14c0.44,-1.73 1.99,-3 3.86,-3 2.21,0 4,1.79 4,4h0.5c1.38,0 2.5,1.12 2.5,2.5S17.88,16 16.5,16z"/>
+</vector>

app/src/main/res/layout/fragment_calendar_settings.xml

@@ -7,9 +7,12 @@
         <variable
             name="isCalendarEnabled"
             type="Boolean" />
+        <variable
+            name="isDiffEnabled"
+            type="Boolean" />
     </data>
 
-    <ScrollView
+    <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -158,7 +161,8 @@
                         android:src="@drawable/round_date_range"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -174,6 +178,12 @@
                             android:id="@+id/all_day_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:id="@+id/show_all_day_toggle"
+                        android:buttonTint="@color/colorAccent" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -195,7 +205,8 @@
                         android:src="@drawable/round_event_busy"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -211,6 +222,12 @@
                             android:id="@+id/show_declined_events_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:id="@+id/show_declined_events_toggle"
+                        android:buttonTint="@color/colorAccent" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -281,7 +298,8 @@
                         android:src="@drawable/round_timelapse"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -297,6 +315,12 @@
                             android:id="@+id/show_diff_time_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:id="@+id/show_diff_time_toggle"
+                        android:buttonTint="@color/colorAccent" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -307,6 +331,7 @@
                     android:paddingRight="8dp"
                     android:clickable="true"
                     android:focusable="true"
+                    android:alpha="@{isDiffEnabled ? 1f : 0.2f, default=1}"
                     android:background="?android:attr/selectableItemBackground"
                     android:gravity="center_vertical"
                     android:id="@+id/action_widget_update_frequency"
@@ -404,7 +429,8 @@
                         android:src="@drawable/round_code"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -420,6 +446,12 @@
                             android:id="@+id/show_multiple_events_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:id="@+id/show_multiple_events_toggle"
+                        android:buttonTint="@color/colorAccent" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -497,5 +529,5 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </ScrollView>
+    </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>
 </layout>

app/src/main/res/layout/fragment_clock_settings.xml

@@ -8,7 +8,7 @@
             name="isClockVisible"
             type="Boolean" />
     </data>
-    <ScrollView
+    <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -20,6 +20,7 @@
             android:layout_height="wrap_content"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
+            android:focusable="true"
             android:orientation="vertical">
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
@@ -77,8 +78,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:padding="12dp"
-                    android:src="@drawable/round_schedule"
+                    android:src="@drawable/alarm"/>
-                    android:tint="@color/colorPrimaryText"/>
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_weight="1"
@@ -230,7 +230,8 @@
                         android:scaleX="-1"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -246,6 +247,12 @@
                             android:id="@+id/ampm_indicator_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:id="@+id/ampm_indicator_toggle"
+                        android:buttonTint="@color/colorAccent" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -356,5 +363,5 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </ScrollView>
+    </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>
 </layout>

app/src/main/res/layout/fragment_general_settings.xml

@@ -6,7 +6,7 @@
             name="viewModel"
             type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
     </data>
-    <ScrollView
+    <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/scrollView"
@@ -334,7 +334,8 @@
                     android:rotation="90"
                     android:tint="@color/colorPrimaryText"/>
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:paddingLeft="8dp"
@@ -350,6 +351,12 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
                 </LinearLayout>
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:id="@+id/show_dividers_toggle"
+                    android:buttonTint="@color/colorAccent" />
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -392,5 +399,5 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </ScrollView>
+    </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>
 </layout>

app/src/main/res/layout/fragment_glance_settings.xml

@@ -10,7 +10,7 @@
             name="isGlanceVisible"
             type="Boolean" />
     </data>
-    <ScrollView
+    <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/scrollView"
@@ -39,8 +39,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:padding="12dp"
-                    android:src="@drawable/round_hourglass_empty"
+                    android:src="@drawable/menu"/>
-                    android:tint="@color/colorPrimaryText"/>
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_weight="1"
@@ -382,5 +381,5 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </ScrollView>
+    </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>
 </layout>

app/src/main/res/layout/fragment_settings.xml

@@ -49,7 +49,7 @@
                     tools:ignore="RelativeOverlap" />
             </RelativeLayout>
         </com.google.android.material.card.MaterialCardView>
-        <ScrollView
+        <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/scrollView"
@@ -126,7 +126,8 @@
                         android:src="@drawable/round_compare"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -142,6 +143,12 @@
                             android:id="@+id/show_widget_preview_label"
                             style="@style/AnotherWidget.Settings.Subtitle" />
                     </LinearLayout>
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:id="@+id/show_widget_preview_toggle"
+                        android:buttonTint="@color/colorAccent" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -163,7 +170,8 @@
                         android:src="@drawable/round_wallpaper"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -179,6 +187,12 @@
                             android:id="@+id/show_wallpaper_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:id="@+id/show_wallpaper_toggle"
+                        android:buttonTint="@color/colorAccent" />
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -440,6 +454,6 @@
                         app:textAllCaps="false" />
                 </LinearLayout>
             </LinearLayout>
-        </ScrollView>
+        </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_weather_settings.xml

@@ -8,7 +8,7 @@
             name="isWeatherVisible"
             type="Boolean" />
     </data>
-    <ScrollView
+    <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -77,6 +77,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:padding="12dp"
+                    android:id="@+id/weather_icon_pack"
                     android:src="@drawable/round_brightness_5"
                     android:tint="@color/colorPrimaryText"/>
                 <LinearLayout
@@ -327,8 +328,7 @@
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:padding="12dp"
-                        android:id="@+id/weather_icon_pack"
+                        android:src="@drawable/round_cloud_circle"
-                        android:src="@drawable/round_cloud_queue"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -399,5 +399,5 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </ScrollView>
+    </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>
 </layout>

app/src/main/res/layout/settings_menu_header.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.AppCompatTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:text="@string/filters_header"
+    android:textAlignment="viewStart"
+    android:paddingLeft="20dp"
+    android:paddingRight="20dp"
+    android:textSize="16sp"
+    android:id="@+id/header"
+    android:textColor="@color/colorAccent"
+    android:textAppearance="@style/AnotherWidget.Settings.Header"
+    android:textAllCaps="false" />

app/src/main/res/layout/settings_menu_item.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:id="@+id/container"
+    android:orientation="horizontal">
+    <ImageView
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:padding="12dp"
+        android:id="@+id/icon"
+        android:src="@drawable/calendar"/>
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/AnotherWidget.Settings.Title"
+            android:id="@+id/title"
+            android:text="@string/title_permission_calendar"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/label"
+            android:text="@string/description_permission_calendar"
+            style="@style/AnotherWidget.Settings.Subtitle"/>
+        <com.google.android.material.button.MaterialButton
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:letterSpacing="0"
+            android:textAllCaps="false"
+            android:clickable="true"
+            android:layout_marginStart="-8dp"
+            android:layout_marginBottom="-8dp"
+            android:paddingBottom="0dp"
+            android:paddingTop="0dp"
+            android:focusable="true"
+            android:id="@+id/action_grant_permission"
+            android:textColor="@color/errorColorText"
+            android:text="@string/action_grant_permission"/>
+    </LinearLayout>
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:id="@+id/toggle"
+        android:buttonTint="@color/colorAccent" />
+</LinearLayout>