Add the background location disclaimer

Update translation

.gitignore

@@ -1,11 +1,10 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
+/.idea/*
-/.idea/libraries
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 /tasksintegration/build
-apikey.properties
+/app/google-services.json

.idea/codeStyles/Project.xml

@@ -1,6 +1,22 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

.idea/gradle.xml

@@ -11,8 +11,6 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/googlefit" />
-            <option value="$PROJECT_DIR$/tasksintegration" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.idea/modules.xml

@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Another Widget.iml" filepath="$PROJECT_DIR$/Another Widget.iml" group="Another Widget" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Another_Widget.iml" filepath="$PROJECT_DIR$/.idea/modules/Another_Widget.iml" group="Another_Widget" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="Another Widget/app" />
-      <module fileurl="file://$PROJECT_DIR$/googlefit/googlefit.iml" filepath="$PROJECT_DIR$/googlefit/googlefit.iml" group="Another Widget/googlefit" />
-      <module fileurl="file://$PROJECT_DIR$/tasksintegration/tasksintegration.iml" filepath="$PROJECT_DIR$/tasksintegration/tasksintegration.iml" group="Another Widget/tasksintegration" />
     </modules>
   </component>
 </project>

README.md

@@ -13,6 +13,13 @@ Also, as much as possible, there are always updates and new features in the shor
 Help me developing with feedback and support me on how you can.
 <div style="text-align:center"><a href="https://play.google.com/store/apps/details?id=com.tommasoberlose.anotherwidget" target="_blank"><img src="google-play-badge.png" height="100" /></a></div>
 
+
+Help with translations
+-------
+
+Hey! You could view the file strings.xml ([here](https://github.com/tommasoberlose/another-widget/blob/master/app/src/main/res/values/strings.xml)) that contains the English version of the app strings.
+You have to copy the file, create a copy of it inside the folder values-[LANGUAGE-SUFFIX] with the translated strings and create a pull request to submit your changes.
+
 License
 -------
 Copyright (C) 2017-2020 Tommaso Berlose (http://tommasoberlose.com)

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 81
+        versionCode 105
-        versionName "2.0.6"
+        versionName "2.0.13"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -52,10 +52,6 @@ android {
     }
 
     viewBinding.enabled = true
-
-    dynamicFeatures = [":tasksintegration", ":googlefit"]
-
-
 }
 
 dependencies {
@@ -63,13 +59,13 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     // UI
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'com.google.android.material:material:1.2.0-alpha06'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'net.idik:slimadapter:2.1.2'
     implementation 'com.google.android:flexbox:2.0.1'
@@ -79,18 +75,18 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    implementation "androidx.work:work-runtime-ktx:2.3.4"
+    implementation "androidx.work:work-runtime-ktx:2.4.0"
 
     // EventBus
     implementation 'org.greenrobot:eventbus:3.1.1'
 
     // Navigation
-    implementation 'androidx.navigation:navigation-fragment:2.3.0-alpha05'
+    implementation 'androidx.navigation:navigation-fragment:2.3.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
 
     // Other
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'joda-time:joda-time:2.9.9'
+    implementation 'joda-time:joda-time:2.10.3'
     implementation 'me.everything:providers-android:1.0.1'
     implementation 'com.github.warkiz.widget:indicatorseekbar:2.1.2'
 
@@ -98,32 +94,32 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
+    // Fitness
+    implementation 'com.google.android.gms:play-services-fitness:18.0.0'
+    implementation 'com.google.android.gms:play-services-auth:18.1.0'
+
     //Weather
     implementation 'com.github.KwabenBerko:OpenWeatherMap-Android-Library:2.0.2'
-    implementation 'com.google.android.gms:play-services-location:17.0.0'
+    implementation 'com.google.android.gms:play-services-location:17.1.0'
 
     // Billing
-    implementation 'com.android.billingclient:billing:2.2.0'
+    implementation 'com.android.billingclient:billing:3.0.1'
-    implementation 'com.android.billingclient:billing-ktx:2.2.0'
+    implementation 'com.android.billingclient:billing-ktx:3.0.1'
 
     // KTX
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.core:core-ktx:1.3.2"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
     implementation "androidx.palette:palette-ktx:1.0.0"
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
 
     // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
 
     // Preferences
-    implementation 'com.chibatching.kotpref:kotpref:2.10.0'
+    implementation 'com.chibatching.kotpref:kotpref:2.11.0'
     implementation 'com.chibatching.kotpref:livedata-support:2.10.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
     // Permissions
     implementation 'com.karumi:dexter:6.1.0'
-
-    // Billing
-    implementation 'com.android.billingclient:billing:2.2.0'
-    implementation 'com.android.billingclient:billing-ktx:2.2.0'
 }

app/google-services.json

@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "791844924473",
-    "firebase_url": "https://anotherwidget-182008.firebaseio.com",
-    "project_id": "anotherwidget-182008",
-    "storage_bucket": "anotherwidget-182008.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:791844924473:android:0ad4f6e3890f1ad320b1e8",
-        "android_client_info": {
-          "package_name": "com.tommasoberlose.anotherwidget"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "791844924473-73dh46rorjq8vm97dgbn6can2dcpqlf0.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAeJRXstqnzebibxmm3FRM98nbwE_kC8tA"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "791844924473-73dh46rorjq8vm97dgbn6can2dcpqlf0.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/src/main/AndroidManifest.xml

@@ -10,10 +10,13 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+    <uses-permission android:name="android.gms.permission.ACTIVITY_RECOGNITION"/>
+    <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
+
 
     <application
         android:allowBackup="true"
-        android:fullBackupContent="@xml/my_backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:name=".AWApplication"
@@ -82,44 +85,16 @@
             android:enabled="true"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="com.tommasoberlose.anotherwidget.action.ACTION_WEATHER_UPDATE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.TIME_SET" />
                 <action android:name="android.intent.action.TIMEZONE_CHANGED" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
         </receiver>
 
-        <receiver
-            android:name=".receivers.PlayerReceiver"
-            android:enabled="true"
-            android:exported="true"
-            tools:ignore="ExportedReceiver">
-            <intent-filter>
-                <action android:name="com.android.music.metachanged" />
-                <action android:name="com.android.music.playstatechanged" />
-                <action android:name="com.android.music.playbackcomplete" />
-                <action android:name="com.android.music.queuechanged" />
-
-                <action android:name="com.htc.music.metachanged" />
-                <action android:name="fm.last.android.metachanged" />
-                <action android:name="com.sec.android.app.music.metachanged" />
-                <action android:name="com.nullsoft.winamp.metachanged" />
-                <action android:name="com.amazon.mp3.metachanged" />
-                <action android:name="com.miui.player.metachanged" />
-                <action android:name="com.real.IMP.metachanged" />
-                <action android:name="com.sonyericsson.music.metachanged" />
-                <action android:name="com.rdio.android.metachanged" />
-                <action android:name="com.samsung.sec.android.MusicPlayer.metachanged" />
-                <action android:name="com.andrew.apollo.metachanged" />
-                <action android:name="com.spotify.music.playbackstatechanged"/>
-                <action android:name="com.spotify.music.metadatachanged"/>
-                <action android:name="com.spotify.music.queuechanged"/>
-            </intent-filter>
-        </receiver>
-
         <receiver
             android:name=".receivers.WidgetClickListenerReceiver"
             android:enabled="true"
@@ -140,12 +115,41 @@
 
         <service android:name=".services.EventListenerJob" android:permission="android.permission.BIND_JOB_SERVICE" />
 
+        <service android:name=".services.BatteryListenerJob" android:permission="android.permission.BIND_JOB_SERVICE" />
+
         <service android:name=".receivers.MusicNotificationListener"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>
         </service>
+
+        <receiver android:name=".receivers.BatteryLevelReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
+                <action android:name="android.intent.action.BATTERY_LOW"/>
+                <action android:name="android.intent.action.BATTERY_OKAY"/>
+                <action android:name="android.intent.action.BATTERY_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".receivers.ActivityDetectionReceiver"
+            android:exported="false"
+            android:permission="com.google.android.gms.permission.ACTIVITY_RECOGNITION">
+            <intent-filter>
+                <action android:name="com.mypackage.ACTION_PROCESS_ACTIVITY_TRANSITIONS" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".services.UpdateCalendarJob"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="true"/>
     </application>
 
 </manifest>

app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt

@@ -1,6 +1,7 @@
 package com.tommasoberlose.anotherwidget
 
 import android.app.Application
+import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import com.chibatching.kotpref.Kotpref
 import com.google.firebase.crashlytics.FirebaseCrashlytics

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

@@ -0,0 +1,27 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.content.Context
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Preferences
+import kotlinx.android.synthetic.main.custom_notes_dialog_layout.view.*
+
+class CustomNotesDialog(context: Context) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
+
+    init {
+        val view = View.inflate(context, R.layout.custom_notes_dialog_layout, null)
+        view.notes.setText(Preferences.customNotes)
+
+        view.action_positive.setOnClickListener {
+            Preferences.customNotes = view.notes.text.toString()
+            this.dismiss()
+        }
+
+        view.notes.requestFocus()
+
+        setContentView(view)
+    }
+}

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

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

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

@@ -0,0 +1,98 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+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
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.isColorDark
+import com.tommasoberlose.anotherwidget.helpers.GlanceProviderHelper
+import com.tommasoberlose.anotherwidget.models.GlanceProvider
+import kotlinx.android.synthetic.main.glance_provider_sort_bottom_menu.view.*
+import kotlinx.coroutines.*
+import net.idik.lib.slimadapter.SlimAdapter
+import java.util.*
+import kotlin.collections.ArrayList
+
+class GlanceProviderSortMenu(
+    context: Context
+) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
+
+    private lateinit var adapter: SlimAdapter
+
+    override fun show() {
+        val view = View.inflate(context, R.layout.glance_provider_sort_bottom_menu, null)
+
+        // Header
+        view.header_text.text = context.getString(R.string.settings_sort_glance_providers_title)
+
+        // List
+        adapter = SlimAdapter.create()
+
+        view.menu.setHasFixedSize(true)
+        val mLayoutManager = LinearLayoutManager(context)
+        view.menu.layoutManager = mLayoutManager
+
+        adapter = SlimAdapter.create()
+        adapter
+            .register<GlanceProvider>(R.layout.glance_provider_item) { item, injector ->
+                injector
+                    .text(R.id.title, item.title)
+                    .with<ImageView>(R.id.icon) {
+                        it.setImageDrawable(ContextCompat.getDrawable(context, item.icon))
+                    }
+            }
+            .attachTo(view.menu)
+
+        val mIth = ItemTouchHelper(
+            object : ItemTouchHelper.SimpleCallback(
+                ItemTouchHelper.UP or ItemTouchHelper.DOWN,
+                ItemTouchHelper.LEFT
+            ) {
+                override fun onMove(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder
+                ): Boolean {
+                    val fromPos = viewHolder.adapterPosition
+                    val toPos = target.adapterPosition
+                    // move item in `fromPos` to `toPos` in adapter.
+                    adapter.notifyItemMoved(fromPos, toPos)
+
+                    val list = GlanceProviderHelper.getGlanceProviders(context)
+                    Collections.swap(list, fromPos, toPos)
+                    GlanceProviderHelper.saveGlanceProviderOrder(list)
+                    return true
+                }
+
+                override fun onSwiped(
+                    viewHolder: RecyclerView.ViewHolder,
+                    direction: Int
+                ) {
+                    // remove from adapter
+                }
+            })
+
+        mIth.attachToRecyclerView(view.menu)
+
+        adapter.updateData(
+            GlanceProviderHelper.getGlanceProviders(context)
+                .mapNotNull { GlanceProviderHelper.getGlanceProviderById(context, it) }
+        )
+
+        setContentView(view)
+        super.show()
+    }
+}
+

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

@@ -0,0 +1,57 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.content.Context
+import android.view.View
+import android.widget.ImageView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
+import kotlinx.android.synthetic.main.bottom_sheet_menu.view.*
+import kotlinx.android.synthetic.main.bottom_sheet_menu.view.header
+import kotlinx.android.synthetic.main.fragment_weather_settings.*
+import kotlinx.android.synthetic.main.icon_pack_menu_item.view.*
+
+class IconPackSelector(context: Context, private val header: String? = null) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
+
+    override fun show() {
+        val view = View.inflate(context, R.layout.bottom_sheet_menu, null)
+
+        // Header
+        view.header.isVisible = header != null
+        view.header_text.text = header ?: ""
+
+        view.warning_text.isVisible = false
+
+        // Menu
+        for (item in Constants.WeatherIconPack.values()) {
+            val itemView = View.inflate(context, R.layout.icon_pack_menu_item, null)
+            itemView.label.text = context.getString(R.string.settings_weather_icon_pack_default).format(item.value + 1)
+            itemView.isSelected = item.value == Preferences.weatherIconPack
+
+            itemView.icon_1.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("01d", item.value)))
+            itemView.icon_2.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("01n", item.value)))
+            itemView.icon_3.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("10d", item.value)))
+            itemView.icon_4.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("09n", item.value)))
+
+            listOf<ImageView>(itemView.icon_1, itemView.icon_2, itemView.icon_3, itemView.icon_4).forEach {
+                if (item == Constants.WeatherIconPack.MINIMAL) {
+                    it.setColorFilter(ContextCompat.getColor(context, R.color.colorPrimaryText))
+                } else {
+                    it.setColorFilter(ContextCompat.getColor(context, android.R.color.transparent))
+                }
+            }
+
+            itemView.setOnClickListener {
+                Preferences.weatherIconPack = item.value
+                this.dismiss()
+            }
+            view.menu.addView(itemView)
+        }
+        setContentView(view)
+        super.show()
+    }
+}

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

@@ -11,8 +11,8 @@ typealias DialogCallback = () -> Unit
 
 class MaterialBottomSheetDialog(
     context: Context,
-    private val title: String? = "",
+    private val title: String? = null,
-    private val message: String? = ""
+    private val message: String? = null
 ) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
 
     private var positiveButtonLabel: String? = null
@@ -36,7 +36,7 @@ class MaterialBottomSheetDialog(
         val view = View.inflate(context, R.layout.bottom_sheet_dialog, null)
 
         // Header
-        view.message.isVisible = title != null
+        view.title.isVisible = title != null
         view.title.text = title ?: ""
 
         view.message.isVisible = message != null

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

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

app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt

@@ -1,32 +1,37 @@
 package com.tommasoberlose.anotherwidget.db
 
 import android.content.Context
+import android.provider.CalendarContract
 import android.util.Log
 import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import io.realm.Realm
 import io.realm.RealmResults
 import java.util.*
+import kotlin.Comparator
 import kotlin.collections.ArrayList
 
 class EventRepository(val context: Context) {
     private val realm by lazy { Realm.getDefaultInstance() }
 
     fun saveEvents(eventList: ArrayList<Event>) {
-        realm.executeTransactionAsync { realm ->
+        realm.executeTransaction { realm ->
             realm.where(Event::class.java).findAll().deleteAllFromRealm()
             realm.copyToRealm(eventList)
         }
     }
 
-    fun resetNextEventData() {
+    fun clearEvents() {
-        realm.executeTransactionAsync {
+        realm.executeTransaction { realm ->
-            it.where(Event::class.java).findAll().deleteAllFromRealm()
+            realm.where(Event::class.java).findAll().deleteAllFromRealm()
+        }
     }
 
+    fun resetNextEventData() {
         Preferences.bulk {
             remove(Preferences::nextEventId)
             remove(Preferences::nextEventName)
@@ -39,36 +44,63 @@ class EventRepository(val context: Context) {
     }
 
     fun saveNextEventData(event: Event) {
-        Preferences.nextEventId = event.id
+        Preferences.nextEventId = event.eventID
     }
 
     fun getNextEvent(): Event? {
         val nextEvent = getEventByEventId(Preferences.nextEventId)
-        return if (nextEvent != null && nextEvent.endDate > Calendar.getInstance().timeInMillis) {
+        val now = Calendar.getInstance().timeInMillis
+        val limit = Calendar.getInstance().apply {
+            timeInMillis = now
+            when (Preferences.showUntil) {
+                0 -> add(Calendar.HOUR, 3)
+                1 -> add(Calendar.HOUR, 6)
+                2 -> add(Calendar.HOUR, 12)
+                3 -> add(Calendar.DAY_OF_MONTH, 1)
+                4 -> add(Calendar.DAY_OF_MONTH, 3)
+                5 -> add(Calendar.DAY_OF_MONTH, 7)
+                6 -> add(Calendar.MINUTE, 30)
+                7 -> add(Calendar.HOUR, 1)
+                else -> add(Calendar.HOUR, 6)
+            }
+        }
+        val event = if (nextEvent != null && nextEvent.endDate > now && nextEvent.startDate < limit.timeInMillis) {
             nextEvent
         } else {
             val events = getEvents()
             if (events.isNotEmpty()) {
                 val newNextEvent = events.first()
-                Preferences.nextEventId = newNextEvent!!.eventID
+                Preferences.nextEventId = newNextEvent.eventID
                 newNextEvent
             } else {
                 resetNextEventData()
                 null
             }
         }
+        return try {
+            realm.copyFromRealm(event!!)
+        } catch (ex: Exception) {
+            event
+        }
     }
 
-    fun getEventByEventId(id: Long): Event? = realm.where(Event::class.java).equalTo("eventID", id).findFirst()
+    fun getEventByEventId(id: Long): Event? {
+        val event = realm.where(Event::class.java).equalTo("eventID", id).findFirst()
+        return try {
+            realm.copyFromRealm(event!!)
+        } catch (ex: Exception) {
+            event
+        }
+    }
 
     fun goToNextEvent() {
         val eventList = getEvents()
         if (eventList.isNotEmpty()) {
-            val index = eventList.indexOfFirst { it.id == Preferences.nextEventId }
+            val index = eventList.indexOfFirst { it.eventID == Preferences.nextEventId }
             if (index > -1 && index < eventList.size - 1) {
-                Preferences.nextEventId = eventList[index + 1]!!.id
+                Preferences.nextEventId = eventList[index + 1].eventID
             } else {
-                Preferences.nextEventId = eventList.first()!!.id
+                Preferences.nextEventId = eventList.first().eventID
             }
         } else {
             resetNextEventData()
@@ -80,11 +112,11 @@ class EventRepository(val context: Context) {
     fun goToPreviousEvent() {
         val eventList = getEvents()
         if (eventList.isNotEmpty()) {
-            val index = eventList.indexOfFirst { it.id == Preferences.nextEventId }
+            val index = eventList.indexOfFirst { it.eventID == Preferences.nextEventId }
             if (index > 0) {
-                Preferences.nextEventId = eventList[index - 1]!!.id
+                Preferences.nextEventId = eventList[index - 1].eventID
             } else {
-                Preferences.nextEventId = eventList.last()!!.id
+                Preferences.nextEventId = eventList.last().eventID
             }
         } else {
             resetNextEventData()
@@ -93,14 +125,44 @@ class EventRepository(val context: Context) {
         MainWidget.updateWidget(context)
     }
 
-    fun getEvents(): RealmResults<Event> {
+    fun getFutureEvents(): List<Event> {
         val now = Calendar.getInstance().timeInMillis
-        val list = realm.where(Event::class.java).greaterThan("endDate", now).findAll()
+        realm.refresh()
-        realm.executeTransactionAsync {
+        return realm
-            it.where(Event::class.java).lessThanOrEqualTo("endDate", now).findAll().deleteAllFromRealm()
+            .where(Event::class.java)
+            .greaterThan("endDate", now)
+            .findAll()
+            .applyFilters()
     }
-        return list
+
+    private fun getEvents(): List<Event> {
+        val now = Calendar.getInstance().timeInMillis
+        val limit = Calendar.getInstance().apply {
+            timeInMillis = now
+            when (Preferences.showUntil) {
+                0 -> add(Calendar.HOUR, 3)
+                1 -> add(Calendar.HOUR, 6)
+                2 -> add(Calendar.HOUR, 12)
+                3 -> add(Calendar.DAY_OF_MONTH, 1)
+                4 -> add(Calendar.DAY_OF_MONTH, 3)
+                5 -> add(Calendar.DAY_OF_MONTH, 7)
+                6 -> add(Calendar.MINUTE, 30)
+                7 -> add(Calendar.HOUR, 1)
+                else -> add(Calendar.HOUR, 6)
+            }
+        }
+        realm.refresh()
+        return realm
+            .where(Event::class.java)
+            .greaterThan("endDate", now)
+            .lessThanOrEqualTo("startDate", limit.timeInMillis)
+            .findAll()
+            .applyFilters()
     }
 
     fun getEventsCount(): Int = getEvents().size
+
+    fun close() {
+        realm.close()
+    }
 }

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

@@ -15,11 +15,31 @@ object Constants {
         LARGE(3)
     }
 
+    enum class SecondRowTopMargin(val value: Int) {
+        NONE(0),
+        SMALL(1),
+        MEDIUM(2),
+        LARGE(3)
+    }
+
     enum class GlanceProviderId(val id: String) {
         PLAYING_SONG("PLAYING_SONG"),
         NEXT_CLOCK_ALARM("NEXT_CLOCK_ALARM"),
-//        BATTERY_LEVEL_LOW("BATTERY_LEVEL_LOW"),
+        BATTERY_LEVEL_LOW("BATTERY_LEVEL_LOW"),
-//        CUSTOM_INFO("CUSTOM_INFO"),
+        CUSTOM_INFO("CUSTOM_INFO"),
-//        GOOGLE_FIT_STEPS("GOOGLE_FIT_STEPS")
+        GOOGLE_FIT_STEPS("GOOGLE_FIT_STEPS")
+    }
+
+    enum class WidgetUpdateFrequency(val value: Int) {
+        LOW(0),
+        DEFAULT(1),
+        HIGH(2)
+    }
+
+    enum class WeatherIconPack(val value: Int) {
+        DEFAULT(0),
+        MINIMAL(1),
+        COOL(2),
+        GOOGLE_NEWS(3)
     }
 }

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

@@ -30,6 +30,8 @@ object Preferences : KotprefModel() {
     var customLocationLon by stringPref(key = "PREF_CUSTOM_LOCATION_LON", default = "")
     var customLocationAdd by stringPref(key = "PREF_CUSTOM_LOCATION_ADD", default = "")
     var dateFormat by stringPref(default = "")
+    var isDateCapitalize by booleanPref(default = true)
+    var isDateUppercase by booleanPref(default = false)
     var weatherRefreshPeriod by intPref(key = "PREF_WEATHER_REFRESH_PERIOD", default = 1)
     var showUntil by intPref(key = "PREF_SHOW_UNTIL", default = 1)
     var calendarAppName by stringPref(key = "PREF_CALENDAR_APP_NAME", default = "")
@@ -40,26 +42,54 @@ object Preferences : KotprefModel() {
     var eventAppName by stringPref(key = "PREF_EVENT_APP_NAME", default = "")
     var eventAppPackage by stringPref(key = "PREF_EVENT_APP_PACKAGE", default = "")
     var openEventDetails by booleanPref(default = true)
+
+    var widgetUpdateFrequency by intPref(default = Constants.WidgetUpdateFrequency.DEFAULT.value)
+
     var textGlobalColor by stringPref(key = "PREF_TEXT_COLOR", default = "#FFFFFF")
     var textGlobalAlpha by stringPref(default = "FF")
 
+    var textSecondaryColor by stringPref(default = "#FFFFFF")
+    var textSecondaryAlpha by stringPref(default = "FF")
+
     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 textGlobalColorDark by stringPref(default = "#FFFFFF")
+    var textGlobalAlphaDark by stringPref(default = "FF")
+
+    var textSecondaryColorDark by stringPref(default = "#FFFFFF")
+    var textSecondaryAlphaDark by stringPref(default = "FF")
+
+    var backgroundCardColorDark by stringPref(default = "#000000")
+    var backgroundCardAlphaDark by stringPref(default = "00")
+
+    var clockTextColorDark by stringPref(default = "#FFFFFF")
+    var clockTextAlphaDark by stringPref(default = "FF")
+
+
+    var showAMPMIndicator by booleanPref(default = true)
+
+    var weatherIconPack by intPref(default = Constants.WeatherIconPack.DEFAULT.value)
+
     // Global
     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)
     var clockBottomMargin by intPref(default = Constants.ClockBottomMargin.MEDIUM.value)
+    var secondRowTopMargin by intPref(default = Constants.SecondRowTopMargin.NONE.value)
     var showClock by booleanPref(key = "PREF_SHOW_CLOCK", default = false)
     var clockAppName by stringPref(key = "PREF_CLOCK_APP_NAME", default = "")
     var clockAppPackage by stringPref(key = "PREF_CLOCK_APP_PACKAGE", default = "")
     var textShadow by intPref(key = "PREF_TEXT_SHADOW", default = 1)
+    var textShadowDark by intPref(default = 1)
     var showDiffTime by booleanPref(key = "PREF_SHOW_DIFF_TIME", default = true)
     var showDeclinedEvents by booleanPref(key = "PREF_SHOW_DECLINED_EVENTS", default = false)
+    var showInvitedEvents by booleanPref(default = false)
+    var showAcceptedEvents by booleanPref(default = true)
+    var showOnlyBusyEvents by booleanPref(default = false)
     var secondRowInformation by intPref(key = "PREF_SECOND_ROW_INFORMATION", default = 0)
     var customFont by intPref(key = "PREF_CUSTOM_FONT", default = Constants.CUSTOM_FONT_PRODUCT_SANS)
     var customFontFile by stringPref(key = "PREF_CUSTOM_FONT_FILE")
@@ -77,10 +107,13 @@ object Preferences : KotprefModel() {
     // Glance
     var showGlance by booleanPref(default = true)
     var enabledGlanceProviderOrder by stringPref(default = "")
-    var customInfo by stringPref(default = "")
+    var customNotes by stringPref(default = "")
-    var showNextAlarm by booleanPref(default = false)
+    var showNextAlarm by booleanPref(default = true)
+    var showBatteryCharging by booleanPref(default = false)
     var isBatteryLevelLow by booleanPref(default = false)
+    var isCharging by booleanPref(default = false)
     var googleFitSteps by longPref(default = -1)
+    var showDailySteps by booleanPref(default = false)
 
     var showMusic by booleanPref(default = false)
     var mediaInfoFormat by stringPref(default = "")

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

@@ -12,8 +12,7 @@ object AlarmHelper {
         val alarm = nextAlarmClock
         return if (
             alarm != null
-            && alarm.triggerTime - Calendar.getInstance().timeInMillis > 10 * 60 * 1000
+            && alarm.triggerTime - Calendar.getInstance().timeInMillis > 5 * 60 * 1000
-            && alarm.triggerTime - Calendar.getInstance().timeInMillis < 12 * 60 * 60 * 1000
         ) {
             "%s %s".format(
                 SimpleDateFormat("EEE", Locale.getDefault()).format(alarm.triggerTime),

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

@@ -0,0 +1,23 @@
+package com.tommasoberlose.anotherwidget.helpers
+
+import android.content.Context
+import android.content.Context.BATTERY_SERVICE
+import android.os.BatteryManager
+import androidx.core.content.ContextCompat.getSystemService
+import com.tommasoberlose.anotherwidget.global.Preferences
+
+
+object BatteryHelper {
+    fun updateBatteryInfo(context: Context) {
+        with(context.getSystemService(BATTERY_SERVICE) as BatteryManager) {
+            Preferences.isBatteryLevelLow = getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY) <= 15
+            Preferences.isCharging = isCharging
+        }
+    }
+
+    fun getBatteryLevel(context: Context): Int {
+        with(context.getSystemService(BATTERY_SERVICE) as BatteryManager) {
+            return getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+        }
+    }
+}

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

@@ -104,13 +104,12 @@ object BitmapHelper {
     }
 
     fun drawableToBitmap(drawable: Drawable): Bitmap? {
-        var bitmap: Bitmap? = null
         if (drawable is BitmapDrawable) {
             if (drawable.bitmap != null) {
                 return drawable.bitmap
             }
         }
-        bitmap = if (drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0) {
+        val bitmap: Bitmap = if (drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0) {
             Bitmap.createBitmap(
                 1,
                 1,

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

@@ -1,14 +1,22 @@
 package com.tommasoberlose.anotherwidget.helpers
 
 import android.Manifest
+import android.app.job.JobInfo
+import android.app.job.JobParameters
+import android.app.job.JobScheduler
+import android.app.job.JobService
+import android.content.ComponentName
 import android.content.ContentUris
 import android.content.Context
+import android.content.Intent
 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.services.UpdateCalendarJob
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
@@ -23,110 +31,8 @@ import kotlin.collections.ArrayList
  */
 
 object CalendarHelper {
-
     fun updateEventList(context: Context) {
-        val eventRepository = EventRepository(context)
+        UpdateCalendarJob.enqueueWork(context, Intent())
-        if (Preferences.showEvents) {
-            val eventList = ArrayList<Event>()
-
-            val now = Calendar.getInstance()
-            val limit = Calendar.getInstance()
-            when (Preferences.showUntil) {
-                0 -> limit.add(Calendar.HOUR, 3)
-                1 -> limit.add(Calendar.HOUR, 6)
-                2 -> limit.add(Calendar.HOUR, 12)
-                3 -> limit.add(Calendar.DAY_OF_MONTH, 1)
-                4 -> limit.add(Calendar.DAY_OF_MONTH, 3)
-                5 -> limit.add(Calendar.DAY_OF_MONTH, 7)
-                6 -> limit.add(Calendar.MINUTE, 30)
-                7 -> limit.add(Calendar.HOUR, 1)
-                else -> limit.add(Calendar.HOUR, 6)
-            }
-
-            val builder = CalendarContract.Instances.CONTENT_URI.buildUpon()
-            ContentUris.appendId(builder, now.timeInMillis)
-            ContentUris.appendId(builder, limit.timeInMillis)
-
-            if (!context.checkGrantedPermission(
-                    Manifest.permission.READ_CALENDAR
-                )
-            ) {
-                eventRepository.resetNextEventData()
-            } else {
-                try {
-                    val provider = CalendarProvider(context)
-                    val data = provider.getInstances(now.timeInMillis, limit.timeInMillis)
-                    if (data != null) {
-                        val instances = data.list
-                        for (instance in instances) {
-                            try {
-                                val e = provider.getEvent(instance.eventId)
-                                if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && (Preferences.calendarAllDay || !e.allDay) && !getFilteredCalendarIdList().contains(
-                                        e.calendarId
-                                    ) && (Preferences.showDeclinedEvents || e.selfAttendeeStatus.toInt() != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)
-                                ) {
-                                    if (e.allDay) {
-                                        val start = Calendar.getInstance()
-                                        start.timeInMillis = instance.begin
-                                        val end = Calendar.getInstance()
-                                        end.timeInMillis = instance.end
-                                        instance.begin =
-                                            start.timeInMillis - start.timeZone.getOffset(start.timeInMillis)
-                                        instance.end =
-                                            end.timeInMillis - end.timeZone.getOffset(end.timeInMillis)
-                                    }
-                                    eventList.add(
-                                        Event(
-                                            instance.id,
-                                            e.id,
-                                            e.title ?: "",
-                                            instance.begin,
-                                            instance.end,
-                                            e.calendarId.toInt(),
-                                            e.allDay,
-                                            e.eventLocation ?: ""
-                                        )
-                                    )
-                                }
-                            } catch (ignored: Exception) {
-                            }
-                        }
-                    }
-
-                    if (eventList.isEmpty()) {
-                        eventRepository.resetNextEventData()
-                    } else {
-                        eventList.sortWith(Comparator { event: Event, event1: Event ->
-                            if (event.allDay && event1.allDay) {
-                                event.startDate.compareTo(event1.startDate)
-                            } else if (event.allDay) {
-                                1
-                            } else if (event1.allDay) {
-                                -1
-                            } else {
-                                event1.startDate.compareTo(event.startDate)
-                            }
-                        })
-                        eventList.reverse()
-                        eventRepository.saveEvents(
-                            eventList
-                        )
-                        eventRepository.saveNextEventData(
-                            eventList[0]
-                        )
-                    }
-                } catch (ignored: java.lang.Exception) {
-
-                }
-            }
-        } else {
-            eventRepository.resetNextEventData()
-        }
-
-        UpdatesReceiver.setUpdates(context)
-        MainWidget.updateWidget(context)
-
-        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
     }
 
     fun getCalendarList(context: Context): List<me.everything.providers.android.calendar.Calendar> {
@@ -148,7 +54,8 @@ object CalendarHelper {
     }
 
     fun getFilteredCalendarIdList(): List<Long> {
-        return Preferences.calendarFilter.split(",").map { it.replace(" ", "") }.filter { it != "" }.map { it.toLong() }
+        return Preferences.calendarFilter.split(",").map { it.replace(" ", "") }
+            .filter { it != "" }.map { it.toLong() }
     }
 
     fun filterCalendar(list: List<Long>) {
@@ -162,4 +69,15 @@ object CalendarHelper {
     fun removeEventUpdatesAndroidN(context: Context) {
         EventListenerJob.remove(context)
     }
+
+    fun List<Event>.applyFilters() : List<Event> {
+        return this
+            .asSequence()
+            .filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) }
+            .filter { (Preferences.showAcceptedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED) }
+            .filter { (Preferences.showInvitedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_INVITED) }
+            .filter { (Preferences.calendarAllDay || !it.allDay) }
+            .filter { (!Preferences.showOnlyBusyEvents || it.availability != CalendarContract.EventsEntity.AVAILABILITY_FREE) }
+            .toList()
+    }
 }

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

