Fix #217

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

@@ -64,7 +64,8 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
         view.action_filter_music_players.isVisible = provider == Constants.GlanceProviderId.PLAYING_SONG
         if (provider == Constants.GlanceProviderId.PLAYING_SONG) {
             view.action_filter_music_players.setOnClickListener {
-                context.startActivity(Intent(context, MusicPlayersFilterActivity::class.java))
+                dismiss()
+                context.startActivityForResult(Intent(context, MusicPlayersFilterActivity::class.java), 0)
             }
             checkNotificationPermission(view)
         }
@@ -97,7 +98,8 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
         if (provider == Constants.GlanceProviderId.NOTIFICATIONS) {
             checkLastNotificationsPermission(view)
             view.action_filter_notifications_app.setOnClickListener {
-                context.startActivity(Intent(context, AppNotificationsFilterActivity::class.java))
+                dismiss()
+                context.startActivityForResult(Intent(context, AppNotificationsFilterActivity::class.java), 0)
             }
         }
 

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

@@ -1,6 +1,7 @@
 package com.tommasoberlose.anotherwidget.helpers
 
 import android.content.Context
+import android.util.Log
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Constants
@@ -16,7 +17,9 @@ object GlanceProviderHelper {
         val providers = Constants.GlanceProviderId.values()
             .filter {
                 context.checkIfFitInstalled() || it != Constants.GlanceProviderId.GOOGLE_FIT_STEPS
-            }.toTypedArray()
+            }
+            .filterNot { it.id == Constants.GlanceProviderId.GREETINGS.id }
+            .toTypedArray()
 
         providers.sortWith(Comparator { p1, p2 ->
             when {
@@ -35,6 +38,8 @@ object GlanceProviderHelper {
             }
         })
 
+        Log.d("ciao", providers.toList().toString())
+
         return ArrayList(providers.toList())
     }
 
@@ -49,7 +54,7 @@ object GlanceProviderHelper {
             Constants.GlanceProviderId.PLAYING_SONG -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_show_music_title),
