[FIX] Replaced the ic_splash.png with a relevant one for v24. The o…

…ld one was not consistent with the original.

[FEAT] Updated `Toast`.kt to use priority instead of `duration`. The priority now has four values: `low`, `medium`, `high`, and `critical`. The critical priority displays a non-swipeable `toast` in `expanded` form.

app/build.gradle.kts

@@ -65,8 +65,8 @@ android {
         applicationId = "com.prime.player"
         minSdk = 21
         targetSdk = 35
-        versionCode = 159
-        versionName = "3.0.1"
+        versionCode = 160
+        versionName = "3.0.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
         // init different config fields.

app/src/main/java/com/prime/media/MainActivity.kt

@@ -206,7 +206,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                         val res = toastHostState.showToast(
                             "Restart the app for changes to take effect.",
                             "Restart",
-                            duration = Toast.DURATION_INDEFINITE
+                            priority = Toast.PRIORITY_HIGH
                         )
                         // Restart the app if the user chooses to
                         if (res == Toast.ACTION_PERFORMED)
@@ -266,20 +266,15 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
 
     @Suppress("UNCHECKED_CAST")
     override fun <T> getDeviceService(name: String): T = getSystemService(name) as T
-    override fun showToast(
-        message: CharSequence,
-        icon: ImageVector?,
-        accent: Color,
-        duration: Int
-    ) {
+    override fun showToast(message: CharSequence, icon: ImageVector?, accent: Color, priority: Int) {
         lifecycleScope.launch {
-            toastHostState.showToast(message, null, icon, accent, duration)
+            toastHostState.showToast(message, null, icon, accent, priority)
         }
     }
 
-    override fun showToast(message: Int, icon: ImageVector?, accent: Color, duration: Int) {
+    override fun showToast(message: Int, icon: ImageVector?, accent: Color, priority: Int) {
         lifecycleScope.launch {
-            toastHostState.showToast(resources.getText2(id = message), null, icon, accent, duration)
+            toastHostState.showToast(resources.getText2(id = message), null, icon, accent, priority)
         }
     }
 
@@ -357,7 +352,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                     val res = toastHostState.showToast(
                         message = resources.getText2(R.string.msg_new_update_downloaded),
                         action = resources.getText2(R.string.install),
-                        duration = Toast.DURATION_INDEFINITE,
+                        priority = Toast.PRIORITY_HIGH,
                         accent = Color.MetroGreen,
                         icon = Icons.Outlined.Downloading
                     )
@@ -484,7 +479,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 ),
                 icon = Icons.Outlined.AdsClick,
                 action = getString(R.string.claim).uppercase(),
-                duration = Toast.DURATION_INDEFINITE,
+                priority = Toast.PRIORITY_HIGH,
                 accent = Color.MetroGreen2
             )
             if (result == Toast.ACTION_PERFORMED) {
@@ -518,7 +513,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 remaining
             ),
             icon = Icons.Outlined.AdsClick,
-            duration = Toast.DURATION_INDEFINITE,
+            priority = Toast.PRIORITY_HIGH,
             accent = Color.MetroGreen,
         )
     }
@@ -588,7 +583,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 val result = toastHostState.showToast(
                     info.richDesc,
                     action = info.formattedPrice ?: "N/A",
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_CRITICAL
                 )
                 if (result == Toast.ACTION_PERFORMED)
                     initiatePurchaseFlow(BuildConfig.IAP_NO_ADS)
@@ -602,7 +597,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 val result = toastHostState.showToast(
                     info.richDesc,
                     action = info.formattedPrice ?: "N/A",
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_CRITICAL
                 )
                 if (result == Toast.ACTION_PERFORMED)
                     initiatePurchaseFlow(BuildConfig.IAP_CODEX)
@@ -616,7 +611,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 val result = toastHostState.showToast(
                     info.richDesc,
                     action = info.formattedPrice ?: getText(R.string.abbr_not_available),
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_CRITICAL
                 )
                 if (result == Toast.ACTION_PERFORMED)
                     initiatePurchaseFlow(BuildConfig.IAP_BUY_ME_COFFEE)
@@ -630,7 +625,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 val result = toastHostState.showToast(
                     info.richDesc,
                     action = info.formattedPrice ?: getText(R.string.abbr_not_available),
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_CRITICAL
                 )
                 if (result == Toast.ACTION_PERFORMED)
                     initiatePurchaseFlow(BuildConfig.IAP_TAG_EDITOR_PRO)