@@ -7,72 +7,97 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 import kotlin.math.roundToInt
 
 object ColorHelper {
-    fun getFontColor(): Int {
+    fun getFontColor(isDark: Boolean): Int {
         return try {
-            Color.parseColor("#%s%s".format(Preferences.textGlobalAlpha, Preferences.textGlobalColor.replace("#", "")))
+            Color.parseColor("#%s%s".format(if (!isDark) Preferences.textGlobalAlpha else Preferences.textGlobalAlphaDark, (if (!isDark) Preferences.textGlobalColor else Preferences.textGlobalColorDark).replace("#", "")))
         } catch (e: Exception) {
             Color.parseColor("#FFFFFFFF")
         }
     }
 
-    fun getFontColorAlpha(): Int {
+    fun getFontColorAlpha(isDark: Boolean): Int {
         return try {
-            Preferences.textGlobalAlpha.toIntValue().toDouble() * 255 / 100
+            (if (!isDark) Preferences.textGlobalAlpha else Preferences.textGlobalAlphaDark).toIntValue().toDouble() * 255 / 100
         } catch (e: Exception) {
             "FF".toIntValue().toDouble() * 255 / 100
         }.roundToInt()
     }
 
-    fun getFontColorRgb(): Int {
+    fun getFontColorRgb(isDark: Boolean): Int {
         return try {
-            Color.parseColor(Preferences.textGlobalColor)
+            Color.parseColor((if (!isDark) Preferences.textGlobalColor else Preferences.textGlobalColorDark))
         } catch (e: Exception) {
             Color.parseColor("#000000")
         }
     }
-    fun getClockFontColor(): Int {
+
+    fun getSecondaryFontColor(isDark: Boolean): Int {
         return try {
-            Color.parseColor("#%s%s".format(Preferences.clockTextAlpha, Preferences.clockTextColor.replace("#", "")))
+            Color.parseColor("#%s%s".format((if (!isDark) Preferences.textSecondaryAlpha else Preferences.textSecondaryAlphaDark), (if (!isDark) Preferences.textSecondaryColor else Preferences.textSecondaryColorDark).replace("#", "")))
         } catch (e: Exception) {
             Color.parseColor("#FFFFFFFF")
         }
     }
 
-    fun getClockFontColorAlpha(): Int {
+    fun getSecondaryFontColorAlpha(isDark: Boolean): Int {
         return try {
-            Preferences.clockTextAlpha.toIntValue().toDouble() * 255 / 100
+            (if (!isDark) Preferences.textSecondaryAlpha else Preferences.textSecondaryAlphaDark).toIntValue().toDouble() * 255 / 100
         } catch (e: Exception) {
             "FF".toIntValue().toDouble() * 255 / 100
         }.roundToInt()
     }
 
-    fun getClockFontColorRgb(): Int {
+    fun getSecondaryFontColorRgb(isDark: Boolean): Int {
         return try {
-            Color.parseColor(Preferences.clockTextColor)
+            Color.parseColor((if (!isDark) Preferences.textSecondaryColor else Preferences.textSecondaryColorDark))
         } catch (e: Exception) {
             Color.parseColor("#000000")
         }
     }
 
-    fun getBackgroundColor(): Int {
+    fun getClockFontColor(isDark: Boolean): Int {
         return try {
-            Color.parseColor("#%s%s".format(Preferences.backgroundCardAlpha, Preferences.backgroundCardColor.replace("#", "")))
+            Color.parseColor("#%s%s".format((if (!isDark) Preferences.clockTextAlpha else Preferences.clockTextAlphaDark), (if (!isDark) Preferences.clockTextColor else Preferences.clockTextColorDark).replace("#", "")))
+        } catch (e: Exception) {
+            Color.parseColor("#FFFFFFFF")
+        }
+    }
+
+    fun getClockFontColorAlpha(isDark: Boolean): Int {
+        return try {
+            (if (!isDark) Preferences.clockTextAlpha else Preferences.clockTextAlphaDark).toIntValue().toDouble() * 255 / 100
+        } catch (e: Exception) {
+            "FF".toIntValue().toDouble() * 255 / 100
+        }.roundToInt()
+    }
+
+    fun getClockFontColorRgb(isDark: Boolean): Int {
+        return try {
+            Color.parseColor((if (!isDark) Preferences.clockTextColor else Preferences.clockTextColorDark))
+        } catch (e: Exception) {
+            Color.parseColor("#000000")
+        }
+    }
+
+    fun getBackgroundColor(isDark: Boolean): Int {
+        return try {
+            Color.parseColor("#%s%s".format((if (!isDark) Preferences.backgroundCardAlpha else Preferences.backgroundCardAlphaDark), (if (!isDark) Preferences.backgroundCardColor else Preferences.backgroundCardColorDark).replace("#", "")))
         } catch (e: Exception) {
             Color.parseColor("#00000000")
         }
     }
 
-    fun getBackgroundAlpha(): Int {
+    fun getBackgroundAlpha(isDark: Boolean): Int {
         return try {
-            Preferences.backgroundCardAlpha.toIntValue().toDouble() * 255 / 100
+            (if (!isDark) Preferences.backgroundCardAlpha else Preferences.backgroundCardAlphaDark).toIntValue().toDouble() * 255 / 100
         } catch (e: Exception) {
             "00".toIntValue().toDouble() * 255 / 100
         }.roundToInt()
     }
 
-    fun getBackgroundColorRgb(): Int {
+    fun getBackgroundColorRgb(isDark: Boolean): Int {
         return try {
-            Color.parseColor(Preferences.backgroundCardColor)
+            Color.parseColor((if (!isDark) Preferences.backgroundCardColor else Preferences.backgroundCardColorDark))
         } catch (e: Exception) {
             Color.parseColor("#000000")
         }

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

@@ -2,7 +2,6 @@ package com.tommasoberlose.anotherwidget.helpers
 
 import android.content.Context
 import android.text.format.DateUtils
-import android.util.Log
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.utils.getCapWordString
 import java.lang.Exception
@@ -12,18 +11,28 @@ import java.util.*
 object DateHelper {
     fun getDateText(context: Context, date: Calendar): String {
         return if (Preferences.dateFormat != "") {
-            try {
+            val text = try {
                 SimpleDateFormat(Preferences.dateFormat, Locale.getDefault()).format(date.time)
             } catch (e: Exception) {
                 getDefaultDateText(context, date)
             }
+            when {
+                Preferences.isDateUppercase -> text.toUpperCase(Locale.getDefault())
+                Preferences.isDateCapitalize -> text.getCapWordString()
+                else -> text
+            }
         } else {
             val flags: Int =
                 DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-            "%s, %s".format(
+            val text = "%s, %s".format(
                 SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
                 DateUtils.formatDateTime(context, date.timeInMillis, flags)
-            ).getCapWordString()
+            )
+            when {
+                Preferences.isDateUppercase -> text.toUpperCase(Locale.getDefault())
+                Preferences.isDateCapitalize -> text.getCapWordString()
+                else -> text
+            }
         }
     }
 
@@ -33,6 +42,6 @@ object DateHelper {
         return "%s, %s".format(
             SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
             DateUtils.formatDateTime(context, date.timeInMillis, flags)
-        ).getCapWordString()
+        )
     }
 }

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

@@ -1,16 +1,23 @@
 package com.tommasoberlose.anotherwidget.helpers
 
 import android.content.Context
+import android.util.Log
 import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.models.GlanceProvider
+import com.tommasoberlose.anotherwidget.utils.checkIfFitInstalled
 import java.util.ArrayList
 
 object GlanceProviderHelper {
-    fun getGlanceProviders(): ArrayList<Constants.GlanceProviderId> {
+    fun getGlanceProviders(context: Context): ArrayList<Constants.GlanceProviderId> {
         val enabledProviders = Preferences.enabledGlanceProviderOrder.split(",").filter { it != "" }
+
         val providers = Constants.GlanceProviderId.values()
+            .filter {
+                context.checkIfFitInstalled() || it != Constants.GlanceProviderId.GOOGLE_FIT_STEPS
+            }.toTypedArray()
 
         providers.sortWith(Comparator { p1, p2 ->
             when {
@@ -37,40 +44,52 @@ object GlanceProviderHelper {
             Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_show_next_alarm_title),
-                   R.drawable.round_alarm,
+                   R.drawable.round_alarm
-                   context.getString(R.string.settings_show_next_alarm_subtitle)
                )
             }
             Constants.GlanceProviderId.PLAYING_SONG -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_show_music_title),
-                   R.drawable.round_music_note,
+                   R.drawable.round_music_note
-                   context.getString(R.string.settings_show_music_enabled_subtitle)
+               )
+            }
+            Constants.GlanceProviderId.CUSTOM_INFO -> {
+               GlanceProvider(providerId.id,
+                   context.getString(R.string.settings_custom_notes_title),
+                   R.drawable.round_notes
+               )
+            }
+            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+               GlanceProvider(providerId.id,
+                   context.getString(R.string.settings_low_battery_level_title),
+                   R.drawable.round_battery_charging_full
+               )
+            }
+            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+               GlanceProvider(providerId.id,
+                   context.getString(R.string.settings_daily_steps_title),
+                   R.drawable.round_directions_walk
                )
             }
-//            Constants.GlanceProviderId.CUSTOM_INFO -> {
-//               GlanceProvider(providerId.id,
-//                   context.getString(R.string.settings_show_next_alarm_title),
-//                   R.drawable.round_event_note
-//               )
-//            }
-//            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
-//               GlanceProvider(providerId.id,
-//                   context.getString(R.string.settings_show_next_alarm_title),
-//                   R.drawable.round_battery_charging_full
-//               )
-//            }
-//            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-//               GlanceProvider(providerId.id,
-//                   context.getString(R.string.settings_show_next_alarm_title),
-//                   R.drawable.round_directions_walk
-//               )
-//            }
-            else -> null
         }
     }
 
     fun saveGlanceProviderOrder(list: ArrayList<Constants.GlanceProviderId>) {
         Preferences.enabledGlanceProviderOrder = list.joinToString(separator = ",")
     }
+
+    fun showGlanceProviders(context: Context): Boolean {
+        val eventRepository = EventRepository(context)
+        BatteryHelper.updateBatteryInfo(context)
+
+        val showGlance = Preferences.showGlance && (eventRepository.getEventsCount() == 0 || !Preferences.showEvents) && (
+                (Preferences.showNextAlarm && AlarmHelper.getNextAlarm(context) != "") ||
+                (MediaPlayerHelper.isSomeonePlaying(context)) ||
+                (Preferences.showBatteryCharging && Preferences.isCharging || Preferences.isBatteryLevelLow) ||
+                (Preferences.customNotes.isNotEmpty()) ||
+                (Preferences.showDailySteps && Preferences.googleFitSteps > 0)
+        )
+        eventRepository.close()
+        return showGlance
+    }
 }

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

@@ -11,9 +11,11 @@ import android.provider.AlarmClock
 import android.provider.CalendarContract
 import android.provider.CalendarContract.Events
 import android.util.Log
+import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.toast
 import java.util.*
 
 
@@ -64,12 +66,8 @@ object IntentHelper {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK
                     }
                 } catch (e: Exception) {
-                    Intent(Intent.ACTION_VIEW).apply {
+                    context.toast(context.getString(R.string.error_opening_app))
-                        addCategory(Intent.CATEGORY_DEFAULT)
+                    Intent()
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                        data = Uri.parse("dynact://velour/weather/ProxyActivity")
-                        component = ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
-                    }
                 }
             }
         }
@@ -98,10 +96,8 @@ object IntentHelper {
                         data = calendarUri
                     }
                 } catch (e: Exception) {
-                    e.printStackTrace()
+                    context.toast(context.getString(R.string.error_opening_app))
-                    Intent(Intent.ACTION_VIEW).apply {
+                    Intent()
-                        data = calendarUri
-                    }
                 }
             }
         }
@@ -114,19 +110,51 @@ object IntentHelper {
                 if (Preferences.calendarAppPackage == "") {
                     Intent(Intent.ACTION_VIEW).apply {
                         data = uri
+                        flags = (Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                        if (!e.allDay) {
                             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)
+                        } else {
-//                        type = "vnd.android.cursor.item/event"
+                            val start = Calendar.getInstance().apply {
+                                timeInMillis = e.startDate
+                            }
+                            val end = Calendar.getInstance().apply {
+                                timeInMillis = e.endDate
+                            }
+
+                            putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate + start.timeZone.getOffset(start.timeInMillis))
+                            putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate + end.timeZone.getOffset(end.timeInMillis))
+                            putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1)
+                        }
                     }
                 } else {
-                    getCalendarIntent(context).apply {
+                    val calendarIntent = getCalendarIntent(context)
-                        action = Intent.ACTION_VIEW
+                    if (calendarIntent.action == Intent.ACTION_VIEW) {
+                        calendarIntent.apply {
                             data = uri
+                            if (!e.allDay) {
                                 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)
+                            } else {
-//                        type = "vnd.android.cursor.item/event"
+                                val start = Calendar.getInstance().apply {
+                                    timeInMillis = e.startDate
+                                }
+                                val end = Calendar.getInstance().apply {
+                                    timeInMillis = e.endDate
+                                }
+                                putExtra(
+                                    CalendarContract.EXTRA_EVENT_BEGIN_TIME,
+                                    start.timeInMillis + start.timeZone.getOffset(start.timeInMillis)
+                                )
+                                putExtra(
+                                    CalendarContract.EXTRA_EVENT_END_TIME,
+                                    end.timeInMillis + end.timeZone.getOffset(end.timeInMillis)
+                                )
+                                putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1)
+                            }
+                        }
+                    } else {
+                        Intent()
                     }
                 }
             }
