renaming launcher icons + updating recycler adapters

app/build.gradle

@@ -39,7 +39,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.38.6'
+    compile 'com.simplemobiletools:commons:2.38.8'
     compile 'com.android.support:multidex:1.0.2'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
     compile 'com.facebook.stetho:stetho:1.5.0'

app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt

@@ -2,7 +2,7 @@ package com.simplemobiletools.applauncher.adapters
 
 import android.app.AlertDialog
 import android.content.pm.PackageManager
-import android.graphics.PorterDuff
+import android.content.res.Resources
 import android.support.v7.view.ActionMode
 import android.support.v7.widget.RecyclerView
 import android.util.SparseArray
@@ -15,9 +15,11 @@ import com.simplemobiletools.applauncher.activities.SimpleActivity
 import com.simplemobiletools.applauncher.extensions.config
 import com.simplemobiletools.applauncher.extensions.dbHelper
 import com.simplemobiletools.applauncher.models.AppLauncher
+import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.beGone
 import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.interfaces.MyAdapterListener
 import kotlinx.android.synthetic.main.app_launcher_item.view.*
 import kotlinx.android.synthetic.main.dialog_edit_launcher.view.*
 import java.util.*
@@ -26,18 +28,20 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: List<AppLaunc
         RecyclerView.Adapter<RecyclerAdapter.ViewHolder>() {
 
     private val config = activity.config
-    var actMode: ActionMode? = null
+    private var actMode: ActionMode? = null
-    var primaryColor = config.primaryColor
+    private var primaryColor = config.primaryColor
 
     private val multiSelector = MultiSelector()
     private var itemViews = SparseArray<View>()
     private val selectedPositions = HashSet<Int>()
     private var textColor = config.textColor
+    private var resources = activity.resources
+    private var packageManager = activity.packageManager
 
     fun toggleItemSelection(select: Boolean, pos: Int) {
         if (select) {
             if (itemViews[pos] != null) {
-                itemViews[pos].launcher_check?.background?.setColorFilter(primaryColor, PorterDuff.Mode.SRC_IN)
+                itemViews[pos].launcher_check?.background?.applyColorFilter(primaryColor)
                 selectedPositions.add(pos)
             }
         } else {
@@ -100,7 +104,7 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: List<AppLaunc
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bindView(launchers[position], textColor)
+        itemViews.put(position, holder.bindView(launchers[position], textColor, resources, packageManager))
     }
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
@@ -140,10 +144,6 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: List<AppLaunc
         }
     }
 
-    private fun finishActionMode() {
-        actMode?.finish()
-    }
-
     private fun deleteSelectedItems() {
         val positions = multiSelector.selectedPositions
         val deleteIds = ArrayList<String>(positions.size)
@@ -153,11 +153,13 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: List<AppLaunc
             deleteIds.add(launcher.id.toString())
 
             launcher.name = getRealAppName(launcher)
-            if (launcher.name.isNotEmpty())
+            if (launcher.name.isNotEmpty()) {
                 deletedLaunchers.add(launcher)
             }
+        }
+
         activity.dbHelper.deleteLaunchers(deleteIds)
-        finishActionMode()
+        actMode?.finish()
         listener?.refreshLaunchers()
     }
 
@@ -172,7 +174,7 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: List<AppLaunc
 
     class ViewHolder(view: View, val adapterListener: MyAdapterListener, val activity: SimpleActivity, val multiSelectorCallback: ModalMultiSelectorCallback,
                      val multiSelector: MultiSelector, val listener: AppLaunchersListener?, val itemClick: (AppLauncher) -> (Unit)) : SwappingHolder(view, MultiSelector()) {
-        fun bindView(launcher: AppLauncher, textColor: Int): View {
+        fun bindView(launcher: AppLauncher, textColor: Int, resources: Resources, packageManager: PackageManager): View {
             itemView.apply {
                 launcher_label.text = launcher.name
                 launcher_label.setTextColor(textColor)
@@ -180,13 +182,12 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: List<AppLaunc
                 setOnClickListener { viewClicked(launcher) }
                 setOnLongClickListener { viewLongClicked(); true }
 
-                /*if (launcher.iconId != 0) {
+                val drawable = if (launcher.iconId != 0) {
-                    val icon = act.resources.getDrawable(launcher.iconId)
+                    resources.getDrawable(launcher.iconId)
-                    launcher_icon.setImageDrawable(icon)
                 } else {
-                    val icon = act.packageManager.getApplicationIcon(launcher.pkgName)
+                    packageManager.getApplicationIcon(launcher.pkgName)
-                    launcher_icon.setImageDrawable(icon)
+                }
-                }*/
+                launcher_icon.setImageDrawable(drawable)
             }
             return itemView
         }
@@ -210,12 +211,6 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: List<AppLaunc
         }
     }
 
-    interface MyAdapterListener {
-        fun toggleItemSelectionAdapter(select: Boolean, position: Int)
-
-        fun getSelectedPositions(): HashSet<Int>
-    }
-
     interface AppLaunchersListener {
         fun refreshLaunchers()
     }

app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerDialogAdapter.kt

@@ -1,50 +1,85 @@
 package com.simplemobiletools.applauncher.adapters
 
-import android.content.Context
+import android.app.Activity
+import android.content.pm.PackageManager
+import android.content.res.Resources
 import android.support.v7.widget.RecyclerView
+import android.util.SparseArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.simplemobiletools.applauncher.R
+import com.simplemobiletools.applauncher.extensions.config
 import com.simplemobiletools.applauncher.models.AppLauncher
-import com.simplemobiletools.commons.extensions.beInvisibleIf
+import com.simplemobiletools.commons.extensions.applyColorFilter
+import com.simplemobiletools.commons.extensions.beVisibleIf
+import com.simplemobiletools.commons.interfaces.MyAdapterListener
 import kotlinx.android.synthetic.main.app_launcher_item.view.*
