Skip to content
This repository was archived by the owner on Apr 26, 2020. It is now read-only.

Commit a490dca

Browse files
committed
Cleaned up log messages
1 parent c2152ea commit a490dca

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

app/src/main/java/de/dreier/mytargets/base/fragments/EditableListFragmentBase.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import de.dreier.mytargets.shared.models.IRecursiveModel
2626
import de.dreier.mytargets.utils.multiselector.MultiSelector
2727
import de.dreier.mytargets.utils.multiselector.OnItemLongClickListener
2828
import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
29-
import timber.log.Timber
3029

3130
/**
3231
* @param <T> Model of the item which is managed within the fragment.
@@ -45,8 +44,8 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFrag
4544

4645
override fun onCreate(savedInstanceState: Bundle?) {
4746
super.onCreate(savedInstanceState)
48-
Timber.d("onCreate: %b", selector.selectable)
4947

48+
// Restore action mode after fragment recreation
5049
if(savedInstanceState != null) {
5150
selector.restoreSelectionStates(savedInstanceState.getBundle(KEY_SELECTOR)!!)
5251
if(selector.selectable) {
@@ -101,11 +100,8 @@ abstract class EditableListFragmentBase<T, U : ListAdapterBase<*, T>> : ListFrag
101100
}
102101

103102
override fun onClick(holder: SelectableViewHolder<T>, item: T?) {
104-
Timber.d("onClick: ")
105103
if (!actionModeCallback!!.click(holder)) {
106-
Timber.d("item: ")
107104
if (item != null) {
108-
Timber.d("onSelected: ")
109105
onSelected(item)
110106
}
111107
}

app/src/main/java/de/dreier/mytargets/base/fragments/ItemActionModeCallback.kt

-8
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import android.view.MenuItem
2323
import de.dreier.mytargets.R
2424
import de.dreier.mytargets.utils.multiselector.MultiSelector
2525
import de.dreier.mytargets.utils.multiselector.SelectableViewHolder
26-
import timber.log.Timber
2726

2827

2928
typealias EditCallback = (Long) -> Unit
@@ -57,7 +56,6 @@ class ItemActionModeCallback(
5756
}
5857

5958
override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
60-
Timber.d("onCreateActionMode")
6159
selector.selectable = true
6260
actionMode = mode
6361
mode.menuInflater.inflate(R.menu.context_menu_edit_delete, menu)
@@ -87,16 +85,13 @@ class ItemActionModeCallback(
8785
}
8886

8987
override fun onDestroyActionMode(mode: ActionMode) {
90-
Timber.d("onDestroyActionMode")
9188
selector.selectable = false
9289
selector.clearSelections()
9390
actionMode = null
9491
}
9592

9693
fun longClick(holder: SelectableViewHolder<*>) {
97-
Timber.d("longClick")
9894
if (actionMode == null) {
99-
Timber.d("startActionMode")
10095
val activity = fragment.getActivity() as AppCompatActivity?
10196
activity!!.startSupportActionMode(this)
10297
}
@@ -105,7 +100,6 @@ class ItemActionModeCallback(
105100
}
106101

107102
fun restartActionMode() {
108-
Timber.d("restartActionMode")
109103
val activity = fragment.getActivity() as AppCompatActivity?
110104
activity!!.startSupportActionMode(this)
111105
updateTitle()
@@ -115,7 +109,6 @@ class ItemActionModeCallback(
115109
* Returns true if the click has been handled.
116110
*/
117111
fun click(holder: SelectableViewHolder<*>): Boolean {
118-
Timber.d("IAMC#click")
119112
if (selector.tapSelection(holder)) {
120113
updateTitle()
121114
return true
@@ -124,7 +117,6 @@ class ItemActionModeCallback(
124117
}
125118

126119
private fun updateTitle() {
127-
Timber.d("updateTitle")
128120
if (actionMode == null) {
129121
return
130122
}

app/src/main/java/de/dreier/mytargets/utils/multiselector/MultiSelector.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class MultiSelector : SelectorBase() {
2222
private val selections = HashSet<Long>()
2323

2424
val selectedItemCount: Int
25-
get() = selections.size
25+
get() = selections.size
2626

27-
val selectedIds: ArrayList<Long>
28-
get() = ArrayList(selections)
27+
val selectedIds: List<Long>
28+
get() = selections.toList()
2929

3030
override fun setSelected(id: Long, isSelected: Boolean) {
3131
if (isSelected) {

0 commit comments

Comments
 (0)