@@ -153,12 +181,15 @@ object IntentHelper {
                         addCategory(Intent.CATEGORY_LAUNCHER)
                     }
                 } catch (e: Exception) {
-                    Intent(AlarmClock.ACTION_SHOW_ALARMS).apply {
+                    context.toast(context.getString(R.string.error_opening_app))
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    Intent()
                 }
             }
         }
     }
+
+    fun getBatteryIntent(): Intent {
+        return Intent(Intent.ACTION_POWER_USAGE_SUMMARY)
     }
 
     fun getMusicIntent(context: Context): Intent {
@@ -173,9 +204,22 @@ object IntentHelper {
                         addCategory(Intent.CATEGORY_LAUNCHER)
                     }
                 } catch (e: Exception) {
+                    context.toast(context.getString(R.string.error_opening_app))
                     Intent()
                 }
             }
         }
     }
+
+    fun getFitIntent(context: Context): Intent {
+        val pm: PackageManager = context.packageManager
+        return try {
+            pm.getLaunchIntentForPackage("com.google.android.apps.fitness")!!.apply {
+                addCategory(Intent.CATEGORY_LAUNCHER)
+            }
+        } catch (e: Exception) {
+            context.toast(context.getString(R.string.error_opening_app))
+            Intent()
+        }
+    }
 }

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

@@ -10,6 +10,8 @@ import android.media.session.MediaSessionManager
 import android.media.session.PlaybackState
 import android.util.Log
 import androidx.core.app.NotificationManagerCompat
+import com.chibatching.kotpref.Kotpref
+import com.chibatching.kotpref.blockingBulk
 import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.receivers.MusicNotificationListener
@@ -28,6 +30,7 @@ object MediaPlayerHelper {
     }
 
     fun updatePlayingMediaInfo(context: Context) {
+        Kotpref.init(context)
         if (NotificationManagerCompat.getEnabledListenerPackages(context).contains(context.packageName)) {
             val list = try {
                 (context.getSystemService(Context.MEDIA_SESSION_SERVICE) as MediaSessionManager).getActiveSessions(
@@ -65,20 +68,21 @@ object MediaPlayerHelper {
                 }
 
                 if (!isSomeonePlaying) {
-                    removeMediaInfo()
+                    removeMediaInfo(context)
                 }
 
             } else {
-                removeMediaInfo()
+                removeMediaInfo(context)
             }
         } else {
-            removeMediaInfo()
+            removeMediaInfo(context)
         }
         MainWidget.updateWidget(context)
     }
 
-    private fun removeMediaInfo() {
+    private fun removeMediaInfo(context: Context) {
-        Preferences.bulk {
+        Kotpref.init(context)
+        Preferences.blockingBulk {
             remove(Preferences::mediaPlayerTitle)
             remove(Preferences::mediaPlayerArtist)
             remove(Preferences::mediaPlayerAlbum)

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

@@ -3,6 +3,8 @@ package com.tommasoberlose.anotherwidget.helpers
 import android.content.Context
 import android.text.format.DateUtils
 import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
 import org.joda.time.DateTime
 import java.util.concurrent.TimeUnit
 
@@ -68,11 +70,38 @@ object SettingsStringHelper {
         difference += 60 * 1000 - (difference % (60 * 1000))
 
         when {
-            difference <= 0 || TimeUnit.MILLISECONDS.toHours(difference) < 1 -> {
+            difference <= 0 -> {
                 return ""
             }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.HIGH.value && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
+                return DateUtils.getRelativeTimeSpanString(start, start - 1000 * 60 * (TimeUnit.MILLISECONDS.toMinutes(difference) - 1 - (TimeUnit.MILLISECONDS.toMinutes(difference) - 1) % 5), DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
+            }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.DEFAULT.value && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
+                return DateUtils.getRelativeTimeSpanString(start, start - 1000 * 60 * (TimeUnit.MILLISECONDS.toMinutes(difference) - 1 - (TimeUnit.MILLISECONDS.toMinutes(difference) - 1) % 15), DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
+            }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.LOW.value -> {
+                return context.getString(R.string.soon)
+            }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 -> {
+                return context.getString(R.string.now)
+            }
             TimeUnit.MILLISECONDS.toHours(difference) < 12 -> {
-                return DateUtils.getRelativeTimeSpanString(start, now, DateUtils.HOUR_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
+                val minutes =  TimeUnit.MILLISECONDS.toMinutes(difference) - 60 * TimeUnit.MILLISECONDS.toHours(difference)
+                return if (minutes < 1 || minutes > 30) {
+                    DateUtils.getRelativeTimeSpanString(
+                        start,
+                        now - 1000 * 60 * 40,
+                        DateUtils.HOUR_IN_MILLIS,
+                        DateUtils.FORMAT_ABBREV_RELATIVE
+                    ).toString()
+                } else {
+                    DateUtils.getRelativeTimeSpanString(
+                        start,
+                        now,
+                        DateUtils.HOUR_IN_MILLIS,
+                        DateUtils.FORMAT_ABBREV_RELATIVE
+                    ).toString()
+                }
             }
             eventDate.dayOfYear == nowDate.plusDays(1).dayOfYear -> {
                 return String.format("%s", context.getString(R.string.tomorrow))

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

@@ -5,7 +5,7 @@ import android.content.Context
 import android.os.Build
 import com.google.android.gms.location.LocationServices
 import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.db.EventRepository
+import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
@@ -46,82 +46,202 @@ object WeatherHelper {
         MainWidget.updateWidget(context)
     }
 
-    fun getWeatherIconResource(icon: String): Int {
+    fun getWeatherIconResource(icon: String, style: Int = Preferences.weatherIconPack): Int {
-        when (icon) {
+        return when (icon) {
             "01d" -> {
-                return R.drawable.clear_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.clear_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_day_4
+                    else -> R.drawable.clear_day
+                }
             }
             "02d" -> {
-                return R.drawable.partly_cloudy
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_4
+                    else -> R.drawable.partly_cloudy
+                }
             }
             "03d" -> {
-                return R.drawable.mostly_cloudy
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_4
+                    else -> R.drawable.mostly_cloudy
+                }
             }
             "04d" -> {
-                return R.drawable.cloudy_weather
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
+                    else -> R.drawable.cloudy_weather
+                }
             }
             "09d" -> {
-                return R.drawable.storm_weather_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_day_4
+                    else -> R.drawable.storm_weather_day
+                }
             }
             "10d" -> {
-                return R.drawable.rainy_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_day_4
+                    else -> R.drawable.rainy_day
+                }
             }
             "11d" -> {
-                return R.drawable.thunder_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_day_4
+                    else -> R.drawable.thunder_day
+                }
             }
             "13d" -> {
-                return R.drawable.snow_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.snow_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_day_4
+                    else -> R.drawable.snow_day
+                }
             }
             "50d" -> {
-                return R.drawable.haze_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_day_4
+                    else -> R.drawable.haze_day
+                }
             }
             "80d" -> {
-                return R.drawable.windy_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.windy_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_day_4
+                    else -> R.drawable.windy_day
+                }
             }
             "81d" -> {
-                return R.drawable.rain_snow_day
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_day_4
+                    else -> R.drawable.rain_snow_day
+                }
             }
             "82d" -> {
-                return R.drawable.haze_weather
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
+                    else -> R.drawable.haze_weather
+                }
             }
 
 
 
             "01n" -> {
-                return R.drawable.clear_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.clear_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_night_4
+                    else -> R.drawable.clear_night
+                }
             }
             "02n" -> {
-                return R.drawable.partly_cloudy_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_night_4
+                    else -> R.drawable.partly_cloudy_night
+                }
             }
             "03n" -> {
-                return R.drawable.mostly_cloudy_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_night_4
+                    else -> R.drawable.mostly_cloudy_night
+                }
             }
             "04n" -> {
-                return R.drawable.cloudy_weather
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
+                    else -> R.drawable.cloudy_weather
+                }
             }
             "09n" -> {
-                return R.drawable.storm_weather_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_night_4
+                    else -> R.drawable.storm_weather_night
+                }
             }
             "10n" -> {
-                return R.drawable.rainy_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_night_4
+                    else -> R.drawable.rainy_night
+                }
             }
             "11n" -> {
-                return R.drawable.thunder_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_night_4
+                    else -> R.drawable.thunder_night
+                }
             }
             "13n" -> {
-                return R.drawable.snow_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.snow_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_night_4
+                    else -> R.drawable.snow_night
+                }
             }
             "50n" -> {
-                return R.drawable.haze_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_night_4
+                    else -> R.drawable.haze_night
+                }
             }
             "80n" -> {
-                return R.drawable.windy_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.windy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_night_4
+                    else -> R.drawable.windy_night
+                }
             }
             "81n" -> {
-                return R.drawable.rain_snow_night
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_night_4
+                    else -> R.drawable.rain_snow_night
+                }
             }
             "82n" -> {
-                return R.drawable.haze_weather
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
+                    else -> R.drawable.haze_weather
+                }
             }
             else -> {
                 return R.drawable.unknown

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 android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -24,19 +25,9 @@ object WidgetHelper {
             return widthInPx to heightInPx
         }
 
-        private fun getWidgetWidth(isPortrait: Boolean, widgetId: Int): Int =
+        private fun getWidgetWidth(isPortrait: Boolean, widgetId: Int): Int = getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH)
-            if (isPortrait) {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
-            } else {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH)
-            }
 
-        private fun getWidgetHeight(isPortrait: Boolean, widgetId: Int): Int =
+        private fun getWidgetHeight(isPortrait: Boolean, widgetId: Int): Int = getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT)
-            if (isPortrait) {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT)
-            } else {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)
-            }
 
         private fun getWidgetSizeInDp(widgetId: Int, key: String): Int =
             appWidgetManager.getAppWidgetOptions(widgetId).getInt(key, 0)
@@ -53,11 +44,4 @@ object WidgetHelper {
             width to second * factor
         }
     }
-
-    fun showSpecialWeather(context: Context): Boolean {
-        return EventRepository(context).getEventsCount() == 0 && (
-                (Preferences.showNextAlarm && AlarmHelper.getNextAlarm(context) != "") ||
-                (MediaPlayerHelper.isSomeonePlaying(context))
-            )
-    }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/models/Event.kt

@@ -1,5 +1,6 @@
 package com.tommasoberlose.anotherwidget.models
 
+import android.provider.CalendarContract
 import io.realm.RealmObject
 import java.util.Date
 
@@ -7,14 +8,18 @@ import java.util.Date
  * Created by tommaso on 05/10/17.
  */
 
-open class Event(var id: Long = 0,
+open class Event(
+    var id: Long = 0,
     var eventID: Long = 0,
     var title: String = "",
     var startDate: Long = 0,
     var endDate: Long = 0,
     var calendarID: Int = 0,
     var allDay: Boolean = false,
-            var address: String = "") : RealmObject() {
+    var address: String = "",
+    var selfAttendeeStatus: Int = CalendarContract.Attendees.ATTENDEE_STATUS_NONE,
+    var availability: Int = CalendarContract.EventsEntity.AVAILABILITY_BUSY
+) : RealmObject() {
     override fun toString(): String {
         return "Event:\nEVENT ID: " + eventID + "\nTITLE: " + title + "\nSTART DATE: " + Date(startDate) + "\nEND DATE: " + Date(endDate) + "\nCAL ID: " + calendarID  + "\nADDRESS: " + address
     }

app/src/main/java/com/tommasoberlose/anotherwidget/models/GlanceProvider.kt

@@ -3,10 +3,5 @@ package com.tommasoberlose.anotherwidget.models
 class GlanceProvider(
     val id: String,
     val title: String,
-    val icon: Int,
+    val icon: Int
-    val label: String = "",
-    val enabled: Boolean = false,
-    val isPermissionRequired: Boolean = false,
-    val isPermissionGranted: (() -> Boolean)? = null,
-    val requestPermission: (() -> Unit)? = null
 )

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

@@ -0,0 +1,180 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.Manifest
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import com.chibatching.kotpref.Kotpref
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.fitness.Fitness
+import com.google.android.gms.fitness.FitnessOptions
+import com.google.android.gms.fitness.data.DataType
+import com.google.android.gms.fitness.data.Field.FIELD_STEPS
+import com.google.android.gms.fitness.request.DataReadRequest
+import com.google.android.gms.location.*
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+
+class ActivityDetectionReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (ActivityTransitionResult.hasResult(intent)) {
+            val result = ActivityTransitionResult.extractResult(intent)!!
+            val lastEvent = result.transitionEvents.last()
+
+            if (lastEvent.activityType == DetectedActivity.WALKING || lastEvent.activityType == DetectedActivity.RUNNING && lastEvent.transitionType == ActivityTransition.ACTIVITY_TRANSITION_EXIT) {
+                requestDailySteps(context)
+            }
+        } else {
+            if (intent.action == Intent.ACTION_BOOT_COMPLETED || intent.action == Intent.ACTION_MY_PACKAGE_REPLACED && Preferences.showDailySteps && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(Manifest.permission.ACTIVITY_RECOGNITION)) {
+                resetDailySteps(context)
+                registerFence(context)
+            } else {
+                resetDailySteps(context)
+            }
+        }
+    }
+
+    private fun resetDailySteps(context: Context) {
+        Kotpref.init(context)
+        Preferences.googleFitSteps = -1
+    }
+
+    companion object {
+        val FITNESS_OPTIONS: FitnessOptions = FitnessOptions.builder()
+            .addDataType(DataType.TYPE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+            .addDataType(DataType.AGGREGATE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+            .build()
+
+        fun registerFence(context: Context) {
+            Kotpref.init(context)
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(
+                    Manifest.permission.ACTIVITY_RECOGNITION)) {
+                val transitions = mutableListOf<ActivityTransition>()
+
+                transitions +=
+                    ActivityTransition.Builder()
+                        .setActivityType(DetectedActivity.WALKING)
+                        .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
+                        .build()
+
+                transitions +=
+                    ActivityTransition.Builder()
+                        .setActivityType(DetectedActivity.RUNNING)
+                        .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
+                        .build()
+
+                val request = ActivityTransitionRequest(transitions)
+
+                // myPendingIntent is the instance of PendingIntent where the app receives callbacks.
+                val task = ActivityRecognition.getClient(context)
+                    .requestActivityTransitionUpdates(
+                        request,
+                        PendingIntent.getBroadcast(
+                            context,
+                            2,
+                            Intent(context, ActivityDetectionReceiver::class.java),
+                            0
+                        )
+                    )
+
+                task.addOnFailureListener { e: Exception ->
+                    e.printStackTrace()
+                    Preferences.showDailySteps = false
+                }
+
+            }
+        }
+
+        fun unregisterFence(context: Context) {
+            val task = ActivityRecognition.getClient(context)
+                .removeActivityTransitionUpdates(
+                    PendingIntent.getBroadcast(
+                        context,
+                        2,
+                        Intent(context, ActivityDetectionReceiver::class.java),
+                        0
+                    )
+                )
+
+            task.addOnCompleteListener {
+                if (it.isSuccessful) {
+                    PendingIntent.getBroadcast(
+                        context,
+                        2,
+                        Intent(context, ActivityDetectionReceiver::class.java),
+                        0
+                    ).cancel()
+                }
+            }
+        }
+
+        fun requestDailySteps(context: Context) {
+            Kotpref.init(context)
+
+            val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(context)
+            if (account != null && GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
+
+                val cal: Calendar = Calendar.getInstance()
+                cal.set(Calendar.HOUR_OF_DAY, 0)
+                cal.set(Calendar.MINUTE, 0)
+                cal.set(Calendar.SECOND, 0)
+                cal.set(Calendar.MILLISECOND, 0)
+                val startTime: Long = cal.timeInMillis
+
+                cal.add(Calendar.DAY_OF_YEAR, 1)
+                val endTime: Long = cal.timeInMillis
+                
+                val readRequest = DataReadRequest.Builder()
+                    .aggregate(
+                        DataType.TYPE_STEP_COUNT_DELTA,
+                        DataType.AGGREGATE_STEP_COUNT_DELTA
+                    )
+                    .setTimeRange(startTime, endTime, TimeUnit.MILLISECONDS)
+                    .bucketByTime(1, TimeUnit.DAYS)
+                    .build()
+
+                Fitness.getHistoryClient(context, account)
+                    .readData(readRequest)
+                    .addOnSuccessListener { response ->
+                        Preferences.googleFitSteps = response.buckets.sumBy {
+                            try {
+                                it.getDataSet(DataType.AGGREGATE_STEP_COUNT_DELTA)?.dataPoints?.get(
+                                    0
+                                )?.getValue(FIELD_STEPS)?.asInt() ?: 0
+                            } catch (ex: Exception) {
+                                0
+                            }
+                        }.toLong()
+                        MainWidget.updateWidget(context)
+                        setTimeout(context)
+                    }
+            }
+        }
+
+        private fun setTimeout(context: Context) {
+            with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+                cancel(PendingIntent.getBroadcast(context, 5, Intent(context, ActivityDetectionReceiver::class.java), 0))
+                setExactAndAllowWhileIdle(
+                    AlarmManager.RTC,
+                    Calendar.getInstance().timeInMillis + 5 * 60 * 1000,
+                    PendingIntent.getBroadcast(
+                        context,
+                        5,
+                        Intent(context, ActivityDetectionReceiver::class.java),
+                        0
+                    )
+                )
+            }
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.BatteryManager
+import android.util.Log
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.toast
+
+class BatteryLevelReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        when(intent.action) {
+            Intent.ACTION_BATTERY_LOW -> Preferences.isBatteryLevelLow = true
+            Intent.ACTION_BATTERY_OKAY -> Preferences.isBatteryLevelLow = false
+            Intent.ACTION_POWER_CONNECTED -> Preferences.isCharging = true
+            Intent.ACTION_POWER_DISCONNECTED -> Preferences.isCharging = false
+        }
+        MainWidget.updateWidget(context)
+    }
+
+}

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

@@ -24,5 +24,6 @@ class NewCalendarEventReceiver : BroadcastReceiver() {
                 eventRepository.goToPreviousEvent()
             }
         }
