fix manual card ordering

Author: Razeeman

app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt

@@ -4,15 +4,12 @@ import android.widget.TimePicker
 import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.contrib.PickerActions
 import androidx.test.espresso.contrib.PickerActions.setTime
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.example.util.simpletimetracker.R
-import org.hamcrest.CoreMatchers
 import org.hamcrest.CoreMatchers.equalTo
 
 object NavUtils {

core/src/main/java/com/example/util/simpletimetracker/core/extension/ViewExtensions.kt

@@ -113,7 +113,7 @@ fun SeekBar.onProgressChanged(func: (Int) -> Unit) {
 fun RecyclerView.onItemMoved(
     onSelected: (RecyclerView.ViewHolder?) -> Unit = {},
     onClear: (RecyclerView.ViewHolder) -> Unit = {},
-    onMoved: (Int, Int) -> Unit
+    onMoved: (Int, Int) -> Unit = { _, _ -> }
 ) {
     val dragDirections =
         ItemTouchHelper.DOWN or ItemTouchHelper.UP or ItemTouchHelper.START or ItemTouchHelper.END

feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/cardOrder/view/CardOrderDialogFragment.kt

@@ -50,7 +50,7 @@ class CardOrderDialogFragment : BaseBottomSheetFragment<Binding>() {
 
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
-        viewModel.onDismiss()
+        viewModel.onDismiss(recordTypesAdapter.currentList)
     }
 
     override fun initDialog() {
@@ -73,7 +73,6 @@ class CardOrderDialogFragment : BaseBottomSheetFragment<Binding>() {
         binding.rvCardOrderContainer.onItemMoved(
             onSelected = ::setItemSelected,
             onClear = ::setItemUnselected,
-            onMoved = viewModel::onCardMoved
         )
     }
 

feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/cardOrder/viewModel/CardOrderViewModel.kt

@@ -14,7 +14,6 @@ import com.example.util.simpletimetracker.domain.model.CardOrder
 import com.example.util.simpletimetracker.navigation.params.CardOrderDialogParams
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import java.util.Collections
 import javax.inject.Inject
 
 class CardOrderViewModel @Inject constructor(
@@ -35,33 +34,19 @@ class CardOrderViewModel @Inject constructor(
         }
     }
 
-    private var types: List<RecordTypeViewData> = emptyList()
+    fun onDismiss(newList: List<ViewHolderType>) = GlobalScope.launch {
+        val types = newList.filterIsInstance<RecordTypeViewData>()
 
-    fun onCardMoved(fromPosition: Int, toPosition: Int) {
-        if (fromPosition < toPosition) {
-            for (i in fromPosition until toPosition) {
-                Collections.swap(types, i, i + 1)
+        types
+            .takeIf(List<RecordTypeViewData>::isNotEmpty)
+            ?.mapIndexed { index, recordTypeViewData ->
+                recordTypeViewData.id to index.toLong()
             }
-        } else {
-            for (i in fromPosition downTo toPosition + 1) {
-                Collections.swap(types, i, i - 1)
+            ?.toMap()
+            ?.let {
+                prefsInteractor.setCardOrder(CardOrder.MANUAL)
+                prefsInteractor.setCardOrderManual(it)
             }
-        }
-    }
-
-    fun onDismiss() {
-        GlobalScope.launch {
-            types
-                .takeIf(List<RecordTypeViewData>::isNotEmpty)
-                ?.mapIndexed { index, recordTypeViewData ->
-                    recordTypeViewData.id to index.toLong()
-                }
-                ?.toMap()
-                ?.let {
-                    prefsInteractor.setCardOrder(CardOrder.MANUAL)
-                    prefsInteractor.setCardOrderManual(it)
-                }
-        }
     }
 
     private suspend fun loadRecordTypes(): List<ViewHolderType> {
@@ -72,7 +57,6 @@ class CardOrderViewModel @Inject constructor(
             .filter { !it.hidden }
             .takeUnless { it.isEmpty() }
             ?.map { type -> recordTypeViewDataMapper.map(type, numberOfCards, isDarkTheme) }
-            ?.also { types = it }
             ?: recordTypeViewDataMapper.mapToEmpty()
     }
 }