Fix #275

French v2.2.2 (120)

app/build.gradle

@@ -22,7 +22,7 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 119
+        versionCode 128
         versionName "2.2.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

@@ -40,7 +40,7 @@
         <activity android:name=".ui.activities.settings.IntegrationsActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.tabs.MusicPlayersFilterActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.tabs.AppNotificationsFilterActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
-
+        <activity android:name=".ui.activities.tabs.MediaInfoFormatActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
 
         <receiver android:name=".ui.widgets.MainWidget">
             <intent-filter>
@@ -152,7 +152,8 @@
         <service
             android:name=".services.UpdateCalendarService"
             android:enabled="true"
-            android:exported="false"/>
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
         <service
             android:name=".services.LocationService"
             android:enabled="true"

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

@@ -30,6 +30,7 @@ import com.tommasoberlose.anotherwidget.helpers.GreetingsHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.AppNotificationsFilterActivity
+import com.tommasoberlose.anotherwidget.ui.activities.tabs.MediaInfoFormatActivity
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.MusicPlayersFilterActivity
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
@@ -68,11 +69,16 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
 
         /* SONG */
         binding.actionFilterMusicPlayers.isVisible = provider == Constants.GlanceProviderId.PLAYING_SONG
+        binding.actionChangeMediaInfoFormat.isVisible = provider == Constants.GlanceProviderId.PLAYING_SONG
         if (provider == Constants.GlanceProviderId.PLAYING_SONG) {
             binding.actionFilterMusicPlayers.setOnClickListener {
                 dismiss()
                 context.startActivityForResult(Intent(context, MusicPlayersFilterActivity::class.java), 0)
             }
+            binding.actionChangeMediaInfoFormat.setOnClickListener {
+                dismiss()
+                context.startActivityForResult(Intent(context, MediaInfoFormatActivity::class.java), 0)
+            }
             checkNotificationPermission()
         }
 

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