+        eventRepository.close()
     }
 }

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

@@ -1,22 +0,0 @@
-package com.tommasoberlose.anotherwidget.receivers
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-
-
-class PlayerReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        Log.d("ciao", "player ok")
-
-//        val cmd = intent.getStringExtra("command")
-//        Log.v("tag ", "$action / $cmd")
-//        val artist = intent.getStringExtra("artist")
-//        val album = intent.getStringExtra("album")
-//        val track = intent.getStringExtra("track")
-//        Log.v("tag", "$artist:$album:$track")
-
-    }
-}

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

@@ -10,6 +10,9 @@ import androidx.core.app.AlarmManagerCompat
 import androidx.core.content.ContextCompat.getSystemService
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.BatteryHelper
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
@@ -26,10 +29,12 @@ class UpdatesReceiver : BroadcastReceiver() {
             Intent.ACTION_TIME_CHANGED,
             Intent.ACTION_TIMEZONE_CHANGED,
             Intent.ACTION_LOCALE_CHANGED,
-            Actions.ACTION_CALENDAR_UPDATE -> CalendarHelper.updateEventList(context)
+            Intent.ACTION_DATE_CHANGED,
+            Actions.ACTION_CALENDAR_UPDATE -> {
+                CalendarHelper.updateEventList(context)
+            }
 
             "com.sec.android.widgetapp.APPWIDGET_RESIZE",
-            Intent.ACTION_DATE_CHANGED,
             AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED,
             Actions.ACTION_TIME_UPDATE -> {
                 MainWidget.updateWidget(context)
@@ -48,7 +53,7 @@ class UpdatesReceiver : BroadcastReceiver() {
             if (eventId == null) {
                 removeUpdates(context)
 
-                eventRepository.getEvents().forEach { event ->
+                eventRepository.getFutureEvents().forEach { event ->
                     setEventUpdate(context, event)
                 }
             } else {
@@ -57,6 +62,7 @@ class UpdatesReceiver : BroadcastReceiver() {
                     setEventUpdate(context, event)
                 }
             }
+            eventRepository.close()
         }
 
         private fun setEventUpdate(context: Context, event: Event) {
@@ -66,11 +72,38 @@ class UpdatesReceiver : BroadcastReceiver() {
                     set(Calendar.MILLISECOND, 0)
                 }
                 val diff = Period(now.timeInMillis, event.startDate)
+                val limit = when (Preferences.showUntil) {
+                    0 -> 1000 * 60 * 60 * 3
+                    1 -> 1000 * 60 * 60 * 6
+                    2 -> 1000 * 60 * 60 * 12
+                    3 -> 1000 * 60 * 60 * 24
+                    4 -> 1000 * 60 * 60 * 24 * 3
+                    5 -> 1000 * 60 * 60 * 24 * 7
+                    6 -> 1000 * 60 * 30
+                    7 -> 1000 * 60 * 60
+                    else -> 1000 * 60 * 60 * 6
+                }
+                if (event.startDate <= limit) {
                     if (event.startDate > now.timeInMillis) {
                         // Update the widget every hour till the event
-                    setExactAndAllowWhileIdle(
+                        if (diff.hours == 0) {
+                            var minutes = 0
+                            when (Preferences.widgetUpdateFrequency) {
+                                Constants.WidgetUpdateFrequency.DEFAULT.value -> {
+                                    minutes = when {
+                                        diff.minutes > 50 -> 50
+                                        diff.minutes > 30 -> 30
+                                        diff.minutes > 15 -> 15
+                                        else -> 0
+                                    }
+                                }
+                                Constants.WidgetUpdateFrequency.HIGH.value -> {
+                                    minutes = diff.minutes - (diff.minutes % 5)
+                                }
+                            }
+                            setExact(
                                 AlarmManager.RTC,
-                        if (event.startDate - diff.hours * 1000 * 60 * 60 > (now.timeInMillis + 120 * 1000)) event.startDate - diff.hours * 1000 * 60 * 60 else now.timeInMillis + 120000,
+                                if (event.startDate - minutes * 1000 * 60 > (now.timeInMillis + 120 * 1000)) event.startDate - 60 * 1000 * minutes else now.timeInMillis + 120000,
                                 PendingIntent.getBroadcast(
                                     context,
                                     event.eventID.toInt(),
@@ -78,14 +111,29 @@ class UpdatesReceiver : BroadcastReceiver() {
                                         action = Actions.ACTION_TIME_UPDATE
                                         putExtra(EVENT_ID, event.eventID)
                                     },
-                            0
+                                    PendingIntent.FLAG_UPDATE_CURRENT
                                 )
                             )
+                        } else {
+                            setExact(
+                                AlarmManager.RTC,
+                                event.startDate - diff.hours * 1000 * 60 * 60 + if (diff.minutes > 30) (-30) else (+30),
+                                PendingIntent.getBroadcast(
+                                    context,
+                                    event.eventID.toInt(),
+                                    Intent(context, UpdatesReceiver::class.java).apply {
+                                        action = Actions.ACTION_TIME_UPDATE
+                                        putExtra(EVENT_ID, event.eventID)
+                                    },
+                                    PendingIntent.FLAG_UPDATE_CURRENT
+                                )
+                            )
+                        }
                     } else {
                         // Update the widget one second after the event is finished
                         val fireTime =
                             if (event.endDate > now.timeInMillis + 120 * 1000) event.endDate else now.timeInMillis + 120000
-                    setExactAndAllowWhileIdle(
+                        setExact(
                             AlarmManager.RTC,
                             fireTime,
                             PendingIntent.getBroadcast(
@@ -98,14 +146,31 @@ class UpdatesReceiver : BroadcastReceiver() {
                             )
                         )
                     }
+                } else {
+                    setExact(
+                        AlarmManager.RTC,
+                        if (event.startDate - limit > now.timeInMillis + 120 * 1000) event.startDate - limit else now.timeInMillis + 120000,
+                        PendingIntent.getBroadcast(
+                            context,
+                            event.eventID.toInt(),
+                            Intent(context, UpdatesReceiver::class.java).apply {
+                                action = Actions.ACTION_TIME_UPDATE
+                                putExtra(EVENT_ID, event.eventID)
+                            },
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                        )
+                    )
+                }
             }
         }
 
         fun removeUpdates(context: Context) {
             with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
-                EventRepository(context).getEvents().forEach {
+                val eventRepository = EventRepository(context)
+                eventRepository.getFutureEvents().forEach {
                     cancel(PendingIntent.getBroadcast(context, it.eventID.toInt(), Intent(context, UpdatesReceiver::class.java), 0))
                 }
+                eventRepository.close()
             }
         }
     }

app/src/main/java/com/tommasoberlose/anotherwidget/services/BatteryListenerJob.kt

@@ -0,0 +1,61 @@
+package com.tommasoberlose.anotherwidget.services
+
+import android.app.job.JobInfo
+import android.app.job.JobParameters
+import android.app.job.JobScheduler
+import android.app.job.JobService
+import android.content.ComponentName
+import android.content.Context
+import android.os.Build
+import android.provider.CalendarContract
+import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+
+class BatteryListenerJob : JobService() {
+    override fun onStartJob(params: JobParameters): Boolean {
+        MainWidget.updateWidget(this)
+        schedule(
+            this
+        )
+        return false
+    }
+
+    @Synchronized
+    override fun onStopJob(params: JobParameters): Boolean {
+        return false
+    }
+
+    companion object {
+        private const val chargingJobId = 1006
+        private const val notChargingJobId = 1007
+        fun schedule(context: Context) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                remove(context)
+                val componentName = ComponentName(
+                    context,
+                    EventListenerJob::class.java
+                )
+                with(context.getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler) {
+                    schedule(
+                        JobInfo.Builder(chargingJobId, componentName)
+                            .setRequiresCharging(true)
+                            .setPersisted(true)
+                            .build()
+                    )
+                    schedule(
+                        JobInfo.Builder(notChargingJobId, componentName)
+                            .setRequiresCharging(false)
+                            .setPersisted(true)
+                            .build()
+                    )
+                }
+            }
+        }
+
+        private fun remove(context: Context) {
+            val js = context.getSystemService(JobScheduler::class.java)
+            js?.cancel(chargingJobId)
+            js?.cancel(notChargingJobId)
+        }
+    }
+}

app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarJob.kt

@@ -0,0 +1,143 @@
+package com.tommasoberlose.anotherwidget.services
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.provider.CalendarContract
+import android.util.Log
+import androidx.core.app.JobIntentService
+import com.tommasoberlose.anotherwidget.db.EventRepository
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
+import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters
+import com.tommasoberlose.anotherwidget.models.Event
+import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+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
+import org.greenrobot.eventbus.EventBus
+import java.util.*
+import kotlin.Comparator
+import kotlin.collections.ArrayList
+
+class UpdateCalendarJob : JobIntentService() {
+
+    companion object {
+        private const val jobId = 1200
+
+        fun enqueueWork(context: Context, work: Intent) {
+            enqueueWork(context, UpdateCalendarJob::class.java, jobId, work)
+        }
+    }
+
+    override fun onHandleWork(intent: Intent) {
+        val eventRepository = EventRepository(this)
+        if (Preferences.showEvents) {
+            val eventList = ArrayList<Event>()
+
+            val now = Calendar.getInstance()
+            val begin = Calendar.getInstance().apply {
+                set(Calendar.MILLISECOND, 0)
+                set(Calendar.SECOND, 0)
+                set(Calendar.MINUTE, 0)
+                set(Calendar.HOUR_OF_DAY, 0)
+            }
+            val limit = Calendar.getInstance().apply {
+                timeInMillis = begin.timeInMillis
+                add(Calendar.DAY_OF_YEAR, 2)
+            }
+
+            if (!checkGrantedPermission(
+                    Manifest.permission.READ_CALENDAR
+                )
+            ) {
+                eventRepository.resetNextEventData()
+            } else {
+                try {
+                    val provider = CalendarProvider(this)
+                    val data = provider.getInstances(begin.timeInMillis, limit.timeInMillis)
+                    if (data != null) {
+                        val instances = data.list
+                        for (instance in instances) {
+                            try {
+                                val e = provider.getEvent(instance.eventId)
+                                if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && now.timeInMillis < instance.end && !CalendarHelper.getFilteredCalendarIdList()
+                                        .contains(e.calendarId)
+                                ) {
+                                    if (e.allDay) {
+                                        val start = Calendar.getInstance()
+                                        start.timeInMillis = instance.begin
+                                        val end = Calendar.getInstance()
+                                        end.timeInMillis = instance.end
+                                        instance.begin =
+                                            start.timeInMillis - start.timeZone.getOffset(start.timeInMillis)
+                                        instance.end =
+                                            end.timeInMillis - end.timeZone.getOffset(end.timeInMillis)
+                                    }
+                                    eventList.add(
+                                        Event(
+                                            id = instance.id,
+                                            eventID = e.id,
+                                            title = e.title ?: "",
+                                            startDate = instance.begin,
+                                            endDate = instance.end,
+                                            calendarID = e.calendarId.toInt(),
+                                            allDay = e.allDay,
+                                            address = e.eventLocation ?: "",
+                                            selfAttendeeStatus = e.selfAttendeeStatus.toInt(),
+                                            availability = e.availability
+                                        )
+                                    )
+                                }
+                            } catch (ignored: Exception) {
+                            }
+                        }
+                    }
+
+                    val filteredEventList = eventList
+                        .applyFilters()
+
+                    if (filteredEventList.isEmpty()) {
+                        eventRepository.resetNextEventData()
+                        eventRepository.clearEvents()
+                    } else {
+                        eventList.sortWith(Comparator { event: Event, event1: Event ->
+                            val date = Calendar.getInstance().apply { timeInMillis = event.startDate }
+                            val date1 = Calendar.getInstance().apply { timeInMillis = event1.startDate }
+
+                            if (date.get(Calendar.DAY_OF_YEAR) == date1.get(Calendar.DAY_OF_YEAR) && date.get(Calendar.YEAR) == date1.get(Calendar.YEAR)) {
+                                if (event.allDay && event1.allDay) {
+                                    event1.startDate.compareTo(event.startDate)
+                                } else if (event.allDay) {
+                                    -1
+                                } else if (event1.allDay) {
+                                    1
+                                } else {
+                                    event1.startDate.compareTo(event.startDate)
+                                }
+                            } else {
+                                event1.startDate.compareTo(event.startDate)
+                            }
+                        })
+                        eventList.reverse()
+                        eventRepository.saveEvents(
+                            eventList
+                        )
+                        eventRepository.saveNextEventData(filteredEventList.first())
+                    }
+                } catch (ignored: java.lang.Exception) {
+
+                }
+            }
+        } else {
+            eventRepository.resetNextEventData()
+        }
+
+        UpdatesReceiver.setUpdates(this)
+        MainWidget.updateWidget(this)
+
+        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
+        eventRepository.close()
+    }
+}

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

@@ -6,19 +6,23 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.chibatching.kotpref.blockingBulk
 import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.databinding.ActivityCustomDateBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.DateHelper
 import com.tommasoberlose.anotherwidget.ui.viewmodels.CustomDateViewModel
+import com.tommasoberlose.anotherwidget.utils.getCapWordString
 import com.tommasoberlose.anotherwidget.utils.openURI
+import com.tommasoberlose.anotherwidget.utils.toast
 import kotlinx.android.synthetic.main.activity_custom_date.*
 import kotlinx.android.synthetic.main.activity_custom_location.action_back
 import kotlinx.android.synthetic.main.activity_custom_location.list_view
@@ -78,7 +82,7 @@ class CustomDateActivity  : AppCompatActivity() {
                 }
 
                 delay(200)
-                val text = if (dateFormat != "") {
+                var text = if (dateFormat != "") {
                     try {
                         SimpleDateFormat(dateFormat, Locale.getDefault()).format(DATE.time)
                     } catch (e: Exception) {
@@ -88,6 +92,14 @@ class CustomDateActivity  : AppCompatActivity() {
                     "__"
                 }
 
+                if (viewModel.isDateCapitalize.value == true) {
+                    text = text.getCapWordString()
+                }
+
+                if (viewModel.isDateUppercase.value == true) {
+                    text = text.toUpperCase(Locale.getDefault())
+                }
+
                 withContext(Dispatchers.Main) {
                     action_save.isVisible = text != ERROR_STRING
                     loader.visibility = View.INVISIBLE
@@ -96,6 +108,33 @@ class CustomDateActivity  : AppCompatActivity() {
 
             }
         })
+
+        viewModel.isDateCapitalize.observe(this, Observer {
+            viewModel.dateInput.value = viewModel.dateInput.value
+            updateCapitalizeUi()
+        })
+
+        viewModel.isDateUppercase.observe(this, Observer {
+            viewModel.dateInput.value = viewModel.dateInput.value
+            updateCapitalizeUi()
+        })
+    }
+
+    private fun updateCapitalizeUi() {
+        when {
+            viewModel.isDateUppercase.value == true -> {
+                action_capitalize.setImageDrawable(ContextCompat.getDrawable(this@CustomDateActivity, R.drawable.round_publish))
+                action_capitalize.alpha = 1f
+            }
+            viewModel.isDateCapitalize.value == true -> {
+                action_capitalize.setImageDrawable(ContextCompat.getDrawable(this@CustomDateActivity, R.drawable.ic_capitalize))
+                action_capitalize.alpha = 1f
+            }
+            else -> {
+                action_capitalize.setImageDrawable(ContextCompat.getDrawable(this@CustomDateActivity, R.drawable.round_publish))
+                action_capitalize.alpha = 0.3f
+            }
+        }
     }
 
     private fun setupListener() {
@@ -104,10 +143,36 @@ class CustomDateActivity  : AppCompatActivity() {
         }
 
         action_save.setOnClickListener {
-            Preferences.dateFormat = viewModel.dateInput.value ?: ""
+            Preferences.blockingBulk {
+                dateFormat = viewModel.dateInput.value ?: ""
+                isDateCapitalize = viewModel.isDateCapitalize.value ?: true
+                isDateUppercase = viewModel.isDateUppercase.value ?: false
+            }
             finish()
         }
 
+        action_capitalize.setOnClickListener {
+            when {
+                viewModel.isDateUppercase.value == true -> {
+                    viewModel.isDateCapitalize.value = false
+                    viewModel.isDateUppercase.value = false
+                }
+                viewModel.isDateCapitalize.value == true -> {
+                    viewModel.isDateCapitalize.value = false
+                    viewModel.isDateUppercase.value = true
+                }
+                else -> {
+                    viewModel.isDateCapitalize.value = true
+                    viewModel.isDateUppercase.value = false
+                }
+            }
+        }
+
+        action_capitalize.setOnLongClickListener {
+            toast(getString(R.string.action_capitalize_the_date))
+            true
+        }
+
         action_date_format_info.setOnClickListener {
             openURI("https://developer.android.com/reference/java/text/SimpleDateFormat")
         }

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

@@ -28,6 +28,7 @@ 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.components.MaterialBottomSheetDialog
 import com.tommasoberlose.anotherwidget.databinding.ActivityChooseApplicationBinding
 import com.tommasoberlose.anotherwidget.databinding.ActivityCustomLocationBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -62,8 +63,12 @@ class CustomLocationActivity : AppCompatActivity() {
                 injector
                     .text(R.id.text, getString(R.string.custom_location_gps))
                     .clicked(R.id.text) {
+                        MaterialBottomSheetDialog(this, message = getString(R.string.background_location_warning))
+                            .setPositiveButton(getString(android.R.string.ok)) {
                                 requirePermission()
                             }
+                            .show()
+                    }
             }
             .register<Address>(R.layout.custom_location_item) { item, injector ->
                 injector.text(R.id.text, item.getAddressLine(0))

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

@@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
+import com.chibatching.kotpref.Kotpref
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.tabs.TabLayoutMediator
 import com.karumi.dexter.Dexter
@@ -75,8 +76,10 @@ class MainActivity : AppCompatActivity() {
         viewModel = ViewModelProvider(this).get(MainViewModel::class.java)
 
         controlExtras(intent)
+        if (Preferences.showWallpaper) {
             requirePermission()
         }
+    }
 
     override fun onBackPressed() {
         if (mainNavController?.currentDestination?.id == R.id.appMainFragment) {

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

@@ -6,6 +6,7 @@ import android.location.Address
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
@@ -45,8 +46,17 @@ class SupportDevActivity : AppCompatActivity(), PurchasesUpdatedListener {
         adapter = SlimAdapter.create()
         adapter
             .register<SkuDetails>(R.layout.inapp_product_layout) { item, injector ->
+                item.sku
                 injector
-                    .text(R.id.product_title, item.title.replace("(Another Widget)", ""))
+                    .with<TextView>(R.id.product_title) {
+                        it.text = when (item.sku) {
+                            "donation_coffee" -> getString(R.string.donation_coffee)
+                            "donation_donuts" -> getString(R.string.donation_donuts)
+                            "donation_breakfast" -> getString(R.string.donation_breakfast)
+                            "donation_lunch" -> getString(R.string.donation_lunch)
+                            else -> ""
+                        }
+                    }
                     .text(R.id.product_price, item.price)
                     .clicked(R.id.item) {
                         viewModel.purchase(this, item)

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

@@ -32,11 +32,6 @@ class WeatherProviderActivity : AppCompatActivity() {
             openURI("https://home.openweathermap.org/users/sign_up")
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            last_info.text = Html.fromHtml(getString(R.string.api_key_info_all_set), Html.FROM_HTML_MODE_LEGACY)
-        } else {
-            last_info.text = Html.fromHtml(getString(R.string.api_key_info_all_set))
-        }
         api_key.editText?.setText(Preferences.weatherProviderApi)
     }
 }

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

@@ -4,7 +4,7 @@ import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
+import android.provider.CalendarContract
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -31,16 +31,15 @@ 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.helpers.CalendarHelper
-import com.tommasoberlose.anotherwidget.helpers.DateHelper
+import com.tommasoberlose.anotherwidget.helpers.IntentHelper
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
-import com.tommasoberlose.anotherwidget.ui.activities.CustomDateActivity
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.isDefaultSet
 import com.tommasoberlose.anotherwidget.utils.toast
 import kotlinx.android.synthetic.main.fragment_calendar_settings.*
 import kotlinx.android.synthetic.main.fragment_calendar_settings.scrollView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.util.*
 import kotlin.Comparator
 
 class CalendarTabFragment : Fragment() {
@@ -74,6 +73,11 @@ class CalendarTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        show_all_day_toggle.isChecked = Preferences.calendarAllDay
+        show_only_busy_events_toggle.isChecked = Preferences.showOnlyBusyEvents
+        show_diff_time_toggle.isChecked = Preferences.showDiffTime
+        show_multiple_events_toggle.isChecked = Preferences.showNextEvent
+
         setupListener()
     }
 
@@ -81,6 +85,9 @@ class CalendarTabFragment : Fragment() {
         binding: FragmentCalendarSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isCalendarEnabled = Preferences.showEvents
+        binding.isDiffEnabled = Preferences.showDiffTime || !Preferences.showEvents
+
         viewModel.showEvents.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 binding.isCalendarEnabled = it
@@ -90,23 +97,17 @@ class CalendarTabFragment : Fragment() {
                 } else {
                     CalendarHelper.removeEventUpdatesAndroidN(requireContext())
                 }
+                binding.isDiffEnabled = Preferences.showDiffTime || !it
             }
             checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.calendarAllDay.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 all_day_label?.text =
-                    if (it) getString(R.string.settings_all_day_subtitle_visible) else getString(R.string.settings_all_day_subtitle_gone)
+                    if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
             }
-            checkReadEventsPermission()
-        })
-
-        viewModel.showDeclinedEvents.observe(viewLifecycleOwner, Observer {
-            maintainScrollPosition {
-                show_declined_events_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-            }
-            checkReadEventsPermission()
         })
 
         viewModel.secondRowInformation.observe(viewLifecycleOwner, Observer {
@@ -118,6 +119,18 @@ class CalendarTabFragment : Fragment() {
         viewModel.showDiffTime.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_diff_time_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+                binding.isDiffEnabled = it || !Preferences.showEvents
+            }
+        })
+
+        viewModel.widgetUpdateFrequency.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                widget_update_frequency_label?.text = when (it) {
+                    Constants.WidgetUpdateFrequency.HIGH.value -> getString(R.string.settings_widget_update_frequency_high)
+                    Constants.WidgetUpdateFrequency.DEFAULT.value -> getString(R.string.settings_widget_update_frequency_default)
+                    Constants.WidgetUpdateFrequency.LOW.value -> getString(R.string.settings_widget_update_frequency_low)
+                    else -> ""
+                }
             }
         })
 
@@ -125,22 +138,30 @@ class CalendarTabFragment : Fragment() {
             maintainScrollPosition {
                 show_until_label?.text = getString(SettingsStringHelper.getShowUntilString(it))
             }
-            checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.showNextEvent.observe(viewLifecycleOwner, Observer {
-            show_multiple_events_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-        })
-
-        viewModel.dateFormat.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                date_format_label?.text = DateHelper.getDateText(requireContext(), Calendar.getInstance())
+                show_multiple_events_label?.text =
+                    if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
             }
         })
 
         viewModel.calendarAppName.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                calendar_app_label?.text = if (it != "") it else getString(R.string.default_calendar_app)
