Cleaned up log messages

DreierF · Jan 12, 2018 · a490dca · a490dca
1 parent c2152ea
commit a490dca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt
@@ -26,7 +26,6 @@ import de.dreier.mytargets.shared.models.IRecursiveModel
 import de.dreier.mytargets.utils.multiselector.MultiSelector
 import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
-import timber.log.Timber
 
 /**
  * @param <T> Model of the item which is managed within the fragment.
@@ -45,8 +44,8 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFrag
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Timber.d("onCreate: %b", selector.selectable)
 
+        // Restore action mode after fragment recreation
         if(savedInstanceState != null) {
             selector.restoreSelectionStates(savedInstanceState.getBundle(KEY_SELECTOR)!!)
             if(selector.selectable) {
@@ -101,11 +100,8 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFrag
     }
 
     override fun onClick(holder: SelectableViewHolder<T>, item: T?) {
-        Timber.d("onClick: ")
         if (!actionModeCallback!!.click(holder)) {
-            Timber.d("item: ")
             if (item != null) {
-                Timber.d("onSelected: ")
                 onSelected(item)
             }
         }

diff --git a/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt b/app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt
@@ -23,7 +23,6 @@ import android.view.MenuItem
 import de.dreier.mytargets.R
 import de.dreier.mytargets.utils.multiselector.MultiSelector
 import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
-import timber.log.Timber
 
 
 typealias EditCallback = (Long) -> Unit
@@ -57,7 +56,6 @@ class ItemActionModeCallback(
     }
 
     override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-        Timber.d("onCreateActionMode")
         selector.selectable = true
         actionMode = mode
         mode.menuInflater.inflate(R.menu.context_menu_edit_delete, menu)
@@ -87,16 +85,13 @@ class ItemActionModeCallback(
     }
 
     override fun onDestroyActionMode(mode: ActionMode) {
-        Timber.d("onDestroyActionMode")
         selector.selectable = false
         selector.clearSelections()
         actionMode = null
     }
 
     fun longClick(holder: SelectableViewHolder<*>) {
-        Timber.d("longClick")
         if (actionMode == null) {
-            Timber.d("startActionMode")
             val activity = fragment.getActivity() as AppCompatActivity?
             activity!!.startSupportActionMode(this)
         }
@@ -105,7 +100,6 @@ class ItemActionModeCallback(
     }
 
     fun restartActionMode() {
-        Timber.d("restartActionMode")
         val activity = fragment.getActivity() as AppCompatActivity?
         activity!!.startSupportActionMode(this)
         updateTitle()
@@ -115,7 +109,6 @@ class ItemActionModeCallback(
      * Returns true if the click has been handled.
      */
     fun click(holder: SelectableViewHolder<*>): Boolean {
-        Timber.d("IAMC#click")
         if (selector.tapSelection(holder)) {
             updateTitle()
             return true
@@ -124,7 +117,6 @@ class ItemActionModeCallback(
     }
 
     private fun updateTitle() {
-        Timber.d("updateTitle")
         if (actionMode == null) {
             return
         }

diff --git a/app/src/main/java/de/dreier/mytargets/utils/multiselector/MultiSelector.kt b/app/src/main/java/de/dreier/mytargets/utils/multiselector/MultiSelector.kt
@@ -22,10 +22,10 @@ class MultiSelector : SelectorBase() {
     private val selections = HashSet<Long>()
 
     val selectedItemCount: Int
-            get() = selections.size
+        get() = selections.size
 
-    val selectedIds: ArrayList<Long>
-        get() = ArrayList(selections)
+    val selectedIds: List<Long>
+        get() = selections.toList()
 
     override fun setSelected(id: Long, isSelected: Boolean) {
         if (isSelected) {