Add clock text color

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

@@ -7,7 +7,6 @@ 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
@@ -43,10 +42,10 @@ import kotlinx.coroutines.launch
 import java.util.*
 import kotlin.Comparator
 
-class CalendarSettingsFragment : Fragment() {
+class CalendarTabFragment : Fragment() {
 
     companion object {
-        fun newInstance() = CalendarSettingsFragment()
+        fun newInstance() = CalendarTabFragment()
     }
 
     private lateinit var viewModel: MainViewModel

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

@@ -6,7 +6,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -20,29 +19,35 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 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.databinding.FragmentClockSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
 import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toHexValue
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
 import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
-import com.tommasoberlose.anotherwidget.utils.toast
 import kotlinx.android.synthetic.main.fragment_clock_settings.*
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.lang.Exception
 
 
-class ClockSettingsFragment : Fragment() {
+class ClockTabFragment : Fragment() {
 
     companion object {
-        fun newInstance() = ClockSettingsFragment()
+        fun newInstance() = ClockTabFragment()
     }
 
     private lateinit var viewModel: MainViewModel
+    private lateinit var colors: IntArray
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -67,6 +72,12 @@ class ClockSettingsFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        lifecycleScope.launch(Dispatchers.IO) {
+            val lazyColors = requireContext().resources.getIntArray(R.array.material_colors)
+            withContext(Dispatchers.Main) {
+                colors = lazyColors
+            }
+        }
         setupListener()
         updateNextAlarmWarningUi()
     }
@@ -94,6 +105,28 @@ class ClockSettingsFragment : Fragment() {
             }
         })
 
+        viewModel.clockTextColor.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.clockTextAlpha == "00") {
+                    clock_text_color_label?.text = getString(R.string.transparent)
+                } else {
+                    clock_text_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor())).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.clockTextAlpha.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.clockTextAlpha == "00") {
+                    clock_text_color_label?.text = getString(R.string.transparent)
+                } else {
+                    clock_text_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor())).toUpperCase()
+                }
+            }
+        })
+
         viewModel.clockBottomMargin.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 clock_bottom_margin_label?.text = when (it) {
@@ -136,6 +169,23 @@ class ClockSettingsFragment : Fragment() {
             }.show()
         }
 
+        action_clock_text_color.setOnClickListener {
+            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
+                },
+                showAlphaSelector = true,
+                alpha = Preferences.clockTextAlpha.toIntValue(),
+                onAlphaChangeListener = { alpha ->
+                    Preferences.clockTextAlpha = alpha.toHexValue()
+                }
+            ).show()
+        }
+
         action_clock_bottom_margin_size.setOnClickListener {
             BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_show_next_alarm_title)).setSelectedValue(Preferences.clockBottomMargin)
                 .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_none), Constants.ClockBottomMargin.NONE.value)

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

@@ -3,9 +3,7 @@ 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
@@ -33,10 +31,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 
-class GeneralSettingsFragment : Fragment() {
+class GeneralTabFragment : Fragment() {
 
     companion object {
-        fun newInstance() = GeneralSettingsFragment()
+        fun newInstance() = GeneralTabFragment()
     }
 
     private lateinit var viewModel: MainViewModel

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

@@ -17,13 +17,11 @@ import android.widget.RelativeLayout
 import androidx.core.animation.addListener
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.Navigation
-import androidx.navigation.fragment.FragmentNavigator
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.tabs.TabLayoutMediator
 import com.google.android.material.transition.MaterialSharedAxis
@@ -50,10 +48,10 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
-class AppMainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeListener {
+class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
     companion object {
-        fun newInstance() = AppMainFragment()
+        fun newInstance() = MainFragment()
     }
 
     private lateinit var viewModel: MainViewModel
@@ -91,9 +89,9 @@ class AppMainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeL
         }.attach()
 
         // Init clock
-        time.setTextColor(ColorHelper.getFontColor())
+        time.setTextColor(ColorHelper.getClockFontColor())
         time.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(requireContext()))
-        time_am_pm.setTextColor(ColorHelper.getFontColor())
+        time_am_pm.setTextColor(ColorHelper.getClockFontColor())
         time_am_pm.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2)
         time_container.isVisible = Preferences.showClock
 
@@ -151,8 +149,8 @@ class AppMainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeL
                 )
                 withContext(Dispatchers.Main) {
                     // Clock
-                    time.setTextColor(ColorHelper.getFontColor())
-                    time_am_pm.setTextColor(ColorHelper.getFontColor())
+                    time.setTextColor(ColorHelper.getClockFontColor())
+                    time_am_pm.setTextColor(ColorHelper.getClockFontColor())
                     time.setTextSize(
                         TypedValue.COMPLEX_UNIT_SP,
                         Preferences.clockTextSize.toPixel(requireContext())

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

@@ -41,10 +41,10 @@ import kotlinx.android.synthetic.main.fragment_weather_settings.scrollView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
-class WeatherSettingsFragment : Fragment() {
+class WeatherTabFragment : Fragment() {
 
     companion object {
-        fun newInstance() = WeatherSettingsFragment()
+        fun newInstance() = WeatherTabFragment()
     }
 
     private lateinit var viewModel: MainViewModel