@@ -645,7 +640,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 val result = toastHostState.showToast(
                     resources.getText2(R.string.msg_promotion_gallery_app),
                     action = resources.getText2(R.string.dive_in),
-                    duration = Toast.DURATION_INDEFINITE,
+                    priority = Toast.PRIORITY_CRITICAL,
                     accent = Color.Amber,
                     icon = Icons.Outlined.GetApp
                 )
@@ -656,8 +651,8 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
             // promo message for widgets.
             5 -> {
                 val result = toastHostState.showToast(
-                    "Personalize your app now with in-app widgets!",
-                    duration = Toast.DURATION_INDEFINITE,
+                    resources.getText2(R.string.msg_promo_personalize),
+                    priority = Toast.PRIORITY_CRITICAL,
                     accent = Color.MetroGreen,
                     icon = Icons.Outlined.ColorLens,
                     action = "View"
@@ -712,7 +707,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                         id = R.string.msg_install_dynamic_module_ss,
                         details.title
                     ),
-                    duration = Toast.DURATION_INDEFINITE,
+                    priority = Toast.PRIORITY_HIGH,
                     action = resources.getText2(R.string.install)
                 )
                 if (response == Toast.ACTION_PERFORMED)
@@ -737,7 +732,7 @@ class MainActivity : ComponentActivity(), SystemFacade, OnDestinationChangedList
                 preferences[KEY_APP_VERSION_CODE] = versionCode
                 showToast(
                     R.string.what_s_new_toast,
-                    duration = Toast.DURATION_INDEFINITE,
+                    priority = Toast.PRIORITY_HIGH,
                     icon = Icons.Outlined.Whatshot
                 )
             }

app/src/main/java/com/prime/media/common/SystemFacade.kt

@@ -4,7 +4,6 @@ package com.prime.media.common
 
 import android.app.Activity
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
@@ -24,7 +23,7 @@ import com.prime.media.MainActivity
 import com.primex.preferences.Key
 import com.zs.core.paymaster.Purchase
 import com.zs.core_ui.WindowStyle
-import com.zs.core_ui.toast.Duration
+import com.zs.core_ui.toast.Priority
 import com.zs.core_ui.toast.Toast
 import kotlinx.coroutines.flow.map
 
@@ -126,7 +125,7 @@ interface SystemFacade {
         message: CharSequence,
         icon: ImageVector? = null,
         accent: Color = Color.Unspecified,
-        @Duration duration: Int = Toast.DURATION_SHORT,
+        @Priority priority: Int = Toast.PRIORITY_LOW,
     )
 
     /**
@@ -136,7 +135,7 @@ interface SystemFacade {
         @StringRes message: Int,
         icon: ImageVector? = null,
         accent: Color = Color.Unspecified,
-        @Duration duration: Int = Toast.DURATION_SHORT,
+        @Priority priority: Int = Toast.PRIORITY_LOW,
     )
 
     /**
@@ -161,12 +160,12 @@ interface SystemFacade {
     /**
      * @see com.zs.core_ui.showPlatformToast
      */
-    fun showPlatformToast(message: String, @Duration duration: Int = Toast.DURATION_SHORT)
+    fun showPlatformToast(message: String, @Priority priority: Int = Toast.PRIORITY_LOW)
 
     /**
      * @see com.zs.core_ui.showPlatformToast
      */
