Add google fit integration

.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

@@ -4,8 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Another Widget.iml" filepath="$PROJECT_DIR$/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>

app/build.gradle

@@ -10,6 +10,10 @@ apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'realm-android'
 
+def apiKeyPropertiesFile = rootProject.file("apikey.properties")
+def apiKeyProperties = new Properties()
+apiKeyProperties.load(new FileInputStream(apiKeyPropertiesFile))
+
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
@@ -18,10 +22,12 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 81
+        versionCode 84
-        versionName "2.0.6"
+        versionName "2.0.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        manifestPlaceholders = [ "AWARENESS_API_KEY": apiKeyProperties['AWARENESS_API_KEY']]
     }
 
     buildTypes {
@@ -52,10 +58,6 @@ android {
     }
 
     viewBinding.enabled = true
-
-    dynamicFeatures = [":tasksintegration", ":googlefit"]
-
-
 }
 
 dependencies {
@@ -98,6 +100,10 @@ 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.0.0'
+
     //Weather
     implementation 'com.github.KwabenBerko:OpenWeatherMap-Android-Library:2.0.2'
     implementation 'com.google.android.gms:play-services-location:17.0.0'

app/src/main/AndroidManifest.xml

@@ -10,6 +10,10 @@
     <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"
@@ -146,6 +150,29 @@
                 <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"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".receivers.FenceReceiver"
+            android:exported="false"
+            android:permission="com.google.android.gms.permission.ACTIVITY_RECOGNITION">
+            <intent-filter>
+                <action android:name="com.mypackage.ACTION_PROCESS_ACTIVITY_TRANSITIONS" />
+            </intent-filter>
+        </receiver>
+
+        <meta-data
+            android:name="com.google.android.awareness.API_KEY"
+            android:value="${AWARENESS_API_KEY}"/>
     </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/GlanceProviderSortMenu.kt

@@ -0,0 +1,97 @@
+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.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()
+                    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()
+                .mapNotNull { GlanceProviderHelper.getGlanceProviderById(context, it) }
+        )
+
+        setContentView(view)
+        super.show()
+    }
+}
+

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

@@ -39,7 +39,7 @@ class EventRepository(val context: Context) {
     }
 
     fun saveNextEventData(event: Event) {
-        Preferences.nextEventId = event.id
+        Preferences.nextEventId = event.eventID
     }
 
     fun getNextEvent(): Event? {
@@ -64,11 +64,11 @@ class EventRepository(val context: Context) {
     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 +80,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()
@@ -95,11 +95,7 @@ class EventRepository(val context: Context) {
 
     fun getEvents(): RealmResults<Event> {
         val now = Calendar.getInstance().timeInMillis
-        val list = realm.where(Event::class.java).greaterThan("endDate", now).findAll()
+        return realm.where(Event::class.java).greaterThan("endDate", now).findAll()
-        realm.executeTransactionAsync {
-            it.where(Event::class.java).lessThanOrEqualTo("endDate", now).findAll().deleteAllFromRealm()
-        }
-        return list
     }
 
     fun getEventsCount(): Int = getEvents().size

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

@@ -18,8 +18,8 @@ object Constants {
     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")
     }
 }

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

@@ -48,6 +48,7 @@ object Preferences : KotprefModel() {
 
     var clockTextColor by stringPref(default = "#FFFFFF")
     var clockTextAlpha by stringPref(default = "FF")
+    var showAMPMIndicator by booleanPref(default = true)
 
     // Global
     var textMainSize by floatPref(key = "PREF_TEXT_MAIN_SIZE", default = 26f)
@@ -77,10 +78,12 @@ 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 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/DailyStepsHelper.kt

@@ -0,0 +1,97 @@
+package com.tommasoberlose.anotherwidget.helpers
+
+import android.Manifest
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import com.google.android.gms.location.ActivityRecognition
+import com.google.android.gms.location.ActivityTransition
+import com.google.android.gms.location.ActivityTransitionRequest
+import com.google.android.gms.location.DetectedActivity
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.receivers.FenceReceiver
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+
+
+object DailyStepsHelper {
+    fun registerFence(context: 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_ENTER)
+                    .build()
+
+            transitions +=
+                ActivityTransition.Builder()
+                    .setActivityType(DetectedActivity.WALKING)
+                    .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
+                    .build()
+
+            transitions +=
+                ActivityTransition.Builder()
+                    .setActivityType(DetectedActivity.RUNNING)
+                    .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_ENTER)
+                    .build()
+
+            transitions +=
+                ActivityTransition.Builder()
+                    .setActivityType(DetectedActivity.RUNNING)
+                    .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
+                    .build()
+
+            transitions +=
+                ActivityTransition.Builder()
+                    .setActivityType(DetectedActivity.STILL)
+                    .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_ENTER)
+                    .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, FenceReceiver::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, FenceReceiver::class.java),
+                    0
+                )
+            )
+
+        task.addOnCompleteListener {
+            if (it.isSuccessful) {
+                PendingIntent.getBroadcast(
+                    context,
+                    2,
+                    Intent(context, FenceReceiver::class.java),
+                    0
+                ).cancel()
+
+            }
+        }
+    }
+}

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

