Merge develop

Update new strings for Chinese Simplified

.idea/assetWizardSettings.xml

@@ -123,6 +123,29 @@
             </PersistentState>
           </value>
         </entry>
+        <entry key="vectorWizard">
+          <value>
+            <PersistentState>
+              <option name="children">
+                <map>
+                  <entry key="vectorAssetStep">
+                    <value>
+                      <PersistentState>
+                        <option name="values">
+                          <map>
+                            <entry key="assetSourceType" value="FILE" />
+                            <entry key="outputName" value="round_aspect_ratio_24" />
+                            <entry key="sourceFile" value="$USER_HOME$/Desktop/round_aspect_ratio_24.svg" />
+                          </map>
+                        </option>
+                      </PersistentState>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </PersistentState>
+          </value>
+        </entry>
       </map>
     </option>
   </component>

app/build.gradle

@@ -16,15 +16,15 @@ apikeyProperties.load(new FileInputStream(apikeyPropertiesFile))
 
 android {
 
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
-        versionCode 109
+        versionCode 114
-        versionName "2.0.15"
+        versionName "2.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "GOOGLE_API_KEY", apikeyProperties['GOOGLE_API_KEY'])
@@ -72,9 +72,9 @@ dependencies {
 
     // UI
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'com.google.android.material:material:1.3.0-beta01'
-    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.browser:browser:1.3.0'
     implementation 'net.idik:slimadapter:2.1.2'
     implementation 'com.google.android:flexbox:2.0.1'
 
@@ -89,8 +89,8 @@ dependencies {
     implementation 'org.greenrobot:eventbus:3.2.0'
 
     // Navigation
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
 
     // Other
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -103,7 +103,7 @@ dependencies {
     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-fitness:20.0.0'
     implementation 'com.google.android.gms:play-services-auth:18.1.0'
 
     //Weather
@@ -111,8 +111,8 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:17.1.0'
 
     // Billing
-    implementation 'com.android.billingclient:billing:3.0.1'
+    implementation 'com.android.billingclient:billing:3.0.2'
-    implementation 'com.android.billingclient:billing-ktx:3.0.1'
+    implementation 'com.android.billingclient:billing-ktx:3.0.2'
 
     // KTX
     implementation "androidx.core:core-ktx:1.3.2"
@@ -128,10 +128,10 @@ dependencies {
     implementation "com.github.haroldadmin:NetworkResponseAdapter:4.0.1"
 
     //Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
 
     // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
 
     // Preferences
     implementation 'com.chibatching.kotpref:kotpref:2.11.0'

app/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
 
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="com.android.vending.BILLING" />
@@ -13,6 +12,7 @@
     <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" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
 
     <application
@@ -154,6 +154,14 @@
             android:name=".services.UpdateCalendarJob"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="true"/>
+        <service
+            android:name=".services.LocationService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="location" />
     </application>
 
+    <queries>
+        <package android:name="com.google.android.apps.fitness"/>
+    </queries>
 </manifest>

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

@@ -24,6 +24,7 @@ import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.isColorDark
 import com.tommasoberlose.anotherwidget.utils.expand
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 import com.tommasoberlose.anotherwidget.utils.reveal
 import com.tommasoberlose.anotherwidget.utils.toPixel
 import com.warkiz.widget.IndicatorSeekBar
@@ -93,6 +94,7 @@ class BottomSheetColorPicker(
                     injector
                         .with<MaterialCardView>(R.id.color) {
                             it.setCardBackgroundColor(ColorStateList.valueOf(item))
+                            it.strokeWidth = if ((colors.indexOf(item) == 0 && !context.isDarkTheme()) || (colors.indexOf(item) == 10 && context.isDarkTheme())) 2 else 0
                         }
                         .with<AppCompatImageView>(R.id.check) {
                             if (getSelected?.invoke() == item) {

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

@@ -9,7 +9,7 @@ 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) {
+class CustomNotesDialog(context: Context, callback: (() -> Unit)?) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
 
     init {
         val view = View.inflate(context, R.layout.custom_notes_dialog_layout, null)
@@ -18,6 +18,7 @@ class CustomNotesDialog(context: Context) : BottomSheetDialog(context, R.style.B
         view.action_positive.setOnClickListener {
             Preferences.customNotes = view.notes.text.toString()
             this.dismiss()
+            callback?.invoke()
         }
 
         view.notes.requestFocus()

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

@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
+import android.util.EventLog
 import android.util.Log
 import android.view.View
 import androidx.core.app.NotificationManagerCompat
@@ -30,9 +31,11 @@ import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
 import com.tommasoberlose.anotherwidget.ui.activities.AppNotificationsFilterActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MusicPlayersFilterActivity
+import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import kotlinx.android.synthetic.main.glance_provider_settings_layout.view.*
 import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
 
 class GlanceSettingsDialog(val context: Activity, val provider: Constants.GlanceProviderId, private val statusCallback: (() -> Unit)?) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
 
@@ -48,6 +51,7 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
             Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> context.getString(R.string.settings_daily_steps_title)
             Constants.GlanceProviderId.NOTIFICATIONS -> context.getString(R.string.settings_show_notifications_title)
             Constants.GlanceProviderId.GREETINGS -> context.getString(R.string.settings_show_greetings_title)
+            Constants.GlanceProviderId.EVENTS -> context.getString(R.string.settings_show_events_as_glance_provider_title)
         }
 
         /* SUBTITLE*/
@@ -59,6 +63,7 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
             Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> context.getString(R.string.settings_daily_steps_subtitle)
             Constants.GlanceProviderId.NOTIFICATIONS -> context.getString(R.string.settings_show_notifications_subtitle)
             Constants.GlanceProviderId.GREETINGS -> context.getString(R.string.settings_show_greetings_subtitle)
+            Constants.GlanceProviderId.EVENTS -> context.getString(R.string.settings_show_events_as_glance_provider_subtitle)
         }
 
         /* SONG */
@@ -124,6 +129,13 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
             view.divider.isVisible = false
         }
 
+        /* EVENTS */
+        if (provider == Constants.GlanceProviderId.EVENTS) {
+            view.header.isVisible = false
+            view.divider.isVisible = false
+            checkCalendarConfig(view)
+        }
+
         /* TOGGLE */
         view.provider_switch.isChecked = when (provider) {
             Constants.GlanceProviderId.PLAYING_SONG -> Preferences.showMusic
@@ -133,6 +145,7 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
             Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> Preferences.showDailySteps
             Constants.GlanceProviderId.NOTIFICATIONS -> Preferences.showNotifications
             Constants.GlanceProviderId.GREETINGS -> Preferences.showGreetings
+            Constants.GlanceProviderId.EVENTS -> Preferences.showEventsAsGlanceProvider
         }
 
         var job: Job? = null
@@ -188,6 +201,9 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
                             checkFitnessPermission(view)
                             checkGoogleFitConnection(view)
                         }
+                        Constants.GlanceProviderId.EVENTS -> {
+                            Preferences.showEventsAsGlanceProvider = isChecked
+                        }
                         else -> {
                         }
                     }
@@ -220,6 +236,19 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
         statusCallback?.invoke()
     }
 
+    private fun checkCalendarConfig(view: View) {
+        if (!Preferences.showEvents || !context.checkGrantedPermission(Manifest.permission.READ_CALENDAR)) {
+            view.warning_container.isVisible = true
+            view.warning_title.text = context.getString(R.string.settings_show_events_as_glance_provider_error)
+            view.warning_container.setOnClickListener {
+                dismiss()
+                EventBus.getDefault().post(MainFragment.ChangeTabEvent(1))
+            }
+        } else {
+            view.warning_container.isVisible = false
+        }
+    }
+
     private fun checkNotificationPermission(view: View) {
         when {
             ActiveNotificationsHelper.checkNotificationAccess(context) -> {

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

@@ -32,7 +32,8 @@ object Constants {
         CUSTOM_INFO("CUSTOM_INFO"),
         GOOGLE_FIT_STEPS("GOOGLE_FIT_STEPS"),
         NOTIFICATIONS("NOTIFICATIONS"),
-        GREETINGS("GREETINGS");
+        GREETINGS("GREETINGS"),
+        EVENTS("EVENTS");
 
         companion object {
             private val map = GlanceProviderId.values().associateBy(GlanceProviderId::id)

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

@@ -141,6 +141,8 @@ object Preferences : KotprefModel() {
     var musicPlayersFilter by stringPref(default = "")
     var appNotificationsFilter by stringPref(default = "")
 
+    var showEventsAsGlanceProvider by booleanPref(default = false)
+
     // Integrations
     var installedIntegrations by intPref(default = 0)
 }

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

@@ -9,6 +9,7 @@ import com.chibatching.kotpref.Kotpref
 import com.chibatching.kotpref.blockingBulk
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.receivers.NotificationListener
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 
 object ActiveNotificationsHelper {
     fun showLastNotification(): Boolean {
@@ -23,6 +24,7 @@ object ActiveNotificationsHelper {
             remove(Preferences::lastNotificationPackage)
             remove(Preferences::lastNotificationIcon)
         }
+        MainWidget.updateWidget(context)
     }
 
     fun checkNotificationAccess(context: Context): Boolean {

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

@@ -1,5 +1,6 @@
 package com.tommasoberlose.anotherwidget.helpers
 
+import android.Manifest
 import android.content.Context
 import android.util.Log
 import com.tommasoberlose.anotherwidget.R
@@ -7,6 +8,7 @@ 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.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.checkIfFitInstalled
 import java.util.ArrayList
 
@@ -20,7 +22,7 @@ object GlanceProviderHelper {
             }
             .toTypedArray()
 
-        providers.sortWith(Comparator { p1, p2 ->
+        return ArrayList(providers.filter { enabledProviders.contains(it.id) }.sortedWith(Comparator { p1, p2 ->
             when {
                 enabledProviders.contains(p1.id) && enabledProviders.contains(p2.id) -> {
                     enabledProviders.indexOf(p1.id).compareTo(enabledProviders.indexOf(p2.id))
@@ -35,8 +37,7 @@ object GlanceProviderHelper {
                     p1.id.compareTo(p2.id)
                 }
             }
-        })
+        }) + providers.filter { !enabledProviders.contains(it.id) })
-        return ArrayList(providers.toList())
     }
 
     fun getGlanceProviderById(context: Context, providerId: Constants.GlanceProviderId): GlanceProvider? {
@@ -44,49 +45,55 @@ object GlanceProviderHelper {
             Constants.GlanceProviderId.NEXT_CLOCK_ALARM -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_show_next_alarm_title),
-                   R.drawable.round_access_alarm
+                   R.drawable.round_access_alarm_24
                )
             }
             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_24
                )
             }
             Constants.GlanceProviderId.CUSTOM_INFO -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_custom_notes_title),
-                   R.drawable.round_sticky_note_2
+                   R.drawable.round_sticky_note_2_24
                )
             }
             Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_low_battery_level_title),
-                   R.drawable.round_battery_charging_full
+                   R.drawable.round_battery_charging_full_24
                )
             }
             Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_daily_steps_title),
-                   R.drawable.round_near_me
+                   R.drawable.round_favorite_border_24
                )
             }
             Constants.GlanceProviderId.NOTIFICATIONS -> {
                 GlanceProvider(providerId.id,
                     context.getString(R.string.settings_show_notifications_title),
-                    R.drawable.round_notifications
+                    R.drawable.round_notifications_24
                 )
             }
             Constants.GlanceProviderId.GREETINGS -> {
                 GlanceProvider(providerId.id,
                     context.getString(R.string.settings_show_greetings_title),
-                    R.drawable.round_history_edu
+                    R.drawable.round_history_edu_24
+                )
+            }
+            Constants.GlanceProviderId.EVENTS -> {
+                GlanceProvider(providerId.id,
+                    context.getString(R.string.settings_show_events_as_glance_provider_title),
+                    R.drawable.round_event_note_24
                 )
             }
         }
     }
 