-    fun showPlatformToast(@StringRes message: Int, @Duration duration: Int = Toast.DURATION_SHORT)
+    fun showPlatformToast(@StringRes message: Int, @Priority priority: Int = Toast.PRIORITY_LOW)
 
     /**
      * Returns the handle to a system-level service by name.

app/src/main/java/com/prime/media/impl/KoinViewModel.kt

@@ -37,7 +37,7 @@ import com.primex.core.OrientRed
 import com.primex.core.getText2
 import com.primex.core.withSpanStyle
 import com.primex.preferences.Preferences
-import com.zs.core_ui.toast.Duration
+import com.zs.core_ui.toast.Priority
 import com.zs.core_ui.toast.Result
 import com.zs.core_ui.toast.Toast
 import com.zs.core_ui.toast.ToastHostState
@@ -62,34 +62,34 @@ abstract class KoinViewModel : ScopeViewModel() {
 
     fun showPlatformToast(
         @StringRes message: Int,
-        @Duration duration: Int = Toast.DURATION_SHORT
-    ) = context.showAndroidToast(message, duration)
+        @Priority priority: Int = Toast.PRIORITY_LOW
+    ) = context.showAndroidToast(message, priority)
 
     fun showPlatformToast(
         message: String,
-        @Duration duration: Int = Toast.DURATION_SHORT
-    ) = context.showAndroidToast(message, duration)
+        @Priority priority: Int = Toast.PRIORITY_LOW
+    ) = context.showAndroidToast(message, priority)
 
     suspend fun showToast(
         message: CharSequence,
         action: CharSequence? = null,
         icon: ImageVector? = null,
         accent: Color = Color.Unspecified,
-        @Duration duration: Int = if (action == null) Toast.DURATION_SHORT else Toast.DURATION_INDEFINITE
-    ): @Result Int = toastHostState.showToast(message, action, icon, accent, duration)
+        @Priority priority: Int = if (action == null) Toast.PRIORITY_LOW else Toast.PRIORITY_HIGH
+    ): @Result Int = toastHostState.showToast(message, action, icon, accent, priority)
 
     suspend fun showToast(
         @StringRes message: Int,
         @StringRes action: Int = ResourcesCompat.ID_NULL,
         icon: ImageVector? = null,
         accent: Color = Color.Unspecified,
-        @Duration duration: Int = if (action == ResourcesCompat.ID_NULL) Toast.DURATION_SHORT else Toast.DURATION_INDEFINITE
+        @Priority priority: Int = if (action == ResourcesCompat.ID_NULL) Toast.PRIORITY_LOW else Toast.PRIORITY_HIGH
     ): @Result Int = showToast(
         message = resources.getText2(message),
         action = if (action == ResourcesCompat.ID_NULL) null else resources.getText2(action),
         icon = icon,
         accent = accent,
-        duration = duration
+        priority = priority
     )
 
     fun getText(@StringRes id: Int): CharSequence = resources.getText2(id)
@@ -109,7 +109,7 @@ abstract class KoinViewModel : ScopeViewModel() {
         action = "REPORT",
         icon = Icons.Outlined.Error,
         accent = Color.OrientRed,
-        duration = Toast.DURATION_LONG
+        priority = Toast.PRIORITY_MEDIUM
     )
 
     /**

app/src/main/java/com/prime/media/impl/PlaylistsViewModel.kt

@@ -69,7 +69,7 @@ class PlaylistsViewModel(val playlists: Playlists) : KoinViewModel(), PlaylistsV
                 action = "Delete",
                 icon = Icons.Outlined.FolderDelete,
                 accent = Color.RedViolet,
-                duration = Toast.DURATION_INDEFINITE
+                priority = Toast.PRIORITY_HIGH
             )
             if (result != Toast.ACTION_PERFORMED) return@launch
             // Attempt to delete the playlist from the data source (e.g., database).

app/src/main/java/com/prime/media/old/console/ConsoleView.kt

@@ -194,7 +194,7 @@ fun SystemFacade.launchEqualizer(id: Int) {
     showToast(
         message = R.string.msg_3rd_party_equalizer_not_found,
         accent = Color.OrientRed,
-        duration = Toast.DURATION_SHORT
+        priority = Toast.PRIORITY_LOW
     )
 }
 

app/src/main/java/com/prime/media/old/directory/playlists/Members.kt

@@ -24,7 +24,6 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.prime.media.R
 import com.prime.media.old.common.Artwork
-import com.prime.media.common.composable
 import com.prime.media.old.common.composable
 import com.prime.media.old.common.util.addDistinct
 import com.prime.media.old.common.util.toMediaItem
@@ -131,7 +130,7 @@ class MembersViewModel(
                     "Error",
                     icon = Icons.Outlined.Error,
                     accent = Color.Rose,
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_HIGH
                 )
             }.stateIn(viewModelScope, SharingStarted.Lazily, emptyMap())
 

app/src/main/java/com/prime/media/old/directory/store/Artists.kt

@@ -126,7 +126,7 @@ class ArtistsViewModel (
                     "Error\nSome unknown error occured!.",
                     icon = Icons.Outlined.Error,
                     accent = Color.Rose,
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_HIGH
                 )
             }
             .stateIn(viewModelScope, SharingStarted.Lazily, emptyMap())

app/src/main/java/com/prime/media/old/directory/store/Audios.kt

@@ -260,7 +260,7 @@ class AudiosViewModel  (
                     "Error\nSome unknown error occured!. $it",
                     icon = Icons.Outlined.Error,
                     accent = Color.Rose,
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_HIGH
                 )
             }
             .stateIn(viewModelScope, SharingStarted.Lazily, emptyMap())
@@ -509,10 +509,10 @@ class AudiosViewModel  (
                             "Delete",
                             icon = Icons.Outlined.WarningAmber,
                             accent = Color.Rose,
-                            Toast.DURATION_INDEFINITE
+                            Toast.PRIORITY_HIGH
                         )
                         // check if user is interested in deleting the files or not.
-                        if (res == Toast.RESULT_DISMISSED)
+                        if (res == Toast.ACTION_DISMISSED)
                             return@launch
                         // return
                         repository.delete(activity, *uris.toTypedArray(), trash = false)

app/src/main/java/com/prime/media/old/directory/store/Folders.kt

@@ -120,7 +120,7 @@ class FoldersViewModel (
                     "Error\nSome unknown error occured!. ${it.message}",
                     icon = Icons.Outlined.Error,
                     accent = Color.Rose,
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_HIGH
                 )
             }
             .stateIn(viewModelScope, SharingStarted.Lazily, emptyMap())
@@ -134,17 +134,17 @@ class FoldersViewModel (
                     "Warning\nYou are about to block folder $name",
                     icon = Icons.Outlined.Block,
                    accent =  Color.DahliaYellow,
-                    duration = Toast.DURATION_INDEFINITE,
+                    priority = Toast.PRIORITY_HIGH,
                 )
-                if (response == Toast.RESULT_DISMISSED)
+                if (response == Toast.ACTION_DISMISSED)
                     return@launch
                 val result = preferences.block(path)
                 if (result > 0)
                     showToast(
                         "$name has been added to block list",
                         icon = Icons.Outlined.Block,
                         accent = Color.Rose,
-                        duration = Toast.DURATION_SHORT,
+                        priority = Toast.PRIORITY_LOW,
                     )
                 else
                     showToast("Oops! some unknown error has occurred.")

app/src/main/java/com/prime/media/old/directory/store/Genres.kt

@@ -122,7 +122,7 @@ class GenresViewModel (
                     "Error\nSome unknown error occured!.",
                     icon = Icons.Outlined.Error,
                     accent = Color.Rose,
-                    duration = Toast.DURATION_INDEFINITE
+                    priority = Toast.PRIORITY_HIGH
                 )
             }
             .stateIn(viewModelScope, SharingStarted.Lazily, emptyMap())

app/src/main/java/com/prime/media/old/impl/SystemDelegate.kt

@@ -7,11 +7,10 @@ import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.core.content.res.ResourcesCompat
 import com.primex.core.getQuantityText2
 import com.primex.core.getText2
-import com.zs.core_ui.toast.Duration
+import com.zs.core_ui.toast.Priority
 import com.zs.core_ui.toast.Result
 import com.zs.core_ui.toast.ToastHostState
 
@@ -58,21 +57,21 @@ interface SystemDelegate {
         action: CharSequence? = null,
         icon: ImageVector? = null,
         accent: Color = Color.Unspecified,
-        @Duration duration: Int = if (action == null) com.zs.core_ui.toast.Toast.DURATION_SHORT else com.zs.core_ui.toast.Toast.DURATION_INDEFINITE
+        @Priority priority: Int = if (action == null) com.zs.core_ui.toast.Toast.PRIORITY_LOW else com.zs.core_ui.toast.Toast.PRIORITY_HIGH
     ): @Result Int
 
     suspend fun showSnackbar(
         @StringRes message: Int,
         @StringRes action: Int = ResourcesCompat.ID_NULL,
         icon: ImageVector? = null,
         accent: Color = Color.Unspecified,
-        @Duration duration: Int = if (action == ResourcesCompat.ID_NULL) com.zs.core_ui.toast.Toast.DURATION_SHORT else com.zs.core_ui.toast.Toast.DURATION_INDEFINITE
+        @Priority priority: Int = if (action == ResourcesCompat.ID_NULL) com.zs.core_ui.toast.Toast.PRIORITY_LOW else com.zs.core_ui.toast.Toast.PRIORITY_HIGH
     ): @Result Int = showSnackbar(
         message = resources.getText2(message),
         action = if (action == ResourcesCompat.ID_NULL) null else resources.getText2(action),
         icon = icon,
         accent = accent,
-        duration = duration
+        priority = priority
     )
 }