@@ -2,6 +2,7 @@ package com.tommasoberlose.anotherwidget.helpers
 
 import android.content.Context
 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
@@ -37,40 +38,47 @@ 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 {
+        return Preferences.showGlance && EventRepository(context).getEventsCount() == 0 && (
+                (Preferences.showNextAlarm && AlarmHelper.getNextAlarm(context) != "") ||
+                        (MediaPlayerHelper.isSomeonePlaying(context)) ||
+                        (Preferences.isBatteryLevelLow) ||
+                        (Preferences.customNotes.isNotEmpty()) ||
+                        (Preferences.showDailySteps && Preferences.googleFitSteps > 0)
+                )
+    }
 }

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

@@ -53,11 +53,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/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/BatteryLevelReceiver.kt

@@ -0,0 +1,19 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.BatteryManager
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+
+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
+        }
+        MainWidget.updateWidget(context)
+    }
+
+}

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

@@ -0,0 +1,83 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+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.DataSource
+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.ActivityTransitionResult
+import com.google.android.gms.location.DetectedActivity
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+
+class FenceReceiver : 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) {
+                requestDailySteps(context)
+            } else {
+                resetDailySteps()
+            }
+        }
+    }
+
+    private fun requestDailySteps(context: Context) {
+        val fitnessOptions = FitnessOptions.builder()
+            .addDataType(DataType.TYPE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+            .addDataType(DataType.AGGREGATE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+            .build()
+
+        val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(context)
+
+        Log.d("ciao", "hasPermission: ${GoogleSignIn.hasPermissions(account, fitnessOptions)}")
+
+        if (GoogleSignIn.hasPermissions(account, fitnessOptions)) {
+            val cal: Calendar = Calendar.getInstance()
+            cal.time = Date()
+            val endTime: Long = cal.timeInMillis
+            cal.add(Calendar.YEAR, -1)
+            val startTime: 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()
+
+            if (account != null) {
+                Fitness.getHistoryClient(context, account)
+                    .readData(readRequest)
+                    .addOnSuccessListener { response ->
+                        Preferences.googleFitSteps =
+                            response.dataSets[0].dataPoints[0].getValue(FIELD_STEPS).asFloat()
+                                .toLong()
+                        Log.d("ciao",
+                            "response: ${response.dataSets[0].dataPoints[0].getValue(FIELD_STEPS)
+                                .asFloat().toLong()}"
+                        )
+                        MainWidget.updateWidget(context)
+                    }
+            }
+        }
+    }
+
+    private fun resetDailySteps() {
+        Preferences.googleFitSteps = -1
+    }
+}

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

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

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

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

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

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

@@ -21,7 +21,9 @@ 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 kotlinx.android.synthetic.main.fragment_general_settings.*
@@ -29,6 +31,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.*
 
 
 class GeneralTabFragment : Fragment() {
@@ -141,6 +144,12 @@ class GeneralTabFragment : Fragment() {
             }
         })
 
+        viewModel.dateFormat.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                date_format_label?.text = DateHelper.getDateText(requireContext(), Calendar.getInstance())
+            }
+        })
+
         viewModel.customFont.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 custom_font_label?.text = getString(SettingsStringHelper.getCustomFontLabel(it))
@@ -148,7 +157,10 @@ class GeneralTabFragment : Fragment() {
         })
 
         viewModel.showDividers.observe(viewLifecycleOwner, Observer {
-            show_dividers_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            maintainScrollPosition {
+                show_dividers_label?.text =
+                    if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
         })
     }
 
