he4et/yamf_launcher
1
0
Fork 0
mirror of https://github.com/He4eT/yamf_launcher.git synced 2026-05-04 17:37:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring and changed loadLabel to getApplicationLabel across the board

Browse source
This commit is contained in:
ottoptj 2024-08-11 13:40:59 +03:00
commit 90f5fecb8f
7 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/ottop/yamlauncher/AppMenuAdapter.kt
View file

@ -139,7 +139,7 @@ class AppMenuAdapter(
holder.textView.setTextColor(sharedPreferenceManager.getTextColor()) 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. // 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) { if (appInfo != null) {
holder.textView.text = sharedPreferenceManager.getAppName( holder.textView.text = sharedPreferenceManager.getAppName(

2
app/src/main/java/eu/ottop/yamlauncher/AppUtils.kt
View file

@ -34,7 +34,7 @@ class AppUtils(private val context: Context, private val launcherApps: LauncherA
sharedPreferenceManager.getAppName( sharedPreferenceManager.getAppName(
it.first.applicationInfo.packageName, it.first.applicationInfo.packageName,
it.third, it.third,
it.first.applicationInfo.loadLabel(context.packageManager) context.packageManager.getApplicationLabel(it.first.applicationInfo)
).toString().lowercase() ).toString().lowercase()
} }
} }

2
app/src/main/java/eu/ottop/yamlauncher/GestureAppsAdapter.kt
View file

@ -66,7 +66,7 @@ class GestureAppsAdapter(
holder.textView.text = sharedPreferenceManager.getAppName( holder.textView.text = sharedPreferenceManager.getAppName(
app.first.applicationInfo.packageName, app.first.applicationInfo.packageName,
app.third, app.third,
holder.itemView.context.packageManager.getApplicationLabel(appInfo) context.packageManager.getApplicationLabel(appInfo)
) )
holder.textView.visibility = View.VISIBLE holder.textView.visibility = View.VISIBLE

11
app/src/main/java/eu/ottop/yamlauncher/GestureAppsFragment.kt
View file

@ -12,13 +12,10 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.setFragmentResult
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputEditText
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class GestureAppsFragment(private val direction: String) : Fragment(), GestureAppsAdapter.OnItemClickListener { 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?) { override fun afterTextChanged(s: Editable?) {
lifecycleScope.launch { 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( val cleanItemText = stringUtils.cleanString(sharedPreferenceManager.getAppName(
it.first.applicationInfo.packageName, it.first.applicationInfo.packageName,
it.third, it.third,
requireActivity().packageManager.getApplicationLabel(it.first.applicationInfo) requireContext().packageManager.getApplicationLabel(it.first.applicationInfo)
).toString()) ).toString())
if (cleanItemText != null) { if (cleanItemText != null) {
if (cleanItemText.contains(cleanQuery, ignoreCase = true)) { 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) { private fun showConfirmationDialog(appInfo: LauncherActivityInfo, appName: String, profile: Int) {
AlertDialog.Builder(requireContext()).apply { AlertDialog.Builder(requireContext()).apply {
setTitle("Confirmation") 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") { _, _ -> setPositiveButton("Yes") { _, _ ->
// Perform action on confirmation
performConfirmedAction(appInfo, appName, profile) performConfirmedAction(appInfo, appName, profile)
} }

2
app/src/main/java/eu/ottop/yamlauncher/HiddenAppsAdapter.kt
View file

@ -66,7 +66,7 @@ class HiddenAppsAdapter(
holder.textView.text = sharedPreferenceManager.getAppName( holder.textView.text = sharedPreferenceManager.getAppName(
app.first.applicationInfo.packageName, app.first.applicationInfo.packageName,
app.third, app.third,
holder.itemView.context.packageManager.getApplicationLabel(appInfo) context.packageManager.getApplicationLabel(appInfo)
) )
holder.textView.visibility = View.VISIBLE holder.textView.visibility = View.VISIBLE

4
app/src/main/java/eu/ottop/yamlauncher/HiddenAppsFragment.kt
View file

@ -79,7 +79,7 @@ class HiddenAppsFragment : Fragment(), HiddenAppsAdapter.OnItemClickListener {
override fun afterTextChanged(s: Editable?) { override fun afterTextChanged(s: Editable?) {
lifecycleScope.launch { lifecycleScope.launch {
filterItems(searchView.text.toString()) filterItems(s.toString())
} }
} }
@ -114,7 +114,7 @@ class HiddenAppsFragment : Fragment(), HiddenAppsAdapter.OnItemClickListener {
val cleanItemText = stringUtils.cleanString(sharedPreferenceManager.getAppName( val cleanItemText = stringUtils.cleanString(sharedPreferenceManager.getAppName(
it.first.applicationInfo.packageName, it.first.applicationInfo.packageName,
it.third, it.third,
requireActivity().packageManager.getApplicationLabel(it.first.applicationInfo) requireContext().packageManager.getApplicationLabel(it.first.applicationInfo)
).toString()) ).toString())
if (cleanItemText != null) { if (cleanItemText != null) {
if (cleanItemText.contains(cleanQuery, ignoreCase = true)) { if (cleanItemText.contains(cleanQuery, ignoreCase = true)) {

2
app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
View file

@ -522,7 +522,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
override fun afterTextChanged(s: Editable?) { override fun afterTextChanged(s: Editable?) {
lifecycleScope.launch(Dispatchers.Default) { lifecycleScope.launch(Dispatchers.Default) {
filterItems(searchView.text.toString()) filterItems(s.toString())
} }
} }
}) })