-                   R.drawable.round_radio
+                   R.drawable.round_music_note
                )
             }
             Constants.GlanceProviderId.CUSTOM_INFO -> {
@@ -67,7 +72,7 @@ object GlanceProviderHelper {
             Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
                GlanceProvider(providerId.id,
                    context.getString(R.string.settings_daily_steps_title),
-                   R.drawable.round_run_circle
+                   R.drawable.round_near_me
                )
             }
             Constants.GlanceProviderId.NOTIFICATIONS -> {

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

@@ -13,6 +13,7 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.ActiveNotificationsHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import java.lang.Exception
 import java.util.*
 
 
@@ -35,10 +36,18 @@ class NotificationListener : NotificationListenerService() {
                     Preferences.lastNotificationId = sbn.id
                     Preferences.lastNotificationTitle = bundle.getString(Notification.EXTRA_TITLE) ?: ""
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                        Preferences.lastNotificationIcon = sbn.notification.smallIcon.resId
+                        try {
+                            Preferences.lastNotificationIcon = sbn.notification.smallIcon.resId
+                        } catch (ex: Exception) {
+                            Preferences.lastNotificationIcon = 0
+                        }
                         Preferences.lastNotificationPackage = sbn.notification.smallIcon.resPackage
                     } else {
-                        Preferences.lastNotificationIcon = sbn.notification.icon
+                        try {
+                            Preferences.lastNotificationIcon = sbn.notification.icon
+                        } catch (ex: Exception) {
+                            Preferences.lastNotificationIcon = 0
+                        }
                         Preferences.lastNotificationPackage = sbn.packageName
                     }
                     MainWidget.updateWidget(this)

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

@@ -30,6 +30,7 @@ import kotlinx.android.synthetic.main.activity_choose_application.search
 import kotlinx.android.synthetic.main.activity_music_players_filter.*
 import kotlinx.coroutines.*
 import net.idik.lib.slimadapter.SlimAdapter
+import net.idik.lib.slimadapter.SlimAdapterEx
 
 
 class ChooseApplicationActivity : AppCompatActivity() {
@@ -47,7 +48,7 @@ class ChooseApplicationActivity : AppCompatActivity() {
         val mLayoutManager = LinearLayoutManager(this)
         list_view.layoutManager = mLayoutManager
 
-        adapter = SlimAdapter.create()
+        adapter = SlimAdapterEx.create()
         adapter
             .register<String>(R.layout.application_info_layout) { _, injector ->
                 injector

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

@@ -241,8 +241,6 @@ class GlanceTabFragment : Fragment() {
                     val toPos = target.adapterPosition
                     // move item in `fromPos` to `toPos` in adapter.
                     adapter.notifyItemMoved(fromPos, toPos)
-
-                    Collections.swap(list, fromPos, toPos)
                     return true
                 }
 
@@ -250,12 +248,22 @@ class GlanceTabFragment : Fragment() {
                     return false
                 }
 
-                override fun clearView(
+                override fun onMoved(
                     recyclerView: RecyclerView,
-                    viewHolder: RecyclerView.ViewHolder
+                    viewHolder: RecyclerView.ViewHolder,
+                    fromPos: Int,
+                    target: RecyclerView.ViewHolder,
+                    toPos: Int,
+                    x: Int,
+                    y: Int
                 ) {
-                    super.clearView(recyclerView, viewHolder)
+                    with(list[fromPos]) {
+                        list[fromPos] = list[toPos]
+                        list[toPos] = this
+                    }
                     GlanceProviderHelper.saveGlanceProviderOrder(list)
+                    Log.d("ciao", list.toString())
+                    super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y)
                 }
 
                 override fun onChildDraw(
@@ -279,7 +287,6 @@ class GlanceTabFragment : Fragment() {
                     }
 
                     val topEdge = if ((view.top == 0 && dY < 0) || ((view.top + view.height >= recyclerView.height - 32f.convertDpToPixel(requireContext())) && dY > 0)) 0f else dY
-                    Log.d("ciao", "${view.top} + ${view.height} = ${view.top + view.height} to compare to ${recyclerView.height} - ${32f.convertDpToPixel(requireContext())}")
 
                     super.onChildDraw(c,
                         recyclerView,
@@ -302,7 +309,6 @@ class GlanceTabFragment : Fragment() {
         adapter.updateData(
             GlanceProviderHelper.getGlanceProviders(requireContext())
                 .mapNotNull { GlanceProviderHelper.getGlanceProviderById(requireContext(), it) }
-                .filterNot { it.id == Constants.GlanceProviderId.GREETINGS.id }
         )
         providers_list.isNestedScrollingEnabled = false
 

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

@@ -624,8 +624,15 @@ class MainWidget : AppWidgetProvider() {
                     } else {
                         val flags: Int =
                             DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-                        v.next_event_date.text =
+                        val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
+
+                        v.next_event_date.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(Calendar.DAY_OF_YEAR)) {
                             DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                        } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(Calendar.YEAR) > start.get(Calendar.YEAR)) {
+                            DateUtils.formatDateTime(context, now.timeInMillis, flags)
+                        } else {
+                            DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                        }
                     }
                 }
 
@@ -718,9 +725,14 @@ class MainWidget : AppWidgetProvider() {
                             if (Preferences.showNotifications && ActiveNotificationsHelper.showLastNotification()) {
                                 try {
                                     val remotePackageContext = context.createPackageContext(Preferences.lastNotificationPackage, 0)
-                                    val icon = ContextCompat.getDrawable(remotePackageContext, Preferences.lastNotificationIcon)
-                                    v.second_row_icon.isVisible = true
-                                    v.second_row_icon.setImageDrawable(icon)
+                                    if (Preferences.lastNotificationIcon != 0) {
+                                        val icon = ContextCompat.getDrawable(remotePackageContext,
+                                            Preferences.lastNotificationIcon)
+                                        v.second_row_icon.isVisible = true
+                                        v.second_row_icon.setImageDrawable(icon)
+                                    } else {
+                                        v.second_row_icon.isVisible = false
+                                    }
                                     v.next_event_date.text = Preferences.lastNotificationTitle
                                     showSomething = true
                                     break@loop

app/src/main/res/drawable/round_design_services_24.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16.24,11.51l1.57,-1.57l-3.75,-3.75l-1.57,1.57L8.35,3.63c-0.78,-0.78 -2.05,-0.78 -2.83,0l-1.9,1.9c-0.78,0.78 -0.78,2.05 0,2.83l4.13,4.13L3.15,17.1C3.05,17.2 3,17.32 3,17.46v3.04C3,20.78 3.22,21 3.5,21h3.04c0.13,0 0.26,-0.05 0.35,-0.15l4.62,-4.62l4.13,4.13c1.32,1.32 2.76,0.07 2.83,0l1.9,-1.9c0.78,-0.78 0.78,-2.05 0,-2.83L16.24,11.51zM9.18,11.07L5.04,6.94l1.89,-1.9c0,0 0,0 0,0l1.27,1.27L7.73,6.8c-0.39,0.39 -0.39,1.02 0,1.41c0.39,0.39 1.02,0.39 1.41,0l0.48,-0.48l1.45,1.45L9.18,11.07zM17.06,18.96l-4.13,-4.13l1.9,-1.9l1.45,1.45l-0.48,0.48c-0.39,0.39 -0.39,1.02 0,1.41c0.39,0.39 1.02,0.39 1.41,0l0.48,-0.48l1.27,1.27L17.06,18.96z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.47,-0.47 -1.12,-0.29 -1.41,0l-1.83,1.83l3.75,3.75L20.71,7.04z"/>
+</vector>

app/src/main/res/drawable/round_grass_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.64,11.02c0.55,-1.47 1.43,-2.78 2.56,-3.83c0.38,-0.36 0.04,-1 -0.46,-0.85c-3.32,0.98 -5.75,4.05 -5.74,7.69c0,0 0,0 0,0C12.95,12.75 14.2,11.72 15.64,11.02zM11.42,8.85c-0.6,-1.56 -1.63,-2.91 -2.96,-3.87C8.04,4.68 7.5,5.17 7.74,5.63C8.54,7.15 9,8.88 9,10.71c0,0.21 -0.03,0.41 -0.04,0.61c0.43,0.24 0.83,0.52 1.22,0.82C10.39,10.96 10.83,9.85 11.42,8.85zM12,20H3c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h4.75c-0.57,-2.19 -2.04,-4.02 -4,-5.06l0,0c-0.16,-0.08 -0.26,-0.25 -0.26,-0.44c0,-0.27 0.22,-0.49 0.49,-0.5c0.01,0 0.02,0 0.02,0C8.42,12 12,15.58 12,20zM20.26,12.94L20.26,12.94c-1.96,1.04 -3.44,2.87 -4,5.06H21c0.55,0 1,0.45 1,1s-0.45,1 -1,1h-5h-2c0,-0.68 -0.07,-1.35 -0.2,-2c-0.15,-0.72 -0.38,-1.42 -0.67,-2.07C14.52,13.58 17.07,12 20,12c0.01,0 0.02,0 0.02,0c0.27,0 0.49,0.23 0.49,0.5C20.52,12.69 20.41,12.85 20.26,12.94z"/>
+</vector>

app/src/main/res/drawable/round_near_me_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18.75,3.94L4.07,10.08c-0.83,0.35 -0.81,1.53 0.02,1.85L9.43,14c0.26,0.1 0.47,0.31 0.57,0.57l2.06,5.33c0.32,0.84 1.51,0.86 1.86,0.03l6.15,-14.67c0.33,-0.83 -0.5,-1.66 -1.32,-1.32z"/>
+</vector>

app/src/main/res/drawable/round_topic.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,6h-8l-1.41,-1.41C10.21,4.21 9.7,4 9.17,4H4C2.9,4 2.01,4.9 2.01,6L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8C22,6.9 21.1,6 20,6zM13,16H7c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1h6c0.55,0 1,0.45 1,1C14,15.55 13.55,16 13,16zM17,12H7c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1h10c0.55,0 1,0.45 1,1C18,11.55 17.55,12 17,12z"/>
+</vector>

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

@@ -366,7 +366,7 @@
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:padding="12dp"
-                        android:src="@drawable/round_cloud_queue"
+                        android:src="@drawable/round_design_services"
                         app:tint="@color/colorPrimaryText"/>
                     <LinearLayout
                         android:layout_width="match_parent"