Skip to content

fix(home): Show app alias on home screen, favorites and widget #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smrtkrft wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(home): Show app alias on home screen, favorites and widget #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/java/com/github/codeworkscreativehub/mlauncher/data/Prefs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,11 @@ class Prefs(val context: Context) {
prefsNormal.edit { putString("${appPackage}_ALIAS", appAlias) }
}

/** The name to show for [app]: the alias the user gave it, or its own label. */
fun getAppDisplayName(app: AppListItem): String {
return getAppAlias(app.settingsKey).takeIf { it.isNotBlank() } ?: app.activityLabel
}

fun setProfileCounter(profile: String, counter: Int) {
prefsNormal.edit { putInt(profile, counter) }
}
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/github/codeworkscreativehub/mlauncher/ui/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
// Set properties of existingAppView
textSize = prefs.appSize.toFloat()
id = i
text = prefs.getHomeAppModel(i).activityLabel
text = prefs.getAppDisplayName(prefs.getHomeAppModel(i))
getHomeAppsGestureListener()
setOnClickListener(this@HomeFragment)
if (!prefs.extendHomeAppsArea) {
Expand Down Expand Up @@ -1042,7 +1042,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
text = if (homeApp.activityPackage.isBlank()) {
getLocalizedString(R.string.select_app)
} else {
prefs.getAppAlias(homeApp.settingsKey).takeIf { it.isNotBlank() } ?: homeApp.activityLabel
prefs.getAppDisplayName(homeApp)
}

getHomeAppsGestureListener()
Expand Down Expand Up @@ -1138,7 +1138,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe

this.text = if (count > 0) {
val circledNumber = getCircledDigit(count)
val newText = "${appModel.activityLabel} $circledNumber"
val newText = "${prefs.getAppDisplayName(appModel)} $circledNumber"
val spannable = SpannableString(newText)

val start = newText.indexOf(circledNumber)
Expand Down Expand Up @@ -1168,7 +1168,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe

spannable
} else {
appModel.activityLabel
prefs.getAppDisplayName(appModel)
}

AppLogger.d("HomeFragment", "Notification count updated for $packageName: $count")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/codeworkscreativehub/mlauncher/ui/adapter/FavoriteAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class FavoriteAdapter(
val appItem = apps[position]

// Set the label text from the app item
holder.appTextView.text = appItem.activityLabel
holder.appTextView.text = prefs.getAppDisplayName(appItem)

// Set the text size and color dynamically using prefs
holder.appTextView.setTextColor(prefs.appColor) // Get color from prefs
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/github/codeworkscreativehub/mlauncher/ui/widgets/home/HomeAppsWidgetProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class HomeAppsWidgetProvider : AppWidgetProvider() {
} catch (_: Exception) {
appModel.activityLabel
}.let { label ->
if (appModel.isShortcut) prefs.getAppAlias(appModel.settingsKey).ifBlank { label } else label
prefs.getAppAlias(appModel.settingsKey).ifBlank { label }
}

// --- Get icon safely ---
Expand Down
Loading