Skip to content

Fixed app options drawer dismiss bug #622

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed app options drawer dismiss bug #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7a76d6
Changed Delete button label to Uninstall
RaghavSharma1938 May 30, 2025
eecffa7
Fix: Hide previous app options mwnu when long-pressing another app in…
RaghavSharma1938 Jun 7, 2025
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
208 changes: 102 additions & 106 deletions app/src/main/java/app/olauncher/ui/AppDrawerAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
package app.olauncher.ui

import android.content.Context
import android.os.UserHandle
import android.text.Editable
Expand All @@ -22,7 +21,6 @@ import app.olauncher.helper.hideKeyboard
import app.olauncher.helper.isSystemApp
import app.olauncher.helper.showKeyboard
import java.text.Normalizer

class AppDrawerAdapter(
private var flag: Int,
private val appLabelGravity: Int,
Expand All @@ -32,7 +30,6 @@ class AppDrawerAdapter(
private val appHideListener: (AppModel, Int) -> Unit,
private val appRenameListener: (AppModel, String) -> Unit,
) : ListAdapter<AppModel, AppDrawerAdapter.ViewHolder>(DIFF_CALLBACK), Filterable {

companion object {
val DIFF_CALLBACK = object : DiffUtil.ItemCallback<AppModel>() {
override fun areItemsTheSame(oldItem: AppModel, newItem: AppModel): Boolean =
Expand All @@ -47,6 +44,7 @@ class AppDrawerAdapter(
private var isBangSearch = false
private val appFilter = createAppFilter()
private val myUserHandle = android.os.Process.myUserHandle()
private var previouslyOpenedHolder: ViewHolder? = null

var appsList: MutableList<AppModel> = mutableListOf()
var appFilteredList: MutableList<AppModel> = mutableListOf()
Expand All @@ -56,7 +54,7 @@ class AppDrawerAdapter(

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
try {
if (appFilteredList.size == 0 || position == RecyclerView.NO_POSITION) return
if (appFilteredList.isEmpty() || position == RecyclerView.NO_POSITION) return
val appModel = appFilteredList[holder.bindingAdapterPosition]
holder.bind(
flag,
Expand All @@ -67,7 +65,15 @@ class AppDrawerAdapter(
appDeleteListener,
appInfoListener,
appHideListener,
appRenameListener
appRenameListener,
setOpenedHolder = { newHolder ->
previouslyOpenedHolder?.let {
it.binding.appHideLayout.visibility = View.GONE
it.binding.renameLayout.visibility = View.GONE
it.binding.appTitle.visibility = View.VISIBLE
}
previouslyOpenedHolder = newHolder
}
)
} catch (e: Exception) {
e.printStackTrace()
Expand All @@ -82,12 +88,10 @@ class AppDrawerAdapter(
isBangSearch = charSearch?.startsWith("!") ?: false
autoLaunch = charSearch?.startsWith(" ")?.not() ?: true

val appFilteredList = (if (charSearch.isNullOrBlank()) appsList
val appFilteredList = if (charSearch.isNullOrBlank()) appsList
else appsList.filter { app ->
appLabelMatches(app.appLabel, charSearch)
// }.sortedByDescending {
// charSearch.contentEquals(it.appLabel, true)
} as MutableList<AppModel>)
} as MutableList<AppModel>

val filterResults = FilterResults()
filterResults.values = appFilteredList
Expand All @@ -109,39 +113,35 @@ class AppDrawerAdapter(

private fun autoLaunch() {
try {
if (itemCount == 1
&& autoLaunch
&& isBangSearch.not()
&& flag == Constants.FLAG_LAUNCH_APP
&& appFilteredList.size > 0
) appClickListener(appFilteredList[0])
if (itemCount == 1 && autoLaunch && !isBangSearch && flag == Constants.FLAG_LAUNCH_APP && appFilteredList.isNotEmpty()) {
appClickListener(appFilteredList[0])
}
} catch (e: Exception) {
e.printStackTrace()
}
}

private fun appLabelMatches(appLabel: String, charSearch: CharSequence): Boolean {
return (appLabel.contains(charSearch.trim(), true) or
return (appLabel.contains(charSearch.trim(), true) ||
Normalizer.normalize(appLabel, Normalizer.Form.NFD)
.replace(Regex("\\p{InCombiningDiacriticalMarks}+"), "")
.replace(Regex("[-_+,. ]"), "")
.contains(charSearch, true))
}

fun setAppList(appsList: MutableList<AppModel>) {
// Add empty app for bottom padding in recyclerview
appsList.add(AppModel("", null, "", "", false, android.os.Process.myUserHandle()))
this.appsList = appsList
this.appFilteredList = appsList
submitList(appsList)
}

fun launchFirstInList() {
if (appFilteredList.size > 0)
if (appFilteredList.isNotEmpty())
appClickListener(appFilteredList[0])
}

class ViewHolder(private val binding: AdapterAppDrawerBinding) : RecyclerView.ViewHolder(binding.root) {
class ViewHolder(val binding: AdapterAppDrawerBinding) : RecyclerView.ViewHolder(binding.root) {

fun bind(
flag: Int,
Expand All @@ -153,114 +153,110 @@ class AppDrawerAdapter(
appInfoListener: (AppModel) -> Unit,
appHideListener: (AppModel, Int) -> Unit,
appRenameListener: (AppModel, String) -> Unit,
) =
with(binding) {
appHideLayout.visibility = View.GONE
renameLayout.visibility = View.GONE
appTitle.visibility = View.VISIBLE
appTitle.text = appModel.appLabel + if (appModel.isNew == true) " ✦" else ""
appTitle.gravity = appLabelGravity
otherProfileIndicator.isVisible = appModel.user != myUserHandle
setOpenedHolder: (ViewHolder) -> Unit
) = with(binding) {
appHideLayout.visibility = View.GONE
renameLayout.visibility = View.GONE
appTitle.visibility = View.VISIBLE
appTitle.text = appModel.appLabel + if (appModel.isNew == true) " \u2726" else ""
appTitle.gravity = appLabelGravity
otherProfileIndicator.isVisible = appModel.user != myUserHandle

appTitle.setOnClickListener { clickListener(appModel) }
appTitle.setOnLongClickListener {
if (appModel.appPackage.isNotEmpty()) {
appDelete.alpha = if (root.context.isSystemApp(appModel.appPackage)) 0.5f else 1.0f
appHide.text = if (flag == Constants.FLAG_HIDDEN_APPS)
root.context.getString(R.string.adapter_show)
else
root.context.getString(R.string.adapter_hide)
appTitle.visibility = View.INVISIBLE
appHideLayout.visibility = View.VISIBLE
appRename.isVisible = flag != Constants.FLAG_HIDDEN_APPS
}
true
appTitle.setOnClickListener { clickListener(appModel) }

appTitle.setOnLongClickListener {
if (appModel.appPackage.isNotEmpty()) {
appDelete.alpha = if (root.context.isSystemApp(appModel.appPackage)) 0.5f else 1.0f
appHide.text = if (flag == Constants.FLAG_HIDDEN_APPS)
root.context.getString(R.string.adapter_show)
else
root.context.getString(R.string.adapter_hide)

appTitle.visibility = View.INVISIBLE
appHideLayout.visibility = View.VISIBLE
appRename.isVisible = flag != Constants.FLAG_HIDDEN_APPS

setOpenedHolder(this@ViewHolder)
}
appRename.setOnClickListener {
if (appModel.appPackage.isNotEmpty()) {
etAppRename.hint = getAppName(etAppRename.context, appModel.appPackage)
etAppRename.setText(appModel.appLabel)
etAppRename.setSelectAllOnFocus(true)
renameLayout.visibility = View.VISIBLE
appHideLayout.visibility = View.GONE
etAppRename.showKeyboard()
etAppRename.imeOptions = EditorInfo.IME_ACTION_DONE;
}
true
}

appRename.setOnClickListener {
if (appModel.appPackage.isNotEmpty()) {
etAppRename.hint = getAppName(etAppRename.context, appModel.appPackage)
etAppRename.setText(appModel.appLabel)
etAppRename.setSelectAllOnFocus(true)
renameLayout.visibility = View.VISIBLE
appHideLayout.visibility = View.GONE
etAppRename.showKeyboard()
etAppRename.imeOptions = EditorInfo.IME_ACTION_DONE
}
etAppRename.onFocusChangeListener = View.OnFocusChangeListener { v, hasFocus ->
if (hasFocus)
appTitle.visibility = View.INVISIBLE
else
appTitle.visibility = View.VISIBLE
}

etAppRename.onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus ->
appTitle.visibility = if (hasFocus) View.INVISIBLE else View.VISIBLE
}

etAppRename.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {
etAppRename.hint = getAppName(etAppRename.context, appModel.appPackage)
}
etAppRename.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {
etAppRename.hint = getAppName(etAppRename.context, appModel.appPackage)
}

override fun beforeTextChanged(
s: CharSequence?,
start: Int,
count: Int,
after: Int,
) {
}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}

override fun onTextChanged(
s: CharSequence?,
start: Int,
before: Int,
count: Int,
) {
etAppRename.hint = ""
}
})
etAppRename.setOnEditorActionListener { _, actionCode, _ ->
if (actionCode == EditorInfo.IME_ACTION_DONE) {
val renameLabel = etAppRename.text.toString().trim()
if (renameLabel.isNotBlank() && appModel.appPackage.isNotBlank()) {
appRenameListener(appModel, renameLabel)
renameLayout.visibility = View.GONE
}
true
}
false
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
etAppRename.hint = ""
}
tvSaveRename.setOnClickListener {
etAppRename.hideKeyboard()
})

etAppRename.setOnEditorActionListener { _, actionCode, _ ->
if (actionCode == EditorInfo.IME_ACTION_DONE) {
val renameLabel = etAppRename.text.toString().trim()
if (renameLabel.isNotBlank() && appModel.appPackage.isNotBlank()) {
appRenameListener(appModel, renameLabel)
renameLayout.visibility = View.GONE
} else {
val packageManager = etAppRename.context.packageManager
appRenameListener(
appModel,
packageManager.getApplicationLabel(
packageManager.getApplicationInfo(appModel.appPackage, 0)
).toString()
)
renameLayout.visibility = View.GONE
}
}
appInfo.setOnClickListener { appInfoListener(appModel) }
appDelete.setOnClickListener { appDeleteListener(appModel) }
appMenuClose.setOnClickListener {
appHideLayout.visibility = View.GONE
appTitle.visibility = View.VISIBLE
}
appRenameClose.setOnClickListener {
true
} else false
}

tvSaveRename.setOnClickListener {
etAppRename.hideKeyboard()
val renameLabel = etAppRename.text.toString().trim()
if (renameLabel.isNotBlank() && appModel.appPackage.isNotBlank()) {
appRenameListener(appModel, renameLabel)
renameLayout.visibility = View.GONE
} else {
val packageManager = etAppRename.context.packageManager
appRenameListener(
appModel,
packageManager.getApplicationLabel(
packageManager.getApplicationInfo(appModel.appPackage, 0)
).toString()
)
renameLayout.visibility = View.GONE
appTitle.visibility = View.VISIBLE
}
appHide.setOnClickListener { appHideListener(appModel, bindingAdapterPosition) }
}

appInfo.setOnClickListener { appInfoListener(appModel) }
appDelete.setOnClickListener { appDeleteListener(appModel) }
appMenuClose.setOnClickListener {
appHideLayout.visibility = View.GONE
appTitle.visibility = View.VISIBLE
}
appRenameClose.setOnClickListener {
renameLayout.visibility = View.GONE
appTitle.visibility = View.VISIBLE
}
appHide.setOnClickListener { appHideListener(appModel, bindingAdapterPosition) }
}

private fun getAppName(context: Context, appPackage: String): String {
val packageManager = context.packageManager
return packageManager.getApplicationLabel(
packageManager.getApplicationInfo(appPackage, 0)
).toString()
}
}

}
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<string name="disable">Disable</string>
<string name="not_working"><u>Not working?</u></string>
<string name="info">Info</string>
<string name="delete">Delete</string>
<string name="delete">Uninstall</string>
<string name="text_size">Text size</string>
<string name="enabled">Enabled</string>
<string name="disabled">Disabled</string>
Expand Down