+                calendar_app_label?.text = when {
+                    Preferences.clockAppName != "" -> Preferences.clockAppName
+                    else -> {
+                        if (IntentHelper.getCalendarIntent(requireContext()).isDefaultSet(requireContext())) {
+                            getString(
+                                R.string.default_calendar_app
+                            )
+                        } else {
+                            getString(R.string.nothing)
+                        }
+                    }
+                }
             }
         })
 
@@ -205,14 +226,14 @@ class CalendarTabFragment : Fragment() {
                     }
                     
                     dialog.addItem(
-                        if (calendarSelectorList[index].name == calendarSelectorList[index].accountName) getString(R.string.account_events) else calendarSelectorList[index].name,
+                        if (calendarSelectorList[index].name == calendarSelectorList[index].accountName) getString(R.string.main_calendar) else calendarSelectorList[index].name,
                         calendarSelectorList[index].id
                     )
                 }
 
                 dialog.addOnMultipleSelectItemListener { values ->
                     CalendarHelper.filterCalendar(calendarSelectorList.map { it.id }.filter { !values.contains(it) })
-                    checkReadEventsPermission()
+                    updateCalendar()
                 }.show()
             } else {
                 activity?.toast(getString(R.string.calendar_settings_list_error))
@@ -221,44 +242,100 @@ class CalendarTabFragment : Fragment() {
 
         action_show_all_day.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_all_day_title)).setSelectedValue(Preferences.calendarAllDay)
+                show_all_day_toggle.isChecked = !show_all_day_toggle.isChecked
-                    .addItem(getString(R.string.settings_all_day_subtitle_visible), true)
+            }
-                    .addItem(getString(R.string.settings_all_day_subtitle_gone), false)
+        }
-                    .addOnSelectItemListener { value ->
+
-                        Preferences.calendarAllDay = value
+        show_all_day_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showEvents) {
+                Preferences.calendarAllDay = isChecked
+                updateCalendar()
+            }
+        }
+
+        action_change_attendee_filter.setOnClickListener {
+            if (Preferences.showEvents) {
+                val selectedValues = emptyList<Int>().toMutableList()
+                if (Preferences.showDeclinedEvents) {
+                    selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)
+                }
+                if (Preferences.showInvitedEvents) {
+                    selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_INVITED)
+                }
+                if (Preferences.showAcceptedEvents) {
+                    selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED)
+                }
+
+                val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_attendee_status_title), isMultiSelection = true)
+                    .setSelectedValues(selectedValues)
+
+                dialog.addItem(
+                    getString(R.string.attendee_status_invited),
+                    CalendarContract.Attendees.ATTENDEE_STATUS_INVITED
+                )
+                dialog.addItem(
+                    getString(R.string.attendee_status_accepted),
+                    CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED
+                )
+                dialog.addItem(
+                    getString(R.string.attendee_status_declined),
+                    CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED
+                )
+
+                dialog.addOnMultipleSelectItemListener { values ->
+                    Preferences.showDeclinedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)
+                    Preferences.showAcceptedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED)
+                    Preferences.showInvitedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_INVITED)
+                    updateCalendar()
                 }.show()
             }
         }
 
-        action_show_declined_events.setOnClickListener {
+        action_show_only_busy_events.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_declined_events_title)).setSelectedValue(Preferences.showDeclinedEvents)
+                show_only_busy_events_toggle.isChecked = !show_only_busy_events_toggle.isChecked
-                    .addItem(getString(R.string.settings_visible), true)
+            }
-                    .addItem(getString(R.string.settings_not_visible), false)
+        }
-                    .addOnSelectItemListener { value ->
+
-                        Preferences.showDeclinedEvents = value
+        show_only_busy_events_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    }.show()
+            if (Preferences.showEvents) {
+                Preferences.showOnlyBusyEvents = isChecked
+                updateCalendar()
             }
         }
 
         action_show_multiple_events.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_multiple_events_title)).setSelectedValue(Preferences.showNextEvent)
+                show_multiple_events_toggle.isChecked = !show_multiple_events_toggle.isChecked
-                    .addItem(getString(R.string.settings_visible), true)
+            }
-                    .addItem(getString(R.string.settings_not_visible), false)
+        }
-                    .addOnSelectItemListener { value ->
+
-                        Preferences.showNextEvent = value
+        show_multiple_events_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    }.show()
+            if (Preferences.showEvents) {
+                Preferences.showNextEvent = isChecked
             }
         }
 
         action_show_diff_time.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_diff_time_title)).setSelectedValue(Preferences.showDiffTime)
+                show_diff_time_toggle.isChecked = !show_diff_time_toggle.isChecked
-                    .addItem(getString(R.string.settings_visible), true)
+            }
-                    .addItem(getString(R.string.settings_not_visible), false)
+        }
+
+        show_diff_time_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showEvents) {
+                Preferences.showDiffTime = isChecked
+            }
+        }
+
+        action_widget_update_frequency.setOnClickListener {
+            if (Preferences.showEvents && Preferences.showDiffTime) {
+                BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_widget_update_frequency_title), message = getString(R.string.settings_widget_update_frequency_subtitle)).setSelectedValue(Preferences.widgetUpdateFrequency)
+                    .addItem(getString(R.string.settings_widget_update_frequency_high), Constants.WidgetUpdateFrequency.HIGH.value)
+                    .addItem(getString(R.string.settings_widget_update_frequency_default), Constants.WidgetUpdateFrequency.DEFAULT.value)
+                    .addItem(getString(R.string.settings_widget_update_frequency_low), Constants.WidgetUpdateFrequency.LOW.value)
                     .addOnSelectItemListener { value ->
-                        Preferences.showDiffTime = value
+                        Preferences.widgetUpdateFrequency = value
                     }.show()
             }
         }
@@ -278,7 +355,7 @@ class CalendarTabFragment : Fragment() {
         action_show_until.setOnClickListener {
             if (Preferences.showEvents) {
                 val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_show_until_title)).setSelectedValue(Preferences.showUntil)
-                intArrayOf(6,7,0,1,2).forEach {
+                intArrayOf(6,7,0,1,2,3, 4, 5).forEach {
                     dialog.addItem(getString(SettingsStringHelper.getShowUntilString(it)), it)
                 }
                 dialog.addOnSelectItemListener { value ->
@@ -287,27 +364,6 @@ class CalendarTabFragment : Fragment() {
             }
         }
 
-        action_date_format.setOnClickListener {
-            if (Preferences.showEvents) {
-                val now = Calendar.getInstance()
-                val dialog = BottomSheetMenu<String>(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat)
-
-                dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "")
-                if (Preferences.dateFormat != "") {
-                    dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat)
-                }
-                dialog.addItem(getString(R.string.custom_date_format), "-")
-
-                dialog.addOnSelectItemListener { value ->
-                        if (value == "-") {
-                            startActivity(Intent(requireContext(), CustomDateActivity::class.java))
-                        } else {
-                            Preferences.dateFormat = value
-                        }
-                }.show()
-            }
-        }
-
         action_open_event_details.setOnClickListener {
             if (Preferences.showEvents) {
                 BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_event_app_title)).setSelectedValue(Preferences.openEventDetails)
@@ -328,7 +384,6 @@ class CalendarTabFragment : Fragment() {
         if (activity?.checkGrantedPermission(Manifest.permission.READ_CALENDAR) == true) {
             show_events_label?.text = if (showEvents) getString(R.string.show_events_visible) else getString(R.string.show_events_not_visible)
             read_calendar_permission_alert?.isVisible = false
-            CalendarHelper.updateEventList(requireContext())
         } else {
             show_events_label?.text = if (showEvents) getString(R.string.description_permission_calendar) else getString(R.string.show_events_not_visible)
             read_calendar_permission_alert?.isVisible = showEvents
@@ -338,6 +393,12 @@ class CalendarTabFragment : Fragment() {
         }
     }
 
+    private fun updateCalendar() {
+        if (activity?.checkGrantedPermission(Manifest.permission.READ_CALENDAR) == true) {
+            CalendarHelper.updateEventList(requireContext())
+        }
+    }
+
     private fun requirePermission() {
         Dexter.withContext(requireContext())
             .withPermissions(
@@ -385,11 +446,11 @@ class CalendarTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

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

@@ -8,6 +8,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.text.format.DateFormat
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -21,6 +23,7 @@ import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetColorPicker
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
 import com.tommasoberlose.anotherwidget.databinding.FragmentClockSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -29,9 +32,12 @@ 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.helpers.IntentHelper
 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.isDarkTheme
+import com.tommasoberlose.anotherwidget.utils.isDefaultSet
 import kotlinx.android.synthetic.main.fragment_clock_settings.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -48,6 +54,7 @@ class ClockTabFragment : Fragment() {
 
     private lateinit var viewModel: MainViewModel
     private lateinit var colors: IntArray
+    private lateinit var binding: FragmentClockSettingsBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -59,7 +66,7 @@ class ClockTabFragment : Fragment() {
     ): View {
 
         viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
-        val binding = DataBindingUtil.inflate<FragmentClockSettingsBinding>(inflater, R.layout.fragment_clock_settings, container, false)
+        binding = DataBindingUtil.inflate<FragmentClockSettingsBinding>(inflater, R.layout.fragment_clock_settings, container, false)
 
         subscribeUi(binding, viewModel)
 
@@ -72,6 +79,8 @@ class ClockTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        ampm_indicator_toggle.isChecked = Preferences.showAMPMIndicator
+
         lifecycleScope.launch(Dispatchers.IO) {
             val lazyColors = requireContext().resources.getIntArray(R.array.material_colors)
             withContext(Dispatchers.Main) {
@@ -85,6 +94,10 @@ class ClockTabFragment : Fragment() {
         binding: FragmentClockSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isClockVisible = Preferences.showClock
+        binding.is24Format = DateFormat.is24HourFormat(requireContext())
+        binding.isDarkModeEnabled = activity?.isDarkTheme() == true
+
         viewModel.showBigClockWarning.observe(viewLifecycleOwner, Observer {
             large_clock_warning?.isVisible = it
             small_clock_warning?.isVisible = !it
@@ -104,13 +117,30 @@ class ClockTabFragment : Fragment() {
             }
         })
 
+        viewModel.showAMPMIndicator.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                ampm_indicator_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+        })
+
         viewModel.clockTextColor.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 if (Preferences.clockTextAlpha == "00") {
                     clock_text_color_label?.text = getString(R.string.transparent)
                 } else {
                     clock_text_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.clockTextColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.clockTextAlphaDark == "00") {
+                    clock_text_color_label?.text = getString(R.string.transparent)
+                } else {
+                    clock_text_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -121,7 +151,18 @@ class ClockTabFragment : Fragment() {
                     clock_text_color_label?.text = getString(R.string.transparent)
                 } else {
                     clock_text_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.clockTextAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.clockTextAlphaDark == "00") {
+                    clock_text_color_label?.text = getString(R.string.transparent)
+                } else {
+                    clock_text_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -139,8 +180,18 @@ class ClockTabFragment : Fragment() {
 
         viewModel.clockAppName.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                clock_app_label?.text =
+                clock_app_label?.text = when {
-                    if (Preferences.clockAppName != "") Preferences.clockAppName else getString(R.string.default_clock_app)
+                    Preferences.clockAppName != "" -> Preferences.clockAppName
+                    else -> {
+                        if (IntentHelper.getClockIntent(requireContext()).isDefaultSet(requireContext())) {
+                            getString(
+                                R.string.default_clock_app
+                            )
+                        } else {
+                            getString(R.string.nothing)
+                        }
+                    }
+                }
             }
         })
     }
@@ -159,7 +210,11 @@ class ClockTabFragment : Fragment() {
         }
 
         action_clock_text_size.setOnClickListener {
-            val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.settings_clock_text_size_title)).setSelectedValue(Preferences.clockTextSize)
+            if (Preferences.showClock) {
+                val dialog = BottomSheetMenu<Float>(
+                    requireContext(),
+                    header = getString(R.string.settings_clock_text_size_title)
+                ).setSelectedValue(Preferences.clockTextSize)
                 (46 downTo 12).filter { it % 2 == 0 }.forEach {
                     dialog.addItem("${it}sp", it.toFloat())
                 }
@@ -167,43 +222,88 @@ class ClockTabFragment : Fragment() {
                     Preferences.clockTextSize = value
                 }.show()
             }
+        }
+
+        action_ampm_indicator_size.setOnClickListener {
+            if (Preferences.showClock) {
+                ampm_indicator_toggle.isChecked = !ampm_indicator_toggle.isChecked
+            }
+        }
+
+        ampm_indicator_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showClock) {
+                Preferences.showAMPMIndicator = isChecked
+            }
+        }
 
         action_clock_text_color.setOnClickListener {
+            if (Preferences.showClock) {
                 BottomSheetColorPicker(requireContext(),
                     colors = colors,
                     header = getString(R.string.settings_font_color_title),
-                getSelected = ColorHelper::getClockFontColorRgb,
+                    getSelected = { ColorHelper.getClockFontColorRgb(activity?.isDarkTheme() == true) },
                     onColorSelected = { color: Int ->
                         val colorString = Integer.toHexString(color)
-                    Preferences.clockTextColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                        if (activity?.isDarkTheme() == true) {
+                            Preferences.clockTextColorDark =
+                                "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                        } else {
+                            Preferences.clockTextColor =
+                                "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                        }
                     },
                     showAlphaSelector = true,
-                alpha = Preferences.clockTextAlpha.toIntValue(),
+                    alpha = if (activity?.isDarkTheme() == true) Preferences.clockTextAlphaDark.toIntValue() else Preferences.clockTextAlpha.toIntValue(),
                     onAlphaChangeListener = { alpha ->
+                        if (activity?.isDarkTheme() == true) {
+                            Preferences.clockTextAlphaDark = alpha.toHexValue()
+                        } else {
                             Preferences.clockTextAlpha = alpha.toHexValue()
                         }
+                    }
                 ).show()
             }
+        }
 
         action_clock_bottom_margin_size.setOnClickListener {
-            BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_clock_bottom_margin_title)).setSelectedValue(Preferences.clockBottomMargin)
+            if (Preferences.showClock) {
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_none), Constants.ClockBottomMargin.NONE.value)
+                BottomSheetMenu<Int>(
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_small), Constants.ClockBottomMargin.SMALL.value)
+                    requireContext(),
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_medium), Constants.ClockBottomMargin.MEDIUM.value)
+                    header = getString(R.string.settings_clock_bottom_margin_title)
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_large), Constants.ClockBottomMargin.LARGE.value)
+                ).setSelectedValue(Preferences.clockBottomMargin)
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_none),
+                        Constants.ClockBottomMargin.NONE.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_small),
+                        Constants.ClockBottomMargin.SMALL.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_medium),
+                        Constants.ClockBottomMargin.MEDIUM.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_large),
+                        Constants.ClockBottomMargin.LARGE.value
+                    )
                     .addOnSelectItemListener { value ->
                         Preferences.clockBottomMargin = value
                     }.show()
             }
+        }
 
         action_clock_app.setOnClickListener {
             if (Preferences.showClock) {
-                startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java),
+                if (Preferences.showClock) {
+                    startActivityForResult(
+                        Intent(requireContext(), ChooseApplicationActivity::class.java),
                         RequestCode.CLOCK_APP_REQUEST_CODE.code
                     )
                 }
             }
         }
+    }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK && requestCode ==  RequestCode.CLOCK_APP_REQUEST_CODE.code) {
@@ -215,12 +315,17 @@ class ClockTabFragment : Fragment() {
         super.onActivityResult(requestCode, resultCode, data)
     }
 
+    override fun onResume() {
+        binding.is24Format = DateFormat.is24HourFormat(requireContext())
+        super.onResume()
+    }
+
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

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

@@ -12,23 +12,31 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import com.chibatching.kotpref.blockingBulk
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetColorPicker
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
 import com.tommasoberlose.anotherwidget.databinding.FragmentGeneralSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toHexValue
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
+import com.tommasoberlose.anotherwidget.helpers.DateHelper
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
+import com.tommasoberlose.anotherwidget.ui.activities.CustomDateActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
+import kotlinx.android.synthetic.main.fragment_clock_settings.*
 import kotlinx.android.synthetic.main.fragment_general_settings.*
+import kotlinx.android.synthetic.main.fragment_general_settings.scrollView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.*
 
 
 class GeneralTabFragment : Fragment() {
@@ -57,6 +65,7 @@ class GeneralTabFragment : Fragment() {
 
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
+        binding.isDarkModeEnabled = activity?.isDarkTheme() == true
 
         return binding.root
     }
@@ -64,6 +73,8 @@ class GeneralTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        show_dividers_toggle.isChecked = Preferences.showDividers
+
         setupListener()
         lifecycleScope.launch(Dispatchers.IO) {
             val lazyColors = requireContext().resources.getIntArray(R.array.material_colors)
@@ -97,7 +108,18 @@ class GeneralTabFragment : Fragment() {
                     font_color_label?.text = getString(R.string.transparent)
                 } else {
                     font_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textGlobalColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textGlobalAlphaDark == "00") {
+                    font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -108,7 +130,73 @@ class GeneralTabFragment : Fragment() {
                     font_color_label?.text = getString(R.string.transparent)
                 } else {
                     font_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textGlobalAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textGlobalAlphaDark == "00") {
+                    font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textSecondaryColor.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlpha == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textSecondaryColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlphaDark == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textSecondaryAlpha.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlpha == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textSecondaryAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlphaDark == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.secondRowTopMargin.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                second_row_top_margin_label?.text = when (it) {
+                    Constants.SecondRowTopMargin.NONE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_none)
+                    Constants.SecondRowTopMargin.SMALL.value -> getString(R.string.settings_clock_bottom_margin_subtitle_small)
+                    Constants.SecondRowTopMargin.LARGE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_large)
+                    else -> getString(R.string.settings_clock_bottom_margin_subtitle_medium)
                 }
             }
         })
