rename app_launcher_item to item_app_launcher for consistency

This commit is contained in:
tibbi 2018-04-04 20:58:40 +02:00
parent 01e4e9cb48
commit dcc56deaa4
4 changed files with 6 additions and 8 deletions

View File

@ -14,7 +14,7 @@ import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.commons.views.MyRecyclerView
import kotlinx.android.synthetic.main.app_launcher_item.view.* import kotlinx.android.synthetic.main.item_app_launcher.view.*
import java.util.* import java.util.*
class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppLauncher>, val listener: RefreshRecyclerViewListener?, class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppLauncher>, val listener: RefreshRecyclerViewListener?,
@ -34,7 +34,7 @@ class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppL
view?.launcher_check?.beVisibleIf(select) view?.launcher_check?.beVisibleIf(select)
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.app_launcher_item, parent) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_app_launcher, parent)
override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) { override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
val launcher = launchers[position] val launcher = launchers[position]
@ -48,7 +48,7 @@ class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppL
override fun prepareActionMode(menu: Menu) { override fun prepareActionMode(menu: Menu) {
menu.apply { menu.apply {
findItem(R.id.cab_edit).isVisible = selectedPositions.size == 1 findItem(R.id.cab_edit).isVisible = isOneItemSelected()
} }
} }

View File

@ -12,7 +12,7 @@ import com.simplemobiletools.applauncher.models.AppLauncher
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.interfaces.MyAdapterListener import com.simplemobiletools.commons.interfaces.MyAdapterListener
import kotlinx.android.synthetic.main.app_launcher_item.view.* import kotlinx.android.synthetic.main.item_app_launcher.view.*
import java.util.* import java.util.*
class LaunchersDialogAdapter(activity: Activity, val launchers: ArrayList<AppLauncher>) : RecyclerView.Adapter<LaunchersDialogAdapter.ViewHolder>() { class LaunchersDialogAdapter(activity: Activity, val launchers: ArrayList<AppLauncher>) : RecyclerView.Adapter<LaunchersDialogAdapter.ViewHolder>() {
@ -60,7 +60,7 @@ class LaunchersDialogAdapter(activity: Activity, val launchers: ArrayList<AppLau
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.app_launcher_item, parent, false) val view = LayoutInflater.from(parent.context).inflate(R.layout.item_app_launcher, parent, false)
return ViewHolder(view, adapterListener) return ViewHolder(view, adapterListener)
} }

View File

@ -11,12 +11,11 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
import kotlinx.android.synthetic.main.dialog_pick_launchers.view.* import kotlinx.android.synthetic.main.dialog_pick_launchers.view.*
class AddAppLauncherDialog(val activity: Activity, val notDisplayedLaunchers: ArrayList<AppLauncher>, val callback: () -> Unit) { class AddAppLauncherDialog(val activity: Activity, val notDisplayedLaunchers: ArrayList<AppLauncher>, val callback: () -> Unit) {
private var dialog: AlertDialog
private var view = (activity.layoutInflater.inflate(R.layout.dialog_pick_launchers, null) as ViewGroup) private var view = (activity.layoutInflater.inflate(R.layout.dialog_pick_launchers, null) as ViewGroup)
private var adapter: LaunchersDialogAdapter? = null private var adapter: LaunchersDialogAdapter? = null
init { init {
dialog = AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok, { dialogInterface, i -> confirmSelection() }) .setPositiveButton(R.string.ok, { dialogInterface, i -> confirmSelection() })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.create().apply { .create().apply {
@ -32,6 +31,5 @@ class AddAppLauncherDialog(val activity: Activity, val notDisplayedLaunchers: Ar
activity.dbHelper.insertAppLauncher(it) activity.dbHelper.insertAppLauncher(it)
} }
callback() callback()
dialog.dismiss()
} }
} }