+import java.util.*
 
-class RecyclerDialogAdapter(val cxt: Context, val launchers: List<AppLauncher>) : RecyclerView.Adapter<RecyclerDialogAdapter.ViewHolder>() {
+class RecyclerDialogAdapter(activity: Activity, val launchers: List<AppLauncher>) : RecyclerView.Adapter<RecyclerDialogAdapter.ViewHolder>() {
+    private val config = activity.config
+    private var primaryColor = config.primaryColor
+    private var itemViews = SparseArray<View>()
+    private val selectedPositions = HashSet<Int>()
+    private var textColor = config.textColor
+    private var resources = activity.resources
+    private var packageManager = activity.packageManager
+
+    fun toggleItemSelection(select: Boolean, pos: Int) {
+        if (select) {
+            if (itemViews[pos] != null) {
+                itemViews[pos].launcher_check?.background?.applyColorFilter(primaryColor)
+                selectedPositions.add(pos)
+            }
+        } else {
+            selectedPositions.remove(pos)
+        }
+
+        itemViews[pos]?.launcher_check?.beVisibleIf(select)
+    }
+
+    private val adapterListener = object : MyAdapterListener {
+        override fun toggleItemSelectionAdapter(select: Boolean, position: Int) {
+            toggleItemSelection(select, position)
+        }
+
+        override fun getSelectedPositions(): HashSet<Int> = selectedPositions
+    }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bindView(cxt, launchers[position])
+        itemViews.put(position, holder.bindView(launchers[position], textColor, resources, packageManager))
     }
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(parent?.context).inflate(R.layout.app_launcher_item, parent, false)
-        return ViewHolder(view)
+        return ViewHolder(view, adapterListener)
     }
 
     override fun getItemCount() = launchers.count()
 
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    class ViewHolder(view: View, val adapterListener: MyAdapterListener) : RecyclerView.ViewHolder(view) {
-        fun bindView(context: Context, launcher: AppLauncher) {
+        fun bindView(launcher: AppLauncher, textColor: Int, resources: Resources, packageManager: PackageManager): View {
-            with(launcher) {
+            itemView.apply {
-                itemView.launcher_label.text = launcher.name
+                launcher_label.text = launcher.name
-                itemView.setOnClickListener {
+                launcher_label.setTextColor(textColor)
-                    launcher.isChecked = !launcher.isChecked
-                    handleCheck(itemView.launcher_check, launcher)
-                }
 
-                handleCheck(itemView.launcher_check, launcher)
+                setOnClickListener { viewClicked() }
-                if (launcher.iconId != 0) {
+                setOnLongClickListener { viewClicked(); true }
-                    val icon = context.resources.getDrawable(launcher.iconId)
+
-                    itemView.launcher_icon.setImageDrawable(icon)
+                val drawable = if (launcher.iconId != 0) {
+                    resources.getDrawable(launcher.iconId)
                 } else {
-                    val icon = context.packageManager.getApplicationIcon(launcher.pkgName)
+                    packageManager.getApplicationIcon(launcher.pkgName)
-                    itemView.launcher_icon.setImageDrawable(icon)
                 }
+                launcher_icon.setImageDrawable(drawable)
             }
+            return itemView
         }
 
-        fun handleCheck(check: View, launcher: AppLauncher) {
+        private fun viewClicked() {
-            check.beInvisibleIf(!launcher.isChecked)
+            val isSelected = adapterListener.getSelectedPositions().contains(adapterPosition)
+            adapterListener.toggleItemSelectionAdapter(!isSelected, adapterPosition)
         }
     }
 }

app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt

@@ -72,15 +72,15 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
         )
 
         val icons = arrayListOf(
-                R.drawable.ic_calculator,
+                R.drawable.ic_launcher_calculator,
-                R.drawable.ic_calendar,
+                R.drawable.ic_launcher_calendar,
-                R.drawable.ic_camera,
+                R.drawable.ic_launcher_camera,
-                R.drawable.ic_draw,
+                R.drawable.ic_launcher_draw,
-                R.drawable.ic_filemanager,
+                R.drawable.ic_launcher_filemanager,
-                R.drawable.ic_flashlight,
+                R.drawable.ic_launcher_flashlight,
-                R.drawable.ic_gallery,
+                R.drawable.ic_launcher_gallery,
-                R.drawable.ic_musicplayer,
+                R.drawable.ic_launcher_musicplayer,
-                R.drawable.ic_notes
+                R.drawable.ic_launcher_notes
         )
 
         val cnt = titles.size

app/src/main/kotlin/com/simplemobiletools/applauncher/models/AppLauncher.kt

@@ -1,6 +1,6 @@
 package com.simplemobiletools.applauncher.models
 
-data class AppLauncher(val id: Int, var name: String, val pkgName: String, val iconId: Int, var isChecked: Boolean = false) {
+data class AppLauncher(val id: Int, var name: String, val pkgName: String, val iconId: Int) {
     override fun equals(other: Any?): Boolean {
         return pkgName.equals((other as AppLauncher).pkgName, true)
     }

app/src/main/res/layout/app_launcher_item.xml

@@ -27,11 +27,15 @@
 
     <ImageView
         android:id="@+id/launcher_check"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/selection_check_size"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/selection_check_size"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:background="@drawable/ic_check"
+        android:layout_margin="@dimen/small_margin"
-        android:visibility="invisible"/>
+        android:background="@drawable/circle_background"
+        android:padding="@dimen/tiny_margin"
+        android:src="@drawable/ic_check"
+        android:visibility="gone"/>
 
 </RelativeLayout>