@@ -199,6 +211,27 @@ class GeneralTabFragment : Fragment() {
             ).show()
         }
 
+        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_background_color.setOnClickListener {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,

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

@@ -1,44 +1,49 @@
 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.os.Build
 import android.os.Bundle
 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.fitness.FitnessOptions
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.google.android.gms.fitness.data.DataType
+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.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.DailyStepsHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
-import com.tommasoberlose.anotherwidget.models.GlanceProvider
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import kotlinx.android.synthetic.main.fragment_glance_settings.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import net.idik.lib.slimadapter.SlimAdapter
-import java.util.*
 
 
 class GlanceTabFragment : Fragment() {
@@ -48,7 +53,6 @@ class GlanceTabFragment : Fragment() {
     }
 
     private lateinit var viewModel: MainViewModel
-    private lateinit var adapter: SlimAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -73,65 +77,6 @@ class GlanceTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        list.setHasFixedSize(true)
-        val mLayoutManager = LinearLayoutManager(requireContext())
-        list.layoutManager = mLayoutManager
-
-        adapter = SlimAdapter.create()
-        adapter
-            .register<String>(R.layout.glance_provider_item) { item, injector ->
-                injector
-                    .text(R.id.title, item)
-            }
-            .register<GlanceProvider>(R.layout.glance_provider_item) { item, injector ->
-                injector
-                    .text(R.id.title, item.title)
-                    .with<ImageView>(R.id.icon) {
-                        it.setImageDrawable(ContextCompat.getDrawable(requireContext(), item.icon))
-                    }
-                    .with<TextView>(R.id.label) {
-                        it.isVisible = item.label != ""
-                        it.text = item.label
-                    }
-            }
-            .attachTo(list)
-
-        adapter.updateData(
-            GlanceProviderHelper.getGlanceProviders()
-                .mapNotNull { GlanceProviderHelper.getGlanceProviderById(requireContext(), it) }
-        )
-
-        val mIth = ItemTouchHelper(
-            object : ItemTouchHelper.SimpleCallback(
-                ItemTouchHelper.UP or ItemTouchHelper.DOWN,
-                ItemTouchHelper.LEFT
-            ) {
-                override fun onMove(
-                    recyclerView: RecyclerView,
-                    viewHolder: ViewHolder, target: ViewHolder
-                ): Boolean {
-                    val fromPos = viewHolder.adapterPosition
-                    val toPos = target.adapterPosition
-                    // move item in `fromPos` to `toPos` in adapter.
-                    adapter.notifyItemMoved(fromPos, toPos)
-
-                    val list = GlanceProviderHelper.getGlanceProviders()
-                    Collections.swap(list, fromPos, toPos)
-                    GlanceProviderHelper.saveGlanceProviderOrder(list)
-                    return true
-                }
-
-                override fun onSwiped(
-                    viewHolder: ViewHolder,
-                    direction: Int
-                ) {
-                    // remove from adapter
-                }
-            })
-
-        mIth.attachToRecyclerView(list)
-
-
         setupListener()
         updateNextAlarmWarningUi()
     }
@@ -142,15 +87,40 @@ class GlanceTabFragment : Fragment() {
     ) {
 
         viewModel.showGlance.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
                 binding.isGlanceVisible = it
+            }
         })
 
         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 +135,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 +167,40 @@ class GlanceTabFragment : Fragment() {
                     }.show()
             }
         }
