Update build version

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: tommasoberlose
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. OnePlus 6]
+ - OS Version: [e.g. Android 9.0]
+ - App Version (that you can find inside the advanced settings) [e.g. v2.0.5 (71)]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: tommasoberlose
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.idea/navEditor.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="navEditor-manualLayoutAlgorithm2">
+    <option name="myPositions">
+      <map>
+        <entry key="nav_graph.xml">
+          <value>
+            <LayoutPositions>
+              <option name="myPositions">
+                <map>
+                  <entry key="appMainFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="242" />
+                            <option name="y" value="352" />
+                          </Point>
+                        </option>
+                        <option name="myPositions">
+                          <map>
+                            <entry key="action_appMainFragment_to_appSettingsFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="appSettingsFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="532" />
+                            <option name="y" value="353" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </LayoutPositions>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>

app/build.gradle

@@ -18,7 +18,7 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 74
+        versionCode 79
         versionName "2.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@@ -16,6 +16,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.card.MaterialCardView
@@ -79,61 +80,51 @@ class BottomSheetColorPicker(
 
         // List
 
-        view.menu.setHasFixedSize(true)
-        val mLayoutManager = GridLayoutManager(context, 6)
-        view.menu.layoutManager = mLayoutManager
-
         adapter = SlimAdapter.create()
 
+        loadingJobs.add(GlobalScope.launch(Dispatchers.IO) {
+            val listView = View.inflate(context, R.layout.bottom_sheet_menu_list, null) as RecyclerView
+            listView.setHasFixedSize(true)
+            val mLayoutManager = GridLayoutManager(context, 6)
+            listView.layoutManager = mLayoutManager
+
             adapter
                 .register<Int>(R.layout.color_picker_menu_item) { item, injector ->
                     injector
                         .with<MaterialCardView>(R.id.color) {
-                        loadingJobs.add(GlobalScope.launch(Dispatchers.IO) {
-                            val colorList = ColorStateList.valueOf(item)
-                            withContext(Dispatchers.Main) {
-                                it.setCardBackgroundColor(colorList)
-                            }
-                        })
+                            it.setCardBackgroundColor(ColorStateList.valueOf(item))
                         }
                         .with<AppCompatImageView>(R.id.check) {
                             if (getSelected?.invoke() == item) {
-                            loadingJobs.add(GlobalScope.launch(Dispatchers.IO) {
-                                val colorList = ContextCompat.getColor(
+                                it.setColorFilter(
+                                    ContextCompat.getColor(
                                         context,
                                         if (item.isColorDark()) android.R.color.white else android.R.color.black
-                                )
-                                withContext(Dispatchers.Main) {
-                                    it.setColorFilter(
-                                        colorList,
+                                    ),
                                     android.graphics.PorterDuff.Mode.MULTIPLY
                                 )
                                 it.isVisible = true
-                                }
-                            })
                             } else {
                                 it.isVisible = false
                             }
                         }
-                injector.clicked(R.id.color) {
+                        .clicked(R.id.color) {
                             adapter.notifyItemChanged(adapter.data.indexOf(getSelected?.invoke()))
                             onColorSelected?.invoke(item)
                             val position = adapter.data.indexOf(item)
                             adapter.notifyItemChanged(position)
-                    (view.menu.layoutManager as GridLayoutManager).scrollToPositionWithOffset(position,0)
+                            (listView.layoutManager as GridLayoutManager).scrollToPositionWithOffset(position,0)
                         }
                 }
-                .attachTo(view.menu)
-
-        loadingJobs.add(GlobalScope.launch(Dispatchers.IO) {
+                .attachTo(listView)
 
             adapter.updateData(colors.toList())
 
             withContext(Dispatchers.Main) {
                 view.color_loader.isVisible = false
+                view.list_container.addView(listView)
                 this@BottomSheetColorPicker.behavior.state = BottomSheetBehavior.STATE_EXPANDED
-//                this@BottomSheetColorPicker.behavior.isFitToContents = false
-                view.menu.isVisible = true
+                view.list_container.isVisible = true
             }
         })
 

app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt

@@ -45,6 +45,9 @@ object Preferences : KotprefModel() {
     var backgroundCardColor by stringPref(default = "#000000")
     var backgroundCardAlpha by stringPref(default = "00")
 
+    var clockTextColor by stringPref(default = "#FFFFFF")
+    var clockTextAlpha by stringPref(default = "FF")
+
     var textMainSize by floatPref(key = "PREF_TEXT_MAIN_SIZE", default = 26f)
     var textSecondSize by floatPref(key = "PREF_TEXT_SECOND_SIZE", default = 18f)
     var clockTextSize by floatPref(key = "PREF_TEXT_CLOCK_SIZE", default = 90f)

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

@@ -15,22 +15,43 @@ object BitmapHelper {
 
     fun getBitmapFromView(view: View, width: Int? = null, height: Int? = null, draw: Boolean = true): Bitmap {
         //Define a bitmap with the same size as the view
-        val measuredWidth = View.MeasureSpec.makeMeasureSpec(width ?: view.width, if (width != null) View.MeasureSpec.EXACTLY else View.MeasureSpec.UNSPECIFIED)
+        val measuredWidth = View.MeasureSpec.makeMeasureSpec(width ?: view.width, if (width != null) View.MeasureSpec.EXACTLY else View.MeasureSpec.AT_MOST)
         val measuredHeight = View.MeasureSpec.makeMeasureSpec(height ?: view.height, if (height != null) View.MeasureSpec.EXACTLY else View.MeasureSpec.UNSPECIFIED)
-        view.measure(measuredWidth, measuredHeight)
+        view.measure(
+            if (measuredWidth > 0) measuredWidth else 0,
+            if (measuredHeight > 0) measuredHeight else 0
+        )
+
+        val calculatedWidth = view.measuredWidth
+        val widgetWidth = if (calculatedWidth in 1..16000) {
+            calculatedWidth
+        } else if (width != null && width > 0) {
+            width
+        } else {
+            1
+        }
+        val calculatedHeight = view.measuredHeight
+        val widgetHeight = if (calculatedHeight in 1..16000) {
+            calculatedHeight
+        } else if (height != null && height > 0) {
+            height
+        } else {
+            1
+        }
 
         if (draw) {
-            FirebaseCrashlytics.getInstance().setCustomKey("measuredWidth", view.measuredWidth)
-            FirebaseCrashlytics.getInstance().setCustomKey("measuredWidth_spec", measuredWidth)
-            FirebaseCrashlytics.getInstance().setCustomKey("measuredHeight", view.measuredHeight)
-            FirebaseCrashlytics.getInstance()
-                .setCustomKey("measuredHeight_spec", measuredHeight)
+            FirebaseCrashlytics.getInstance().setCustomKey("WIDTH SPEC", measuredWidth)
+            FirebaseCrashlytics.getInstance().setCustomKey("HEIGHT SPEC", measuredHeight)
+            FirebaseCrashlytics.getInstance().setCustomKey("VIEW measuredWidth", view.measuredWidth)
+            FirebaseCrashlytics.getInstance().setCustomKey("VIEW measuredHeight", view.measuredHeight)
+            FirebaseCrashlytics.getInstance().setCustomKey("WIDGET final width", measuredWidth)
+            FirebaseCrashlytics.getInstance().setCustomKey("WIDGET final height", view.measuredHeight)
         }
 
         return try {
             val btm = Bitmap.createBitmap(
-                view.measuredWidth,
-                view.measuredHeight,
+                widgetWidth,
+                widgetHeight,
                 if (draw) Bitmap.Config.ARGB_8888 else Bitmap.Config.ALPHA_8
             )
             if (draw) {

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

@@ -4,13 +4,12 @@ import android.Manifest
 import android.content.ContentUris
 import android.content.Context
 import android.provider.CalendarContract
-import android.util.Log
 import com.tommasoberlose.anotherwidget.services.EventListenerJob
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
-import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import me.everything.providers.android.calendar.CalendarProvider
@@ -127,7 +126,7 @@ object CalendarHelper {
         UpdatesReceiver.setUpdates(context)
         MainWidget.updateWidget(context)
 
-        EventBus.getDefault().post(MainActivity.UpdateUiMessageEvent())
+        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
     }
 
     fun getCalendarList(context: Context): List<me.everything.providers.android.calendar.Calendar> {

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

@@ -30,6 +30,29 @@ object ColorHelper {
             Color.parseColor("#000000")
         }
     }
+    fun getClockFontColor(): Int {
+        return try {
+            Color.parseColor("#%s%s".format(Preferences.clockTextAlpha, Preferences.clockTextColor.replace("#", "")))
+        } catch (e: Exception) {
+            Color.parseColor("#FFFFFFFF")
+        }
+    }
+
+    fun getClockFontColorAlpha(): Int {
+        return try {
+            Preferences.clockTextAlpha.toIntValue().toDouble() * 255 / 100
+        } catch (e: Exception) {
+            "FF".toIntValue().toDouble() * 255 / 100
+        }.roundToInt()
+    }
+
+    fun getClockFontColorRgb(): Int {
+        return try {
+            Color.parseColor(Preferences.clockTextColor)
+        } catch (e: Exception) {
+            Color.parseColor("#000000")
+        }
+    }
 
     fun getBackgroundColor(): Int {
         return try {

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

@@ -79,7 +79,7 @@ object IntentHelper {
         val calendarUri = CalendarContract.CONTENT_URI
             .buildUpon()
             .appendPath("time")
-            .appendPath("0".toString())
+            .appendPath(Calendar.getInstance().timeInMillis.toString())
             .build()
         return when (Preferences.calendarAppPackage) {
             "" -> {
@@ -116,6 +116,8 @@ object IntentHelper {
                         data = uri
                         putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
                         putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
+//                        putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, if (e.allDay) 1 else 0)
+//                        type = "vnd.android.cursor.item/event"
                     }
                 } else {
                     getCalendarIntent(context).apply {
@@ -123,6 +125,8 @@ object IntentHelper {
                         data = uri
                         putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
                         putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
+//                        putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, if (e.allDay) 1 else 0)
+//                        type = "vnd.android.cursor.item/event"
                     }
                 }
             }

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

@@ -3,17 +3,11 @@ package com.tommasoberlose.anotherwidget.helpers
 import android.Manifest
 import android.content.Context
 import android.os.Build
-import android.util.EventLog
-import android.util.Log
 import com.google.android.gms.location.LocationServices
-import com.kwabenaberko.openweathermaplib.constants.Units
-import com.kwabenaberko.openweathermaplib.implementation.OpenWeatherMapHelper
-import com.kwabenaberko.openweathermaplib.implementation.callbacks.CurrentWeatherCallback
-import com.kwabenaberko.openweathermaplib.models.currentweather.CurrentWeather
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
-import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import org.greenrobot.eventbus.EventBus
@@ -38,7 +32,7 @@ object WeatherHelper {
                         Preferences.customLocationLon = location.longitude.toString()
 
                         networkApi.updateWeather()
-                        EventBus.getDefault().post(MainActivity.UpdateUiMessageEvent())
+                        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
                     }
                 }
             }

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

@@ -3,6 +3,7 @@ package com.tommasoberlose.anotherwidget.helpers
 import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.res.Configuration.ORIENTATION_PORTRAIT
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 
 object WidgetHelper {
     class WidgetSizeProvider(
@@ -16,6 +17,8 @@ object WidgetHelper {
             val height = getWidgetHeight(isPortrait, widgetId)
             val widthInPx = context.dip(width)
             val heightInPx = context.dip(height)
+            FirebaseCrashlytics.getInstance().setCustomKey("widthInPx", widthInPx)
+            FirebaseCrashlytics.getInstance().setCustomKey("heightInPx", heightInPx)
             return widthInPx to heightInPx
         }
 

app/src/main/java/com/tommasoberlose/anotherwidget/network/WeatherNetworkApi.kt

@@ -1,14 +1,13 @@
 package com.tommasoberlose.anotherwidget.network
 
 import android.content.Context
-import android.util.Log
 import com.kwabenaberko.openweathermaplib.constants.Units
 import com.kwabenaberko.openweathermaplib.implementation.OpenWeatherMapHelper
 import com.kwabenaberko.openweathermaplib.implementation.callbacks.CurrentWeatherCallback
 import com.kwabenaberko.openweathermaplib.models.currentweather.CurrentWeather
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
-import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import org.greenrobot.eventbus.EventBus
 
@@ -26,7 +25,7 @@ class WeatherNetworkApi(val context: Context) {
                         Preferences.weatherRealTempUnit = Preferences.weatherTempUnit
                         MainWidget.updateWidget(context)
 
-                        EventBus.getDefault().post(MainActivity.UpdateUiMessageEvent())
+                        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
                     }
                 }
 

app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt

@@ -34,8 +34,6 @@ class WeatherReceiver : BroadcastReceiver() {
             removeUpdates(context)
 
             if (Preferences.showWeather && Preferences.weatherProviderApi != "") {
-                WeatherHelper.updateWeather(context)
-
                 val interval = MINUTE * when (Preferences.weatherRefreshPeriod) {
                     0 -> 30
                     1 -> 60
@@ -48,7 +46,7 @@ class WeatherReceiver : BroadcastReceiver() {
                 with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
                     setRepeating(
                         AlarmManager.RTC,
-                        Calendar.getInstance().timeInMillis + interval,
+                        Calendar.getInstance().timeInMillis,
                         interval,
                         PendingIntent.getBroadcast(context, 0, Intent(context, WeatherReceiver::class.java).apply { action = Actions.ACTION_WEATHER_UPDATE }, 0)
                     )

app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt

@@ -24,8 +24,15 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.Navigation
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.tabs.TabLayoutMediator
+import com.karumi.dexter.Dexter
+import com.karumi.dexter.MultiplePermissionsReport
+import com.karumi.dexter.PermissionToken
+import com.karumi.dexter.listener.PermissionRequest
+import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
 import com.tommasoberlose.anotherwidget.global.Actions
@@ -50,10 +57,16 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 
-class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
+class MainActivity : AppCompatActivity() {
 
     private var mAppWidgetId: Int = -1
     private lateinit var viewModel: MainViewModel
+    private val mainNavController: NavController? by lazy {
+        Navigation.findNavController(
+            this,
+            R.id.content_fragment
+        )
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -62,239 +75,20 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
         viewModel = ViewModelProvider(this).get(MainViewModel::class.java)
 
         controlExtras(intent)
-
-        // Viewpager
-        pager.adapter = ViewPagerAdapter(this)
-        pager.offscreenPageLimit = 4
-        TabLayoutMediator(tabs, pager) { tab, position ->
-            tab.text = when (position) {
-                0 -> getString(R.string.settings_general_title)
-                1 -> getString(R.string.settings_calendar_title)
-                2 -> getString(R.string.settings_weather_title)
-                3 -> getString(R.string.settings_clock_title)
-                4 -> getString(R.string.advanced_settings_title)
-                else -> ""
-            }
-        }.attach()
-
-        // Init clock
-        time.setTextColor(ColorHelper.getFontColor())
-        time.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(this@MainActivity))
-        time_am_pm.setTextColor(ColorHelper.getFontColor())
-        time_am_pm.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(this@MainActivity) / 5 * 2)
-        time_container.isVisible = Preferences.showClock
-
-        preview.layoutParams = preview.layoutParams.apply {
-            height = 160.toPixel(this@MainActivity) + if (Preferences.showClock) 100.toPixel(this@MainActivity) else 0
-        }
-
-        Preferences.preferences.registerOnSharedPreferenceChangeListener(this)
-        subscribeUi(viewModel)
-        updateUI()
-
-        WeatherHelper.updateWeather(this)
-
-
-        // Warnings
-        if (getString(R.string.xiaomi_manufacturer).equals(Build.MANUFACTURER, ignoreCase = true) && Preferences.showXiaomiWarning) {
-            MaterialBottomSheetDialog(this, getString(R.string.xiaomi_warning_title), getString(R.string.xiaomi_warning_message))
-                .setNegativeButton(getString(R.string.action_ignore)) {
-                    Preferences.showXiaomiWarning = false
-                }
-                .setPositiveButton(getString(R.string.action_grant_permission)) {
-                    Preferences.showXiaomiWarning = false
-                    val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-                        data = Uri.parse("package:$packageName")
-                    }
-                    startActivity(intent)
-                }
-                .show()
-        }
-    }
-
-    private var uiJob: Job? = null
-
-    private fun updateUI() {
-        uiJob?.cancel()
-
-        if (Preferences.showPreview) {
-            preview.setCardBackgroundColor(
-                getColor(
-                    if (ColorHelper.getFontColor()
-                            .isColorDark()
-                    ) android.R.color.white else R.color.colorAccent
-                )
-            )
-            widget_shape_background.setImageDrawable(BitmapHelper.getTintedDrawable(this, R.drawable.card_background, ColorHelper.getBackgroundColor()))
-            uiJob = lifecycleScope.launch(Dispatchers.IO) {
-                delay(200)
-                val generatedView = MainWidget.generateWidgetView(this@MainActivity)
-
-                withContext(Dispatchers.Main) {
-                    generatedView.measure(0, 0)
-                    preview.measure(0, 0)
-                }
-
-                val bitmap = BitmapHelper.getBitmapFromView(
-                    generatedView,
-                    if (preview.width > 0) preview.width else generatedView.measuredWidth,
-                    generatedView.measuredHeight
-                )
-                withContext(Dispatchers.Main) {
-                    // Clock
-                    time.setTextColor(ColorHelper.getFontColor())
-                    time_am_pm.setTextColor(ColorHelper.getFontColor())
-                    time.setTextSize(
-                        TypedValue.COMPLEX_UNIT_SP,
-                        Preferences.clockTextSize.toPixel(this@MainActivity)
-                    )
-                    time_am_pm.setTextSize(
-                        TypedValue.COMPLEX_UNIT_SP,
-                        Preferences.clockTextSize.toPixel(this@MainActivity) / 5 * 2
-                    )
-
-                    // Clock bottom margin
-                    clock_bottom_margin_none.isVisible =
-                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.value
-                    clock_bottom_margin_small.isVisible =
-                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.value
-                    clock_bottom_margin_medium.isVisible =
-                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.value
-                    clock_bottom_margin_large.isVisible =
-                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.value
-
-                    if ((Preferences.showClock && !time_container.isVisible) || (!Preferences.showClock && time_container.isVisible)) {
-                        if (Preferences.showClock) {
-                            time_container.layoutParams = time_container.layoutParams.apply {
-                                height = RelativeLayout.LayoutParams.WRAP_CONTENT
-                            }
-                            time_container.measure(0, 0)
-                        }
-                        val initialHeight = time_container.measuredHeight
-                        ValueAnimator.ofFloat(
-                            if (Preferences.showClock) 0f else 1f,
-                            if (Preferences.showClock) 1f else 0f
-                        ).apply {
-                            duration = 500L
-                            addUpdateListener {
-                                val animatedValue = animatedValue as Float
-                                time_container.layoutParams = time_container.layoutParams.apply {
-                                    height = (initialHeight * animatedValue).toInt()
-                                }
-                            }
-                            addListener(
-                                onStart = {
-                                    if (Preferences.showClock) {
-                                        time_container.isVisible = true
-                                    }
-                                },
-                                onEnd = {
-                                    if (!Preferences.showClock) {
-                                        time_container.isVisible = false
-                                    }
-                                }
-                            )
-                        }.start()
-
-                        ValueAnimator.ofInt(
-                            preview.height,
-                            160.toPixel(this@MainActivity) + if (Preferences.showClock) 100.toPixel(
-                                this@MainActivity
-                            ) else 0
-                        ).apply {
-                            duration = 500L
-                            addUpdateListener {
-                                val animatedValue = animatedValue as Int
-                                val layoutParams = preview.layoutParams
-                                layoutParams.height = animatedValue
-                                preview.layoutParams = layoutParams
-                            }
-                        }.start()
-                    } else {
-                        time_container.layoutParams = time_container.layoutParams.apply {
-                            height = RelativeLayout.LayoutParams.WRAP_CONTENT
-                        }
-                        time_container.measure(0, 0)
-                    }
-
-                    if (preview.height == 0) {
-                        ValueAnimator.ofInt(
-                            preview.height,
-                            160.toPixel(this@MainActivity) + if (Preferences.showClock) 100.toPixel(
-                                this@MainActivity
-                            ) else 0
-                        ).apply {
-                            duration = 300L
-                            addUpdateListener {
-                                val animatedValue = animatedValue as Int
-                                val layoutParams = preview.layoutParams
-                                layoutParams.height = animatedValue
-                                preview.layoutParams = layoutParams
-                            }
-                        }.start()
-                    }
-
-                    bitmap_container.setImageBitmap(bitmap)
-                    widget_loader.animate().scaleX(0f).scaleY(0f).start()
-                    widget.animate().alpha(1f).start()
-                }
-            }
-        } else {
-            ValueAnimator.ofInt(
-                preview.height,
-                0
-            ).apply {
-                duration = 300L
-                addUpdateListener {
-                    val animatedValue = animatedValue as Int
-                    val layoutParams = preview.layoutParams
-                    layoutParams.height = animatedValue
-                    preview.layoutParams = layoutParams
-                }
-            }.start()
-        }
-
-
-        // Calendar error indicator
-        tabs.getTabAt(1)?.orCreateBadge?.apply {
-            backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.errorColorText)
-            badgeGravity = BadgeDrawable.TOP_END
-        }?.isVisible = Preferences.showEvents && !checkGrantedPermission(Manifest.permission.READ_CALENDAR)
-
-        // Weather error indicator
-        tabs.getTabAt(2)?.orCreateBadge?.apply {
-            backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.errorColorText)
-            badgeGravity = BadgeDrawable.TOP_END
-        }?.isVisible = Preferences.showWeather && (Preferences.weatherProviderApi == "" || (Preferences.customLocationAdd == "" && !checkGrantedPermission(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION)))
-
-    }
-
-    private fun subscribeUi(viewModel: MainViewModel) {
-        viewModel.showWallpaper.observe(this, Observer {
-            val wallpaper = getCurrentWallpaper()
-            widget_bg.setImageDrawable(if (it) wallpaper else null)
-            widget_bg.layoutParams = widget_bg.layoutParams.apply {
-
-                val metrics = DisplayMetrics()
-                windowManager.defaultDisplay.getMetrics(metrics)
-
-                height = metrics.heightPixels
-                width = (wallpaper?.intrinsicWidth ?: 1) * metrics.heightPixels / (wallpaper?.intrinsicWidth ?: 1)
-            }
-        })
-
-        logo.setOnClickListener {
-//            startActivity(Intent(this, SupportDevActivity::class.java))
-        }
+        requirePermission()
     }
 
     override fun onBackPressed() {
+        if (mainNavController?.currentDestination?.id == R.id.appMainFragment) {
             if (mAppWidgetId > 0) {
                 addNewWidget()
             } else {
                 setResult(Activity.RESULT_OK)
                 finish()
             }
+        } else {
+            super.onBackPressed()
+        }
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -333,30 +127,27 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
         finish()
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        Preferences.preferences.unregisterOnSharedPreferenceChangeListener(this)
+    private fun requirePermission() {
+        Dexter.withContext(this)
+            .withPermissions(
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            ).withListener(object : MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    report?.let {
+                        Preferences.showWallpaper = false
+                        Preferences.showWallpaper = report.areAllPermissionsGranted()
+                    }
                 }
 
-    override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
-        updateUI()
-        MainWidget.updateWidget(this)
+                override fun onPermissionRationaleShouldBeShown(
+                    permissions: MutableList<PermissionRequest>?,
+                    token: PermissionToken?
+                ) {
+                    // Remember to invoke this method when the custom rationale is closed
+                    // or just by default if you don't want to use any custom rationale.
+                    token?.cancelPermissionRequest()
                 }
-
-    override fun onStart() {
-        super.onStart()
-        EventBus.getDefault().register(this)
-    }
-
-    override fun onStop() {
-        super.onStop()
-        EventBus.getDefault().unregister(this)
-    }
-
-    class UpdateUiMessageEvent
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onMessageEvent(ignore: UpdateUiMessageEvent?) {
-        updateUI()
+            })
+            .check()
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/adapters/ViewPagerAdapter.kt

@@ -8,15 +8,14 @@ import com.tommasoberlose.anotherwidget.ui.fragments.*
 class ViewPagerAdapter(fragmentActivity: FragmentActivity) :
     FragmentStateAdapter(fragmentActivity) {
 
-    override fun getItemCount(): Int = 5
+    override fun getItemCount(): Int = 4
 
     override fun createFragment(position: Int): Fragment {
         return when (position) {
-            1 -> CalendarSettingsFragment.newInstance()
-            2 -> WeatherSettingsFragment.newInstance()
-            3 -> ClockSettingsFragment.newInstance()
-            4 -> AdvancedSettingsFragment.newInstance()
-            else -> GeneralSettingsFragment.newInstance()
+            1 -> CalendarTabFragment.newInstance()
+            2 -> WeatherTabFragment.newInstance()
+            3 -> ClockTabFragment.newInstance()
+            else -> GeneralTabFragment.newInstance()
         }
     }
 }

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
@@ -156,6 +155,9 @@ class CalendarSettingsFragment : Fragment() {
 
         action_show_events.setOnClickListener {
             Preferences.showEvents = !Preferences.showEvents
+            if (Preferences.showEvents) {
+                requirePermission()
+            }
         }
 
         action_filter_calendar.setOnClickListener {

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

@@ -0,0 +1,331 @@
+package com.tommasoberlose.anotherwidget.ui.fragments
+
+import android.Manifest
+import android.animation.ValueAnimator
+import android.content.Intent
+import android.content.SharedPreferences
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.util.DisplayMetrics
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import androidx.core.animation.addListener
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.Navigation
+import com.google.android.material.badge.BadgeDrawable
+import com.google.android.material.tabs.TabLayoutMediator
+import com.google.android.material.transition.MaterialSharedAxis
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
+import com.tommasoberlose.anotherwidget.databinding.FragmentAdvancedSettingsBinding
+import com.tommasoberlose.anotherwidget.databinding.FragmentAppMainBinding
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.BitmapHelper
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.isColorDark
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.adapters.ViewPagerAdapter
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.getCurrentWallpaper
+import com.tommasoberlose.anotherwidget.utils.toPixel
+import kotlinx.android.synthetic.main.fragment_app_main.*
+import kotlinx.android.synthetic.main.the_widget_sans.*
+import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    companion object {
+        fun newInstance() = MainFragment()
+    }
+
+    private lateinit var viewModel: MainViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, true)
+        reenterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
+        return inflater.inflate(R.layout.fragment_app_main, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        subscribeUi(viewModel)
+
+        // Viewpager
+        pager.adapter = ViewPagerAdapter(requireActivity())
+        pager.offscreenPageLimit = 4
+        TabLayoutMediator(tabs, pager) { tab, position ->
+            tab.text = when (position) {
+                0 -> getString(R.string.settings_general_title)
+                1 -> getString(R.string.settings_calendar_title)
+                2 -> getString(R.string.settings_weather_title)
+                3 -> getString(R.string.settings_clock_title)
+                else -> ""
+            }
+        }.attach()
+
+        // Init clock
+        time.setTextColor(ColorHelper.getClockFontColor())
+        time.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(requireContext()))
+        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
+
+        preview.layoutParams = preview.layoutParams.apply {
+            height = 160.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(requireContext()) else 0
+        }
+        subscribeUi(viewModel)
+        updateUI()
+
+        // Warnings
+        if (getString(R.string.xiaomi_manufacturer).equals(Build.MANUFACTURER, ignoreCase = true) && Preferences.showXiaomiWarning) {
+            MaterialBottomSheetDialog(requireContext(), getString(R.string.xiaomi_warning_title), getString(R.string.xiaomi_warning_message))
+                .setNegativeButton(getString(R.string.action_ignore)) {
+                    Preferences.showXiaomiWarning = false
+                }
+                .setPositiveButton(getString(R.string.action_grant_permission)) {
+                    Preferences.showXiaomiWarning = false
+                    val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                        data = Uri.parse("package:${activity?.packageName}")
+                    }
+                    startActivity(intent)
+                }
+                .show()
+        }
+    }
+
+    private var uiJob: Job? = null
+
+    private fun updateUI() {
+        uiJob?.cancel()
+
+        if (Preferences.showPreview) {
+            preview.setCardBackgroundColor(
+                ContextCompat.getColor(
+                    requireContext(),
+                    if (ColorHelper.getFontColor()
+                            .isColorDark()
+                    ) android.R.color.white else R.color.colorAccent
+                )
+            )
+            widget_shape_background.setImageDrawable(BitmapHelper.getTintedDrawable(requireContext(), R.drawable.card_background, ColorHelper.getBackgroundColor()))
+            uiJob = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
+                delay(200)
+                val generatedView = MainWidget.generateWidgetView(requireContext())
+
+                withContext(Dispatchers.Main) {
+                    generatedView.measure(0, 0)
+                    preview.measure(0, 0)
+                }
+
+                val bitmap = BitmapHelper.getBitmapFromView(
+                    generatedView,
+                    if (preview.width > 0) preview.width else generatedView.measuredWidth,
+                    generatedView.measuredHeight
+                )
+                withContext(Dispatchers.Main) {
+                    // Clock
+                    time.setTextColor(ColorHelper.getClockFontColor())
+                    time_am_pm.setTextColor(ColorHelper.getClockFontColor())
+                    time.setTextSize(
+                        TypedValue.COMPLEX_UNIT_SP,
+                        Preferences.clockTextSize.toPixel(requireContext())
+                    )
+                    time_am_pm.setTextSize(
+                        TypedValue.COMPLEX_UNIT_SP,
+                        Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2
+                    )
+
+                    // Clock bottom margin
+                    clock_bottom_margin_none.isVisible =
+                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.value
+                    clock_bottom_margin_small.isVisible =
+                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.value
+                    clock_bottom_margin_medium.isVisible =
+                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.value
+                    clock_bottom_margin_large.isVisible =
+                        Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.value
+
+                    if ((Preferences.showClock && !time_container.isVisible) || (!Preferences.showClock && time_container.isVisible)) {
+                        if (Preferences.showClock) {
+                            time_container.layoutParams = time_container.layoutParams.apply {
+                                height = RelativeLayout.LayoutParams.WRAP_CONTENT
+                            }
+                            time_container.measure(0, 0)
+                        }
+                        val initialHeight = time_container.measuredHeight
+                        ValueAnimator.ofFloat(
+                            if (Preferences.showClock) 0f else 1f,
+                            if (Preferences.showClock) 1f else 0f
+                        ).apply {
+                            duration = 500L
+                            addUpdateListener {
+                                val animatedValue = animatedValue as Float
+                                time_container.layoutParams = time_container.layoutParams.apply {
+                                    height = (initialHeight * animatedValue).toInt()
+                                }
+                            }
+                            addListener(
+                                onStart = {
+                                    if (Preferences.showClock) {
+                                        time_container.isVisible = true
+                                    }
+                                },
+                                onEnd = {
+                                    if (!Preferences.showClock) {
+                                        time_container.isVisible = false
+                                    }
+                                }
+                            )
+                        }.start()
+
+                        ValueAnimator.ofInt(
+                            preview.height,
+                            160.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(
+                                requireContext()
+                            ) else 0
+                        ).apply {
+                            duration = 500L
+                            addUpdateListener {
+                                val animatedValue = animatedValue as Int
+                                val layoutParams = preview.layoutParams
+                                layoutParams.height = animatedValue
+                                preview.layoutParams = layoutParams
+                            }
+                        }.start()
+                    } else {
+                        time_container.layoutParams = time_container.layoutParams.apply {
+                            height = RelativeLayout.LayoutParams.WRAP_CONTENT
+                        }
+                        time_container.measure(0, 0)
+                    }
+
+                    if (preview.height == 0) {
+                        ValueAnimator.ofInt(
+                            preview.height,
+                            160.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(
+                                requireContext()
+                            ) else 0
+                        ).apply {
+                            duration = 300L
+                            addUpdateListener {
+                                val animatedValue = animatedValue as Int
+                                val layoutParams = preview.layoutParams
+                                layoutParams.height = animatedValue
+                                preview.layoutParams = layoutParams
+                            }
+                        }.start()
+                    }
+
+                    bitmap_container.setImageBitmap(bitmap)
+                    widget_loader.animate().scaleX(0f).scaleY(0f).start()
+                    widget.animate().alpha(1f).start()
+                }
+            }
+        } else {
+            ValueAnimator.ofInt(
+                preview.height,
+                0
+            ).apply {
+                duration = 300L
+                addUpdateListener {
+                    val animatedValue = animatedValue as Int
+                    val layoutParams = preview.layoutParams
+                    layoutParams.height = animatedValue
+                    preview.layoutParams = layoutParams
+                }
+            }.start()
+        }
+
+
+        // Calendar error indicator
+        tabs?.getTabAt(1)?.orCreateBadge?.apply {
+            backgroundColor = ContextCompat.getColor(requireContext(), R.color.errorColorText)
+            badgeGravity = BadgeDrawable.TOP_END
+        }?.isVisible = Preferences.showEvents && activity?.checkGrantedPermission(Manifest.permission.READ_CALENDAR) != true
+
+        // Weather error indicator
+        tabs?.getTabAt(2)?.orCreateBadge?.apply {
+            backgroundColor = ContextCompat.getColor(requireContext(), R.color.errorColorText)
+            badgeGravity = BadgeDrawable.TOP_END
+        }?.isVisible = Preferences.showWeather && (Preferences.weatherProviderApi == "" || (Preferences.customLocationAdd == "" && activity?.checkGrantedPermission(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION) != true))
+
+    }
+
+    private fun subscribeUi(viewModel: MainViewModel) {
+        viewModel.showWallpaper.observe(viewLifecycleOwner, Observer {
+            activity?.let { act ->
+                val wallpaper = act.getCurrentWallpaper()
+                widget_bg.setImageDrawable(if (it) wallpaper else null)
+                widget_bg.layoutParams = widget_bg.layoutParams.apply {
+
+                    val metrics = DisplayMetrics()
+                    act.windowManager.defaultDisplay.getMetrics(metrics)
+
+                    height = metrics.heightPixels
+                    width = (wallpaper?.intrinsicWidth ?: 1) * metrics.heightPixels / (wallpaper?.intrinsicWidth ?: 1)
+                }
+            }
+        })
+
+        logo.setOnClickListener {
+//            startActivity(Intent(this, SupportDevActivity::class.java))
+        }
+
+        action_settings.setOnClickListener {
+            Navigation.findNavController(it).navigate(R.id.action_appMainFragment_to_appSettingsFragment)
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+    }
+
+    override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
+        updateUI()
+        MainWidget.updateWidget(requireContext())
+    }
+
+    override fun onResume() {
+        super.onResume()
+        Preferences.preferences.registerOnSharedPreferenceChangeListener(this)
+        EventBus.getDefault().register(this)
+    }
+
+    override fun onPause() {
+        Preferences.preferences.unregisterOnSharedPreferenceChangeListener(this)
+        EventBus.getDefault().unregister(this)
+        super.onPause()
+    }
+
+    class UpdateUiMessageEvent
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMessageEvent(ignore: UpdateUiMessageEvent?) {
+        updateUI()
+    }
+}

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

@@ -2,10 +2,8 @@ package com.tommasoberlose.anotherwidget.ui.fragments
 
 import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -15,6 +13,9 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.Navigation
+import com.google.android.material.transition.MaterialContainerTransform
+import com.google.android.material.transition.MaterialSharedAxis
 import com.karumi.dexter.Dexter
 import com.karumi.dexter.MultiplePermissionsReport
 import com.karumi.dexter.PermissionToken
@@ -29,7 +30,7 @@ import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.activities.SupportDevActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
-import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.openURI
 import kotlinx.android.synthetic.main.fragment_advanced_settings.*
@@ -37,16 +38,18 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 
-class AdvancedSettingsFragment : Fragment() {
+class SettingsFragment : Fragment() {
 
     companion object {
-        fun newInstance() = AdvancedSettingsFragment()
+        fun newInstance() = SettingsFragment()
     }
 
     private lateinit var viewModel: MainViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, true)
+        returnTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, false)
     }
 
     override fun onCreateView(
@@ -57,8 +60,6 @@ class AdvancedSettingsFragment : Fragment() {
         viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
         val binding = DataBindingUtil.inflate<FragmentAdvancedSettingsBinding>(inflater, R.layout.fragment_advanced_settings, container, false)
 
-        subscribeUi(viewModel)
-
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
 
@@ -68,10 +69,15 @@ class AdvancedSettingsFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        action_back.setOnClickListener {
+            Navigation.findNavController(it).popBackStack()
+        }
+
+        subscribeUi(viewModel)
+
         setupListener()
 
         app_version.text = "v%s (%s)".format(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
-        requirePermission()
     }
 
     private fun subscribeUi(
@@ -187,7 +193,7 @@ class AdvancedSettingsFragment : Fragment() {
         }
 
         action_refresh_widget.setOnClickListener {
-            MainWidget.updateWidget(requireContext())
+            WeatherHelper.updateWeather(requireContext())
             CalendarHelper.updateEventList(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
@@ -81,12 +81,14 @@ class WeatherSettingsFragment : Fragment() {
     ) {
         viewModel.showWeatherWarning.observe(viewLifecycleOwner, Observer {
             weather_warning?.isVisible = it
+            checkLocationPermission()
         })
 
         viewModel.showWeather.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_weather_label?.text =
                     if (it) getString(R.string.show_weather_visible) else getString(R.string.show_weather_not_visible)
+                checkWeatherProviderConfig()
                 binding.isWeatherVisible = it
             }
             checkLocationPermission()
@@ -94,11 +96,7 @@ class WeatherSettingsFragment : Fragment() {
 
         viewModel.weatherProviderApi.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                label_weather_provider_api_key?.text =
-                    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
-                    )
-                label_weather_provider_api_key?.setTextColor(ContextCompat.getColor(requireContext(), if (it == "") R.color.errorColorText else R.color.colorSecondaryText))
+                checkWeatherProviderConfig()
             }
             checkLocationPermission()
         })
@@ -148,9 +146,19 @@ class WeatherSettingsFragment : Fragment() {
             location_permission_alert?.setOnClickListener {
                 requirePermission()
             }
+        } else {
+            location_permission_alert?.isVisible = false
         }
     }
 
+    private fun checkWeatherProviderConfig() {
+        label_weather_provider_api_key?.text =
+            if (Preferences.weatherProviderApi == "") getString(R.string.settings_weather_provider_api_key_subtitle_not_set) else getString(
+                R.string.settings_weather_provider_api_key_subtitle_all_set
+            )
+        label_weather_provider_api_key?.setTextColor(ContextCompat.getColor(requireContext(), if (Preferences.weatherProviderApi == "" && Preferences.showWeather) R.color.errorColorText else R.color.colorSecondaryText))
+    }
+
     private fun setupListener() {
         action_hide_weather_warning.setOnClickListener {
             Preferences.showWeatherWarning = false

app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt

@@ -27,10 +27,11 @@ class MainViewModel : ViewModel() {
     val openEventDetails = Preferences.asLiveData(Preferences::openEventDetails)
     val calendarAppName = Preferences.asLiveData(Preferences::calendarAppName)
 
-
     // Clock Settings
     val showClock = Preferences.asLiveData(Preferences::showClock)
     val clockTextSize = Preferences.asLiveData(Preferences::clockTextSize)
+    val clockTextColor = Preferences.asLiveData(Preferences::clockTextColor)
+    val clockTextAlpha = Preferences.asLiveData(Preferences::clockTextAlpha)
 
     val clockAppName = Preferences.asLiveData(Preferences::clockAppName)
     val showNextAlarm = Preferences.asLiveData(Preferences::showNextAlarm)

app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt

@@ -19,7 +19,6 @@ import android.widget.RemoteViews
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Actions
@@ -260,13 +259,13 @@ class MainWidget : AppWidgetProvider() {
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
                 } else if (Preferences.showNextAlarm && nextAlarm != "") {
-                    val clockIntent = PendingIntent.getActivity(
+                    val alarmIntent = PendingIntent.getActivity(
                         context,
                         widgetID,
                         IntentHelper.getClockIntent(context),
                         0
                     )
-                    views.setOnClickPendingIntent(R.id.second_row_rect, clockIntent)
+                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
 
                     views.setImageViewBitmap(
                         R.id.next_event_rect,
@@ -281,6 +280,7 @@ class MainWidget : AppWidgetProvider() {
 
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(R.id.next_event_rect, calPIntent)
                 }
             } catch (ex: Exception) {
                 ex.printStackTrace()
@@ -333,8 +333,8 @@ class MainWidget : AppWidgetProvider() {
                     views.setViewVisibility(R.id.clock_bottom_margin_medium, View.GONE)
                     views.setViewVisibility(R.id.clock_bottom_margin_large, View.GONE)
                 } else {
-                    views.setTextColor(R.id.time, ColorHelper.getFontColor())
-                    views.setTextColor(R.id.time_am_pm, ColorHelper.getFontColor())
+                    views.setTextColor(R.id.time, ColorHelper.getClockFontColor())
+                    views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor())
                     views.setTextViewTextSize(
                         R.id.time,
                         TypedValue.COMPLEX_UNIT_SP,

app/src/main/res/drawable/round_arrow_back_24.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="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+</vector>

app/src/main/res/drawable/round_short_text_24.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="M5,9h14c0.55,0 1,0.45 1,1s-0.45,1 -1,1L5,11c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1zM5,13h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1L5,15c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1z"/>
+</vector>

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

@@ -1,134 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
+    android:orientation="vertical"
     android:background="?android:attr/colorPrimary"
     tools:context=".ui.activities.MainActivity">
-    <com.google.android.material.card.MaterialCardView
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/content_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/nav_graph"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:cardElevation="2dp"
-        app:cardCornerRadius="0dp"
-        android:id="@+id/toolbar"
-        app:cardBackgroundColor="@color/colorPrimary">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:gravity="center_vertical"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp">
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:src="@drawable/ic_splash_logo"
-                    android:layout_alignParentBottom="true"
-                    android:layout_marginBottom="3dp"
-                    android:visibility="gone"
-                    android:layout_alignParentLeft="true"
-                    android:id="@+id/logo"/>
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_centerInParent="true">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:text="@string/app_name"
-                        android:gravity="center"
-                        android:layout_marginBottom="1dp"
-                        style="@style/AnotherWidget.Main.Title"/>
-                </LinearLayout>
-            </RelativeLayout>
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="160dp"
-                android:id="@+id/preview"
-                android:animateLayoutChanges="true"
-                app:cardBackgroundColor="@color/colorPrimary"
-                android:layout_marginRight="16dp"
-                android:layout_marginLeft="16dp"
-                app:cardCornerRadius="9dp"
-                app:cardElevation="0dp">
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="-80dp"
-                    android:layout_marginStart="-80dp"
-                    android:scaleType="fitStart"
-                    android:adjustViewBounds="true"
-                    android:id="@+id/widget_bg" />
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:layout_gravity="center"
-                        android:orientation="vertical"
-                        android:id="@+id/widget"
-                        android:alpha="0"
-                        android:gravity="center">
-                        <include layout="@layout/the_widget_sans" />
-                    </LinearLayout>
-                    <ProgressBar
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:layout_centerInParent="true"
-                        android:indeterminate="true"
-                        android:indeterminateTint="@android:color/white"
-                        android:id="@+id/widget_loader" />
-                </RelativeLayout>
-            </com.google.android.material.card.MaterialCardView>
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="56dp"
-                app:tabGravity="center"
-                app:tabIndicatorColor="@color/colorAccent"
-                app:tabBackground="@color/colorPrimary"
-                app:tabIndicatorFullWidth="false"
-                app:tabMode="scrollable"
-                app:tabIndicatorHeight="3dp"
-                app:tabUnboundedRipple="true"
-                app:tabRippleColor="@color/colorPrimary"
-                app:tabTextColor="@color/colorSecondaryText"
-                app:tabSelectedTextColor="@color/colorAccent"
-                app:tabIndicator="@drawable/custom_tab_indicator"
-                app:tabPadding="16dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:clipToPadding="false"
-                app:tabMinWidth="110dp"
-                android:background="@color/colorPrimary"
-                app:tabTextAppearance="@style/AnotherWidget.Settings.Header" />
-        </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:background="@color/colorPrimaryDark"
-        android:orientation="vertical">
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:elevation="0dp"
-            android:layout_height="0dp"
         android:layout_weight="1"/>
 
+
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="56dp"
@@ -151,6 +39,4 @@
             app:cornerRadius="0dp"
             style="@style/Widget.MaterialComponents.Button.TextButton"/>
     </com.google.android.material.card.MaterialCardView>
-
 </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -96,13 +96,11 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <androidx.recyclerview.widget.RecyclerView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="300dp"
-            android:id="@+id/menu"
-            android:visibility="gone"
-            android:clipToPadding="false"
-            android:padding="16dp"/>
+            android:layout_height="260dp"
+            android:id="@+id/list_container"
+            android:orientation="vertical" />
         <ProgressBar
             android:layout_width="32dp"
             android:layout_height="32dp"

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="260dp"
+    android:id="@+id/menu"
+    android:clipToPadding="false"
+    android:padding="16dp"/>

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

@@ -7,6 +7,48 @@
             name="viewModel"
             type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
     </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="vertical">
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            app:cardBackgroundColor="@color/colorPrimary"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            android:background="@color/colorPrimary"
+            android:transitionName="@string/toolbar_transition_name"
+            android:id="@+id/toolbar">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="56dp">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="10dp"
+                    android:src="@drawable/round_arrow_back"
+                    android:tint="@color/colorPrimaryText"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:layout_marginEnd="8dp"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginStart="8dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:id="@+id/action_back" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:text="@string/settings_title"
+                    android:textColor="@color/colorPrimaryText"
+                    android:gravity="center"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                    tools:ignore="RelativeOverlap" />
+            </RelativeLayout>
+        </com.google.android.material.card.MaterialCardView>
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -353,4 +395,5 @@
                 </LinearLayout>
             </LinearLayout>
         </ScrollView>
+    </LinearLayout>
 </layout>

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

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:background="?android:attr/colorPrimary"
+    tools:context=".ui.activities.MainActivity">
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:cardElevation="2dp"
+        app:cardCornerRadius="0dp"
+        android:id="@+id/toolbar"
+        android:transitionName="@string/toolbar_transition_name"
+        app:cardBackgroundColor="@color/colorPrimary">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/ic_splash_logo"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="3dp"
+                    android:visibility="gone"
+                    android:layout_alignParentLeft="true"
+                    android:id="@+id/logo"/>
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_centerInParent="true">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:text="@string/app_name"
+                        android:gravity="center"
+                        android:layout_marginBottom="1dp"
+                        style="@style/AnotherWidget.Main.Title"/>
+                </LinearLayout>
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="8dp"
+                    android:src="@drawable/round_short_text"
+                    android:scaleX="-1"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:tint="@color/colorPrimaryText"
+                    android:layout_centerVertical="true"
+                    android:layout_alignParentRight="true"
+                    android:id="@+id/action_settings"/>
+            </RelativeLayout>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:id="@+id/preview"
+                android:animateLayoutChanges="true"
+                app:cardBackgroundColor="@color/colorPrimary"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp"
+                app:cardCornerRadius="9dp"
+                app:cardElevation="0dp">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-80dp"
+                    android:layout_marginStart="-80dp"
+                    android:scaleType="fitStart"
+                    android:adjustViewBounds="true"
+                    android:id="@+id/widget_bg" />
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:layout_gravity="center"
+                        android:orientation="vertical"
+                        android:id="@+id/widget"
+                        android:alpha="0"
+                        android:gravity="center">
+                        <include layout="@layout/the_widget_sans" />
+                    </LinearLayout>
+                    <ProgressBar
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:layout_centerInParent="true"
+                        android:indeterminate="true"
+                        android:indeterminateTint="@android:color/white"
+                        android:id="@+id/widget_loader" />
+                </RelativeLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                app:tabGravity="center"
+                app:tabIndicatorColor="@color/colorAccent"
+                app:tabBackground="@color/colorPrimary"
+                app:tabIndicatorFullWidth="false"
+                app:tabMode="scrollable"
+                app:tabIndicatorHeight="3dp"
+                app:tabUnboundedRipple="true"
+                app:tabRippleColor="@color/colorPrimary"
+                app:tabTextColor="@color/colorSecondaryText"
+                app:tabSelectedTextColor="@color/colorAccent"
+                app:tabIndicator="@drawable/custom_tab_indicator"
+                app:tabPadding="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:clipToPadding="false"
+                app:tabMinWidth="110dp"
+                android:background="@color/colorPrimary"
+                app:tabTextAppearance="@style/AnotherWidget.Settings.Header" />
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:elevation="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -141,6 +141,43 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_clock_text_color"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_palette"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        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:text="@string/settings_clock_text_color_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/clock_text_color_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -198,6 +198,7 @@
                             android:paddingBottom="0dp"
                             android:paddingTop="0dp"
                             android:focusable="true"
+                            android:visibility="gone"
                             android:id="@+id/location_permission_alert"
                             android:textColor="@color/errorColorText"
                             android:text="@string/action_grant_permission"/>

app/src/main/res/navigation/nav_graph.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_graph"
+    app:startDestination="@id/appMainFragment">
+    <fragment
+        android:id="@+id/appMainFragment"
+        android:name="com.tommasoberlose.anotherwidget.ui.fragments.MainFragment"
+        android:label="AppMainFragment" >
+        <action
+            android:id="@+id/action_appMainFragment_to_appSettingsFragment"
+            app:destination="@id/appSettingsFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/appSettingsFragment"
+        android:name="com.tommasoberlose.anotherwidget.ui.fragments.SettingsFragment"
+        android:label="AppSettingsFragment" />
+</navigation>

app/src/main/res/values-de/strings.xml

@@ -206,4 +206,6 @@
 	<string name="settings_background_color_title">Background color</string>
 	<string name="transparent">Transparent</string>
 	<string name="next_alarm_warning">The next alarm clock seems to be wrong.\nIt has been set by %s.</string>
+	<string name="settings_title">Settings</string>
+    <string name="settings_clock_text_color_title">Clock text color</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -186,4 +186,6 @@
     <string name="settings_background_color_title">Background color</string>
     <string name="transparent">Transparent</string>
     <string name="next_alarm_warning">The next alarm clock seems to be wrong.\nIt has been set by %s.</string>
+    <string name="settings_title">Settings</string>
+    <string name="settings_clock_text_color_title">Clock text color</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -185,4 +185,6 @@
     <string name="settings_background_color_title">Colore background</string>
     <string name="transparent">Trasparente</string>
     <string name="next_alarm_warning">La sveglia sembra impostata male.\nÈ stata impostata dall\'app %s.</string>
+    <string name="settings_title">Impostazioni</string>
+    <string name="settings_clock_text_color_title">Colore orologio</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -33,7 +33,7 @@
     <string name="main_calendar">Account calendar</string>
     <string name="settings_calendar_title">Calendar</string>
     <string name="settings_weather_title">Weather</string>
-    <string name="settings_general_title">Typography</string>
+    <string name="settings_general_title">General</string>
     <string name="calendar_settings_list_error">Error loading the calendar list</string>
     <string name="settings_hour_format_title">Hour format</string>
     <string name="settings_hour_format_subtitle_12">12 hour</string>
@@ -197,4 +197,6 @@
     <string name="alpha">Alpha</string>
     <string name="transparent">Transparent</string>
     <string name="next_alarm_warning">The next alarm clock seems to be wrong.\nIt has been set by %s.</string>
+    <string name="settings_title">Settings</string>
+    <string name="settings_clock_text_color_title">Clock text color</string>
 </resources>

tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
-    android:versionCode="74"
+    android:versionCode="78"
     android:versionName="2.0.5" >
 
     <uses-sdk

tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu May 07 12:28:58 CEST 2020
+#Fri May 08 15:13:22 CEST 2020
 base.0=/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -4,7 +4,7 @@
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
     android:targetSandboxVersion="2"
-    android:versionCode="74"
+    android:versionCode="78"
     android:versionName="2.0.5" >
 
     <uses-sdk

tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -3,7 +3,7 @@
 3    xmlns:dist="http://schemas.android.com/apk/distribution"
 4    featureSplit="tasksintegration"
 5    package="com.tommasoberlose.anotherwidget"
-6    android:versionCode="74"
+6    android:versionCode="78"
 7    android:versionName="2.0.5" >
 8
 9    <uses-sdk

tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
-    android:versionCode="74"
+    android:versionCode="78"
     android:versionName="2.0.5" >
 
     <uses-sdk

tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
-    android:versionCode="74"
+    android:versionCode="78"
     android:versionName="2.0.5" >
 
     <uses-sdk android:targetSdkVersion="29" />