-    fun saveGlanceProviderOrder(list: ArrayList<Constants.GlanceProviderId>) {
+    fun saveGlanceProviderOrder(list: List<Constants.GlanceProviderId>) {
         Preferences.enabledGlanceProviderOrder = list.joinToString(separator = ",")
     }
 
@@ -94,7 +101,7 @@ object GlanceProviderHelper {
         val eventRepository = EventRepository(context)
         BatteryHelper.updateBatteryInfo(context)
 
-        val showGlance = Preferences.showGlance && (eventRepository.getEventsCount() == 0 || !Preferences.showEvents)
+        val showGlance = Preferences.showGlance && (eventRepository.getEventsCount() == 0 || !Preferences.showEvents || Preferences.showEventsAsGlanceProvider)
             && (
                 (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) ||
                 (Preferences.showNextAlarm && AlarmHelper.getNextAlarm(context) != "") ||
@@ -102,7 +109,9 @@ object GlanceProviderHelper {
                 (Preferences.showBatteryCharging && Preferences.isCharging || Preferences.isBatteryLevelLow) ||
                 (Preferences.customNotes.isNotEmpty()) ||
                 (Preferences.showDailySteps && Preferences.googleFitSteps > 0) ||
-                (Preferences.showGreetings && GreetingsHelper.showGreetings())
+                (Preferences.showGreetings && GreetingsHelper.showGreetings()) ||
+                        (Preferences.showEventsAsGlanceProvider && Preferences.showEvents && context.checkGrantedPermission(
+                            Manifest.permission.READ_CALENDAR) && eventRepository.getNextEvent() != null)
             )
         eventRepository.close()
         return showGlance

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

@@ -10,6 +10,7 @@ import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
+import com.tommasoberlose.anotherwidget.services.LocationService
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
@@ -31,26 +32,8 @@ object WeatherHelper {
         val networkApi = WeatherNetworkApi(context)
         if (Preferences.customLocationAdd != "") {
             networkApi.updateWeather()
-        } else if (context.checkGrantedPermission(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION)) {
+        } else if (context.checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
-            LocationServices.getFusedLocationProviderClient(context).lastLocation.addOnCompleteListener { task ->
+            LocationService.requestNewLocation(context)
-                if (task.isSuccessful) {
-                    val location = task.result
-                    if (location != null) {
-                        Preferences.customLocationLat = location.latitude.toString()
-                        Preferences.customLocationLon = location.longitude.toString()
-                    }
-
-                    CoroutineScope(Dispatchers.IO).launch {
-                        networkApi.updateWeather()
-                    }
-                    EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
-                } else {
-                    CoroutineScope(Dispatchers.IO).launch {
-                        networkApi.updateWeather()
-                    }
-                    EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
-                }
-            }
         }
     }
 

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

@@ -8,6 +8,7 @@ import android.os.Build
 import android.service.notification.NotificationListenerService
 import android.service.notification.StatusBarNotification
 import android.util.Log
+import android.widget.Toast
 import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -33,24 +34,19 @@ class NotificationListener : NotificationListenerService() {
                 val isGroupHeader = sbn.notification.flags and Notification.FLAG_GROUP_SUMMARY != 0
                 val isOngoing = sbn.notification.flags and Notification.FLAG_ONGOING_EVENT != 0
 
-                if (bundle.containsKey(Notification.EXTRA_TITLE) && !isGroupHeader && !isOngoing && ActiveNotificationsHelper.isAppAccepted(sbn.packageName)) {
+                if (bundle.containsKey(Notification.EXTRA_TITLE) && !isGroupHeader && !isOngoing && ActiveNotificationsHelper.isAppAccepted(sbn.packageName) && !sbn.packageName.contains("com.android.systemui")) {
                     Preferences.lastNotificationId = sbn.id
                     Preferences.lastNotificationTitle = bundle.getString(Notification.EXTRA_TITLE) ?: ""
+                    try {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                        try {
                             Preferences.lastNotificationIcon = sbn.notification.smallIcon.resId
-                        } catch (ex: Exception) {
-                            Preferences.lastNotificationIcon = 0
-                        }
-                        Preferences.lastNotificationPackage = sbn.notification.smallIcon.resPackage
                         } else {
-                        try {
                             Preferences.lastNotificationIcon = sbn.notification.icon
+                        }
                     } catch (ex: Exception) {
                         Preferences.lastNotificationIcon = 0
                     }
                     Preferences.lastNotificationPackage = sbn.packageName
-                    }
                     MainWidget.updateWidget(this)
                     setTimeout(this)
                 }

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

@@ -33,9 +33,9 @@ class UpdatesReceiver : BroadcastReceiver() {
             Intent.ACTION_LOCALE_CHANGED,
             Intent.ACTION_DATE_CHANGED,
             Actions.ACTION_CALENDAR_UPDATE -> {
-                CalendarHelper.updateEventList(context)
                 ActiveNotificationsHelper.clearLastNotification(context)
                 MediaPlayerHelper.updatePlayingMediaInfo(context)
+                CalendarHelper.updateEventList(context)
             }
 
             "com.sec.android.widgetapp.APPWIDGET_RESIZE",

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

@@ -0,0 +1,129 @@
+package com.tommasoberlose.anotherwidget.services
+
+import android.Manifest
+import android.app.*
+import android.app.job.JobScheduler
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.Address
+import android.location.Geocoder
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.*
+import androidx.core.content.ContextCompat
+import com.google.android.gms.location.LocationServices
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
+import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
+import java.lang.Exception
+import java.util.*
+import kotlin.collections.ArrayList
+
+class LocationService : Service() {
+
+    private val jobs: ArrayList<Job> = ArrayList()
+
+    override fun onCreate() {
+        super.onCreate()
+        startForeground(LOCATION_ACCESS_NOTIFICATION_ID, getLocationAccessNotification())
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (ActivityCompat.checkSelfPermission(
+                this,
+                Manifest.permission.ACCESS_FINE_LOCATION
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
+
+            jobs += GlobalScope.launch(Dispatchers.IO) {
+                LocationServices.getFusedLocationProviderClient(this@LocationService).lastLocation.addOnCompleteListener { task ->
+                    val networkApi = WeatherNetworkApi(this@LocationService)
+                    if (task.isSuccessful) {
+                        val location = task.result
+                        if (location != null) {
+                            Preferences.customLocationLat = location.latitude.toString()
+                            Preferences.customLocationLon = location.longitude.toString()
+                        }
+
+                        CoroutineScope(Dispatchers.IO).launch {
+                            networkApi.updateWeather()
+                            withContext(Dispatchers.Main) {
+                                stopSelf()
+                            }
+                        }
+                        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
+                    } else {
+                        CoroutineScope(Dispatchers.IO).launch {
+                            networkApi.updateWeather()
+                            withContext(Dispatchers.Main) {
+                                stopSelf()
+                            }
+                        }
+                        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
+                    }
+                }
+            }
+        } else {
+            stopSelf()
+        }
+        return START_STICKY
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        jobs.forEach {
+            it.cancel()
+        }
+    }
+
+    companion object {
+        const val LOCATION_ACCESS_NOTIFICATION_ID = 28465
+
+        @JvmStatic
+        fun requestNewLocation(context: Context) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                context.startForegroundService(Intent(context, LocationService::class.java))
+            } else {
+                context.startService(Intent(context, LocationService::class.java))
+            }
+        }
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+
+    private fun getLocationAccessNotification(): Notification {
+        with(NotificationManagerCompat.from(this)) {
+            // Create channel
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                createNotificationChannel(
+                    NotificationChannel(
+                        getString(R.string.location_access_notification_channel_id),
+                        getString(R.string.location_access_notification_channel_name),
+                        NotificationManager.IMPORTANCE_LOW
+                    ).apply {
+                        description = getString(R.string.location_access_notification_channel_description)
+                    }
+                )
+            }
+
+            val builder = NotificationCompat.Builder(this@LocationService, getString(R.string.location_access_notification_channel_id))
+                .setSmallIcon(R.drawable.ic_stat_notification)
+                .setContentTitle(getString(R.string.location_access_notification_title))
+                .setStyle(NotificationCompat.BigTextStyle().bigText(getString(R.string.location_access_notification_subtitle)))
+                .setOngoing(true)
+                .setColor(ContextCompat.getColor(this@LocationService, R.color.colorAccent))
+
+            // Main intent that open the activity
+            builder.setContentIntent(PendingIntent.getActivity(this@LocationService, 0, Intent(this@LocationService, MainActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT))
+
+            return builder.build()
+        }
+    }
+}

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

@@ -85,6 +85,24 @@ class UpdateCalendarJob : JobIntentService() {
                                         instance.end =
                                             end.timeInMillis - end.timeZone.getOffset(end.timeInMillis)
                                     }
+
+                                    // Check all day events
+                                    val startDate = Calendar.getInstance()
+                                    startDate.timeInMillis = instance.begin
+                                    val endDate = Calendar.getInstance()
+                                    endDate.timeInMillis = instance.end
+
+                                    val isAllDay = e.allDay || (
+                                            startDate.get(Calendar.MILLISECOND) == 0
+                                                    && startDate.get(Calendar.SECOND) == 0
+                                                    && startDate.get(Calendar.MINUTE) == 0
+                                                    && startDate.get(Calendar.HOUR_OF_DAY) == 0
+                                                    && endDate.get(Calendar.MILLISECOND) == 0
+                                                    && endDate.get(Calendar.SECOND) == 0
+                                                    && endDate.get(Calendar.MINUTE) == 0
+                                                    && endDate.get(Calendar.HOUR_OF_DAY) == 0
+                                            )
+
                                     eventList.add(
                                         Event(
                                             id = instance.id,
@@ -93,7 +111,7 @@ class UpdateCalendarJob : JobIntentService() {
                                             startDate = instance.begin,
                                             endDate = instance.end,
                                             calendarID = e.calendarId.toInt(),
-                                            allDay = e.allDay,
+                                            allDay = isAllDay,
                                             address = e.eventLocation ?: "",
                                             selfAttendeeStatus = e.selfAttendeeStatus.toInt(),
                                             availability = e.availability

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

@@ -53,7 +53,7 @@ class ChooseApplicationActivity : AppCompatActivity() {
             .register<String>(R.layout.application_info_layout) { _, injector ->
                 injector
                     .text(R.id.text, getString(R.string.default_name))
-                    .image(R.id.icon, R.drawable.round_add_to_home_screen)
+                    .image(R.id.icon, R.drawable.round_add_to_home_screen_24)
                     .with<ImageView>(R.id.icon) {
                         it.scaleX = 0.8f
                         it.scaleY = 0.8f

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

@@ -140,7 +140,7 @@ class CustomLocationActivity : AppCompatActivity() {
     private fun requirePermission() {
         Dexter.withContext(this)
             .withPermissions(
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION
+                Manifest.permission.ACCESS_FINE_LOCATION
             ).withListener(object: MultiplePermissionsListener {
                 override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
                     report?.let {

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

@@ -129,7 +129,7 @@ class WeatherProviderActivity : AppCompatActivity() {
                             it.isVisible = false
                         }
                     }
-                    .image(R.id.action_configure, ContextCompat.getDrawable(this, if (WeatherHelper.isKeyRequired(provider)) R.drawable.round_settings else R.drawable.outline_info_white))
+                    .image(R.id.action_configure, ContextCompat.getDrawable(this, if (WeatherHelper.isKeyRequired(provider)) R.drawable.round_settings_24 else R.drawable.outline_info_24))
             }.attachTo(list_view)
 
         adapter.updateData(

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

@@ -15,7 +15,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.databinding.DataBindingUtil
@@ -51,7 +50,6 @@ 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() {
@@ -63,6 +61,7 @@ class GlanceTabFragment : Fragment() {
     private var dialog: GlanceSettingsDialog? = null
     private lateinit var adapter: SlimAdapter
     private lateinit var viewModel: MainViewModel
+    private lateinit var list: ArrayList<Constants.GlanceProviderId>
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -84,6 +83,8 @@ class GlanceTabFragment : Fragment() {
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
 
+        list = GlanceProviderHelper.getGlanceProviders(requireContext())
+
         return binding.root
     }
 
@@ -107,7 +108,9 @@ class GlanceTabFragment : Fragment() {
                     .clicked(R.id.item) {
                         if (Preferences.showGlance) {
                             if (provider == Constants.GlanceProviderId.CUSTOM_INFO) {
-                                CustomNotesDialog(requireContext()).show()
+                                CustomNotesDialog(requireContext()){
+                                    adapter.notifyItemRangeChanged(0, adapter.data.size)
+                                }.show()
                             } else {
                                 dialog = GlanceSettingsDialog(requireActivity(), provider) {
                                     adapter.notifyItemRangeChanged(0, adapter.data.size)
@@ -119,6 +122,7 @@ class GlanceTabFragment : Fragment() {
                             }
                         }
                     }
+                var isVisible = false
                 when (provider) {
                     Constants.GlanceProviderId.PLAYING_SONG -> {
                         when {
@@ -129,16 +133,19 @@ class GlanceTabFragment : Fragment() {
                                 injector.text(R.id.label,
                                     if (Preferences.showMusic) getString(R.string.settings_visible) else getString(
                                         R.string.settings_not_visible))
+                                isVisible = Preferences.showMusic
                             }
                             Preferences.showMusic -> {
                                 injector.visibility(R.id.error_icon, View.VISIBLE)
                                 injector.visibility(R.id.info_icon, View.GONE)
                                 injector.text(R.id.label, getString(R.string.settings_not_visible))
+                                isVisible = false
                             }
                             else -> {
                                 injector.visibility(R.id.error_icon, View.GONE)
                                 injector.visibility(R.id.info_icon, View.VISIBLE)
                                 injector.text(R.id.label, getString(R.string.settings_not_visible))
+                                isVisible = false
                             }
                         }
                     }
@@ -156,6 +163,8 @@ class GlanceTabFragment : Fragment() {
                             if (!(Preferences.showNextAlarm && AlarmHelper.isAlarmProbablyWrong(
                                     requireContext()))
                             ) View.VISIBLE else View.GONE)
+                        isVisible = !(Preferences.showNextAlarm && AlarmHelper.isAlarmProbablyWrong(
+                            requireContext()))
                     }
                     Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
                         injector.text(R.id.label,
@@ -163,6 +172,7 @@ class GlanceTabFragment : Fragment() {
                                 R.string.settings_not_visible))
                         injector.visibility(R.id.error_icon, View.GONE)
                         injector.visibility(R.id.info_icon, View.VISIBLE)
+                        isVisible = Preferences.showBatteryCharging
                     }
                     Constants.GlanceProviderId.NOTIFICATIONS -> {
                         when {
@@ -172,16 +182,19 @@ class GlanceTabFragment : Fragment() {
                                 injector.text(R.id.label,
                                     if (Preferences.showNotifications) getString(
                                         R.string.settings_visible) else getString(R.string.settings_not_visible))
+                                isVisible = Preferences.showNotifications
                             }
                             Preferences.showNotifications -> {
                                 injector.visibility(R.id.error_icon, View.VISIBLE)
                                 injector.visibility(R.id.info_icon, View.GONE)
                                 injector.text(R.id.label, getString(R.string.settings_not_visible))
+                                isVisible = false
                             }
                             else -> {
                                 injector.visibility(R.id.error_icon, View.GONE)
                                 injector.visibility(R.id.info_icon, View.VISIBLE)
                                 injector.text(R.id.label, getString(R.string.settings_not_visible))
+                                isVisible = false
                             }
                         }
                     }
@@ -191,6 +204,7 @@ class GlanceTabFragment : Fragment() {
                                 R.string.settings_not_visible))
                         injector.visibility(R.id.error_icon, View.GONE)
                         injector.visibility(R.id.info_icon, View.VISIBLE)
+                        isVisible = Preferences.showGreetings
                     }
                     Constants.GlanceProviderId.CUSTOM_INFO -> {
                         injector.text(R.id.label,
@@ -198,6 +212,7 @@ class GlanceTabFragment : Fragment() {
                                 R.string.settings_not_visible))
                         injector.visibility(R.id.error_icon, View.GONE)
                         injector.visibility(R.id.info_icon, View.VISIBLE)
+                        isVisible = Preferences.customNotes != ""
                     }
                     Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
                         val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(context)
@@ -209,20 +224,35 @@ class GlanceTabFragment : Fragment() {
                                     R.string.settings_not_visible))
                             injector.visibility(R.id.error_icon, View.GONE)
                             injector.visibility(R.id.info_icon, View.VISIBLE)
+                            isVisible = Preferences.showDailySteps
                         } else if (Preferences.showDailySteps) {
                             ActivityDetectionReceiver.unregisterFence(requireContext())
                             injector.visibility(R.id.error_icon, View.VISIBLE)
                             injector.visibility(R.id.info_icon, View.GONE)
                             injector.text(R.id.label, getString(R.string.settings_not_visible))
+                            isVisible = false
                         } else {
                             ActivityDetectionReceiver.unregisterFence(requireContext())
                             injector.text(R.id.label, getString(R.string.settings_not_visible))
                             injector.visibility(R.id.error_icon, View.GONE)
                             injector.visibility(R.id.info_icon, View.VISIBLE)
+                            isVisible = false
                         }
                     }
+                    Constants.GlanceProviderId.EVENTS -> {
+                        isVisible = Preferences.showEventsAsGlanceProvider && Preferences.showEvents && requireContext().checkGrantedPermission(Manifest.permission.READ_CALENDAR)
+                        injector.text(R.id.label,
+                            if (isVisible) getString(R.string.settings_visible) else getString(
+                                R.string.settings_not_visible))
+                        injector.visibility(R.id.error_icon, if (isVisible) View.GONE else View.VISIBLE)
+                        injector.visibility(R.id.info_icon, if (isVisible) View.VISIBLE else View.GONE)
                     }
                 }
+
+                injector.alpha(R.id.title, if (isVisible) 1f else .25f)
+                injector.alpha(R.id.label, if (isVisible) 1f else .25f)
+                injector.alpha(R.id.icon, if (isVisible) 1f else .25f)
+            }
             .attachTo(providers_list)
 
         val mIth = ItemTouchHelper(
@@ -231,8 +261,6 @@ class GlanceTabFragment : Fragment() {
                 0
             ) {
 
-                val list = GlanceProviderHelper.getGlanceProviders(requireContext())
-
                 override fun onMove(
                     recyclerView: RecyclerView,
                     viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder,
@@ -244,10 +272,6 @@ class GlanceTabFragment : Fragment() {
                     return true
                 }
 
-                override fun isItemViewSwipeEnabled(): Boolean {
-                    return false
-                }
-
                 override fun onMoved(
                     recyclerView: RecyclerView,
                     viewHolder: RecyclerView.ViewHolder,
@@ -257,14 +281,28 @@ class GlanceTabFragment : Fragment() {
                     x: Int,
                     y: Int
                 ) {
-                    with(list[fromPos]) {
+                    with(list[toPos]) {
-                        list[fromPos] = list[toPos]
+                        list[toPos] = list[fromPos]
-                        list[toPos] = this
+                        list[fromPos] = this
                     }
-                    GlanceProviderHelper.saveGlanceProviderOrder(list)
                     super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y)
                 }
 
+                override fun isItemViewSwipeEnabled(): Boolean {
+                    return false
+                }
+
+                override fun clearView(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder
+                ) {
+                    super.clearView(recyclerView, viewHolder)
+                    GlanceProviderHelper.saveGlanceProviderOrder(
+                        list
+                    )
+                    adapter.updateData(list.mapNotNull { GlanceProviderHelper.getGlanceProviderById(requireContext(), it) })
+                }
+
                 override fun onChildDraw(
                     c: Canvas,
                     recyclerView: RecyclerView,
@@ -305,10 +343,7 @@ class GlanceTabFragment : Fragment() {
             })
 
         mIth.attachToRecyclerView(providers_list)
-        adapter.updateData(
+        adapter.updateData(list.mapNotNull { GlanceProviderHelper.getGlanceProviderById(requireContext(), it) })
-            GlanceProviderHelper.getGlanceProviders(requireContext())
-                .mapNotNull { GlanceProviderHelper.getGlanceProviderById(requireContext(), it) }
-        )
         providers_list.isNestedScrollingEnabled = false
 
         setupListener()
@@ -338,6 +373,11 @@ class GlanceTabFragment : Fragment() {
         show_glance_switch.setOnCheckedChangeListener { _, enabled: Boolean ->
             Preferences.showGlance = enabled
         }
+
+        action_show_glance.setOnLongClickListener {
+            Preferences.enabledGlanceProviderOrder = ""
+            true
+        }
     }
 
     private val nextAlarmChangeBroadcastReceiver = object : BroadcastReceiver() {

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

@@ -351,7 +351,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         }?.isVisible = if (Preferences.showWeather) {
             (WeatherHelper.isKeyRequired() && WeatherHelper.getApiKey() == "")
                     || (Preferences.customLocationAdd == "" && activity?.checkGrantedPermission(
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION
+                            Manifest.permission.ACCESS_FINE_LOCATION
                         ) != true)
                     || (Preferences.weatherProviderError != "" && Preferences.weatherProviderError != "-")
                     || (Preferences.weatherProviderLocationError != "")
@@ -365,7 +365,8 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
             badgeGravity = BadgeDrawable.TOP_END
         }?.isVisible = ((Preferences.showMusic || Preferences.showNotifications) && !ActiveNotificationsHelper.checkNotificationAccess(requireContext())) ||
                 (Preferences.showDailySteps && !(Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || requireActivity().checkGrantedPermission(Manifest.permission.ACTIVITY_RECOGNITION))) ||
-                (AlarmHelper.isAlarmProbablyWrong(requireContext()))
+                (AlarmHelper.isAlarmProbablyWrong(requireContext())) ||
+                (Preferences.showEventsAsGlanceProvider && (!Preferences.showEvents || !requireContext().checkGrantedPermission(Manifest.permission.READ_CALENDAR)))
     }
 
     override fun onResume() {
@@ -396,6 +397,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
     }
 
     class UpdateUiMessageEvent
+    class ChangeTabEvent(val page: Int)
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMessageEvent(ignore: UpdateUiMessageEvent?) {
@@ -407,4 +409,11 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
             }
         }
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMessageEvent(event: ChangeTabEvent?) {
+        event?.let {
+            pager.setCurrentItem(event.page, true)
+        }
+    }
 }

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

@@ -161,12 +161,7 @@ class WeatherTabFragment : Fragment() {
     }
 
     private fun checkLocationPermission() {
-        // Background permission
+        if (requireActivity().checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && activity?.checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION) == true && activity?.checkGrantedPermission(Manifest.permission.ACCESS_BACKGROUND_LOCATION) != true) {
-            requirePermission()
-        }
-
-        if (activity?.checkGrantedPermission(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION) == true) {
             location_permission_alert?.isVisible = false
             background_location_warning.isVisible = Preferences.customLocationAdd == ""
             WeatherReceiver.setUpdates(requireContext())
@@ -299,7 +294,7 @@ class WeatherTabFragment : Fragment() {
     private fun requirePermission() {
         Dexter.withContext(requireContext())
             .withPermissions(
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else Manifest.permission.ACCESS_FINE_LOCATION
+                Manifest.permission.ACCESS_FINE_LOCATION
             ).withListener(object: MultiplePermissionsListener {
                 override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
                     report?.let {

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

@@ -172,7 +172,7 @@ class MainWidget : AppWidgetProvider() {
                 val nextEvent = eventRepository.getNextEvent()
                 val nextAlarm = AlarmHelper.getNextAlarm(context)
 
-                if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
                     if (Preferences.showNextEvent && eventRepository.getEventsCount() > 1) {
                         views.setImageViewBitmap(
                             R.id.action_next_rect,
@@ -378,6 +378,26 @@ class MainWidget : AppWidgetProvider() {
                                     break@loop
                                 }
                             }
+                            Constants.GlanceProviderId.EVENTS -> {
+                                if (Preferences.showEventsAsGlanceProvider&& Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                                    val pIntentDetail = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getEventIntent(
+                                            context,
+                                            nextEvent,
+                                            forceEventDetails = true
+                                        ),
+                                        PendingIntent.FLAG_UPDATE_CURRENT
+                                    )
+                                    views.setOnClickPendingIntent(
+                                        R.id.second_row_rect,
+                                        pIntentDetail
+                                    )
+                                    showSomething = true
+                                    break@loop
+                                }
+                            }
                         }
                     }
 
@@ -552,7 +572,7 @@ class MainWidget : AppWidgetProvider() {
             val nextEvent = eventRepository.getNextEvent()
             val nextAlarm = AlarmHelper.getNextAlarm(context)
 
-            if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+            if (Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null && !Preferences.showEventsAsGlanceProvider) {
                 // Multiple counter
                 v.action_next.isVisible =
                     Preferences.showNextEvent && eventRepository.getEventsCount() > 1
@@ -585,7 +605,7 @@ class MainWidget : AppWidgetProvider() {
                     v.second_row_icon.setImageDrawable(
                         ContextCompat.getDrawable(
                             context,
-                            R.drawable.round_place
+                            R.drawable.round_place_24
                         )
                     )
                     v.next_event_date.text = nextEvent.address
@@ -593,7 +613,7 @@ class MainWidget : AppWidgetProvider() {
                     v.second_row_icon.setImageDrawable(
                         ContextCompat.getDrawable(
                             context,
-                            R.drawable.round_today
+                            R.drawable.round_today_24
                         )
                     )
                     if (!nextEvent.allDay) {
@@ -674,7 +694,7 @@ class MainWidget : AppWidgetProvider() {
                                 v.second_row_icon.setImageDrawable(
                                     ContextCompat.getDrawable(
                                         context,
-                                        R.drawable.round_music_note
+                                        R.drawable.round_music_note_24
                                     )
                                 )
                                 v.next_event_date.text = MediaPlayerHelper.getMediaInfo()
@@ -687,7 +707,7 @@ class MainWidget : AppWidgetProvider() {
                                 v.second_row_icon.setImageDrawable(
                                     ContextCompat.getDrawable(
                                         context,
-                                        R.drawable.round_alarm
+                                        R.drawable.round_alarm_24
                                     )
                                 )
                                 v.next_event_date.text = AlarmHelper.getNextAlarm(context)
@@ -765,6 +785,35 @@ class MainWidget : AppWidgetProvider() {
                                 break@loop
                             }
                         }
+                        Constants.GlanceProviderId.EVENTS -> {
+                            if (Preferences.showEventsAsGlanceProvider && Preferences.showEvents && context.checkGrantedPermission(Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                                v.next_event_date.text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
+                                     if (!nextEvent.allDay) {
+                                        SettingsStringHelper.getDifferenceText(
+                                            context,
+                                            now.timeInMillis,
+                                            nextEvent.startDate
+                                        )
+                                            .toLowerCase(Locale.getDefault())
+                                    } else {
+                                        SettingsStringHelper.getAllDayEventDifferenceText(
+                                            context,
+                                            now.timeInMillis,
+                                            nextEvent.startDate
+                                        ).toLowerCase(Locale.getDefault())
+                                    }
+                                } else "").trimEnd()
+                                v.second_row_icon.isVisible = true
+                                v.second_row_icon.setImageDrawable(
+                                    ContextCompat.getDrawable(
+                                        context,
+                                        R.drawable.round_today_24
+                                    )
+                                )
+                                showSomething = true
+                                break@loop
+                            }
+                        }
                     }
                 }
 

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

@@ -21,6 +21,7 @@ import android.content.Intent
 import android.content.res.Resources
 import android.graphics.drawable.Drawable
 import android.util.DisplayMetrics
+import android.util.Log
 import android.util.TypedValue
 import android.view.ViewPropertyAnimator
 import android.view.animation.Animation