Gix switcher, update glance, add glance order, add ampm toggle

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

@@ -129,7 +129,10 @@ class CalendarTabFragment : Fragment() {
         })
 
         viewModel.showNextEvent.observe(viewLifecycleOwner, Observer {
-            show_multiple_events_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            maintainScrollPosition {
+                show_multiple_events_label?.text =
+                    if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
         })
 
         viewModel.dateFormat.observe(viewLifecycleOwner, Observer {
@@ -278,7 +281,7 @@ class CalendarTabFragment : Fragment() {
         action_show_until.setOnClickListener {
             if (Preferences.showEvents) {
                 val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_show_until_title)).setSelectedValue(Preferences.showUntil)
-                intArrayOf(6,7,0,1,2).forEach {
+                intArrayOf(6,7,0,1,2,3).forEach {
                     dialog.addItem(getString(SettingsStringHelper.getShowUntilString(it)), it)
                 }
                 dialog.addOnSelectItemListener { value ->

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

@@ -104,6 +104,12 @@ class ClockTabFragment : Fragment() {
             }
         })
 
+        viewModel.showAMPMIndicator.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                ampm_indicator_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+        })
+
         viewModel.clockTextColor.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 if (Preferences.clockTextAlpha == "00") {
@@ -168,6 +174,15 @@ class ClockTabFragment : Fragment() {
             }.show()
         }
 
+        action_ampm_indicator_size.setOnClickListener {
+            BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_ampm_indicator_title)).setSelectedValue(Preferences.showAMPMIndicator)
+                .addItem(getString(R.string.settings_visible), true)
+                .addItem(getString(R.string.settings_not_visible), false)
+                .addOnSelectItemListener { value ->
+                    Preferences.showAMPMIndicator = value
+                }.show()
+        }
+
         action_clock_text_color.setOnClickListener {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,

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

@@ -148,7 +148,10 @@ class GeneralTabFragment : Fragment() {
         })
 
         viewModel.showDividers.observe(viewLifecycleOwner, Observer {
-            show_dividers_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            maintainScrollPosition {
+                show_dividers_label?.text =
+                    if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
         })
     }
 

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

@@ -7,11 +7,13 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -26,6 +28,8 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.components.CustomNotesDialog
+import com.tommasoberlose.anotherwidget.components.GlanceProviderSortMenu
 import com.tommasoberlose.anotherwidget.databinding.FragmentGlanceSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
@@ -48,7 +52,6 @@ class GlanceTabFragment : Fragment() {
     }
 
     private lateinit var viewModel: MainViewModel
-    private lateinit var adapter: SlimAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -73,65 +76,6 @@ class GlanceTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        list.setHasFixedSize(true)
-        val mLayoutManager = LinearLayoutManager(requireContext())
-        list.layoutManager = mLayoutManager
-
-        adapter = SlimAdapter.create()
-        adapter
-            .register<String>(R.layout.glance_provider_item) { item, injector ->
-                injector
-                    .text(R.id.title, item)
-            }
-            .register<GlanceProvider>(R.layout.glance_provider_item) { item, injector ->
-                injector
-                    .text(R.id.title, item.title)
-                    .with<ImageView>(R.id.icon) {
-                        it.setImageDrawable(ContextCompat.getDrawable(requireContext(), item.icon))
-                    }
-                    .with<TextView>(R.id.label) {
-                        it.isVisible = item.label != ""
-                        it.text = item.label
-                    }
-            }
-            .attachTo(list)
-
-        adapter.updateData(
-            GlanceProviderHelper.getGlanceProviders()
-                .mapNotNull { GlanceProviderHelper.getGlanceProviderById(requireContext(), it) }
-        )
-
-        val mIth = ItemTouchHelper(
-            object : ItemTouchHelper.SimpleCallback(
-                ItemTouchHelper.UP or ItemTouchHelper.DOWN,
-                ItemTouchHelper.LEFT
-            ) {
-                override fun onMove(
-                    recyclerView: RecyclerView,
-                    viewHolder: ViewHolder, target: ViewHolder
-                ): Boolean {
-                    val fromPos = viewHolder.adapterPosition
-                    val toPos = target.adapterPosition
-                    // move item in `fromPos` to `toPos` in adapter.
-                    adapter.notifyItemMoved(fromPos, toPos)
-
-                    val list = GlanceProviderHelper.getGlanceProviders()
-                    Collections.swap(list, fromPos, toPos)
-                    GlanceProviderHelper.saveGlanceProviderOrder(list)
-                    return true
-                }
-
-                override fun onSwiped(
-                    viewHolder: ViewHolder,
-                    direction: Int
-                ) {
-                    // remove from adapter
-                }
-            })
-
-        mIth.attachToRecyclerView(list)
-
-
         setupListener()
         updateNextAlarmWarningUi()
     }
