add the removed launchers back to the possible selection

This commit is contained in:
tibbi
2016-08-16 23:28:17 +02:00
parent cbb077de35
commit 0dcd36e8eb
2 changed files with 8 additions and 3 deletions

View File

@ -104,12 +104,15 @@ class MainActivity : SimpleActivity(), AddAppDialog.AddLaunchersInterface, Recyc
setupLaunchers()
}
override fun launchersDeleted(indexes: List<Int>) {
override fun launchersDeleted(indexes: List<Int>, deletedLaunchers: List<AppLauncher>) {
val reversed = indexes.reversed()
for (index in reversed) {
launchers.removeAt(index)
launchers_holder.adapter.notifyItemRemoved(index)
}
remainingLaunchers.addAll(deletedLaunchers)
remainingLaunchers.sortBy { it.name }
}
override fun onDestroy() {

View File

@ -31,12 +31,14 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
R.id.cab_delete -> {
val positions = multiSelector.selectedPositions
val deleteIds = ArrayList<String>(positions.size)
val deletedLaunchers = ArrayList<AppLauncher>(positions.size)
for (i in positions) {
deletedLaunchers.add(launchers[i])
deleteIds.add(launchers[i].id.toString())
}
DbHelper(act).deleteLaunchers(deleteIds)
actMode?.finish()
(act as EditLaunchersInterface).launchersDeleted(positions)
(act as EditLaunchersInterface).launchersDeleted(positions, deletedLaunchers)
return true
}
}
@ -117,6 +119,6 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
}
interface EditLaunchersInterface {
fun launchersDeleted(indexes: List<Int>)
fun launchersDeleted(indexes: List<Int>, deletedLaunchers: List<AppLauncher>)
}
}