couple style edits to the recycler adapter

This commit is contained in:
tibbi 2016-11-17 10:01:20 +01:00
parent f02de43612
commit b9f12b238b

View File

@ -29,19 +29,19 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
var actMode: ActionMode? = null var actMode: ActionMode? = null
} }
val deleteMode = object : ModalMultiSelectorCallback(multiSelector) { val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) {
override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean { override fun onActionItemClicked(mode: ActionMode?, item: MenuItem): Boolean {
when (item?.itemId) { return when (item.itemId) {
R.id.cab_edit -> { R.id.cab_edit -> {
showEditDialog() showEditDialog()
return true true
} }
R.id.cab_delete -> { R.id.cab_delete -> {
deleteSelectedItems() deleteSelectedItems()
return true true
} }
else -> false
} }
return false
} }
override fun onCreateActionMode(actionMode: ActionMode?, menu: Menu?): Boolean { override fun onCreateActionMode(actionMode: ActionMode?, menu: Menu?): Boolean {
@ -64,7 +64,7 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
} }
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.bindView(act, deleteMode, multiSelector, launchers[position]) holder.bindView(act, multiSelectorMode, multiSelector, launchers[position])
} }
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
@ -81,28 +81,28 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
val editView = act.layoutInflater.inflate(R.layout.edit_launcher, null) val editView = act.layoutInflater.inflate(R.layout.edit_launcher, null)
editView.edit_launcher_edittext.setText(selectedLauncher.name) editView.edit_launcher_edittext.setText(selectedLauncher.name)
val builder = AlertDialog.Builder(act) AlertDialog.Builder(act).apply {
builder.setTitle(act.getString(R.string.rename_launcher)) setTitle(act.getString(R.string.rename_launcher))
builder.setView(editView) setView(editView)
setPositiveButton(R.string.ok, null)
builder.setPositiveButton(R.string.ok, null) setNegativeButton(R.string.cancel, null)
builder.setNegativeButton(R.string.cancel, null) create().apply {
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)
val alertDialog = builder.create() show()
alertDialog.window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE) getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
alertDialog.show() val newName = editView.edit_launcher_edittext.text.toString().trim()
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { if (!newName.isEmpty()) {
val newName = editView.edit_launcher_edittext.text.toString().trim() if (DbHelper(act).updateLauncherName(selectedLauncher.id, newName) > 0) {
if (!newName.isEmpty()) { (act as RecyclerInterface).launcherRenamed()
if (DbHelper(act).updateLauncherName(selectedLauncher.id, newName) > 0) { finishActionMode()
(act as RecyclerInterface).launcherRenamed() dismiss()
finishActionMode() } else {
alertDialog.dismiss() act.toast(R.string.unknown_error)
} else { }
act.toast(R.string.unknown_error) } else {
act.toast(R.string.enter_launcher_name)
}
} }
} else {
act.toast(R.string.enter_launcher_name)
} }
} }
} }