From 90f5fecb8f0be5129074c2c8e7f2b4b9daedef4d Mon Sep 17 00:00:00 2001 From: ottoptj Date: Sun, 11 Aug 2024 13:40:59 +0300 Subject: [PATCH] Refactoring and changed loadLabel to getApplicationLabel across the board --- .../main/java/eu/ottop/yamlauncher/AppMenuAdapter.kt | 2 +- app/src/main/java/eu/ottop/yamlauncher/AppUtils.kt | 2 +- .../java/eu/ottop/yamlauncher/GestureAppsAdapter.kt | 2 +- .../java/eu/ottop/yamlauncher/GestureAppsFragment.kt | 11 ++++------- .../java/eu/ottop/yamlauncher/HiddenAppsAdapter.kt | 2 +- .../java/eu/ottop/yamlauncher/HiddenAppsFragment.kt | 4 ++-- .../main/java/eu/ottop/yamlauncher/MainActivity.kt | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/ottop/yamlauncher/AppMenuAdapter.kt b/app/src/main/java/eu/ottop/yamlauncher/AppMenuAdapter.kt index 07a8d99..161e829 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/AppMenuAdapter.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/AppMenuAdapter.kt @@ -139,7 +139,7 @@ class AppMenuAdapter( holder.textView.setTextColor(sharedPreferenceManager.getTextColor()) // Set app name on the menu. If the app has been uninstalled, replace it with "Removing" until the app menu updates. - val appLabel: CharSequence = appInfo?.loadLabel(context.packageManager) ?: "Removing..." + val appLabel: CharSequence = appInfo?.let { context.packageManager.getApplicationLabel(it) } ?: "Removing..." if (appInfo != null) { holder.textView.text = sharedPreferenceManager.getAppName( diff --git a/app/src/main/java/eu/ottop/yamlauncher/AppUtils.kt b/app/src/main/java/eu/ottop/yamlauncher/AppUtils.kt index 7feb568..2e326ba 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/AppUtils.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/AppUtils.kt @@ -34,7 +34,7 @@ class AppUtils(private val context: Context, private val launcherApps: LauncherA sharedPreferenceManager.getAppName( it.first.applicationInfo.packageName, it.third, - it.first.applicationInfo.loadLabel(context.packageManager) + context.packageManager.getApplicationLabel(it.first.applicationInfo) ).toString().lowercase() } } diff --git a/app/src/main/java/eu/ottop/yamlauncher/GestureAppsAdapter.kt b/app/src/main/java/eu/ottop/yamlauncher/GestureAppsAdapter.kt index f9a1736..bbe47b9 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/GestureAppsAdapter.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/GestureAppsAdapter.kt @@ -66,7 +66,7 @@ class GestureAppsAdapter( holder.textView.text = sharedPreferenceManager.getAppName( app.first.applicationInfo.packageName, app.third, - holder.itemView.context.packageManager.getApplicationLabel(appInfo) + context.packageManager.getApplicationLabel(appInfo) ) holder.textView.visibility = View.VISIBLE diff --git a/app/src/main/java/eu/ottop/yamlauncher/GestureAppsFragment.kt b/app/src/main/java/eu/ottop/yamlauncher/GestureAppsFragment.kt index f1ce023..1a61057 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/GestureAppsFragment.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/GestureAppsFragment.kt @@ -12,13 +12,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import androidx.fragment.app.setFragmentResult import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.RecyclerView import com.google.android.material.textfield.TextInputEditText -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext class GestureAppsFragment(private val direction: String) : Fragment(), GestureAppsAdapter.OnItemClickListener { @@ -88,7 +85,7 @@ class GestureAppsFragment(private val direction: String) : Fragment(), GestureAp override fun afterTextChanged(s: Editable?) { lifecycleScope.launch { - filterItems(searchView.text.toString()) + filterItems(s.toString()) } } @@ -116,7 +113,7 @@ class GestureAppsFragment(private val direction: String) : Fragment(), GestureAp val cleanItemText = stringUtils.cleanString(sharedPreferenceManager.getAppName( it.first.applicationInfo.packageName, it.third, - requireActivity().packageManager.getApplicationLabel(it.first.applicationInfo) + requireContext().packageManager.getApplicationLabel(it.first.applicationInfo) ).toString()) if (cleanItemText != null) { if (cleanItemText.contains(cleanQuery, ignoreCase = true)) { @@ -134,9 +131,9 @@ class GestureAppsFragment(private val direction: String) : Fragment(), GestureAp private fun showConfirmationDialog(appInfo: LauncherActivityInfo, appName: String, profile: Int) { AlertDialog.Builder(requireContext()).apply { setTitle("Confirmation") - setMessage("Are you sure you want to set $appName? as the gesture app") + setMessage("Are you sure you want to choose $appName?") + setPositiveButton("Yes") { _, _ -> - // Perform action on confirmation performConfirmedAction(appInfo, appName, profile) } diff --git a/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsAdapter.kt b/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsAdapter.kt index da0207b..cae4141 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsAdapter.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsAdapter.kt @@ -66,7 +66,7 @@ class HiddenAppsAdapter( holder.textView.text = sharedPreferenceManager.getAppName( app.first.applicationInfo.packageName, app.third, - holder.itemView.context.packageManager.getApplicationLabel(appInfo) + context.packageManager.getApplicationLabel(appInfo) ) holder.textView.visibility = View.VISIBLE diff --git a/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsFragment.kt b/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsFragment.kt index d382402..5e0bdbd 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsFragment.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/HiddenAppsFragment.kt @@ -79,7 +79,7 @@ class HiddenAppsFragment : Fragment(), HiddenAppsAdapter.OnItemClickListener { override fun afterTextChanged(s: Editable?) { lifecycleScope.launch { - filterItems(searchView.text.toString()) + filterItems(s.toString()) } } @@ -114,7 +114,7 @@ class HiddenAppsFragment : Fragment(), HiddenAppsAdapter.OnItemClickListener { val cleanItemText = stringUtils.cleanString(sharedPreferenceManager.getAppName( it.first.applicationInfo.packageName, it.third, - requireActivity().packageManager.getApplicationLabel(it.first.applicationInfo) + requireContext().packageManager.getApplicationLabel(it.first.applicationInfo) ).toString()) if (cleanItemText != null) { if (cleanItemText.contains(cleanQuery, ignoreCase = true)) { diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt index f0922f3..3abd04e 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt @@ -522,7 +522,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh override fun afterTextChanged(s: Editable?) { lifecycleScope.launch(Dispatchers.Default) { - filterItems(searchView.text.toString()) + filterItems(s.toString()) } } })