@@ -119,7 +207,18 @@ class GeneralTabFragment : Fragment() {
                     background_color_label?.text = getString(R.string.transparent)
                 } else {
                     background_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.backgroundCardColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.backgroundCardAlphaDark == "00") {
+                    background_color_label?.text = getString(R.string.transparent)
+                } else {
+                    background_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -130,14 +229,43 @@ class GeneralTabFragment : Fragment() {
                     background_color_label?.text = getString(R.string.transparent)
                 } else {
                     background_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.backgroundCardAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.backgroundCardAlphaDark == "00") {
+                    background_color_label?.text = getString(R.string.transparent)
+                } else {
+                    background_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
 
         viewModel.textShadow.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                text_shadow_label?.text = getString(SettingsStringHelper.getTextShadowString(it))
+                if (activity?.isDarkTheme() != true) {
+                    text_shadow_label?.text =
+                        getString(SettingsStringHelper.getTextShadowString(it))
+                }
+            }
+        })
+
+        viewModel.textShadowDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (activity?.isDarkTheme() == true) {
+                    text_shadow_label?.text =
+                        getString(SettingsStringHelper.getTextShadowString(it))
+                }
+            }
+        })
+
+        viewModel.dateFormat.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                date_format_label?.text = DateHelper.getDateText(requireContext(), Calendar.getInstance())
             }
         })
 
@@ -148,23 +276,17 @@ class GeneralTabFragment : Fragment() {
         })
 
         viewModel.showDividers.observe(viewLifecycleOwner, Observer {
-            show_dividers_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            maintainScrollPosition {
+                show_dividers_label?.text =
+                    if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
         })
     }
 
-    private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
-        callback.invoke()
-        lifecycleScope.launch {
-            delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
-        }
-    }
-
     private fun setupListener() {
         action_main_text_size.setOnClickListener {
             val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.title_main_text_size)).setSelectedValue(Preferences.textMainSize)
-            (32 downTo 10).filter { it % 2 == 0 }.forEach {
+            (40 downTo 10).filter { it % 2 == 0 }.forEach {
                 dialog.addItem("${it}sp", it.toFloat())
             }
             dialog.addOnSelectItemListener { value ->
@@ -174,7 +296,7 @@ class GeneralTabFragment : Fragment() {
 
         action_second_text_size.setOnClickListener {
             val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.title_second_text_size)).setSelectedValue(Preferences.textSecondSize)
-            (28 downTo 10).filter { it % 2 == 0 }.forEach {
+            (40 downTo 10).filter { it % 2 == 0 }.forEach {
                 dialog.addItem("${it}sp", it.toFloat())
             }
             dialog.addOnSelectItemListener { value ->
@@ -186,43 +308,147 @@ class GeneralTabFragment : Fragment() {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,
                 header = getString(R.string.settings_font_color_title),
-                getSelected = ColorHelper::getFontColorRgb,
+                getSelected = { ColorHelper.getFontColorRgb(activity?.isDarkTheme() == true) },
                 onColorSelected = { color: Int ->
                     val colorString = Integer.toHexString(color)
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textGlobalColorDark = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    } else {
                         Preferences.textGlobalColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    }
                 },
                 showAlphaSelector = true,
-                alpha = Preferences.textGlobalAlpha.toIntValue(),
+                alpha = if (activity?.isDarkTheme() == true) Preferences.textGlobalAlphaDark.toIntValue() else Preferences.textGlobalAlpha.toIntValue(),
                 onAlphaChangeListener = { alpha ->
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textGlobalAlphaDark = alpha.toHexValue()
+                    } else {
                         Preferences.textGlobalAlpha = alpha.toHexValue()
                     }
+                }
             ).show()
         }
 
+        action_secondary_font_color.setOnClickListener {
+            BottomSheetColorPicker(requireContext(),
+                colors = colors,
+                header = getString(R.string.settings_secondary_font_color_title),
+                getSelected = { ColorHelper.getSecondaryFontColorRgb(activity?.isDarkTheme() == true) },
+                onColorSelected = { color: Int ->
+                    val colorString = Integer.toHexString(color)
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textSecondaryColorDark =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    } else {
+                        Preferences.textSecondaryColor =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    }
+                },
+                showAlphaSelector = true,
+                alpha = if (activity?.isDarkTheme() == true) Preferences.textSecondaryAlphaDark.toIntValue() else Preferences.textSecondaryAlpha.toIntValue(),
+                onAlphaChangeListener = { alpha ->
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textSecondaryAlphaDark = alpha.toHexValue()
+                    } else {
+                        Preferences.textSecondaryAlpha = alpha.toHexValue()
+                    }
+                }
+            ).show()
+        }
+
+        action_second_row_top_margin_size.setOnClickListener {
+            BottomSheetMenu<Int>(
+                requireContext(),
+                header = getString(R.string.settings_secondary_row_top_margin_title)
+            ).setSelectedValue(Preferences.secondRowTopMargin)
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_none),
+                    Constants.SecondRowTopMargin.NONE.value
+                )
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_small),
+                    Constants.SecondRowTopMargin.SMALL.value
+                )
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_medium),
+                    Constants.SecondRowTopMargin.MEDIUM.value
+                )
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_large),
+                    Constants.SecondRowTopMargin.LARGE.value
+                )
+                .addOnSelectItemListener { value ->
+                    Preferences.secondRowTopMargin = value
+                }.show()
+        }
+
+        action_date_format.setOnClickListener {
+            val now = Calendar.getInstance()
+            val dialog = BottomSheetMenu<String>(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat)
+
+            dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "")
+            if (Preferences.dateFormat != "") {
+                dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat)
+            }
+            dialog.addItem(getString(R.string.custom_date_format), "-")
+
+            dialog.addOnSelectItemListener { value ->
+                when (value) {
+                    "-" -> {
+                        startActivity(Intent(requireContext(), CustomDateActivity::class.java))
+                    }
+                    "" -> {
+                        Preferences.blockingBulk {
+                            isDateCapitalize = false
+                            isDateUppercase = false
+                        }
+                        Preferences.dateFormat = value
+                    }
+                    else -> {
+                        Preferences.dateFormat = value
+                    }
+                }
+            }.show()
+        }
+
         action_background_color.setOnClickListener {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,
                 header = getString(R.string.settings_background_color_title),
-                getSelected = { ColorHelper.getBackgroundColorRgb() },
+                getSelected = { ColorHelper.getBackgroundColorRgb(activity?.isDarkTheme() == true) },
                 onColorSelected = { color: Int ->
                     val colorString = Integer.toHexString(color)
-                    Preferences.backgroundCardColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.backgroundCardColorDark =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    } else {
+                        Preferences.backgroundCardColor =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    }
                 },
                 showAlphaSelector = true,
-                alpha = Preferences.backgroundCardAlpha.toIntValue(),
+                alpha = if (activity?.isDarkTheme() == true) Preferences.backgroundCardAlphaDark.toIntValue() else Preferences.backgroundCardAlpha.toIntValue(),
                 onAlphaChangeListener = { alpha ->
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.backgroundCardAlphaDark = alpha.toHexValue()
+                    } else {
                         Preferences.backgroundCardAlpha = alpha.toHexValue()
                     }
+                }
             ).show()
         }
 
         action_text_shadow.setOnClickListener {
-            val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.title_text_shadow)).setSelectedValue(Preferences.textShadow)
+            val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.title_text_shadow)).setSelectedValue(if (activity?.isDarkTheme() == true) Preferences.textShadowDark else Preferences.textShadow)
             (2 downTo 0).forEach {
                 dialog.addItem(getString(SettingsStringHelper.getTextShadowString(it)), it)
             }
             dialog.addOnSelectItemListener { value ->
+                if (activity?.isDarkTheme() == true) {
+                    Preferences.textShadowDark = value
+                } else {
                     Preferences.textShadow = value
+                }
             }.show()
         }
 
@@ -249,12 +475,11 @@ class GeneralTabFragment : Fragment() {
         }
 
         action_show_dividers.setOnClickListener {
-            BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_multiple_events_title)).setSelectedValue(Preferences.showDividers)
+            show_dividers_toggle.isChecked = !show_dividers_toggle.isChecked
-                .addItem(getString(R.string.settings_visible), true)
+        }
-                .addItem(getString(R.string.settings_not_visible), false)
+
-                .addOnSelectItemListener { value ->
+        show_dividers_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    Preferences.showDividers = value
+            Preferences.showDividers = isChecked
-                }.show()
         }
     }
 
@@ -276,4 +501,13 @@ class GeneralTabFragment : Fragment() {
         }
         super.onActivityResult(requestCode, resultCode, data)
     }
+
+    private fun maintainScrollPosition(callback: () -> Unit) {
+        scrollView.isScrollable = false
+        callback.invoke()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.isScrollable = true
+        }
+    }
 }

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

@@ -1,44 +1,58 @@
 package com.tommasoberlose.anotherwidget.ui.fragments
 
+import android.Manifest
+import android.app.Activity
 import android.app.AlarmManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.ItemTouchHelper
+import com.google.android.gms.auth.api.signin.GoogleSignIn
-import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
-import androidx.recyclerview.widget.RecyclerView
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.google.android.gms.common.api.ApiException
+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.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.components.CustomNotesDialog
+import com.tommasoberlose.anotherwidget.components.GlanceProviderSortMenu
+import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
 import com.tommasoberlose.anotherwidget.databinding.FragmentGlanceSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
-import com.tommasoberlose.anotherwidget.helpers.GlanceProviderHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
-import com.tommasoberlose.anotherwidget.models.GlanceProvider
+import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
+import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver.Companion.FITNESS_OPTIONS
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.checkIfFitInstalled
+import com.tommasoberlose.anotherwidget.utils.toast
+import kotlinx.android.synthetic.main.fragment_calendar_settings.*
 import kotlinx.android.synthetic.main.fragment_glance_settings.*
+import kotlinx.android.synthetic.main.fragment_glance_settings.scrollView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import net.idik.lib.slimadapter.SlimAdapter
-import java.util.*
 
 
 class GlanceTabFragment : Fragment() {
@@ -48,7 +62,6 @@ class GlanceTabFragment : Fragment() {
     }
 
     private lateinit var viewModel: MainViewModel
-    private lateinit var adapter: SlimAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -73,64 +86,7 @@ class GlanceTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        list.setHasFixedSize(true)
+        action_show_steps.isVisible = requireContext().checkIfFitInstalled()
-        val mLayoutManager = LinearLayoutManager(requireContext())
-        list.layoutManager = mLayoutManager
-
-        adapter = SlimAdapter.create()
-        adapter
-            .register<String>(R.layout.glance_provider_item) { item, injector ->
-                injector
-                    .text(R.id.title, item)
-            }
-            .register<GlanceProvider>(R.layout.glance_provider_item) { item, injector ->
-                injector
-                    .text(R.id.title, item.title)
-                    .with<ImageView>(R.id.icon) {
-                        it.setImageDrawable(ContextCompat.getDrawable(requireContext(), item.icon))
-                    }
-                    .with<TextView>(R.id.label) {
-                        it.isVisible = item.label != ""
-                        it.text = item.label
-                    }
-            }
-            .attachTo(list)
-
-        adapter.updateData(
-            GlanceProviderHelper.getGlanceProviders()
-                .mapNotNull { GlanceProviderHelper.getGlanceProviderById(requireContext(), it) }
-        )
-
-        val mIth = ItemTouchHelper(
-            object : ItemTouchHelper.SimpleCallback(
-                ItemTouchHelper.UP or ItemTouchHelper.DOWN,
-                ItemTouchHelper.LEFT
-            ) {
-                override fun onMove(
-                    recyclerView: RecyclerView,
-                    viewHolder: ViewHolder, target: ViewHolder
-                ): Boolean {
-                    val fromPos = viewHolder.adapterPosition
-                    val toPos = target.adapterPosition
-                    // move item in `fromPos` to `toPos` in adapter.
-                    adapter.notifyItemMoved(fromPos, toPos)
-
-                    val list = GlanceProviderHelper.getGlanceProviders()
-                    Collections.swap(list, fromPos, toPos)
-                    GlanceProviderHelper.saveGlanceProviderOrder(list)
-                    return true
-                }
-
-                override fun onSwiped(
-                    viewHolder: ViewHolder,
-                    direction: Int
-                ) {
-                    // remove from adapter
-                }
-            })
-
-        mIth.attachToRecyclerView(list)
-
 
         setupListener()
         updateNextAlarmWarningUi()
@@ -140,17 +96,44 @@ class GlanceTabFragment : Fragment() {
         binding: FragmentGlanceSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isGlanceVisible = Preferences.showGlance
 
         viewModel.showGlance.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
                 binding.isGlanceVisible = it
+                show_glance_label.text = if (it) getString(R.string.description_show_glance_visible) else getString(R.string.description_show_glance_not_visible)
+            }
         })
 
         viewModel.showMusic.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
                 checkNotificationPermission()
+            }
         })
 
         viewModel.showNextAlarm.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
                 updateNextAlarmWarningUi()
+            }
+        })
+
+        viewModel.showBatteryCharging.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_low_battery_level_warning_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+        })
+
+        viewModel.showDailySteps.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_steps_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+            checkFitnessPermission()
+        })
+
+        viewModel.customInfo.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_custom_notes_label?.text = if (it == "") getString(R.string.settings_not_visible) else it
+            }
         })
 
     }
@@ -165,6 +148,11 @@ class GlanceTabFragment : Fragment() {
             Preferences.showGlance = enabled
         }
 
+        action_sort_glance_providers.setOnClickListener {
+            GlanceProviderSortMenu(requireContext())
+                .show()
+        }
+
         action_show_music.setOnClickListener {
             if (Preferences.showGlance) {
                 BottomSheetMenu<Boolean>(
@@ -192,6 +180,68 @@ class GlanceTabFragment : Fragment() {
                     }.show()
             }
         }
+
+        action_show_next_alarm.setOnLongClickListener {
+            with(requireContext().getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+                val alarm = nextAlarmClock
+                if (alarm != null && alarm.showIntent != null) {
+                    val pm = requireContext().packageManager as PackageManager
+                    val appNameOrPackage = try {
+                        pm.getApplicationLabel(pm.getApplicationInfo(alarm.showIntent?.creatorPackage ?: "", 0))
+                    } catch (e: Exception) {
+                        alarm.showIntent?.creatorPackage ?: ""
+                    }
+                    MaterialBottomSheetDialog(requireContext(), message = getString(R.string.next_alarm_warning).format(appNameOrPackage))
+                        .setPositiveButton(getString(android.R.string.ok))
+                        .show()
+                }
+            }
+            true
+        }
+
+        action_show_low_battery_level_warning.setOnClickListener {
+            if (Preferences.showGlance) {
+                BottomSheetMenu<Boolean>(
+                    requireContext(),
+                    header = getString(R.string.settings_low_battery_level_title)
+                ).setSelectedValue(Preferences.showBatteryCharging)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        Preferences.showBatteryCharging = value
+                    }.show()
+            }
+        }
+
+        action_show_steps.setOnClickListener {
+            if (Preferences.showGlance) {
+                BottomSheetMenu<Boolean>(
+                    requireContext(),
+                    header = getString(R.string.settings_daily_steps_title)
+                ).setSelectedValue(Preferences.showDailySteps)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        if (value) {
+                            val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(requireContext())
+                            if (!GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
+                                val mGoogleSignInClient = GoogleSignIn.getClient(requireActivity(), GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN).addExtension(FITNESS_OPTIONS).build())
+                                startActivityForResult(mGoogleSignInClient.signInIntent, 2)
+                            } else {
+                                Preferences.showDailySteps = true
+                            }
+                        } else {
+                            Preferences.showDailySteps = false
+                        }
+                    }.show()
+            }
+        }
+
+        action_show_custom_notes.setOnClickListener {
+            if (Preferences.showGlance) {
+                CustomNotesDialog(requireContext()).show()
+            }
+        }
     }
 
     private fun updateNextAlarmWarningUi() {
@@ -204,18 +254,13 @@ class GlanceTabFragment : Fragment() {
                 } catch (e: Exception) {
                     alarm.showIntent?.creatorPackage ?: ""
                 }
-                maintainScrollPosition {
+                show_next_alarm_warning.text = getString(R.string.next_alarm_warning).format(appNameOrPackage)
-                    show_next_alarm_warning.text =
-                        getString(R.string.next_alarm_warning).format(appNameOrPackage)
-                }
             } else {
-                maintainScrollPosition {
                 show_next_alarm_label?.text = if (Preferences.showNextAlarm) getString(R.string.settings_visible) else getString(
                         R.string.settings_not_visible)
             }
         }
     }
-    }
 
     private val nextAlarmChangeBroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
@@ -234,28 +279,114 @@ class GlanceTabFragment : Fragment() {
     }
 
     private fun checkNotificationPermission() {
-        if (NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName)) {
+        when {
+            NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName) -> {
                 notification_permission_alert?.isVisible = false
                 MediaPlayerHelper.updatePlayingMediaInfo(requireContext())
-            show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_show_music_enabled_subtitle) else getString(R.string.settings_show_music_disabled_subtitle)
+                show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-        } else if (Preferences.showMusic) {
+            }
+            Preferences.showMusic -> {
                 notification_permission_alert?.isVisible = true
                 show_music_label?.text = getString(R.string.settings_request_notification_access)
                 notification_permission_alert?.setOnClickListener {
                     activity?.startActivity(Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"))
                 }
-        } else {
+            }
-            show_music_label?.text = getString(R.string.settings_show_music_disabled_subtitle)
+            else -> {
+                show_music_label?.text = getString(R.string.settings_not_visible)
                 notification_permission_alert?.isVisible = false
             }
         }
+    }
+
+    private fun checkFitnessPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || activity?.checkGrantedPermission(Manifest.permission.ACTIVITY_RECOGNITION) == true) {
+            fitness_permission_alert?.isVisible = false
+            if (Preferences.showDailySteps) {
+                ActivityDetectionReceiver.registerFence(requireContext())
+            } else {
+                ActivityDetectionReceiver.unregisterFence(requireContext())
+            }
+            show_steps_label?.text = if (Preferences.showDailySteps) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+        } else if (Preferences.showDailySteps) {
+            ActivityDetectionReceiver.unregisterFence(requireContext())
+            fitness_permission_alert?.isVisible = true
+            show_steps_label?.text = getString(R.string.settings_request_fitness_access)
+            fitness_permission_alert?.setOnClickListener {
+                requireFitnessPermission()
+            }
+        } else {
+            ActivityDetectionReceiver.unregisterFence(requireContext())
+            show_steps_label?.text = getString(R.string.settings_not_visible)
+            fitness_permission_alert?.isVisible = false
+        }
+    }
+
+    override fun onActivityResult(
+        requestCode: Int,
+        resultCode: Int,
+        data: Intent?
+    ) {
+        when (requestCode) {
+            1 -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    checkFitnessPermission()
+                } else {
+                    Preferences.showDailySteps = false
+                }
+            }
+            2-> {
+                try {
+                    val account: GoogleSignInAccount? = GoogleSignIn.getSignedInAccountFromIntent(data).getResult(ApiException::class.java)
+                    if (!GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
+                        GoogleSignIn.requestPermissions(
+                            requireActivity(),
+                            1,
+                            account,
+                            FITNESS_OPTIONS)
+                    } else {
+                        checkFitnessPermission()
+                    }
+                } catch (e: ApiException) {
+                    e.printStackTrace()
+                    Preferences.showDailySteps = false
+                }
+            }
+        }
+    }
+
+    private fun requireFitnessPermission() {
+        Dexter.withContext(requireContext())
+            .withPermissions(
+                "com.google.android.gms.permission.ACTIVITY_RECOGNITION",
+                "android.gms.permission.ACTIVITY_RECOGNITION",
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACTIVITY_RECOGNITION else "com.google.android.gms.permission.ACTIVITY_RECOGNITION"
+            ).withListener(object: MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    report?.let {
+                        if (report.areAllPermissionsGranted()){
+                            checkFitnessPermission()
+                        }
+                    }
+                }
+                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?.continuePermissionRequest()
+                }
+            })
+            .check()
+    }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 

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

@@ -2,6 +2,8 @@ package com.tommasoberlose.anotherwidget.ui.fragments
 
 import android.Manifest
 import android.animation.ValueAnimator
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProviderInfo
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
@@ -40,6 +42,7 @@ 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.isDarkTheme
 import com.tommasoberlose.anotherwidget.utils.toPixel
 import kotlinx.android.synthetic.main.fragment_app_main.*
 import kotlinx.android.synthetic.main.the_widget_sans.*
@@ -60,8 +63,8 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, true)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        reenterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, false)
+        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
     }
 
     override fun onCreateView(
@@ -91,9 +94,9 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         }.attach()
 
         // Init clock
-        time.setTextColor(ColorHelper.getClockFontColor())
+        time.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
         time.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(requireContext()))
-        time_am_pm.setTextColor(ColorHelper.getClockFontColor())
+        time_am_pm.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
         time_am_pm.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2)
         time_container.isVisible = Preferences.showClock
 