@@ -2,7 +2,6 @@ package com.tommasoberlose.anotherwidget.global
 
 object Actions {
     const val ACTION_EXTRA_OPEN_WEATHER_PROVIDER = "ACTION_EXTRA_OPEN_WEATHER_PROVIDER"
-    const val ACTION_EXTRA_DISABLE_GPS_NOTIFICATION = "ACTION_EXTRA_DISABLE_GPS_NOTIFICATION"
 
     const val ACTION_TIME_UPDATE = "com.tommasoberlose.anotherwidget.action.TIME_UPDATE"
     const val ACTION_ALARM_UPDATE = "com.tommasoberlose.anotherwidget.action.ALARM_UPDATE"
@@ -14,4 +13,6 @@ object Actions {
     const val ACTION_REPORT_CRASH = "com.tommasoberlose.anotherwidget.action.REPORT_CRASH"
     const val ACTION_CLEAR_NOTIFICATION = "com.tommasoberlose.anotherwidget.action.CLEAR_NOTIFICATION"
     const val ACTION_UPDATE_GREETINGS = "com.tommasoberlose.anotherwidget.action.UPDATE_GREETINGS"
+
+    const val ACTION_REFRESH = "com.tommasoberlose.anotherwidget.action.REFRESH"
 }

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

@@ -4,6 +4,8 @@ import android.os.Build
 import androidx.appcompat.app.AppCompatDelegate.*
 import androidx.core.os.ConfigurationCompat
 import com.chibatching.kotpref.KotprefModel
+import com.tommasoberlose.anotherwidget.helpers.IntentHelper
+import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.utils.isMetric
 import java.util.*
 
@@ -133,11 +135,11 @@ object Preferences : KotprefModel() {
     var lastNotificationPackage by stringPref(default = "")
 
     var showMusic by booleanPref(default = false)
-    var mediaInfoFormat by stringPref(default = "")
+    var mediaInfoFormat by stringPref(default = MediaPlayerHelper.DEFAULT_MEDIA_INFO_FORMAT)
     var mediaPlayerTitle by stringPref(default = "")
     var mediaPlayerAlbum by stringPref(default = "")
     var mediaPlayerArtist by stringPref(default = "")
-    var mediaPlayerPackage by stringPref(default = "")
+    var mediaPlayerPackage by stringPref(default = IntentHelper.DO_NOTHING_OPTION)
     var musicPlayersFilter by stringPref(default = "")
     var appNotificationsFilter by stringPref(default = "")
 

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

@@ -12,8 +12,10 @@ import android.provider.CalendarContract
 import android.provider.CalendarContract.Events
 import android.util.Log
 import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.models.Event
+import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.toast
 import java.util.*
@@ -21,6 +23,10 @@ import java.util.*
 
 object IntentHelper {
 
+    const val DEFAULT_OPTION = ""
+    const val DO_NOTHING_OPTION = "DO_NOTHING"
+    const val REFRESH_WIDGET_OPTION = "REFRESH_WIDGET"
+
     fun getWidgetUpdateIntent(context: Context): Intent {
         val widgetManager = AppWidgetManager.getInstance(context)
         val widgetComponent = ComponentName(context, MainWidget::class.java)
@@ -31,6 +37,13 @@ object IntentHelper {
         }
     }
 
+    private fun getWidgetRefreshIntent(context: Context): Intent {
+        return Intent(context, UpdatesReceiver::class.java).apply {
+            action = Actions.ACTION_REFRESH
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        }
+    }
+
     fun getGoogleMapsIntentFromAddress(context: Context, address: String): Intent {
         val gmmIntentUri: Uri = Uri.parse("geo:0,0?q=$address")
         val mapIntent = Intent(Intent.ACTION_VIEW, gmmIntentUri)
@@ -47,17 +60,21 @@ object IntentHelper {
 
     fun getWeatherIntent(context: Context): Intent {
         return when (Preferences.weatherAppPackage) {
-            "" -> {
+            DEFAULT_OPTION -> {
                 Intent(Intent.ACTION_VIEW).apply {
                     addCategory(Intent.CATEGORY_DEFAULT)
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                     data = Uri.parse("dynact://velour/weather/ProxyActivity")
                     component = ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
+                    setClassName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
                 }
             }
-            "_" -> {
+            DO_NOTHING_OPTION -> {
                 Intent()
             }
+            REFRESH_WIDGET_OPTION -> {
+                getWidgetRefreshIntent(context)
+            }
             else -> {
                 val pm: PackageManager = context.packageManager
                 try {
@@ -79,14 +96,17 @@ object IntentHelper {
             .appendPath(Calendar.getInstance().timeInMillis.toString())
             .build()
         return when (Preferences.calendarAppPackage) {
-            "" -> {
+            DEFAULT_OPTION -> {
                 Intent(Intent.ACTION_VIEW).apply {
                     data = calendarUri
                 }
             }
-            "_" -> {
+            DO_NOTHING_OPTION -> {
                 Intent()
             }
+            REFRESH_WIDGET_OPTION -> {
+                getWidgetRefreshIntent(context)
+            }
             else -> {
                 val pm: PackageManager = context.packageManager
                 try {
@@ -164,14 +184,17 @@ object IntentHelper {
 
     fun getClockIntent(context: Context): Intent {
         return when (Preferences.clockAppPackage) {
-            "" -> {
+            DEFAULT_OPTION -> {
                 Intent(AlarmClock.ACTION_SHOW_ALARMS).apply {
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 }
             }
-            "_" -> {
+            DO_NOTHING_OPTION -> {
                 Intent()
             }
+            REFRESH_WIDGET_OPTION -> {
+                getWidgetRefreshIntent(context)
+            }
             else -> {
                 val pm: PackageManager = context.packageManager
                 try {
@@ -191,7 +214,7 @@ object IntentHelper {
 
     fun getMusicIntent(context: Context): Intent {
         return when (Preferences.mediaPlayerPackage) {
-            "" -> {
+            DO_NOTHING_OPTION -> {
                 Intent()
             }
             else -> {

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

@@ -15,14 +15,32 @@ import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import java.lang.Exception
 
 object MediaPlayerHelper {
+    const val MEDIA_INFO_TITLE = "%TITLE"
+    const val MEDIA_INFO_ARTIST = "%ARTIST"
+    const val MEDIA_INFO_ALBUM = "%ALBUM"
+
+    const val DEFAULT_MEDIA_INFO_FORMAT = "%TITLE, %ARTIST"
+
     fun isSomeonePlaying(context: Context) = Preferences.showMusic && ActiveNotificationsHelper.checkNotificationAccess(context) && Preferences.mediaPlayerTitle != ""
 
-    fun getMediaInfo(): String {
-      return if (Preferences.mediaPlayerArtist == "") {
-          Preferences.mediaPlayerTitle
-      } else {
-          "%s, %s".format(Preferences.mediaPlayerTitle, Preferences.mediaPlayerArtist)
-      }
+    fun getMediaInfo(format: String = Preferences.mediaInfoFormat, title: String = Preferences.mediaPlayerTitle, artist: String = Preferences.mediaPlayerArtist, album: String = Preferences.mediaPlayerAlbum): String {
+        return when (format) {
+            "",
+            DEFAULT_MEDIA_INFO_FORMAT -> {
+                if (Preferences.mediaPlayerArtist == "") {
+                    Preferences.mediaPlayerTitle
+                } else {
+                    DEFAULT_MEDIA_INFO_FORMAT.replace(MEDIA_INFO_TITLE, title)
+                        .replace(MEDIA_INFO_ARTIST, artist)
+                        .replace(MEDIA_INFO_ALBUM, album)
+                }
+            }
+            else -> {
+                format.replace(MEDIA_INFO_TITLE, title)
+                    .replace(MEDIA_INFO_ARTIST, artist)
+                    .replace(MEDIA_INFO_ALBUM, album)
+            }
+        }
     }
 
     fun updatePlayingMediaInfo(context: Context) {

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

@@ -12,12 +12,12 @@ import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
-import com.tommasoberlose.anotherwidget.helpers.ActiveNotificationsHelper
-import com.tommasoberlose.anotherwidget.helpers.BatteryHelper
-import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
-import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
+import com.tommasoberlose.anotherwidget.helpers.*
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.joda.time.Period
 import java.util.*
 
@@ -55,6 +55,14 @@ class UpdatesReceiver : BroadcastReceiver() {
             Actions.ACTION_UPDATE_GREETINGS -> {
                 MainWidget.updateWidget(context)
             }
+
+            Actions.ACTION_REFRESH -> {
+                GlobalScope.launch(Dispatchers.IO) {
+                    CalendarHelper.updateEventList(context)
+                    MediaPlayerHelper.updatePlayingMediaInfo(context)
+                    WeatherHelper.updateWeather(context)
+                }
+            }
         }
     }
 

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

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.IntentHelper
 import com.tommasoberlose.anotherwidget.utils.toast
 
@@ -15,19 +16,20 @@ class WidgetClickListenerReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action == Actions.ACTION_OPEN_WEATHER_INTENT) {
             try {
-                context.startActivity(IntentHelper.getWeatherIntent(context))
+                if (Preferences.weatherAppPackage == IntentHelper.REFRESH_WIDGET_OPTION) {
+                    context.sendBroadcast(IntentHelper.getWeatherIntent(context))
+                } else {
+                    context.startActivity(IntentHelper.getWeatherIntent(context))
+                }
             } catch (e: Exception) {
+                e.printStackTrace()
+                val uri = Uri.parse("http://www.google.com/search?q=weather")
+                val i = Intent(Intent.ACTION_VIEW, uri)
+                i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 try {
-                    context.applicationContext.startActivity(IntentHelper.getWeatherIntent(context.applicationContext))
-                } catch (e: Exception) {
-                    val uri = Uri.parse("http://www.google.com/#q=weather")
-                    val i = Intent(Intent.ACTION_VIEW, uri)
-                    i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    try {
-                        context.startActivity(i)
-                    } catch (ignored: Exception) {
-                        context.toast(context.getString(R.string.error_opening_app))
-                    }
+                    context.startActivity(i)
+                } catch (ignored: Exception) {
+                    context.toast(context.getString(R.string.error_opening_app))
                 }
             }
         }

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

@@ -34,6 +34,7 @@ class LocationService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        startForeground(LOCATION_ACCESS_NOTIFICATION_ID, getLocationAccessNotification())
         job?.cancel()
         job = GlobalScope.launch(Dispatchers.IO) {
             if (ActivityCompat.checkSelfPermission(
@@ -85,11 +86,7 @@ class LocationService : Service() {
 
         @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))
-            }
+            ContextCompat.startForegroundService(context, Intent(context, LocationService::class.java))
         }
     }
 
@@ -115,7 +112,6 @@ class LocationService : Service() {
             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))
 

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

@@ -1,11 +1,15 @@
 package com.tommasoberlose.anotherwidget.services
 
 import android.Manifest
-import android.app.Service
+import android.app.*
 import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
@@ -13,6 +17,7 @@ import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.sortEvents
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
@@ -28,11 +33,17 @@ import kotlin.collections.ArrayList
 class UpdateCalendarService : Service() {
 
     companion object {
+        const val CALENDAR_SYNC_NOTIFICATION_ID = 28468
         fun enqueueWork(context: Context) {
-            context.startService(Intent(context, UpdateCalendarService::class.java))
+            ContextCompat.startForegroundService(context, Intent(context, UpdateCalendarService::class.java))
         }
     }
 
+    override fun onCreate() {
+        super.onCreate()
+        startForeground(CALENDAR_SYNC_NOTIFICATION_ID, getCalendarSyncNotification())
+    }
+
     private var job: Job? = null
 
     override fun onBind(intent: Intent?): IBinder? {
@@ -40,6 +51,7 @@ class UpdateCalendarService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        startForeground(CALENDAR_SYNC_NOTIFICATION_ID, getCalendarSyncNotification())
         job?.cancel()
         job = GlobalScope.launch(Dispatchers.IO) {
 
@@ -171,4 +183,32 @@ class UpdateCalendarService : Service() {
         job?.cancel()
         job = null
     }
+
+    private fun getCalendarSyncNotification(): 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.calendar_sync_notification_channel_id),
+                        getString(R.string.calendar_sync_notification_channel_name),
+                        NotificationManager.IMPORTANCE_LOW
+                    ).apply {
+                        description = getString(R.string.calendar_sync_notification_channel_description)
+                    }
+                )
+            }
+
+            val builder = NotificationCompat.Builder(this@UpdateCalendarService, getString(R.string.calendar_sync_notification_channel_id))
+                .setSmallIcon(R.drawable.ic_stat_notification)
+                .setContentTitle(getString(R.string.calendar_sync_notification_title))
+                .setOngoing(true)
+                .setColor(ContextCompat.getColor(this@UpdateCalendarService, R.color.colorAccent))
+
+            // Main intent that open the activity
+            builder.setContentIntent(PendingIntent.getActivity(this@UpdateCalendarService, 0, Intent(this@UpdateCalendarService, MainActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT))
+
+            return builder.build()
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import android.Manifest
 import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
@@ -22,9 +23,10 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.WeatherProviderActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
 
     private var mAppWidgetId: Int = -1
     private lateinit var viewModel: MainViewModel
@@ -140,4 +142,18 @@ class MainActivity : AppCompatActivity() {
             Preferences.showEvents = false
         }
     }
+
+    override fun onStart() {
+        Preferences.preferences.registerOnSharedPreferenceChangeListener(this)
+        super.onStart()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        Preferences.preferences.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {
+        MainWidget.updateWidget(this)
+    }
 }

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

@@ -15,8 +15,11 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bumptech.glide.Glide
+import com.google.android.material.card.MaterialCardView
 import com.tommasoberlose.anotherwidget.databinding.ActivityChooseApplicationBinding
 import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.helpers.IntentHelper
+import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.ui.viewmodels.tabs.ChooseApplicationViewModel
 import kotlinx.coroutines.*
 import net.idik.lib.slimadapter.SlimAdapter
@@ -29,9 +32,13 @@ class ChooseApplicationActivity : AppCompatActivity() {
     private lateinit var viewModel: ChooseApplicationViewModel
     private lateinit var binding: ActivityChooseApplicationBinding
 
+    private var selectedPackage: String? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        selectedPackage = intent.extras?.getString(Constants.RESULT_APP_PACKAGE)
+
         viewModel = ViewModelProvider(this).get(ChooseApplicationViewModel::class.java)
         binding = ActivityChooseApplicationBinding.inflate(layoutInflater)
 
@@ -41,21 +48,71 @@ class ChooseApplicationActivity : AppCompatActivity() {
 
         adapter = SlimAdapterEx.create()
         adapter
-            .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_24)
-                    .with<ImageView>(R.id.icon) {
-                        it.scaleX = 0.8f
-                        it.scaleY = 0.8f
-                        it.setColorFilter(ContextCompat.getColor(this, R.color.colorPrimaryText), android.graphics.PorterDuff.Mode.MULTIPLY)
+            .register<String>(R.layout.application_info_layout) { item, injector ->
+                when (item) {
+                    IntentHelper.DO_NOTHING_OPTION -> {
+                        injector
+                            .text(R.id.text, getString(R.string.gestures_do_nothing))
+                            .image(R.id.icon, R.drawable.round_no_cell_24)
+                            .with<ImageView>(R.id.icon) {
+                                it.scaleX = 0.8f
+                                it.scaleY = 0.8f
+                                it.setColorFilter(ContextCompat.getColor(this, R.color.colorPrimaryText), android.graphics.PorterDuff.Mode.MULTIPLY)
+                            }
+                            .clicked(R.id.item) {
+                                val resultIntent = Intent()
+                                resultIntent.putExtra(Constants.RESULT_APP_NAME, IntentHelper.DO_NOTHING_OPTION)
+                                resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, IntentHelper.DO_NOTHING_OPTION)
+                                setResult(Activity.RESULT_OK, resultIntent)
+                                finish()
+                            }
+                            .with<MaterialCardView>(R.id.item) {
+                                it.strokeColor = ContextCompat.getColor(this, if (selectedPackage == IntentHelper.DO_NOTHING_OPTION) R.color.colorAccent else R.color.cardBorder)
+                                it.setCardBackgroundColor(ContextCompat.getColor(this, if (selectedPackage == IntentHelper.DO_NOTHING_OPTION) R.color.colorAccent_op10 else R.color.colorPrimaryDark))
+                            }
+                    }
+                    IntentHelper.REFRESH_WIDGET_OPTION -> {
+                        injector
+                            .text(R.id.text, getString(R.string.action_refresh_widget))
+                            .image(R.id.icon, R.drawable.round_refresh)
+                            .with<ImageView>(R.id.icon) {
+                                it.scaleX = 0.8f
+                                it.scaleY = 0.8f
+                                it.setColorFilter(ContextCompat.getColor(this, R.color.colorPrimaryText), android.graphics.PorterDuff.Mode.MULTIPLY)
+                            }
+                            .clicked(R.id.item) {
+                                val resultIntent = Intent()
+                                resultIntent.putExtra(Constants.RESULT_APP_NAME, IntentHelper.REFRESH_WIDGET_OPTION)
+                                resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, IntentHelper.REFRESH_WIDGET_OPTION)
+                                setResult(Activity.RESULT_OK, resultIntent)
+                                finish()
+                            }
+                            .with<MaterialCardView>(R.id.item) {
+                                it.strokeColor = ContextCompat.getColor(this, if (selectedPackage == IntentHelper.REFRESH_WIDGET_OPTION) R.color.colorAccent else R.color.cardBorder)
+                                it.setCardBackgroundColor(ContextCompat.getColor(this, if (selectedPackage == IntentHelper.REFRESH_WIDGET_OPTION) R.color.colorAccent_op10 else R.color.colorPrimaryDark))
+                            }
+                    }
+                    else -> {
+                        injector
+                            .text(R.id.text, getString(R.string.default_name))
+                            .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
+                                it.setColorFilter(ContextCompat.getColor(this, R.color.colorPrimaryText), android.graphics.PorterDuff.Mode.MULTIPLY)
+                            }
+                            .clicked(R.id.item) {
+                                val resultIntent = Intent()
+                                resultIntent.putExtra(Constants.RESULT_APP_NAME, IntentHelper.DEFAULT_OPTION)
+                                resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, IntentHelper.DEFAULT_OPTION)
+                                setResult(Activity.RESULT_OK, resultIntent)
+                                finish()
+                            }
+                            .with<MaterialCardView>(R.id.item) {
+                                it.strokeColor = ContextCompat.getColor(this, if (selectedPackage == IntentHelper.DEFAULT_OPTION) R.color.colorAccent else R.color.cardBorder)
+                                it.setCardBackgroundColor(ContextCompat.getColor(this, if (selectedPackage == IntentHelper.DEFAULT_OPTION) R.color.colorAccent_op10 else R.color.colorPrimaryDark))
+                            }
                     }
-                    .clicked(R.id.item) {
-                    val resultIntent = Intent()
-                    resultIntent.putExtra(Constants.RESULT_APP_NAME, "")
-                    resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, "")
-                    setResult(Activity.RESULT_OK, resultIntent)
-                    finish()
                 }
             }
             .register<ResolveInfo>(R.layout.application_info_layout) { item, injector ->
@@ -68,10 +125,13 @@ class ChooseApplicationActivity : AppCompatActivity() {
                             .centerCrop()
                             .into(it)
                     }
-
-                injector.clicked(R.id.item) {
-                    saveApp(item)
-                }
+                    .clicked(R.id.item) {
+                        saveApp(item)
+                    }
+                    .with<MaterialCardView>(R.id.item) {
+                        it.strokeColor = ContextCompat.getColor(this, if (selectedPackage == item.activityInfo.packageName) R.color.colorAccent else R.color.cardBorder)
+                        it.setCardBackgroundColor(ContextCompat.getColor(this, if (selectedPackage == item.activityInfo.packageName) R.color.colorAccent_op10 else R.color.colorPrimaryDark))
+                    }
             }
             .attachTo(binding.listView)
 
@@ -112,9 +172,21 @@ class ChooseApplicationActivity : AppCompatActivity() {
                     list.filter {
                         it.loadLabel(viewModel.pm).contains(search, true)
                     }
+                }.sortedWith { app1, app2 ->
+                    when (selectedPackage) {
+                        app1.activityInfo.packageName -> {
+                            -1
+                        }
+                        app2.activityInfo.packageName -> {
+                            1
+                        }
+                        else -> {
+                            app1.loadLabel(viewModel.pm).toString().compareTo(app2.loadLabel(viewModel.pm).toString(), ignoreCase = true)
+                        }
+                    }
                 }
                 withContext(Dispatchers.Main) {
-                    adapter.updateData(listOf("Default") + filteredList)
+                    adapter.updateData(listOf(IntentHelper.DO_NOTHING_OPTION, IntentHelper.DEFAULT_OPTION, IntentHelper.REFRESH_WIDGET_OPTION) + filteredList)
                     binding.loader.visibility = View.INVISIBLE
                 }
             }

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

@@ -22,7 +22,7 @@ import java.lang.Exception
 import java.text.SimpleDateFormat
 import java.util.*
 
-class CustomDateActivity  : AppCompatActivity() {
+class CustomDateActivity : AppCompatActivity() {
 
     private lateinit var adapter: SlimAdapter
     private lateinit var viewModel: CustomDateViewModel

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

@@ -0,0 +1,109 @@
+package com.tommasoberlose.anotherwidget.ui.activities.tabs
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.chibatching.kotpref.blockingBulk
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.databinding.ActivityMediaInfoFormatBinding
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
+import com.tommasoberlose.anotherwidget.ui.viewmodels.tabs.MediaInfoFormatViewModel
+import com.tommasoberlose.anotherwidget.utils.getCapWordString
+import com.tommasoberlose.anotherwidget.utils.openURI
+import com.tommasoberlose.anotherwidget.utils.toast
+import kotlinx.coroutines.*
+import net.idik.lib.slimadapter.SlimAdapter
+import java.lang.Exception
+import java.text.SimpleDateFormat
+import java.util.*
+
+class MediaInfoFormatActivity : AppCompatActivity() {
+
+    private lateinit var adapter: SlimAdapter
+    private lateinit var viewModel: MediaInfoFormatViewModel
+    private lateinit var binding: ActivityMediaInfoFormatBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(MediaInfoFormatViewModel::class.java)
+        binding = ActivityMediaInfoFormatBinding.inflate(layoutInflater)
+
+
+        binding.listView.setHasFixedSize(true)
+        val mLayoutManager = LinearLayoutManager(this)
+        binding.listView.layoutManager = mLayoutManager
+
+        adapter = SlimAdapter.create()
+        adapter
+            .register<String>(R.layout.custom_date_example_item) { item, injector ->
+                injector
+                    .text(R.id.custom_date_example_format, item)
+                    .text(
+                        R.id.custom_date_example_value, MediaPlayerHelper.getMediaInfo(item, EXAMPLE_TITLE, EXAMPLE_ARTIST, EXAMPLE_ALBUM))
+            }
+            .attachTo(binding.listView)
+
+        adapter.updateData(
+            listOf(
+                MediaPlayerHelper.MEDIA_INFO_TITLE, MediaPlayerHelper.MEDIA_INFO_ARTIST, MediaPlayerHelper.MEDIA_INFO_ALBUM
+            )
+        )
+
+        setupListener()
+        subscribeUi(binding, viewModel)
+
+        binding.mediaInfoFormatInput.requestFocus()
+
+        setContentView(binding.root)
+    }
+
+    private var formatJob: Job? = null
+
+    private fun subscribeUi(binding: ActivityMediaInfoFormatBinding, viewModel: MediaInfoFormatViewModel) {
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+
+        viewModel.mediaInfoFormatInput.observe(this) { mediaInfoFormatInput ->
+            formatJob?.cancel()
+            formatJob = lifecycleScope.launch(Dispatchers.IO) {
+                withContext(Dispatchers.Main) {
+                    binding.loader.visibility = View.VISIBLE
+                }
+
+                delay(200)
+                val text = MediaPlayerHelper.getMediaInfo(mediaInfoFormatInput, EXAMPLE_TITLE, EXAMPLE_ARTIST, EXAMPLE_ALBUM)
+
+                withContext(Dispatchers.Main) {
+                    binding.loader.visibility = View.INVISIBLE
+                    binding.mediaInfoFormatInputValue.text = text
+                }
+
+            }
+        }
+    }
+
+    private fun setupListener() {
+        binding.actionBack.setOnClickListener {
+            onBackPressed()
+        }
+    }
+
+    override fun onBackPressed() {
+        Preferences.blockingBulk {
+            mediaInfoFormat = viewModel.mediaInfoFormatInput.value ?: ""
+        }
+        super.onBackPressed()
+    }
+
+    companion object {
+        const val EXAMPLE_TITLE = "Thunderstruck"
+        const val EXAMPLE_ARTIST = "AC/DC"
+        const val EXAMPLE_ALBUM = "The Razors Edge"
+    }
+}

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

@@ -97,14 +97,16 @@ class MainFragment : Fragment() {
             binding.actionBack.setOnClickListener {
                 controller.navigateUp()
             }
+            binding.actionBack.isClickable = show
+            binding.actionBack.isFocusable = show
             binding.actionSettings.animate().alpha(if (!show) 1f else 0f).setDuration(200).translationX((if (!show) 0f else -4f).convertDpToPixel(requireContext())).start()
+            binding.actionSettings.isClickable = !show
+            binding.actionSettings.isFocusable = !show
             binding.fragmentTitle.text = if (show) destination.label.toString() else getString(R.string.app_name)
         }
 
         binding.actionSettings.setOnClickListener {
-            Navigation.findNavController(it).navigate(R.id.action_appMainFragment_to_appSettingsFragment, null, null, FragmentNavigatorExtras(
-//                binding.fragmentTitle to "fragment_title"
-            ))
+            Navigation.findNavController(it).navigate(R.id.action_appMainFragment_to_appSettingsFragment,)
         }
 
         binding.preview.layoutParams = binding.preview.layoutParams.apply {

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

@@ -281,26 +281,6 @@ class CalendarFragment : Fragment() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                RequestCode.CALENDAR_APP_REQUEST_CODE.code -> {
-                    Preferences.bulk {
-                        calendarAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_calendar_app)
-                        calendarAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
-                    }
-                }
-                RequestCode.EVENT_APP_REQUEST_CODE.code -> {
-                    Preferences.bulk {
-                        eventAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_event_app)
-                        eventAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
-                    }
-                }
-            }
-        }
-        super.onActivityResult(requestCode, resultCode, data)
-    }
-
     private fun maintainScrollPosition(callback: () -> Unit) {
         binding.scrollView.isScrollable = false
         callback.invoke()

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

@@ -180,16 +180,6 @@ class ClockFragment : Fragment() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK && requestCode ==  RequestCode.CLOCK_APP_REQUEST_CODE.code) {
-            Preferences.bulk {
-                clockAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_clock_app)
-                clockAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
-            }
-        }
-        super.onActivityResult(requestCode, resultCode, data)
-    }
-
     override fun onResume() {
         binding.is24Format = DateFormat.is24HourFormat(requireContext())
         super.onResume()

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

@@ -1,6 +1,7 @@
 package com.tommasoberlose.anotherwidget.ui.fragments.tabs
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,6 +13,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.chibatching.kotpref.blockingBulk
+import com.chibatching.kotpref.bulk
 import com.google.android.material.transition.MaterialSharedAxis
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetColorPicker
@@ -30,6 +32,7 @@ import com.tommasoberlose.anotherwidget.ui.activities.tabs.CustomDateActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.ChooseApplicationActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 import com.tommasoberlose.anotherwidget.utils.isDefaultSet
 import kotlinx.coroutines.Dispatchers
@@ -45,7 +48,6 @@ class GesturesFragment : Fragment() {
     }
 
     private lateinit var viewModel: MainViewModel
-    private lateinit var colors: IntArray
     private lateinit var binding: FragmentTabGesturesBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -97,14 +99,16 @@ class GesturesFragment : Fragment() {
         viewModel.calendarAppName.observe(viewLifecycleOwner) {
             maintainScrollPosition {
                 binding.calendarAppLabel.text = when {
-                    Preferences.calendarAppName != "" -> Preferences.calendarAppName
+                    it == IntentHelper.DO_NOTHING_OPTION -> getString(R.string.gestures_do_nothing)
+                    it == IntentHelper.REFRESH_WIDGET_OPTION -> "None, the widget will be refreshed"
+                    it != IntentHelper.DEFAULT_OPTION -> it
                     else -> {
                         if (IntentHelper.getCalendarIntent(requireContext()).isDefaultSet(requireContext())) {
                             getString(
                                 R.string.default_calendar_app
                             )
                         } else {
-                            getString(R.string.nothing)
+                            getString(R.string.gestures_do_nothing)
                         }
                     }
                 }
@@ -120,14 +124,16 @@ class GesturesFragment : Fragment() {
         viewModel.clockAppName.observe(viewLifecycleOwner) {
             maintainScrollPosition {
                 binding.clockAppLabel.text = when {
-                    Preferences.clockAppName != "" -> Preferences.clockAppName
+                    it == IntentHelper.DO_NOTHING_OPTION -> getString(R.string.gestures_do_nothing)
+                    it == IntentHelper.REFRESH_WIDGET_OPTION -> "None, the widget will be refreshed"
+                    it != IntentHelper.DEFAULT_OPTION -> it
                     else -> {
                         if (IntentHelper.getClockIntent(requireContext()).isDefaultSet(requireContext())) {
                             getString(
                                 R.string.default_clock_app
                             )
                         } else {
-                            getString(R.string.nothing)
+                            getString(R.string.gestures_do_nothing)
                         }
                     }
                 }
@@ -136,8 +142,12 @@ class GesturesFragment : Fragment() {
 
         viewModel.weatherAppName.observe(viewLifecycleOwner) {
             maintainScrollPosition {
-                binding.weatherAppLabel.text =
-                    if (it != "") it else getString(R.string.default_weather_app)
+                binding.weatherAppLabel.text = when {
+                    it == IntentHelper.DO_NOTHING_OPTION -> getString(R.string.gestures_do_nothing)
+                    it == IntentHelper.REFRESH_WIDGET_OPTION -> "None, the widget will be refreshed"
+                    it != IntentHelper.DEFAULT_OPTION -> it
+                    else -> getString(R.string.default_weather_app)
+                }
             }
         }
     }
@@ -163,19 +173,25 @@ class GesturesFragment : Fragment() {
         }
 
         binding.actionCalendarApp.setOnClickListener {
-            startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java), RequestCode.CALENDAR_APP_REQUEST_CODE.code)
+            startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java).apply {
+                putExtra(Constants.RESULT_APP_PACKAGE, Preferences.calendarAppPackage)
+            }, RequestCode.CALENDAR_APP_REQUEST_CODE.code)
         }
 
         binding.actionClockApp.setOnClickListener {
             startActivityForResult(
-                Intent(requireContext(), ChooseApplicationActivity::class.java),
+                Intent(requireContext(), ChooseApplicationActivity::class.java).apply {
+                    putExtra(Constants.RESULT_APP_PACKAGE, Preferences.clockAppPackage)
+                },
                 RequestCode.CLOCK_APP_REQUEST_CODE.code
             )
         }
 
         binding.actionWeatherApp.setOnClickListener {
             startActivityForResult(
-                Intent(requireContext(), ChooseApplicationActivity::class.java),
+                Intent(requireContext(), ChooseApplicationActivity::class.java).apply {
+                    putExtra(Constants.RESULT_APP_PACKAGE, Preferences.weatherAppPackage)
+                },
                 RequestCode.WEATHER_APP_REQUEST_CODE.code
             )
         }
@@ -189,4 +205,37 @@ class GesturesFragment : Fragment() {
             binding.scrollView.isScrollable = true
         }
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK && data != null && data.hasExtra(Constants.RESULT_APP_NAME) && data.hasExtra(Constants.RESULT_APP_PACKAGE)) {
+            when (requestCode) {
+                RequestCode.CALENDAR_APP_REQUEST_CODE.code -> {
+                    Preferences.bulk {
+                        calendarAppName = data.getStringExtra(Constants.RESULT_APP_NAME) ?: IntentHelper.DEFAULT_OPTION
+                        calendarAppPackage = data.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: IntentHelper.DEFAULT_OPTION
+                    }
+                }
+                RequestCode.EVENT_APP_REQUEST_CODE.code -> {
+                    Preferences.bulk {
+                        eventAppName = data.getStringExtra(Constants.RESULT_APP_NAME) ?: IntentHelper.DEFAULT_OPTION
+                        eventAppPackage = data.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: IntentHelper.DEFAULT_OPTION
+                    }
+                }
+                RequestCode.WEATHER_APP_REQUEST_CODE.code -> {
+                    Preferences.bulk {
+                        weatherAppName = data.getStringExtra(Constants.RESULT_APP_NAME) ?: IntentHelper.DEFAULT_OPTION
+                        weatherAppPackage = data.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: IntentHelper.DEFAULT_OPTION
+                    }
+                }
+                RequestCode.CLOCK_APP_REQUEST_CODE.code -> {
+                    Preferences.bulk {
+                        clockAppName = data.getStringExtra(Constants.RESULT_APP_NAME) ?: IntentHelper.DEFAULT_OPTION
+                        clockAppPackage = data.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: IntentHelper.DEFAULT_OPTION
+                    }
+                }
+            }
+            MainWidget.updateWidget(requireContext())
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
 }

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

@@ -209,13 +209,6 @@ class WeatherFragment : Fragment() {
                     WeatherReceiver.setUpdates(requireContext())
                     checkLocationPermission()
                 }
-                RequestCode.WEATHER_APP_REQUEST_CODE.code -> {
-                    Preferences.bulk {
-                        weatherAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_weather_app)
-                        weatherAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
-                    }
-                    MainWidget.updateWidget(requireContext())
-                }
                 RequestCode.WEATHER_PROVIDER_REQUEST_CODE.code -> {
                     checkLocationPermission()
                 }

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

@@ -0,0 +1,11 @@
+package com.tommasoberlose.anotherwidget.ui.viewmodels.tabs
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.MutableLiveData
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
+
+class MediaInfoFormatViewModel(application: Application) : AndroidViewModel(application) {
+    val mediaInfoFormatInput: MutableLiveData<String> = MutableLiveData(if (Preferences.mediaInfoFormat == "") MediaPlayerHelper.DEFAULT_MEDIA_INFO_FORMAT else Preferences.mediaInfoFormat)
+}

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

@@ -17,6 +17,7 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.RemoteViews
 import android.widget.TextView
@@ -34,6 +35,7 @@ import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
 import com.tommasoberlose.anotherwidget.helpers.ImageHelper.applyShadow
 import com.tommasoberlose.anotherwidget.receivers.*
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.convertDpToPixel
 import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 import com.tommasoberlose.anotherwidget.utils.toPixel
 import java.text.DateFormat
@@ -1072,7 +1074,10 @@ class MainWidget : AppWidgetProvider() {
 
             // Dividers
             arrayOf(bindingView.divider1, bindingView.divider2, bindingView.divider3).forEach {
-                it.isVisible = Preferences.showDividers
+                it.visibility = if (Preferences.showDividers) View.VISIBLE else View.INVISIBLE
+                it.layoutParams = (it.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                    this.marginEnd = if (Preferences.showDividers) 8f.convertDpToPixel(context).toInt() else 0
+                }
             }
 
             eventRepository.close()

app/src/main/res/drawable/round_no_cell_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="M8.83,6l-3.7,-3.7C5.42,1.55 6.15,1 7,1l10,0.01c1.1,0 2,0.89 2,1.99v13.17l-2,-2V6H8.83zM20.49,21.9c-0.39,0.39 -1.02,0.39 -1.41,0l-0.2,-0.2C18.58,22.45 17.85,23 17,23H7c-1.1,0 -2,-0.9 -2,-2V7.83l-2.9,-2.9c-0.39,-0.39 -0.39,-1.02 0,-1.41c0.39,-0.39 1.02,-0.39 1.41,0l16.97,16.97C20.88,20.88 20.88,21.51 20.49,21.9zM15.17,18L7,9.83V18H15.17z"/>
+</vector>

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

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.tabs.MediaInfoFormatViewModel" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/colorPrimaryDark">
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            android:id="@+id/toolbar"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:id="@+id/action_back"
+                    app:tint="@color/colorPrimaryText"
+                    android:src="@drawable/round_arrow_back_24" />
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:text="@string/settings_show_music_title"
+                    android:paddingStart="8dp"
+                    android:layout_marginEnd="48dp"
+                    android:gravity="center"
+                    style="@style/AnotherWidget.Main.Title"/>
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/colorPrimaryDark"
+                app:cardCornerRadius="9dp"
+                app:cardElevation="0dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp">
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <EditText
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
+                        android:background="@color/colorPrimaryDark"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="56dp"
+                        android:id="@+id/media_info_format_input"
+                        android:gravity="center_vertical|start"
+                        android:textDirection="locale"
+                        android:textAlignment="viewStart"
+                        android:lines="1"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:hint="@string/song_info_format_activity_title"
+                        android:fontFamily="@font/google_sans"
+                        android:text="@={viewModel.mediaInfoFormatInput}"
+                        android:autofillHints=""
+                        tools:ignore="TextFields" />
+                </RelativeLayout>
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.card.MaterialCardView>
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="16dp">
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="48dp"
+                    android:id="@+id/media_info_format_input_value"
+                    android:textAppearance="@style/AnotherWidget.Settings.Title"
+                    android:letterSpacing="0"
+                    android:textColor="@color/colorPrimaryText"
+                    android:textSize="18sp"
+                    app:textAllCaps="false"
+                    android:gravity="center_vertical|start"
+                    android:textAlignment="viewStart"
+                    android:maxLines="1"
+                    android:lines="1"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:layout_marginLeft="32dp"
+                    android:layout_marginRight="32dp" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+            <androidx.core.widget.ContentLoadingProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:indeterminateTint="@color/colorAccent"
+                android:layout_marginTop="-7dp"
+                android:id="@+id/loader"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingBottom="64dp"
+                android:paddingTop="16dp"
+                android:clipToPadding="false"
+                android:id="@+id/list_view" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>

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

@@ -21,8 +21,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingTop="8dp"
+        android:paddingBottom="4dp"
+        android:paddingTop="4dp"
         android:orientation="horizontal"
         android:gravity="center_vertical|start">
         <ImageView

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

@@ -24,7 +24,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Spacing"
+                android:text="@string/spacing_settings_header"
                 android:paddingTop="16dp"
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp"

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

@@ -21,51 +21,6 @@
             android:paddingTop="8dp"
             android:paddingBottom="48dp"
             android:orientation="vertical">
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings_custom_font_title"
-                android:paddingTop="16dp"
-                android:paddingLeft="20dp"
-                android:paddingRight="20dp"
-                android:textAppearance="@style/AnotherWidget.Settings.Header" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="12dp"
-                android:paddingBottom="12dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:clickable="true"
-                android:focusable="true"
-                android:background="?android:attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:id="@+id/action_custom_font"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="12dp"
-                    android:src="@drawable/round_font_download_24"
-                    app:tint="@color/colorPrimaryText"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/font_family_settings_title"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/custom_font_label"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-            </LinearLayout>
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -283,6 +238,43 @@
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp"
                 android:textAppearance="@style/AnotherWidget.Settings.Header" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_custom_font"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_font_download_24"
+                    app:tint="@color/colorPrimaryText"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/settings_custom_font_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/custom_font_label"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

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

@@ -177,6 +177,39 @@
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:paddingLeft="24dp"
+                android:paddingRight="24dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_change_media_info_format"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/song_info_format_activity_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="14sp"
+                        android:text="@string/song_info_format_activity_subtitle"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="add_widget">Hinzufügen</string>
+    <string name="add_widget">Widget hinzufügen</string>
 
     <!-- Display -->
     <string name="settings_general_title">Anzeige</string>
@@ -16,7 +16,7 @@
     <string name="settings_custom_font_title">Widget Schriftart</string>
     <string name="custom_font_subtitle_0">System Schriftart</string>
     <string name="custom_font_subtitle_1">Google Sans</string>
-    <string name="custom_date_format">Eigenes Format</string>
+    <string name="custom_date_format">Eigenes Datumsformat</string>
     <string name="alpha">Alpha</string>
     <string name="transparent">Transparent</string>
     <string name="settings_show_dividers_title">Texttrennlinien anzeigen</string>
@@ -26,8 +26,8 @@
     <string name="action_capitalize_the_date">Datum groß schreiben</string>
     <string name="settings_date_format_title">Datumsformat</string>
     <string name="header_widget_background">Widget Hintergrund</string>
-    <string name="settings_secondary_row_top_margin_title">Abstand</string>
-    <string name="action_custom_font_to_search">Benutzerdefinierte Schriftart...</string>
+    <string name="settings_secondary_row_top_margin_title">Zeilenabstand</string>
+    <string name="action_custom_font_to_search">Benutzerdefinierte Schriftart…</string>
 
     <!-- Calendar -->
     <string name="settings_calendar_title">Kalender</string>
@@ -51,7 +51,7 @@
     <string name="settings_show_until_subtitle_5">7 Tage vorher</string>
     <string name="settings_show_until_title">Zeige Termine mindestens</string>
     <string name="day_char">T.</string>
-    <string name="settings_calendar_app_title">Standard Kalender App</string>
+    <string name="settings_calendar_app_title">Kalender</string>
     <string name="error_no_calendar">Keine Kalender gefunden.</string>
     <string name="tomorrow">morgen</string>
     <string name="today">heute</string>
@@ -76,7 +76,7 @@
     <string name="settings_attendee_status_title">Teilnahmestatus</string>
     <string name="settings_attendee_status_subtitle">Akzeptierte oder abgelehnte Termine filtern</string>
     <string name="settings_busy_events_title">Relevante Termine</string>
-    <string name="settings_busy_events_subtitle">Nur Termine anzeigen, bei \ndenen Sie beschäftigt sind</string>
+    <string name="settings_busy_events_subtitle">Nur Termine anzeigen, bei denen Sie beschäftigt sind</string>
     <string name="attendee_status_accepted">Akzeptierte Termine</string>
     <string name="attendee_status_invited">Einladungen zu Terminen</string>
     <string name="attendee_status_declined">Abgelehnte Termine</string>
@@ -94,27 +94,19 @@
     <string name="settings_weather_refresh_period_subtitle_4">12 Stunden</string>
     <string name="settings_weather_refresh_period_subtitle_5">24 Stunden</string>
     <string name="settings_custom_location_title">Standort</string>
-    <string name="custom_location_gps">GPS-Standort verwenden</string>
+    <string name="custom_location_gps">GPS-Standort</string>
     <string name="show_weather_visible">Wetterinfos sind sichtbar</string>
     <string name="show_weather_not_visible">Wetterinfos sind ausgeblendet</string>
-    <string name="settings_weather_app_title">Klick auf das Wetter öffnet</string>
+    <string name="settings_weather_app_title">Wetter</string>
     <string name="settings_weather_provider_api_key_title">Wetter API Key</string>
-    <string name="settings_weather_provider_api_key_subtitle_all_set">Der Wetteranbieter ist korrekt konfiguriert</string>
-    <string name="settings_weather_provider_api_key_subtitle_not_set">Der Wetteranbieter muss konfiguriert werden</string>
+    <string name="settings_weather_provider_api_key_subtitle_all_set">Der Wetteranbieter ist korrekt konfiguriert.</string>
+    <string name="settings_weather_provider_api_key_subtitle_not_set">Der Wetteranbieter muss konfiguriert werden.</string>
     <string name="api_key_hint">OpenWeather API Schlüssel</string>
     <string name="default_weather_app">Google Weather</string>
     <string name="weather_warning">Google Awareness Wetter ist veraltet. Es wird nun ein API-Schlüssel von einem Drittanbieter benötigt, um das Wetter im Widget anzuzeigen.</string>
-    <string name="api_key_title_1">OpenWeatherMap Konto registrieren</string>
-    <string name="api_key_subtitle_1">Registriere ein kostenloses Konto bei OpenWeatherMap. Es sollte nur ein paar Minuten dauern.</string>
-    <string name="api_key_title_2">API-Schlüssel kopieren</string>
-    <string name="api_key_subtitle_2">Gehe in die Kontoeinstellungen und kopiere den Standardschlüssel im API-Schlüsselmenü.</string>
-    <string name="api_key_title_3">Schlüssel in die App eingeben</string>
-    <string name="api_key_subtitle_3">Füge den Schlüssel in das obere Feld ein und speicher ihn. Sobald der Schlüssel aktiviert ist, wird das Wetter angezeigt.</string>
-    <string name="action_open_provider">Öffne OpenWeatherMap.org</string>
-    <string name="api_key_info_all_set">Es kann bis zu zehn Minuten dauern, bis der API-Schlüssel aktiviert ist. Das Wetter wird aktualisiert, sobald es verfügbar ist.</string>
     <string name="settings_weather_icon_pack_title">Icon Pack</string>
     <string name="settings_weather_icon_pack_default">Icon Pack %d</string>
-    <string name="background_location_warning">Wenn GPS aktiviert ist, sammeln wir Standortdaten, um die Wetterinformationen zu aktualisieren, auch wenn die App geschlossen oder nicht in Gebrauch ist.\nDie Daten werden nicht für andere Zwecke verwendet.</string>
+    <string name="background_location_warning">Wenn GPS-Standort ausgewählt ist, sammeln wir Standortdaten, um die Wetterinformationen zu aktualisieren, auch wenn die App geschlossen oder nicht in Gebrauch ist.\nDie Daten werden nicht für andere Zwecke verwendet.</string>
     <string name="settings_weather_provider_api">Wetterdienst</string>
 
     <string name="weather_provider_info_open_weather_title">Dieser Wetteranbieter benötigt einen\nAPI-Schlüssel, um korrekt zu funktionieren.</string>
@@ -147,9 +139,14 @@
     <string name="weather_select_a_provider">Wählen einen Anbieter</string>
     <string name="weather_provider_activity_subtitle">Wählen Sie einen Wetterdienst aus der Liste aus.\nEinige Anbieter benötigen ein kostenloses\nBenutzerkonto, allerdings sind sie\ndafür in der Regel genauer.</string>
 
+    <string name="location_access_notification_channel_name">Hintergrunddienst</string>
+    <string name="location_access_notification_channel_description">Dienst zur Aktualisierung des Wetters anhand des aktuellen Standorts des Benutzers.</string>
+    <string name="location_access_notification_title">Wetter wird aktualisiert…</string>
+    <string name="location_access_notification_subtitle">Das Wetter wird basierend auf Ihrem aktuellen Standort aktualisiert.</string>
+
     <!-- Clock -->
     <string name="settings_clock_title">Uhr</string>
-    <string name="settings_clock_app_title">Klick auf die Uhr öffnet</string>
+    <string name="settings_clock_app_title">Uhr</string>
     <string name="title_show_clock">Uhr anzeigen</string>
     <string name="show_clock_visible">Uhr ist sichtbar</string>
     <string name="show_clock_not_visible">Uhr ist nicht sichtbar</string>
@@ -167,7 +164,7 @@
 
     <!-- Glance -->
     <string name="settings_show_next_alarm_title">Nächster Wecker</string>
-    <string name="settings_at_a_glance_title">Überblick</string>
+    <string name="settings_at_a_glance_title">Auf einen Blick</string>
     <string name="settings_show_music_title">Aktuell spielendes Lied</string>
     <string name="settings_request_notification_access">Wir benötigen Zugriff auf die Benachrichtigungen, um auf das aktuell abgespielte Lied zugreifen zu können.</string>
     <string name="settings_request_last_notification_access">Wir benötigen Zugriff auf die Benachrichtigungen, um Ihre letzten Benachrichtigungen sehen zu können.</string>
@@ -176,22 +173,22 @@
     <string name="description_show_glance_visible">Dienst ist aktiviert</string>
     <string name="description_show_glance_not_visible">Dienst ist deaktiviert</string>
     <string name="settings_sort_glance_providers_title">Priorität der Datenquelle</string>
-    <string name="settings_sort_glance_providers_subtitle">Priorität der jeweiligen Dienste ändern</string>
+    <string name="settings_sort_glance_providers_subtitle">Priorität der jeweiligen Dienste ändern, indem Sie die Liste per Drag-and-Drop sortieren.</string>
     <string name="settings_custom_notes_title">Benutzerdefinierte Notiz</string>
-    <string name="settings_low_battery_level_title">Akku</string>
     <string name="settings_daily_steps_title">Tägliche Schritte</string>
-    <string name="battery_low_warning">Niedriger Akkustand</string>
     <string name="daily_steps_counter">%d Schritte bis jetzt</string>
+    <string name="settings_low_battery_level_title">Akku</string>
+    <string name="battery_low_warning">Niedriger Akkustand</string>
     <string name="charging">Wird aufgeladen</string>
     <string name="charged">Aufgeladen</string>
     <string name="providers">Dienste</string>
-    <string name="glance_info">Überblick Informationen sind nur dann sichtbar, wenn keine Termine angezeigt werden und wenn einige Bedingungen erfüllt sind.</string>
+    <string name="glance_info">Informationen auf einen Blick sind nur dann sichtbar, wenn gerade keine Termine angezeigt werden und einige Bedingungen erfüllt sind.</string>
     <string name="settings_music_players_filter_title">Musik Player</string>
     <string name="settings_music_players_filter_subtitle">Wähle die gewünschten Musik Player aus</string>
     <string name="settings_show_music_subtitle">Wir verwenden die Benachrichtigung der Musik-Player, um das aktuell gespielte Lied anzuzeigen.</string>
-    <string name="settings_low_battery_level_subtitle">Darüber informieren, wenn der Akku schwach ist oder aufgeladen wird.</string>
+    <string name="settings_low_battery_level_subtitle">Darüber informiert werden, wenn der Akku schwach ist oder aufgeladen wird.</string>
     <string name="settings_daily_steps_subtitle">Zeigt die täglichen Schritte, nachdem Sie einen Spaziergang oder einen Lauf beendet haben.</string>
-    <string name="settings_show_next_alarm_subtitle">Zeigt den nächsten Alarm an. Stellen Sie sicher, dass Ihre standardmäßige Uhren-App die einzige ist, die Alarme auf dem Gerät einstellt.</string>
+    <string name="settings_show_next_alarm_subtitle">Zeigt den nächsten Alarm an.\nStellen Sie sicher, dass Ihre standardmäßige Uhren-App die einzige ist, die Alarme auf dem Gerät einstellt.</string>
     <string name="settings_show_next_alarm_app_title">Alarm gesetzt durch %s</string>
     <string name="settings_show_next_alarm_app_subtitle_wrong">Der nächste Wecker scheint falsch zu sein</string>
     <string name="settings_show_next_alarm_app_subtitle_correct">Der nächste Wecker scheint korrekt zu sein</string>
@@ -236,6 +233,10 @@
         <item>15 Minuten</item>
         <item>dem Entfernen</item>
     </string-array>
+    <string name="settings_show_events_as_glance_provider_title">Termine</string>
+    <string name="settings_show_events_as_glance_provider_subtitle">Zeigt eine Vorschau Ihrer Termine und lässt das aktuelle Datum angezeigt.</string>
+    <string name="settings_show_events_as_glance_provider_error">Bitte aktiviere die Anzeige der Termine im Kalender Menü und erteile die erforderlichen Berechtigungen</string>
+    <string name="events_glance_provider_format">%1$s %2$s</string>
 
     <!-- Settings -->
     <string name="action_share">Teilen</string>
@@ -267,7 +268,7 @@
     <string name="settings_app_version_title">App Version</string>
     <string name="settings_title_show_wallpaper">Hintergrundbild anzeigen</string>
     <string name="support_refresh_widget_subtitle">Neustart des Widget Dienstes erzwingen</string>
-    <string name="settings_feedback_subtitle">Dies ist ein Open-Source-Projekt, du kannst gerne helfen.</string>
+    <string name="settings_feedback_subtitle">Sie können gerne unserem Projekt helfen!</string>
     <string name="settings_feedback_title">Feedback und Vorschläge</string>
     <string name="xiaomi_warning_title">Xiaomi Geräte</string>
     <string name="xiaomi_warning_message">Aktiviere die Berechtigung zum Anzeigen von Popup-Fenstern, wenn die App im Hintergrund ausgeführt wird, unter \"Andere Berechtigungen\" in den App-Einstellungen. Andernfalls kann beim Klicken auf das Widget keine Anwendung geöffnet werden.</string>
@@ -276,10 +277,10 @@
     <string name="settings_title">Einstellungen</string>
     <string name="style_header">Stil</string>
     <string name="actions_header">Aktionen</string>
-    <string name="provider_header">Konfiguration</string>
+    <string name="provider_header">Provider</string>
     <string name="appearance_header">Erscheinungsbild</string>
     <string name="preferences_header">Präferenzen</string>
-    <string name="settings_privacy_policy_title"><![CDATA[AGB & Datenschutz]]></string>
+    <string name="settings_privacy_policy_title"><![CDATA[Rechtliches & Datenschutz]]></string>
     <string name="settings_privacy_policy_subtitle">Datenschutzrichtlinien der App anzeigen</string>
     <string name="project_header">Open-Source Projekt</string>
     <string name="information_header">Information</string>
@@ -300,4 +301,17 @@
     <string name="nothing">Nichts</string>
     <string name="action_dismiss">Verwerfen</string>
     <string name="action_accept">Akzeptieren</string>
+
+    <!-- More -->
+    <string name="look_and_feel_header"><![CDATA[Erscheinungsbild]]></string>
+    <string name="typography_settings_title">Typografie</string>
+    <string name="typography_settings_subtitle">Schriftart, Größe und Farbe des Textes einstellen</string>
+    <string name="layout_settings_title">Layout</string>
+    <string name="gestures_settings_subtitle">Aktionen, Verhalten und Verknüpfungen</string>
+    <string name="gestures_settings_title">Gesten</string>
+    <string name="gestures_amp_input_header"><![CDATA[Gesten & Bedienung]]></string>
+    <string name="clock_settings_subtitle">Größe, Farbe und Zeitzonen einstellen</string>
+    <string name="layout_settings_subtitle">Widget Abstände und Anpassungen</string>
+    <string name="smart_content_header">Smarte Inhalte</string>
+    <string name="font_family_settings_title">Schriftfamilie</string>
 </resources>

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

@@ -81,6 +81,11 @@
     <string name="attendee_status_invited">Invitations à des évmts</string>
     <string name="attendee_status_declined">Événements refusés</string>
     
+    <string name="calendar_sync_notification_channel_id" translatable="false">calendar-sync</string>
+    <string name="calendar_sync_notification_channel_name">Service de synchronisation du calendrier</string>
+    <string name="calendar_sync_notification_channel_description">Service utilisé pour synchroniser les événements du calendrier.</string>
+    <string name="calendar_sync_notification_title">Synchronisation du calendrier...</string>
+
     <!-- Weather -->
     <string name="settings_weather_title">Météo</string>
     <string name="title_permission_location">Afficher la météo</string>
@@ -140,7 +145,7 @@
     <string name="weather_provider_activity_subtitle">Sélectionnez un fournisseur météo dans la liste.\nCertains fournisseurs ont besoin d\'un\ncompte personnel gratuit pour fonctionner,\nmais ils sont généralement plus précis.</string>
 
     <string name="location_access_notification_channel_id" translatable="false">location-access</string>
-    <string name="location_access_notification_channel_name">Arrière-plan</string>
+    <string name="location_access_notification_channel_name">Service en arrière-plan</string>
     <string name="location_access_notification_channel_description">Service utilisé pour actualiser la météo en fonction de l\'emplacement actuel de l\'utilisateur.</string>
     <string name="location_access_notification_title">Actualisation de la météo...</string>
     <string name="location_access_notification_subtitle">Nous actualisons la météo en fonction de votre emplacement actuel.</string>
@@ -158,7 +163,7 @@
     <string name="settings_clock_bottom_margin_subtitle_small">Petite</string>
     <string name="settings_clock_bottom_margin_subtitle_medium">Moyenne</string>
     <string name="settings_clock_bottom_margin_subtitle_large">Grande</string>
-    <string name="clock_warning">En raison de limitations technologiques, l\'horloge n\'aura pas la police personnalisée et les ombres de texte sélectionnées dans l\'onglet <b>Affichage</b>.</string>
+    <string name="clock_warning">En raison de limitations technologiques, l\'horloge n\'aura pas la police personnalisée et les ombres de texte sélectionnées dans le menu <b>Typographie</b>.</string>
     <string name="settings_clock_text_color_title">Couleur du texte</string>
     <string name="settings_ampm_indicator_title">Afficher l\'indicateur AM/PM</string>
     <string name="clock_text_header">Style du texte</string>
@@ -239,7 +244,7 @@
     
     <string name="settings_show_events_as_glance_provider_title">Événements</string>
     <string name="settings_show_events_as_glance_provider_subtitle">Affiche un petit aperçu des événements de votre calendrier, tout en affichant toujours la date actuelle.</string>
-    <string name="settings_show_events_as_glance_provider_error">Veuillez activer l\'affichage des événements dans l\'onglet <b>Calendrier</b> et accorder l\'autorisation requise.</string>
+    <string name="settings_show_events_as_glance_provider_error">Veuillez activer l\'affichage des événements dans le menu <b>Calendrier</b> et accorder l\'autorisation requise.</string>
     <string name="events_glance_provider_format">%1$s %2$s</string>
 
     <!-- Settings -->
@@ -305,4 +310,18 @@
     <string name="nothing">Rien</string>
     <string name="action_dismiss">REFUSER</string>
     <string name="action_accept">ACCEPTER</string>
+    
+    <!-- More -->
+    <string name="look_and_feel_header"><![CDATA[Apparence du widget]]></string>
+    <string name="typography_settings_title">Typographie</string>
+    <string name="typography_settings_subtitle">Définir la police, la taille et la couleur du texte</string>
+    <string name="layout_settings_title">Mise en page</string>
+    <string name="gestures_settings_subtitle">Actions, comportements et raccourcis</string>
+    <string name="gestures_settings_title">Gestes</string>
+    <string name="gestures_amp_input_header"><![CDATA[Gestes et saisie]]></string>
+    <string name="clock_settings_subtitle">Définir la taille, la couleur et le fuseau horaire</string>
+    <string name="layout_settings_subtitle">Espacement et ajustements du widget</string>
+    <string name="smart_content_header">Contenu intelligent</string>
+    <string name="font_family_settings_title">Famille de polices</string>
+    
 </resources>

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

@@ -30,6 +30,7 @@
     <string name="header_widget_background">Widget background</string>
     <string name="settings_secondary_row_top_margin_title">Rows spacing</string>
     <string name="action_custom_font_to_search">Custom font…</string>
+    <string name="font_family_settings_title">Font family</string>
     
     <string name="font_100" translatable="false">Thin</string>
     <string name="font_200" translatable="false">Light</string>
@@ -103,6 +104,11 @@
     <string name="attendee_status_invited">Events invitations</string>
     <string name="attendee_status_declined">Declined events</string>
 
+    <string name="calendar_sync_notification_channel_id" translatable="false">calendar-sync</string>
+    <string name="calendar_sync_notification_channel_name">Events sync service</string>
+    <string name="calendar_sync_notification_channel_description">Service used to synchronize the calendar events.</string>
+    <string name="calendar_sync_notification_title">Syncing calendar events…</string>
+
     <!-- Weather -->
     <string name="settings_weather_title">Weather</string>
     <string name="title_permission_location">Show the weather</string>
@@ -172,7 +178,7 @@
     <string name="weather_provider_activity_subtitle">Select a weather provider from the list.\nA few providers need a free personal account,\nbut they are usually more accurate.</string>
 
     <string name="location_access_notification_channel_id" translatable="false">location-access</string>
-    <string name="location_access_notification_channel_name">Background service</string>
+    <string name="location_access_notification_channel_name">Weather update service</string>
     <string name="location_access_notification_channel_description">Service used to update the weather based on the current location of the user.</string>
     <string name="location_access_notification_title">Updating the weather…</string>
     <string name="location_access_notification_subtitle">We\'re updating the weather based on your current location.</string>
@@ -190,7 +196,7 @@
     <string name="settings_clock_bottom_margin_subtitle_small">Small</string>
     <string name="settings_clock_bottom_margin_subtitle_medium">Medium</string>
     <string name="settings_clock_bottom_margin_subtitle_large">Large</string>
-    <string name="clock_warning">Due to technological limitations, the clock won\'t have the custom font and the text shadows selected in the Display section.</string>
+    <string name="clock_warning">Due to technological limitations, the clock won\'t have the custom font and the text shadows selected in the typography section.</string>
     <string name="settings_clock_text_color_title">Text color</string>
     <string name="settings_ampm_indicator_title">Show AM/PM indicator</string>
     <string name="clock_text_header">Clock text style</string>
@@ -336,6 +342,9 @@
     <string name="nothing">Nothing</string>
     <string name="action_dismiss">Dismiss</string>
     <string name="action_accept">Accept</string>
+    <string name="gestures_do_nothing">None</string>
+    <string name="song_info_format_activity_title">Song info format</string>
+    <string name="song_info_format_activity_subtitle">Change the visible song info</string>
 
     <!-- More -->
     <string name="look_and_feel_header"><![CDATA[Look & feel]]></string>
@@ -348,5 +357,5 @@
     <string name="clock_settings_subtitle">Set size, color and time zones</string>
     <string name="layout_settings_subtitle">Widget spacing and tweaks</string>
     <string name="smart_content_header">Smart content</string>
-    <string name="font_family_settings_title">Font family</string>
+    <string name="spacing_settings_header">Spacing</string>
 </resources>