forked from upstream-mirrors/quik
Recreate conversation menu dialog when showing, in case theme was changed
This commit is contained in:
@@ -89,15 +89,7 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
|||||||
setAction(R.string.button_undo, { undoSwipeConversationIntent.onNext(Unit) })
|
setAction(R.string.button_undo, { undoSwipeConversationIntent.onNext(Unit) })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private val conversationMenuDialog by lazy {
|
private var conversationMenuDialog: AlertDialog? = null
|
||||||
val recyclerView = RecyclerView(this)
|
|
||||||
recyclerView.layoutManager = LinearLayoutManager(this)
|
|
||||||
recyclerView.adapter = menuItemAdapter
|
|
||||||
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
|
|
||||||
AlertDialog.Builder(this).setView(recyclerView).create().apply {
|
|
||||||
setOnDismissListener { conversationMenuItemIntent.onNext(-1) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
init {
|
init {
|
||||||
appComponent.inject(this)
|
appComponent.inject(this)
|
||||||
@@ -258,8 +250,19 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
|||||||
if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START)
|
if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START)
|
||||||
else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START)
|
else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START)
|
||||||
|
|
||||||
if (conversationMenuDialog.isShowing && menuItemAdapter.data.isEmpty()) conversationMenuDialog.dismiss()
|
if (conversationMenuDialog?.isShowing == true && menuItemAdapter.data.isEmpty()) {
|
||||||
else if (!conversationMenuDialog.isShowing && menuItemAdapter.data.isNotEmpty()) conversationMenuDialog.show()
|
conversationMenuDialog?.dismiss()
|
||||||
|
conversationMenuDialog = null
|
||||||
|
} else if (conversationMenuDialog?.isShowing != true && menuItemAdapter.data.isNotEmpty()) {
|
||||||
|
val recyclerView = RecyclerView(this)
|
||||||
|
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||||
|
recyclerView.adapter = menuItemAdapter
|
||||||
|
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
|
||||||
|
conversationMenuDialog = AlertDialog.Builder(this).setView(recyclerView).create().apply {
|
||||||
|
setOnDismissListener { conversationMenuItemIntent.onNext(-1) }
|
||||||
|
show()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun clearSearch() {
|
override fun clearSearch() {
|
||||||
|
|||||||
Reference in New Issue
Block a user