@@ -142,15 +86,33 @@ class GlanceTabFragment : Fragment() {
     ) {
 
         viewModel.showGlance.observe(viewLifecycleOwner, Observer {
-            binding.isGlanceVisible = it
+            maintainScrollPosition {
+                binding.isGlanceVisible = it
+            }
         })
 
         viewModel.showMusic.observe(viewLifecycleOwner, Observer {
-            checkNotificationPermission()
+            maintainScrollPosition {
+                checkNotificationPermission()
+            }
         })
 
         viewModel.showNextAlarm.observe(viewLifecycleOwner, Observer {
-            updateNextAlarmWarningUi()
+            maintainScrollPosition {
+                updateNextAlarmWarningUi()
+            }
+        })
+
+        viewModel.showBatteryCharging.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_low_battery_level_warning_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+        })
+
+        viewModel.customInfo.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_custom_notes_label?.text = if (it == "") getString(R.string.settings_not_visible) else it
+            }
         })
 
     }
@@ -165,6 +127,11 @@ class GlanceTabFragment : Fragment() {
             Preferences.showGlance = enabled
         }
 
+        action_sort_glance_providers.setOnClickListener {
+            GlanceProviderSortMenu(requireContext())
+                .show()
+        }
+
         action_show_music.setOnClickListener {
             if (Preferences.showGlance) {
                 BottomSheetMenu<Boolean>(
@@ -192,6 +159,26 @@ class GlanceTabFragment : Fragment() {
                     }.show()
             }
         }
+
+        action_show_low_battery_level_warning.setOnClickListener {
+            if (Preferences.showGlance) {
+                BottomSheetMenu<Boolean>(
+                    requireContext(),
+                    header = getString(R.string.settings_low_battery_level_title)
+                ).setSelectedValue(Preferences.showBatteryCharging)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        Preferences.showBatteryCharging = value
+                    }.show()
+            }
+        }
+
+        action_show_custom_notes.setOnClickListener {
+            if (Preferences.showGlance) {
+                CustomNotesDialog(requireContext()).show()
+            }
+        }
     }
 
     private fun updateNextAlarmWarningUi() {
@@ -204,15 +191,11 @@ class GlanceTabFragment : Fragment() {
                 } catch (e: Exception) {
                     alarm.showIntent?.creatorPackage ?: ""
                 }
-                maintainScrollPosition {
-                    show_next_alarm_warning.text =
-                        getString(R.string.next_alarm_warning).format(appNameOrPackage)
-                }
+                show_next_alarm_warning.text =
+                    getString(R.string.next_alarm_warning).format(appNameOrPackage)
             } else {
-                maintainScrollPosition {
-                    show_next_alarm_label?.text = if (Preferences.showNextAlarm) getString(R.string.settings_visible) else getString(
+                show_next_alarm_label?.text = if (Preferences.showNextAlarm) getString(R.string.settings_visible) else getString(
                         R.string.settings_not_visible)
-                }
             }
         }
     }
@@ -237,7 +220,7 @@ class GlanceTabFragment : Fragment() {
         if (NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName)) {
             notification_permission_alert?.isVisible = false
             MediaPlayerHelper.updatePlayingMediaInfo(requireContext())
-            show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_show_music_enabled_subtitle) else getString(R.string.settings_show_music_disabled_subtitle)
+            show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
         } else if (Preferences.showMusic) {
             notification_permission_alert?.isVisible = true
             show_music_label?.text = getString(R.string.settings_request_notification_access)

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

@@ -160,6 +160,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                         TypedValue.COMPLEX_UNIT_SP,
                         Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2
                     )
+                    time_am_pm.isVisible = Preferences.showAMPMIndicator
 
                     // Clock bottom margin
                     clock_bottom_margin_none.isVisible =