Skip to content
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.

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

refact(Android): unify member-field naming convention in Kotlin #1999

Merged
merged 20 commits into from
Jan 2, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Migrate CustomSearchView
  • Loading branch information
kkafar committed Jan 2, 2024
commit 2a3c6f1df9b89c9c934d59b5f3445242b788c1e9
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ class CustomSearchView(context: Context, fragment: Fragment) : SearchView(contex
setOnSearchClickListener - https://developer.android.com/reference/android/widget/SearchView#setOnSearchClickListener(android.view.View.OnClickListener)
setOnCloseListener - https://developer.android.com/reference/android/widget/SearchView#setOnCloseListener(android.widget.SearchView.OnCloseListener)
*/
private var mCustomOnCloseListener: OnCloseListener? = null
private var mCustomOnSearchClickedListener: OnClickListener? = null
private var onCloseListener: OnCloseListener? = null
private var onSearchClickedListener: OnClickListener? = null

private var mOnBackPressedCallback: OnBackPressedCallback =
private var onBackPressedCallback: OnBackPressedCallback =
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
isIconified = true
}
}

private val backPressOverrider = FragmentBackPressOverrider(fragment, mOnBackPressedCallback)
private val backPressOverrider = FragmentBackPressOverrider(fragment, onBackPressedCallback)

var overrideBackAction: Boolean
set(value) {
Expand All @@ -46,11 +46,11 @@ class CustomSearchView(context: Context, fragment: Fragment) : SearchView(contex
}

override fun setOnCloseListener(listener: OnCloseListener?) {
mCustomOnCloseListener = listener
onCloseListener = listener
}

override fun setOnSearchClickListener(listener: OnClickListener?) {
mCustomOnSearchClickedListener = listener
onSearchClickedListener = listener
}

override fun onAttachedToWindow() {
Expand All @@ -67,12 +67,12 @@ class CustomSearchView(context: Context, fragment: Fragment) : SearchView(contex

init {
super.setOnSearchClickListener { v ->
mCustomOnSearchClickedListener?.onClick(v)
onSearchClickedListener?.onClick(v)
backPressOverrider.maybeAddBackCallback()
}

super.setOnCloseListener {
val result = mCustomOnCloseListener?.onClose() ?: false
val result = onCloseListener?.onClose() ?: false
backPressOverrider.removeBackCallbackIfAdded()
result
}
Expand Down