Add am/pm indicator, add tab badges, add widget background, add text color alpha

2020-05-06 12:52:25 +02:00
parent f13cee24d5
commit e2503decd2
77 changed files with 582 additions and 205 deletions
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt
@ -79,21 +79,31 @@ class AdvancedSettingsFragment : Fragment() {
    ) {
        viewModel.darkThemePreference.observe(viewLifecycleOwner, Observer {
            AppCompatDelegate.setDefaultNightMode(it)
-            theme?.text = when (it) {
-                AppCompatDelegate.MODE_NIGHT_NO -> getString(R.string.settings_subtitle_dark_theme_light)
-                AppCompatDelegate.MODE_NIGHT_YES -> getString(R.string.settings_subtitle_dark_theme_dark)
-                AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY -> getString(R.string.settings_subtitle_dark_theme_by_battery_saver)
-                AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -> getString(R.string.settings_subtitle_dark_theme_follow_system)
-                else -> ""
+            maintainScrollPosition {
+                theme?.text = when (it) {
+                    AppCompatDelegate.MODE_NIGHT_NO -> getString(R.string.settings_subtitle_dark_theme_light)
+                    AppCompatDelegate.MODE_NIGHT_YES -> getString(R.string.settings_subtitle_dark_theme_dark)
+                    AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY -> getString(R.string.settings_subtitle_dark_theme_by_battery_saver)
+                    AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -> getString(R.string.settings_subtitle_dark_theme_follow_system)
+                    else -> ""
+                }
            }
        })

        viewModel.showPreview.observe(viewLifecycleOwner, Observer {
-            show_widget_preview_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            maintainScrollPosition {
+                show_widget_preview_label?.text =
+                    if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
        })

        viewModel.showWallpaper.observe(viewLifecycleOwner, Observer {
-            show_wallpaper_label?.text = if (it && activity?.checkGrantedPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == true) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            maintainScrollPosition {
+                show_wallpaper_label?.text =
+                    if (it && activity?.checkGrantedPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == true) getString(
+                        R.string.settings_visible
+                    ) else getString(R.string.settings_not_visible)
+            }
        })
    }

--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt
@ -2,14 +2,12 @@ package com.tommasoberlose.anotherwidget.ui.fragments

 import android.Manifest
 import android.app.Activity
-import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@ -42,7 +40,6 @@ import kotlinx.android.synthetic.main.fragment_calendar_settings.*
 import kotlinx.android.synthetic.main.fragment_calendar_settings.scrollView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.Comparator

@ -89,7 +86,6 @@ class CalendarSettingsFragment : Fragment() {
                binding.isCalendarEnabled = it

                if (it) {
-                    requirePermission()
                    CalendarHelper.setEventUpdatesAndroidN(requireContext())
                } else {
                    CalendarHelper.removeEventUpdatesAndroidN(requireContext())
@ -321,12 +317,12 @@ class CalendarSettingsFragment : Fragment() {
    private fun checkReadEventsPermission(showEvents: Boolean = Preferences.showEvents) {
        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_icon?.isVisible = false
+            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_icon?.isVisible = showEvents
-            read_calendar_permission_alert_icon?.setOnClickListener {
+            read_calendar_permission_alert?.isVisible = showEvents
+            read_calendar_permission_alert?.setOnClickListener {
                requirePermission()
            }
        }
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt
@ -1,9 +1,11 @@
 package com.tommasoberlose.anotherwidget.ui.fragments

+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -18,6 +20,9 @@ import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
 import com.tommasoberlose.anotherwidget.databinding.FragmentGeneralSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toHexValue
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
@ -71,6 +76,7 @@ class GeneralSettingsFragment : Fragment() {
    }


+    @SuppressLint("DefaultLocale")
    private fun subscribeUi(
        viewModel: MainViewModel
    ) {
@ -89,12 +95,45 @@ class GeneralSettingsFragment : Fragment() {

        viewModel.textGlobalColor.observe(viewLifecycleOwner, Observer {
            maintainScrollPosition {
-                try {
-                    Color.parseColor(it)
-                } catch (e: Exception) {
-                    Preferences.textGlobalColor = "#FFFFFF"
+                if (Preferences.textGlobalAlpha == "00") {
+                    font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor())).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textGlobalAlpha.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textGlobalAlpha == "00") {
+                    font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor())).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.backgroundCardColor.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.backgroundCardAlpha == "00") {
+                    background_color_label?.text = getString(R.string.transparent)
+                } else {
+                    background_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor())).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.backgroundCardAlpha.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.backgroundCardAlpha == "00") {
+                    background_color_label?.text = getString(R.string.transparent)
+                } else {
+                    background_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor())).toUpperCase()
                }
-                font_color_label?.text = it.toUpperCase()
            }
        })

@ -142,19 +181,35 @@ class GeneralSettingsFragment : Fragment() {
        }

        action_font_color.setOnClickListener {
-            val textColor = try {
-                Color.parseColor(Preferences.textGlobalColor)
-            } catch (e: Exception) {
-                Preferences.textGlobalColor = "#FFFFFF"
-                Color.parseColor(Preferences.textGlobalColor)
-            }
            BottomSheetColorPicker(requireContext(),
                colors = colors,
                header = getString(R.string.settings_font_color_title),
-                selected = textColor,
+                selected = ColorHelper.getFontColor(),
                onColorSelected = { color: Int ->
                    val colorString = Integer.toHexString(color)
                    Preferences.textGlobalColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                },
+                showAlphaSelector = true,
+                alpha = Preferences.textGlobalAlpha.toIntValue(),
+                onAlphaChangeListener = { alpha ->
+                    Preferences.textGlobalAlpha = alpha.toHexValue()
+                }
+            ).show()
+        }
+
+        action_background_color.setOnClickListener {
+            BottomSheetColorPicker(requireContext(),
+                colors = colors,
+                header = getString(R.string.settings_background_color_title),
+                selected = ColorHelper.getBackgroundColor(),
+                onColorSelected = { color: Int ->
+                    val colorString = Integer.toHexString(color)
+                    Preferences.backgroundCardColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                },
+                showAlphaSelector = true,
+                alpha = Preferences.backgroundCardAlpha.toIntValue(),
+                onAlphaChangeListener = { alpha ->
+                    Preferences.backgroundCardAlpha = alpha.toHexValue()
                }
            ).show()
        }
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt
@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@ -98,7 +99,7 @@ class WeatherSettingsFragment : Fragment() {
                    if (it == "") getString(R.string.settings_weather_provider_api_key_subtitle_not_set) else getString(
                        R.string.settings_weather_provider_api_key_subtitle_all_set
                    )
-                api_key_alert_icon?.isVisible = it == ""
+                label_weather_provider_api_key?.setTextColor(ContextCompat.getColor(requireContext(), if (it == "") R.color.errorColorText else R.color.colorSecondaryText))
            }
            checkLocationPermission()
        })
@ -135,12 +136,17 @@ class WeatherSettingsFragment : Fragment() {
    }

    private fun checkLocationPermission() {
+        // Background permission
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && activity?.checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION) == true) {
+            requirePermission()
+        }
+
        if (activity?.checkGrantedPermission(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION) == true) {
-            location_permission_alert_icon?.isVisible = false
+            location_permission_alert?.isVisible = false
            WeatherWorker.setUpdates(requireContext())
        } else if (Preferences.showWeather && Preferences.customLocationAdd == "") {
-            location_permission_alert_icon?.isVisible = true
-            location_permission_alert_icon?.setOnClickListener {
+            location_permission_alert?.isVisible = true
+            location_permission_alert?.setOnClickListener {
                requirePermission()
            }
        }