@@ -125,60 +128,74 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
     private fun updateUI() {
         uiJob?.cancel()
 
+        preview?.clearAnimation()
+        time_container?.clearAnimation()
+
         if (Preferences.showPreview) {
-            preview.setCardBackgroundColor(
+            preview?.setCardBackgroundColor(
                 ContextCompat.getColor(
                     requireContext(),
-                    if (ColorHelper.getFontColor()
+                    if (ColorHelper.getFontColor(activity?.isDarkTheme() == true)
                             .isColorDark()
                     ) android.R.color.white else R.color.colorAccent
                 )
             )
-            widget_shape_background.setImageDrawable(BitmapHelper.getTintedDrawable(requireContext(), R.drawable.card_background, ColorHelper.getBackgroundColor()))
+            widget_shape_background?.setImageDrawable(
-            uiJob = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
+                BitmapHelper.getTintedDrawable(
+                    requireContext(),
+                    R.drawable.card_background,
+                    ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true)
+                )
+            )
+            uiJob = lifecycleScope.launch(Dispatchers.IO) {
                 val generatedView = MainWidget.generateWidgetView(requireContext())
 
                 withContext(Dispatchers.Main) {
                     generatedView.measure(0, 0)
-                    preview.measure(0, 0)
+                    preview?.measure(0, 0)
                 }
 
-                val bitmap = BitmapHelper.getBitmapFromView(
+                val bitmap = if (preview != null) {
+                    BitmapHelper.getBitmapFromView(
                         generatedView,
                         if (preview.width > 0) preview.width else generatedView.measuredWidth,
                         generatedView.measuredHeight
                     )
+                } else {
+                    null
+                }
                 withContext(Dispatchers.Main) {
                     // Clock
-                    time.setTextColor(ColorHelper.getClockFontColor())
+                    time?.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
-                    time_am_pm.setTextColor(ColorHelper.getClockFontColor())
+                    time_am_pm?.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
-                    time.setTextSize(
+                    time?.setTextSize(
                         TypedValue.COMPLEX_UNIT_SP,
                         Preferences.clockTextSize.toPixel(requireContext())
                     )
-                    time_am_pm.setTextSize(
+                    time_am_pm?.setTextSize(
                         TypedValue.COMPLEX_UNIT_SP,
                         Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2
                     )
+                    time_am_pm?.isVisible = Preferences.showAMPMIndicator
 
                     // Clock bottom margin
-                    clock_bottom_margin_none.isVisible =
+                    clock_bottom_margin_none?.isVisible =
                         Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.value
-                    clock_bottom_margin_small.isVisible =
+                    clock_bottom_margin_small?.isVisible =
                         Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.value
-                    clock_bottom_margin_medium.isVisible =
+                    clock_bottom_margin_medium?.isVisible =
                         Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.value
-                    clock_bottom_margin_large.isVisible =
+                    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?.alpha ?: 1f < 1f)) || (!Preferences.showClock && (time?.alpha ?: 0f > 0f))) {
                         if (Preferences.showClock) {
-                            time_container.layoutParams = time_container.layoutParams.apply {
+                            time_container?.layoutParams = time_container.layoutParams.apply {
                                 height = RelativeLayout.LayoutParams.WRAP_CONTENT
                             }
-                            time_container.measure(0, 0)
+                            time_container?.measure(0, 0)
                         }
-                        val initialHeight = time_container.measuredHeight
+                        val initialHeight = time_container?.measuredHeight ?: 0
                         ValueAnimator.ofFloat(
                             if (Preferences.showClock) 0f else 1f,
                             if (Preferences.showClock) 1f else 0f
@@ -186,24 +203,27 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                             duration = 500L
                             addUpdateListener {
                                 val animatedValue = animatedValue as Float
-                                time_container.layoutParams = time_container.layoutParams.apply {
+                                time_container?.layoutParams =
+                                    time_container.layoutParams.apply {
                                         height = (initialHeight * animatedValue).toInt()
                                     }
+                                time?.alpha = animatedValue
                             }
                             addListener(
                                 onStart = {
                                     if (Preferences.showClock) {
-                                        time_container.isVisible = true
+                                        time_container?.isVisible = true
                                     }
                                 },
                                 onEnd = {
                                     if (!Preferences.showClock) {
-                                        time_container.isVisible = false
+                                        time_container?.isVisible = false
                                     }
                                 }
                             )
                         }.start()
 
+                        if (preview != null) {
                             ValueAnimator.ofInt(
                                 preview.height,
                                 PREVIEW_BASE_HEIGHT.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(
@@ -212,20 +232,23 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                             ).apply {
                                 duration = 500L
                                 addUpdateListener {
+                                    if (preview != null) {
                                         val animatedValue = animatedValue as Int
                                         val layoutParams = preview.layoutParams
                                         layoutParams.height = animatedValue
                                         preview.layoutParams = layoutParams
                                     }
+                                }
                             }.start()
+                        }
                     } else {
-                        time_container.layoutParams = time_container.layoutParams.apply {
+                        time_container?.layoutParams = time_container.layoutParams.apply {
                             height = RelativeLayout.LayoutParams.WRAP_CONTENT
                         }
-                        time_container.measure(0, 0)
+                        time_container?.measure(0, 0)
                     }
 
-                    if (preview.height == 0) {
+                    if (preview != null && preview.height == 0) {
                         ValueAnimator.ofInt(
                             preview.height,
                             PREVIEW_BASE_HEIGHT.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(
@@ -234,33 +257,43 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                         ).apply {
                             duration = 300L
                             addUpdateListener {
+                                if (preview != null) {
                                     val animatedValue = animatedValue as Int
                                     val layoutParams = preview.layoutParams
                                     layoutParams.height = animatedValue
-                                preview.layoutParams = layoutParams
+                                    preview?.layoutParams = layoutParams
+                                }
                             }
                         }.start()
                     }
 
-                    widget_loader.animate().scaleX(0f).scaleY(0f).alpha(0f).setDuration(200L).start()
+                    widget_loader?.animate()?.scaleX(0f)?.scaleY(0f)?.alpha(0f)?.setDuration(200L)?.start()
-                    bitmap_container.setImageBitmap(bitmap)
+                    bitmap_container?.apply {
-                    widget.animate().alpha(1f).start()
+                        setImageBitmap(bitmap)
+                        scaleX = 0.9f
+                        scaleY = 0.9f
+                    }
+                    widget?.animate()?.alpha(1f)?.start()
                 }
             }
         } else {
+            if (preview != null) {
                 ValueAnimator.ofInt(
                     preview.height,
                     0
                 ).apply {
                     duration = 300L
                     addUpdateListener {
+                        if (preview != null) {
                             val animatedValue = animatedValue as Int
                             val layoutParams = preview.layoutParams
                             layoutParams.height = animatedValue
                             preview.layoutParams = layoutParams
                         }
+                    }
                 }.start()
             }
+        }
 
         showErrorBadge()
 
@@ -271,13 +304,27 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
             activity?.let { act ->
                 val wallpaper = act.getCurrentWallpaper()
                 widget_bg.setImageDrawable(if (it) wallpaper else null)
-                widget_bg.layoutParams = widget_bg.layoutParams.apply {
+                if (wallpaper != null) {
+                    widget_bg.layoutParams =
+                        (widget_bg.layoutParams as ViewGroup.MarginLayoutParams).apply {
 
                             val metrics = DisplayMetrics()
                             act.windowManager.defaultDisplay.getMetrics(metrics)
 
-                    height = metrics.heightPixels
+                            val dimensions: Pair<Int, Int> = if (wallpaper.intrinsicWidth >= wallpaper.intrinsicHeight) {
-                    width = (wallpaper?.intrinsicWidth ?: 1) * metrics.heightPixels / (wallpaper?.intrinsicWidth ?: 1)
+                                metrics.heightPixels to (wallpaper.intrinsicWidth) * metrics.heightPixels / (wallpaper.intrinsicHeight)
+                            } else {
+                                metrics.widthPixels to (wallpaper.intrinsicHeight) * metrics.widthPixels / (wallpaper.intrinsicWidth)
+                            }
+
+                            setMargins(
+                                if (dimensions.first >= dimensions.second) (-80).toPixel(requireContext()) else 0,
+                                (-80).toPixel(requireContext()), 0, 0
+                            )
+
+                            width = dimensions.first
+                            height = dimensions.second
+                        }
                 }
             }
         })
@@ -312,11 +359,6 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         }?.isVisible = Preferences.showMusic && !NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName)
     }
 
-    override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
-        updateUI()
-        MainWidget.updateWidget(requireContext())
-    }
-
     override fun onResume() {
         super.onResume()
         Preferences.preferences.registerOnSharedPreferenceChangeListener(this)
@@ -331,10 +373,29 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         super.onPause()
     }
 
+    private var delayJob: Job? = null
+
+    override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
+        delayJob?.cancel()
+        delayJob = lifecycleScope.launch(Dispatchers.IO) {
+            delay(200)
+            withContext(Dispatchers.Main) {
+                updateUI()
+            }
+        }
+        MainWidget.updateWidget(requireContext())
+    }
+
     class UpdateUiMessageEvent
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMessageEvent(ignore: UpdateUiMessageEvent?) {
+        delayJob?.cancel()
+        delayJob = lifecycleScope.launch(Dispatchers.IO) {
+            delay(200)
+            withContext(Dispatchers.Main) {
                 updateUI()
             }
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import android.Manifest
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -49,8 +50,8 @@ class SettingsFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, true)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, false)
+        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
     }
 
     override fun onCreateView(
@@ -64,6 +65,8 @@ class SettingsFragment : Fragment() {
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
 
+        subscribeUi(viewModel)
+
         return binding.root
     }
 
@@ -74,7 +77,8 @@ class SettingsFragment : Fragment() {
             Navigation.findNavController(it).popBackStack()
         }
 
-        subscribeUi(viewModel)
+        show_widget_preview_toggle.isChecked = Preferences.showPreview
+        show_wallpaper_toggle.isChecked = Preferences.showWallpaper
 
         setupListener()
 
@@ -119,44 +123,26 @@ class SettingsFragment : Fragment() {
     }
 
     private fun setupListener() {
-
         action_show_widget_preview.setOnClickListener {
-            maintainScrollPosition {
+            show_widget_preview_toggle.isChecked = !show_widget_preview_toggle.isChecked
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.action_show_widget_preview))
-                    .setSelectedValue(Preferences.showPreview)
-                    .addItem(
-                        getString(R.string.settings_visible),
-                        true
-                    )
-                    .addItem(
-                        getString(R.string.settings_not_visible),
-                        false
-                    )
-                    .addOnSelectItemListener { value ->
-                        Preferences.showPreview = value
-                    }.show()
         }
+
+        show_widget_preview_toggle.setOnCheckedChangeListener { _, isChecked ->
+            Preferences.showPreview = isChecked
         }
 
         action_show_wallpaper.setOnClickListener {
-            maintainScrollPosition {
+        }
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_title_show_wallpaper))
+
-                    .setSelectedValue(Preferences.showWallpaper && activity?.checkGrantedPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == true)
+        action_show_wallpaper.setOnClickListener {
-                    .addItem(
+            show_wallpaper_toggle.isChecked = !show_wallpaper_toggle.isChecked
-                        getString(R.string.settings_visible),
+        }
-                        true
+
-                    )
+        show_wallpaper_toggle.setOnCheckedChangeListener { _, isChecked ->
-                    .addItem(
+            if (isChecked) {
-                        getString(R.string.settings_not_visible),
-                        false
-                    )
-                    .addOnSelectItemListener { value ->
-                        if (value) {
                 requirePermission()
             } else {
-                            Preferences.showWallpaper = value
+                Preferences.showWallpaper = isChecked
-                        }
-                    }.show()
             }
         }
 
@@ -210,11 +196,11 @@ class SettingsFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 
@@ -225,8 +211,11 @@ class SettingsFragment : Fragment() {
             ).withListener(object: MultiplePermissionsListener {
                 override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
                     report?.let {
-                        Preferences.showWallpaper = false
+                        if (report.areAllPermissionsGranted()) {
-                        Preferences.showWallpaper = report.areAllPermissionsGranted()
+                            Preferences.showWallpaper = true
+                        } else {
+                            show_wallpaper_toggle?.isChecked = false
+                        }
                     }
                 }
                 override fun onPermissionRationaleShouldBeShown(

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

@@ -5,10 +5,12 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.core.os.BuildCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -23,11 +25,15 @@ import com.karumi.dexter.listener.PermissionRequest
 import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.components.IconPackSelector
+import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
 import com.tommasoberlose.anotherwidget.databinding.FragmentWeatherSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
+import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
 import com.tommasoberlose.anotherwidget.receivers.WeatherReceiver
 import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
 import com.tommasoberlose.anotherwidget.ui.activities.CustomLocationActivity
@@ -79,6 +85,8 @@ class WeatherTabFragment : Fragment() {
         binding: FragmentWeatherSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isWeatherVisible = Preferences.showWeather
+
         viewModel.showWeatherWarning.observe(viewLifecycleOwner, Observer {
             weather_warning?.isVisible = it
             checkLocationPermission()
@@ -103,6 +111,7 @@ class WeatherTabFragment : Fragment() {
 
         viewModel.customLocationAdd.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
+                background_location_warning.isVisible = it == ""
                 label_custom_location?.text =
                     if (it == "") getString(R.string.custom_location_gps) else it
             }
@@ -124,6 +133,19 @@ class WeatherTabFragment : Fragment() {
             checkLocationPermission()
         })
 
+        viewModel.weatherIconPack.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                label_weather_icon_pack?.text = getString(R.string.settings_weather_icon_pack_default).format((it + 1))
+//                weather_icon_pack.setImageDrawable(ContextCompat.getDrawable(requireContext(), WeatherHelper.getWeatherIconResource("02d")))
+//                if (it == Constants.WeatherIconPack.MINIMAL.value) {
+//                    weather_icon_pack.setColorFilter(ContextCompat.getColor(requireContext(), R.color.colorPrimaryText))
+//                } else {
+//                    weather_icon_pack.setColorFilter(ContextCompat.getColor(requireContext(), android.R.color.transparent))
+//                }
+            }
+            checkLocationPermission()
+        })
+
         viewModel.weatherAppName.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 weather_app_label?.text =
@@ -144,8 +166,12 @@ class WeatherTabFragment : Fragment() {
         } else if (Preferences.showWeather && Preferences.customLocationAdd == "") {
             location_permission_alert?.isVisible = true
             location_permission_alert?.setOnClickListener {
+                MaterialBottomSheetDialog(requireContext(), message = getString(R.string.background_location_warning))
+                    .setPositiveButton(getString(android.R.string.ok)) {
                         requirePermission()
                     }
+                    .show()
+            }
         } else {
             location_permission_alert?.isVisible = false
         }
@@ -196,6 +222,9 @@ class WeatherTabFragment : Fragment() {
                     .addItem(getString(R.string.fahrenheit), "F")
                     .addItem(getString(R.string.celsius), "C")
                     .addOnSelectItemListener { value ->
+                        if (value != Preferences.weatherTempUnit) {
+                            WeatherHelper.updateWeather(requireContext())
+                        }
                         Preferences.weatherTempUnit = value
                     }.show()
             }
@@ -215,6 +244,12 @@ class WeatherTabFragment : Fragment() {
             }
         }
 
+        action_weather_icon_pack.setOnClickListener {
+            if (Preferences.showWeather) {
+                IconPackSelector(requireContext(), header = getString(R.string.settings_weather_icon_pack_title)).show()
+            }
+        }
+
         action_weather_app.setOnClickListener {
             if (Preferences.showWeather) {
                 startActivityForResult(
@@ -272,11 +307,11 @@ class WeatherTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

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

@@ -3,8 +3,11 @@ package com.tommasoberlose.anotherwidget.ui.viewmodels
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
+import com.chibatching.kotpref.livedata.asLiveData
 import com.tommasoberlose.anotherwidget.global.Preferences
 
 class CustomDateViewModel(application: Application) : AndroidViewModel(application) {
     val dateInput: MutableLiveData<String> = MutableLiveData(if (Preferences.dateFormat == "") "EEEE, MMM dd" else Preferences.dateFormat)
+    val isDateCapitalize = MutableLiveData<Boolean>(Preferences.isDateCapitalize)
+    val isDateUppercase = MutableLiveData<Boolean>(Preferences.isDateUppercase)
 }

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

@@ -9,14 +9,24 @@ class MainViewModel : ViewModel() {
     // General Settings
     val textGlobalColor = Preferences.asLiveData(Preferences::textGlobalColor)
     val textGlobalAlpha = Preferences.asLiveData(Preferences::textGlobalAlpha)
+    val textSecondaryColor = Preferences.asLiveData(Preferences::textSecondaryColor)
+    val textSecondaryAlpha = Preferences.asLiveData(Preferences::textSecondaryAlpha)
     val backgroundCardColor = Preferences.asLiveData(Preferences::backgroundCardColor)
     val backgroundCardAlpha = Preferences.asLiveData(Preferences::backgroundCardAlpha)
+    val textGlobalColorDark = Preferences.asLiveData(Preferences::textGlobalColorDark)
+    val textGlobalAlphaDark = Preferences.asLiveData(Preferences::textGlobalAlphaDark)
+    val textSecondaryColorDark = Preferences.asLiveData(Preferences::textSecondaryColorDark)
+    val textSecondaryAlphaDark = Preferences.asLiveData(Preferences::textSecondaryAlphaDark)
+    val backgroundCardColorDark = Preferences.asLiveData(Preferences::backgroundCardColorDark)
+    val backgroundCardAlphaDark = Preferences.asLiveData(Preferences::backgroundCardAlphaDark)
     val textMainSize = Preferences.asLiveData(Preferences::textMainSize)
     val textSecondSize = Preferences.asLiveData(Preferences::textSecondSize)
     val textShadow = Preferences.asLiveData(Preferences::textShadow)
+    val textShadowDark = Preferences.asLiveData(Preferences::textShadowDark)
     val customFont = Preferences.asLiveData(Preferences::customFont)
     val secondRowInformation = Preferences.asLiveData(Preferences::secondRowInformation)
     val showDividers = Preferences.asLiveData(Preferences::showDividers)
+    val secondRowTopMargin = Preferences.asLiveData(Preferences::secondRowTopMargin)
 
     // Calendar Settings
     val showEvents = Preferences.asLiveData(Preferences::showEvents)
@@ -27,12 +37,17 @@ class MainViewModel : ViewModel() {
     val showNextEvent = Preferences.asLiveData(Preferences::showNextEvent)
     val openEventDetails = Preferences.asLiveData(Preferences::openEventDetails)
     val calendarAppName = Preferences.asLiveData(Preferences::calendarAppName)
+    val widgetUpdateFrequency = Preferences.asLiveData(Preferences::widgetUpdateFrequency)
+    val showOnlyBusyEvents = Preferences.asLiveData(Preferences::showOnlyBusyEvents)
 
     // 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 clockTextColorDark = Preferences.asLiveData(Preferences::clockTextColorDark)
+    val clockTextAlphaDark = Preferences.asLiveData(Preferences::clockTextAlphaDark)
+    val showAMPMIndicator = Preferences.asLiveData(Preferences::showAMPMIndicator)
 
     val clockAppName = Preferences.asLiveData(Preferences::clockAppName)
     val dateFormat = Preferences.asLiveData(Preferences::dateFormat)
@@ -51,11 +66,15 @@ class MainViewModel : ViewModel() {
     val customLocationAdd = Preferences.asLiveData(Preferences::customLocationAdd)
 
     val showWeatherWarning = Preferences.asLiveData(Preferences::showWeatherWarning)
+    val weatherIconPack = Preferences.asLiveData(Preferences::weatherIconPack)
 
     // Glance
     val showGlance = Preferences.asLiveData(Preferences::showGlance)
     val showMusic = Preferences.asLiveData(Preferences::showMusic)
     val showNextAlarm = Preferences.asLiveData(Preferences::showNextAlarm)
+    val showBatteryCharging = Preferences.asLiveData(Preferences::showBatteryCharging)
+    val showDailySteps = Preferences.asLiveData(Preferences::showDailySteps)
+    val customInfo = Preferences.asLiveData(Preferences::customNotes)
 
     // Advanced Settings
     val darkThemePreference = Preferences.asLiveData(Preferences::darkThemePreference)

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

@@ -15,9 +15,7 @@ import android.text.format.DateUtils
 import android.util.Log
 import android.util.TypedValue
 import android.view.View
-import android.widget.ImageView
+import android.widget.*
-import android.widget.RemoteViews
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.tommasoberlose.anotherwidget.R
@@ -26,15 +24,19 @@ import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.*
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
 import com.tommasoberlose.anotherwidget.receivers.*
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.getCapWordString
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 import com.tommasoberlose.anotherwidget.utils.toPixel
 import kotlinx.android.synthetic.main.the_widget.view.*
 import java.lang.Exception
 import java.text.DateFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
+import kotlin.math.min
+import kotlin.math.roundToInt
 
 
 class MainWidget : AppWidgetProvider() {
@@ -85,9 +87,10 @@ class MainWidget : AppWidgetProvider() {
                                      appWidgetId: Int) {
             val displayMetrics = Resources.getSystem().displayMetrics
             val width = displayMetrics.widthPixels
+            val height = displayMetrics.heightPixels
 
             val dimensions = WidgetHelper.WidgetSizeProvider(context, appWidgetManager).getWidgetsSize(appWidgetId)
-            generateWidgetView(context, appWidgetId, appWidgetManager, dimensions.first - 8.toPixel(context) /*width - 16.toPixel(context)*/)
+            generateWidgetView(context, appWidgetId, appWidgetManager, min(dimensions.first - 8.toPixel(context), min(width, height) - 16.toPixel(context)))
         }
 
         private fun generateWidgetView(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager, w: Int) {
@@ -98,18 +101,18 @@ class MainWidget : AppWidgetProvider() {
                 views.setInt(
                     R.id.widget_shape_background,
                     "setColorFilter",
-                    ColorHelper.getBackgroundColorRgb()
+                    ColorHelper.getBackgroundColorRgb(context.isDarkTheme())
                 )
                 views.setInt(
                     R.id.widget_shape_background,
                     "setImageAlpha",
-                    ColorHelper.getBackgroundAlpha()
+                    ColorHelper.getBackgroundAlpha(context.isDarkTheme())
                 )
                 val refreshIntent = PendingIntent.getActivity(
                     context,
                     appWidgetId,
                     IntentHelper.getWidgetUpdateIntent(context),
-                    0
+                    PendingIntent.FLAG_UPDATE_CURRENT
                 )
                 views.setOnClickPendingIntent(R.id.widget_shape_background, refreshIntent)
             } catch (ex: Exception) {
@@ -138,9 +141,8 @@ class MainWidget : AppWidgetProvider() {
         }
 
         private fun updateCalendarView(context: Context, v: View, views: RemoteViews, widgetID: Int): RemoteViews {
-            try {
             val eventRepository = EventRepository(context)
-
+            try {
                 views.setImageViewBitmap(
                     R.id.empty_date_rect,
                     BitmapHelper.getBitmapFromView(v.empty_date, draw = false)
@@ -155,7 +157,7 @@ class MainWidget : AppWidgetProvider() {
                     context,
                     widgetID,
                     IntentHelper.getCalendarIntent(context),
-                    0
+                    PendingIntent.FLAG_UPDATE_CURRENT
                 )
                 views.setOnClickPendingIntent(R.id.empty_date_rect, calPIntent)
 
@@ -178,7 +180,7 @@ class MainWidget : AppWidgetProvider() {
                                     context,
                                     NewCalendarEventReceiver::class.java
                                 ).apply { action = Actions.ACTION_GO_TO_NEXT_EVENT },
-                                0
+                                PendingIntent.FLAG_UPDATE_CURRENT
                             )
                         )
 
@@ -196,7 +198,7 @@ class MainWidget : AppWidgetProvider() {
                                     context,
                                     NewCalendarEventReceiver::class.java
                                 ).apply { action = Actions.ACTION_GO_TO_PREVIOUS_EVENT },
-                                0
+                                PendingIntent.FLAG_UPDATE_CURRENT
                             )
                         )
                     } else {
@@ -208,7 +210,7 @@ class MainWidget : AppWidgetProvider() {
                         context,
                         widgetID,
                         IntentHelper.getEventIntent(context, nextEvent),
-                        0
+                        PendingIntent.FLAG_UPDATE_CURRENT
                     )
                     views.setOnClickPendingIntent(R.id.next_event_rect, pIntent)
                     views.setOnClickPendingIntent(R.id.next_event_difference_time_rect, pIntent)
@@ -231,7 +233,7 @@ class MainWidget : AppWidgetProvider() {
                             context,
                             widgetID,
                             IntentHelper.getGoogleMapsIntentFromAddress(context, nextEvent.address),
-                            0
+                            PendingIntent.FLAG_UPDATE_CURRENT
                         )
                         views.setOnClickPendingIntent(R.id.second_row_rect, mapIntent)
                     } else {
@@ -243,7 +245,7 @@ class MainWidget : AppWidgetProvider() {
                                 nextEvent,
                                 forceEventDetails = true
                             ),
-                            0
+                            PendingIntent.FLAG_UPDATE_CURRENT
                         )
                         views.setOnClickPendingIntent(R.id.second_row_rect, pIntentDetail)
                     }
@@ -261,38 +263,88 @@ class MainWidget : AppWidgetProvider() {
 
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
-                } else if (MediaPlayerHelper.isSomeonePlaying(context)) {
+
+                    views.setViewVisibility(
+                        R.id.second_row_top_margin_small_sans,
+                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                    )
+                    views.setViewVisibility(
+                        R.id.second_row_top_margin_medium_sans,
+                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                    )
+                    views.setViewVisibility(
+                        R.id.second_row_top_margin_large_sans,
+                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
+                    )
+                } else if (GlanceProviderHelper.showGlanceProviders(context) && v.calendar_layout.isVisible) {
+                    var showSomething = false
+                    loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
+                        when (provider) {
+                            Constants.GlanceProviderId.PLAYING_SONG -> {
+                                if (MediaPlayerHelper.isSomeonePlaying(context)) {
                                     val musicIntent = PendingIntent.getActivity(
                                         context,
                                         widgetID,
                                         IntentHelper.getMusicIntent(context),
-                        0
+                                        PendingIntent.FLAG_UPDATE_CURRENT
                                     )
                                     views.setOnClickPendingIntent(R.id.second_row_rect, musicIntent)
-
+                                    showSomething = true
-                    views.setImageViewBitmap(
+                                    break@loop
-                        R.id.next_event_rect,
+                                }
-                        BitmapHelper.getBitmapFromView(v.next_event, draw = false)
+                            }
-                    )
+                            Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
-
+                                if (Preferences.showNextAlarm && nextAlarm != "") {
-                    views.setImageViewBitmap(
-                        R.id.second_row_rect,
-                        BitmapHelper.getBitmapFromView(v.second_row, draw = false)
-                    )
-                    views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
-
-                    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)
-                } else if (Preferences.showNextAlarm && nextAlarm != "") {
                                     val alarmIntent = PendingIntent.getActivity(
                                         context,
                                         widgetID,
                                         IntentHelper.getClockIntent(context),
-                        0
+                                        PendingIntent.FLAG_UPDATE_CURRENT
                                     )
                                     views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
+                                    showSomething = true
+                                    break@loop
+                                }
+                            }
+                            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                                if (Preferences.showBatteryCharging) {
+                                    BatteryHelper.updateBatteryInfo(context)
+                                    if (Preferences.isCharging || Preferences.isBatteryLevelLow) {
+                                        val batteryIntent = PendingIntent.getActivity(
+                                            context,
+                                            widgetID,
+                                            IntentHelper.getBatteryIntent(),
+                                            PendingIntent.FLAG_UPDATE_CURRENT
+                                        )
+                                        views.setOnClickPendingIntent(R.id.second_row_rect, batteryIntent)
+                                        showSomething = true
+                                        break@loop
+                                    }
+                                }
+                            }
+                            Constants.GlanceProviderId.CUSTOM_INFO -> {
+                                if (Preferences.customNotes.isNotEmpty()) {
+                                    break@loop
+                                }
+                            }
+                            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                                if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                    val fitIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getFitIntent(context),
+                                        PendingIntent.FLAG_UPDATE_CURRENT
+                                    )
+                                    views.setOnClickPendingIntent(R.id.second_row_rect, fitIntent)
+                                    showSomething = true
+                                    break@loop
+                                }
+                            }
+                        }
+                    }
 
+
+                    if (showSomething) {
                         views.setImageViewBitmap(
                             R.id.next_event_rect,
                             BitmapHelper.getBitmapFromView(v.next_event, draw = false)
@@ -302,15 +354,32 @@ class MainWidget : AppWidgetProvider() {
                             R.id.second_row_rect,
                             BitmapHelper.getBitmapFromView(v.second_row, draw = false)
                         )
-                    views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
 
+                        views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
                         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)
+
+
+                        views.setViewVisibility(
+                            R.id.second_row_top_margin_small_sans,
+                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                        )
+                        views.setViewVisibility(
+                            R.id.second_row_top_margin_medium_sans,
+                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                        )
+                        views.setViewVisibility(
+                            R.id.second_row_top_margin_large_sans,
+                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
+                        )
+                    }
                 }
             } catch (ex: Exception) {
                 ex.printStackTrace()
                 CrashlyticsReceiver.sendCrash(context, ex)
+            } finally {
+                eventRepository.close()
             }
 
             return views