+
+        action_show_low_battery_level_warning.setOnClickListener {
+            if (Preferences.showGlance) {
+                BottomSheetMenu<Boolean>(
+                    requireContext(),
+                    header = getString(R.string.settings_low_battery_level_title)
+                ).setSelectedValue(Preferences.showBatteryCharging)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        Preferences.showBatteryCharging = value
+                    }.show()
+            }
+        }
+
+        action_show_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 ->
+                        Preferences.showDailySteps = value
+                    }.show()
+            }
+        }
+
+        action_show_custom_notes.setOnClickListener {
+            if (Preferences.showGlance) {
+                CustomNotesDialog(requireContext()).show()
+            }
+        }
     }
 
     private fun updateNextAlarmWarningUi() {
@@ -204,18 +213,14 @@ class GlanceTabFragment : Fragment() {
                 } catch (e: Exception) {
                     alarm.showIntent?.creatorPackage ?: ""
                 }
-                maintainScrollPosition {
                 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?) {
@@ -237,7 +242,7 @@ class GlanceTabFragment : Fragment() {
         if (NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName)) {
             notification_permission_alert?.isVisible = false
             MediaPlayerHelper.updatePlayingMediaInfo(requireContext())
-            show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_show_music_enabled_subtitle) else getString(R.string.settings_show_music_disabled_subtitle)
+            show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
         } else if (Preferences.showMusic) {
             notification_permission_alert?.isVisible = true
             show_music_label?.text = getString(R.string.settings_request_notification_access)
@@ -245,11 +250,89 @@ class GlanceTabFragment : Fragment() {
                 activity?.startActivity(Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"))
             }
         } else {
-            show_music_label?.text = getString(R.string.settings_show_music_disabled_subtitle)
+            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) {
+//                val fitnessOptions = FitnessOptions.builder()
+//                    .addDataType(DataType.TYPE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+//                    .addDataType(DataType.AGGREGATE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+//                    .build()
+//
+//                val account: GoogleSignInAccount = GoogleSignIn.getLastSignedInAccount(requireContext()) ?: GoogleSignIn.getAccountForExtension(requireContext(), fitnessOptions)
+//
+//                if (!GoogleSignIn.hasPermissions(account, fitnessOptions)) {
+//                    GoogleSignIn.requestPermissions(
+//                        requireActivity(),
+//                        1,
+//                        account,
+//                        fitnessOptions)
+//                } else {
+//                    DailyStepsHelper.registerFence(requireContext())
+//                }
+//            } else {
+//                DailyStepsHelper.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) {
+//            DailyStepsHelper.unregisterFence(requireContext())
+//            fitness_permission_alert?.isVisible = true
+//            show_steps_label?.text = getString(R.string.settings_request_fitness_access)
+//            fitness_permission_alert?.setOnClickListener {
+//                requireFitnessPermission()
+//            }
+//        } else {
+//            DailyStepsHelper.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?
+//    ) {
+//        if (resultCode == Activity.RESULT_OK) {
+//            if (requestCode == 1) {
+//                DailyStepsHelper.registerFence(requireContext())
+//            } else {
+//                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
         callback.invoke()

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

@@ -124,6 +124,9 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
 
     private fun updateUI() {
         uiJob?.cancel()
+        if (preview != null) {
+            preview.clearAnimation()
+            time_container.clearAnimation()
 
             if (Preferences.showPreview) {
                 preview.setCardBackgroundColor(
@@ -134,7 +137,13 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                         ) 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(
+                    BitmapHelper.getTintedDrawable(
+                        requireContext(),
+                        R.drawable.card_background,
+                        ColorHelper.getBackgroundColor()
+                    )
+                )
                 uiJob = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
                     val generatedView = MainWidget.generateWidgetView(requireContext())
 
@@ -160,6 +169,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                             TypedValue.COMPLEX_UNIT_SP,
                             Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2
                         )
+                        time_am_pm.isVisible = Preferences.showAMPMIndicator
 
                         // Clock bottom margin
                         clock_bottom_margin_none.isVisible =
@@ -186,9 +196,11 @@ 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 = {
@@ -242,7 +254,8 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                             }.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)
                         widget.animate().alpha(1f).start()
                     }
@@ -261,6 +274,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                     }
                 }.start()
             }
+        }
 
         showErrorBadge()
 
@@ -276,8 +290,16 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                     val metrics = DisplayMetrics()
                     act.windowManager.defaultDisplay.getMetrics(metrics)
 
-                    height = metrics.heightPixels
+                    var newHeight = metrics.heightPixels
-                    width = (wallpaper?.intrinsicWidth ?: 1) * metrics.heightPixels / (wallpaper?.intrinsicWidth ?: 1)
+                    var newWidth = (wallpaper?.intrinsicWidth ?: 1) * metrics.heightPixels / (wallpaper?.intrinsicHeight ?: 1)
+
+                    if (newWidth < metrics.widthPixels) {
+                        newWidth = metrics.widthPixels
+                        newHeight = (wallpaper?.intrinsicHeight ?: 1) * metrics.widthPixels / (wallpaper?.intrinsicWidth ?: 1)
+                    }
+
+                    height = newHeight
+                    width = newWidth
                 }
             }
         })