@@ -346,7 +415,7 @@ class MainWidget : AppWidgetProvider() {
                         BitmapHelper.getBitmapFromView(v.calendar_weather, draw = false)
                     )
 
-                    if (WidgetHelper.showSpecialWeather(context)) {
+                    if (GlanceProviderHelper.showGlanceProviders(context)) {
                         views.setViewVisibility(R.id.calendar_weather_rect, View.GONE)
                     } else {
                         views.setViewVisibility(R.id.special_weather_rect, View.GONE)
@@ -373,8 +442,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.getClockFontColor())
+                    views.setTextColor(R.id.time, ColorHelper.getClockFontColor(context.isDarkTheme()))
-                    views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor())
+                    views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor(context.isDarkTheme()))
                     views.setTextViewTextSize(
                         R.id.time,
                         TypedValue.COMPLEX_UNIT_SP,
@@ -394,7 +463,7 @@ class MainWidget : AppWidgetProvider() {
                     views.setOnClickPendingIntent(R.id.time, clockPIntent)
                     views.setOnClickPendingIntent(R.id.time_am_pm, clockPIntent)
                     views.setViewVisibility(R.id.time, View.VISIBLE)
-                    views.setViewVisibility(R.id.time_am_pm, View.VISIBLE)
+                    views.setViewVisibility(R.id.time_am_pm, if (Preferences.showAMPMIndicator) View.VISIBLE else View.GONE)
 
                     views.setViewVisibility(
                         R.id.clock_bottom_margin_none,
@@ -427,7 +496,10 @@ class MainWidget : AppWidgetProvider() {
             val eventRepository = EventRepository(context)
             val v = View.inflate(context, R.layout.the_widget, null)
 
-            val now = Calendar.getInstance()
+            val now = Calendar.getInstance().apply {
+                set(Calendar.SECOND, 0)
+                set(Calendar.MILLISECOND, 0)
+            }
 
             v.empty_layout.visibility = View.VISIBLE
             v.calendar_layout.visibility = View.GONE
@@ -447,7 +519,7 @@ class MainWidget : AppWidgetProvider() {
 
                 v.next_event.text = nextEvent.title
 
-                if (Preferences.showDiffTime && now.timeInMillis < (nextEvent.startDate - 1000 * 60 * 60)) {
+                if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
                     v.next_event_difference_time.text = if (!nextEvent.allDay) {
                         SettingsStringHelper.getDifferenceText(
                             context,
@@ -469,8 +541,8 @@ class MainWidget : AppWidgetProvider() {
                 } else {
                     v.second_row_icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.round_today))
                     if (!nextEvent.allDay) {
-                        val startHour = DateFormat.getTimeInstance(DateFormat.SHORT).format(nextEvent.startDate)
+                        val startHour = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(nextEvent.startDate)
-                        val endHour = DateFormat.getTimeInstance(DateFormat.SHORT).format(nextEvent.endDate)
+                        val endHour = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(nextEvent.endDate)
 
                         var dayDiff = TimeUnit.MILLISECONDS.toDays(nextEvent.endDate - nextEvent.startDate)
 
@@ -493,44 +565,129 @@ class MainWidget : AppWidgetProvider() {
 
                     } else {
                         val flags: Int = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-                        v.next_event_date.text = DateUtils.formatDateTime(context, now.timeInMillis, flags).getCapWordString()
+                        v.next_event_date.text = DateUtils.formatDateTime(context, nextEvent.startDate, flags)
                     }
                 }
 
                 v.empty_layout.visibility = View.GONE
                 v.calendar_layout.visibility = View.VISIBLE
-            } else if (MediaPlayerHelper.isSomeonePlaying(context)) {
+
+                v.second_row_top_margin_small.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                v.second_row_top_margin_medium.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                v.second_row_top_margin_large.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
+            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
+                v.second_row_icon.isVisible = true
+                var showSomething = false
+                loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
+                    when (provider) {
+                        Constants.GlanceProviderId.PLAYING_SONG -> {
+                            if (MediaPlayerHelper.isSomeonePlaying(context)) {
                                 v.second_row_icon.setImageDrawable(
                                     ContextCompat.getDrawable(
                                         context,
                                         R.drawable.round_music_note
                                     )
                                 )
-                v.next_event.text = DateHelper.getDateText(context, now)
                                 v.next_event_date.text = MediaPlayerHelper.getMediaInfo()
-                v.empty_layout.visibility = View.GONE
+                                showSomething = true
-                v.calendar_layout.visibility = View.VISIBLE
+                                break@loop
-            } else if (Preferences.showNextAlarm && nextAlarm != "") {
+                            }
+                        }
+                        Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
+                            if (Preferences.showNextAlarm && nextAlarm != "") {
                                 v.second_row_icon.setImageDrawable(
                                     ContextCompat.getDrawable(
                                         context,
                                         R.drawable.round_alarm
                                     )
                                 )
-                v.next_event.text = DateHelper.getDateText(context, now)
                                 v.next_event_date.text = AlarmHelper.getNextAlarm(context)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                            if (Preferences.showBatteryCharging) {
+                                BatteryHelper.updateBatteryInfo(context)
+                                if (Preferences.isCharging) {
+                                    v.second_row_icon.isVisible = false
+                                    val batteryLevel = BatteryHelper.getBatteryLevel(context)
+                                    if (batteryLevel == 100) {
+                                        v.next_event_date.text = "%s - %d%%".format(context.getString(R.string.charging), batteryLevel)
+                                    } else {
+                                        v.next_event_date.text = context.getString(R.string.charging)
+                                    }
+                                    showSomething = true
+                                    break@loop
+                                } else if (Preferences.isBatteryLevelLow) {
+                                    v.second_row_icon.isVisible = false
+                                    v.next_event_date.text =
+                                        context.getString(R.string.battery_low_warning)
+                                    showSomething = true
+                                    break@loop
+                                }
+                            }
+                        }
+                        Constants.GlanceProviderId.CUSTOM_INFO -> {
+                            if (Preferences.customNotes.isNotEmpty()) {
+                                v.second_row_icon.isVisible = false
+                                v.next_event_date.text = Preferences.customNotes
+                                v.next_event_date.gravity
+                                v.next_event_date.maxLines = 2
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                            if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                v.second_row_icon.isVisible = false
+                                v.next_event_date.text = context.getString(R.string.daily_steps_counter).format(Preferences.googleFitSteps)
+                                showSomething = true
+                                break@loop
+                            }
+                        }
+                    }
+                }
+
+                if (showSomething) {
+                    v.next_event.text = DateHelper.getDateText(context, now)
                     v.empty_layout.visibility = View.GONE
                     v.calendar_layout.visibility = View.VISIBLE
+
+                    v.second_row_top_margin_small.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                    v.second_row_top_margin_medium.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                    v.second_row_top_margin_large.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
+                } else {
+                    v.second_row_icon.isVisible = false
+                }
             }
 
 
             // Color
-            listOf<TextView>(v.empty_date, v.divider1, v.temp, v.next_event, v.next_event_difference_time, v.next_event_date, v.divider2, v.calendar_temp, v.divider3, v.special_temp).forEach {
+            listOf<TextView>(v.empty_date, v.divider1, v.temp, v.next_event, v.next_event_difference_time, v.divider3, v.special_temp).forEach {
-                it.setTextColor(ColorHelper.getFontColor())
+                it.setTextColor(ColorHelper.getFontColor(context.applicationContext.isDarkTheme()))
             }
 
-            listOf<ImageView>(v.second_row_icon, v.action_next, v.action_previous).forEach {
+            if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.value) {
-                it.setColorFilter(ColorHelper.getFontColor())
+                listOf<ImageView>(v.action_next, v.action_previous)
+            } else {
+                listOf<ImageView>(v.action_next, v.action_previous, v.empty_weather_icon, v.special_weather_icon)
+            }.forEach {
+                it.setColorFilter(ColorHelper.getFontColorRgb(context.applicationContext.isDarkTheme()))
+                it.alpha = (if (context.isDarkTheme()) Preferences.textGlobalAlphaDark.toIntValue().toFloat() else Preferences.textGlobalAlpha.toIntValue().toFloat()) / 100
+            }
+
+            listOf<TextView>(v.next_event_date, v.divider2, v.calendar_temp).forEach {
+                it.setTextColor(ColorHelper.getSecondaryFontColor(context.applicationContext.isDarkTheme()))
+            }
+
+            if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.value) {
+                listOf<ImageView>(v.second_row_icon)
+            } else {
+                listOf<ImageView>(v.second_row_icon, v.weather_icon)
+            }.forEach {
+                it.setColorFilter(ColorHelper.getSecondaryFontColorRgb(context.applicationContext.isDarkTheme()))
+                it.alpha = (if (context.isDarkTheme()) Preferences.textSecondaryAlphaDark.toIntValue().toFloat() else Preferences.textSecondaryAlpha.toIntValue().toFloat()) / 100
             }
 
             // Text Size
@@ -553,11 +710,11 @@ class MainWidget : AppWidgetProvider() {
             v.second_row_icon.scaleX = Preferences.textSecondSize / 18f
             v.second_row_icon.scaleY = Preferences.textSecondSize / 18f
 
-            v.weather_icon.scaleX = Preferences.textSecondSize / 16f
+            v.weather_icon.scaleX = Preferences.textSecondSize / 14f
-            v.weather_icon.scaleY = Preferences.textSecondSize / 16f
+            v.weather_icon.scaleY = Preferences.textSecondSize / 14f
 
-            v.empty_weather_icon.scaleX = Preferences.textMainSize / 20f
+            v.empty_weather_icon.scaleX = Preferences.textMainSize / 18f
-            v.empty_weather_icon.scaleY = Preferences.textMainSize / 20f
+            v.empty_weather_icon.scaleY = Preferences.textMainSize / 18f
 
             v.action_next.scaleX = Preferences.textMainSize / 28f
             v.action_next.scaleY = Preferences.textMainSize / 28f
@@ -570,19 +727,19 @@ class MainWidget : AppWidgetProvider() {
 
 
             // Shadows
-            val shadowRadius = when (Preferences.textShadow) {
+            val shadowRadius = when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
                 0 -> 0f
                 1 -> 5f
                 2 -> 5f
                 else -> 5f
             }
-            val shadowColor =  when (Preferences.textShadow) {
+            val shadowColor =  when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
                 0 -> Color.TRANSPARENT
                 1 -> R.color.black_50
                 2 -> Color.BLACK
                 else -> R.color.black_50
             }
-            val shadowDy =  when (Preferences.textShadow) {
+            val shadowDy =  when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
                 0 -> 0f
                 1 -> 0f
                 2 -> 1f
@@ -606,7 +763,7 @@ class MainWidget : AppWidgetProvider() {
                 v.weather.visibility = View.VISIBLE
                 v.calendar_weather.visibility = View.VISIBLE
                 v.special_weather.visibility = View.VISIBLE
-                val currentTemp = String.format(Locale.getDefault(), "%.0f °%s", Preferences.weatherTemp, Preferences.weatherRealTempUnit)
+                val currentTemp = String.format(Locale.getDefault(), "%d °%s", Preferences.weatherTemp.roundToInt(), Preferences.weatherRealTempUnit)
 
                 val icon: String = Preferences.weatherIcon
                 if (icon == "") {
@@ -626,7 +783,7 @@ class MainWidget : AppWidgetProvider() {
                 v.calendar_temp.text = currentTemp
                 v.special_temp.text = currentTemp
 
-                if (WidgetHelper.showSpecialWeather(context)) {
+                if (GlanceProviderHelper.showGlanceProviders(context)) {
                     v.calendar_weather.visibility = View.GONE
                 } else {
                     v.special_weather.visibility = View.GONE
@@ -642,6 +799,8 @@ class MainWidget : AppWidgetProvider() {
                 it.isVisible = Preferences.showDividers
             }
 
+            eventRepository.close()
+
             return v
         }
     }

app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt

@@ -143,11 +143,11 @@ fun Context.isTablet(): Boolean {
 }
 
 fun String.md5(): String {
-    val MD5 = "MD5"
+    val mD5 = "MD5"
     try {
         // Create MD5 Hash
         val digest = java.security.MessageDigest
-            .getInstance(MD5)
+            .getInstance(mD5)
         digest.update(toByteArray())
         val messageDigest = digest.digest()
 
@@ -172,7 +172,7 @@ fun String.isValidEmail(): Boolean
         = this.isNotEmpty() &&
         Patterns.EMAIL_ADDRESS.matcher(this).matches()
 
-fun Activity.isDarkTheme(): Boolean {
+fun Context.isDarkTheme(): Boolean {
     return resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
 }
 
@@ -213,3 +213,21 @@ fun String.getCapWordString(): String {
         this
     }
 }
+
+fun Context.checkIfFitInstalled(): Boolean {
+    return try {
+        packageManager.getPackageInfo("com.google.android.apps.fitness", PackageManager.GET_ACTIVITIES)
+        true
+    } catch (e: Exception) {
+        false
+    }
+}
+
+fun Intent.isDefaultSet(context: Context): Boolean {
+    val pm = context.packageManager
+    return try {
+        resolveActivity(pm) != null && resolveActivity(pm).packageName.isNotBlank()
+    } catch (ex: java.lang.Exception) {
+        false
+    }
+}