@@ -312,11 +334,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 +348,29 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         super.onPause()
     }
 
+    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

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

@@ -33,6 +33,7 @@ class MainViewModel : ViewModel() {
     val clockTextSize = Preferences.asLiveData(Preferences::clockTextSize)
     val clockTextColor = Preferences.asLiveData(Preferences::clockTextColor)
     val clockTextAlpha = Preferences.asLiveData(Preferences::clockTextAlpha)
+    val showAMPMIndicator = Preferences.asLiveData(Preferences::showAMPMIndicator)
 
     val clockAppName = Preferences.asLiveData(Preferences::clockAppName)
     val dateFormat = Preferences.asLiveData(Preferences::dateFormat)
@@ -56,6 +57,9 @@ class MainViewModel : ViewModel() {
     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

@@ -12,7 +12,6 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.format.DateUtils
-import android.util.Log
 import android.util.TypedValue
 import android.view.View
 import android.widget.ImageView
@@ -261,7 +260,11 @@ 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)) {
+                } else if (GlanceProviderHelper.showGlanceProviders(context)) {
+                    loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders()) {
+                        when (provider) {
+                            Constants.GlanceProviderId.PLAYING_SONG -> {
+                                if (MediaPlayerHelper.isSomeonePlaying(context)) {
                                     val musicIntent = PendingIntent.getActivity(
                                         context,
                                         widgetID,
@@ -269,22 +272,11 @@ class MainWidget : AppWidgetProvider() {
                                         0
                                     )
                                     views.setOnClickPendingIntent(R.id.second_row_rect, musicIntent)
-
+                                    break@loop
-                    views.setImageViewBitmap(
+                                }
-                        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,
@@ -292,6 +284,33 @@ class MainWidget : AppWidgetProvider() {
                                         0
                                     )
                                     views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
+                                    break@loop
+                                }
+                            }
+                            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                                if (Preferences.isBatteryLevelLow) {
+                                    val alarmIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getClockIntent(context),
+                                        0
+                                    )
+                                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
+                                    break@loop
+                                }
+                            }
+                            Constants.GlanceProviderId.CUSTOM_INFO -> {
+                                if (Preferences.customNotes.isNotEmpty()) {
+                                    break@loop
+                                }
+                            }
+                            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                                if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                    break@loop
+                                }
+                            }
+                        }
+                    }
 
                     views.setImageViewBitmap(
                         R.id.next_event_rect,
@@ -302,8 +321,8 @@ 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)
@@ -346,7 +365,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)
@@ -394,7 +413,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,
@@ -499,26 +518,69 @@ class MainWidget : AppWidgetProvider() {
 
                 v.empty_layout.visibility = View.GONE
                 v.calendar_layout.visibility = View.VISIBLE
-            } else if (MediaPlayerHelper.isSomeonePlaying(context)) {
+            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
+                v.second_row_icon.isVisible = true
+                loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders()) {
+                    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
+                                break@loop
-                v.calendar_layout.visibility = View.VISIBLE
+                            }
-            } 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)
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                            if (Preferences.isBatteryLevelLow) {
+                                v.second_row_icon.setImageDrawable(
+                                    ContextCompat.getDrawable(
+                                        context,
+                                        R.drawable.round_battery_charging_full
+                                    )
+                                )
+                                v.next_event_date.text = context.getString(R.string.battery_low_warning)
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.CUSTOM_INFO -> {
+                            if (Preferences.customNotes.isNotEmpty()) {
+                                v.second_row_icon.isVisible = false
+                                v.next_event_date.text = Preferences.customNotes
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                            if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                v.second_row_icon.setImageDrawable(
+                                    ContextCompat.getDrawable(
+                                        context,
+                                        R.drawable.round_directions_walk
+                                    )
+                                )
+                                v.next_event_date.text = "${Preferences.googleFitSteps}"
+                                break@loop
+                            }
+                        }
+                    }
+                }
+
+                v.next_event.text = DateHelper.getDateText(context, now)
                 v.empty_layout.visibility = View.GONE
                 v.calendar_layout.visibility = View.VISIBLE
             }
@@ -626,7 +688,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