Skip to content

refactor: edit clip drag and drop #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leeseokchan00 merged 2 commits into from
Jan 4, 2025
Merged

refactor: edit clip drag and drop #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8a4b8a
refactor: block all clip changed
leeseokchan00 Jan 4, 2025
350f8e3
[feat] #197 update version code
leeseokchan00 Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {

defaultConfig {
applicationId = "org.sopt.linkmind"
versionCode = 12
versionCode = 13
versionName = "1.2.0"
}
viewBinding.enable = true
Expand Down
7 changes: 3 additions & 4 deletions feature/clip/src/main/java/org/sopt/clip/clipedit/ClipEditFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ClipEditFragment : BindingFragment<FragmentClipEditBinding>({ FragmentClip
adapter = clipEditAdapter,
recyclerView = binding.rvClipEdit,
) { categoryId, newIndex ->
if (categoryId != null) viewModel.updateCategoryEditPriorityState(categoryId, newIndex)
if (categoryId != null) viewModel.updateCategoryEditPriorityState(categoryId, newIndex - 1)
}
ItemTouchHelper(callback).attachToRecyclerView(binding.rvClipEdit)
updateEditListView()
Expand All @@ -58,9 +58,8 @@ class ClipEditFragment : BindingFragment<FragmentClipEditBinding>({ FragmentClip
viewModel.categoryState.flowWithLifecycle(viewLifeCycle).onEach { state ->
when (state) {
is UiState.Success -> {
val originalList = state.data ?: emptyList()
val newList = originalList.filter { it.categoryId?.toInt() != 0 }
clipEditAdapter.submitList(newList)
val clipList = state.data
clipEditAdapter.submitList(clipList)
}

else -> {}
Expand Down
12 changes: 10 additions & 2 deletions feature/clip/src/main/java/org/sopt/clip/clipedit/ItemTouchCallback.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ class ItemTouchCallback(
recyclerView: RecyclerView,
viewHolder: RecyclerView.ViewHolder,
): Int {
val dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN or ItemTouchHelper.START or ItemTouchHelper.END
return makeMovementFlags(dragFlags, 0)
return if (viewHolder.bindingAdapterPosition == 0) {
0
} else {
val dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN or ItemTouchHelper.START or ItemTouchHelper.END
return makeMovementFlags(dragFlags, 0)
}
}

override fun onMove(
Expand All @@ -24,6 +28,10 @@ class ItemTouchCallback(
): Boolean {
val fromPosition = viewHolder.bindingAdapterPosition
val toPosition = target.bindingAdapterPosition

if (fromPosition == 0 || toPosition == 0) {
return false
}
adapter.moveItem(fromPosition, toPosition)
return true
}
Expand Down
72 changes: 15 additions & 57 deletions feature/clip/src/main/res/layout/fragment_clip_edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,67 +42,25 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_clip_edit_back" />

<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="22dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_clip_edit_guide_msg">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<ImageView
android:id="@+id/iv_pin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:src="@drawable/ic_pin_24"
app:layout_constraintBottom_toBottomOf="@id/tv_all_clip"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_all_clip" />

<TextView
android:id="@+id/tv_all_clip"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_white_fill_12_rect"
android:paddingVertical="15dp"
android:paddingStart="14dp"
android:text="@string/clip_all_clip"
android:textAppearance="@style/Typography.suit.semibold_16"
android:textColor="@color/neutrals850"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_pin"
app:layout_constraintTop_toTopOf="parent" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_clip_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="22dp"
android:overScrollMode="never"
android:nestedScrollingEnabled="false"
android:layout_marginEnd="20dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_pin"
tools:itemCount="3"
tools:listitem="@layout/item_clip_edit_clip" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_clip_edit"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="44dp"
android:paddingVertical="15dp"
android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_clip_edit_back"
tools:itemCount="3"
tools:listitem="@layout/item_clip_edit_clip" />

</androidx.core.widget.NestedScrollView>
<View
android:id="@+id/v_snack"
android:layout_width="match_parent"
android:layout_height="20dp"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 3 additions & 1 deletion feature/clip/src/main/res/layout/item_clip_edit_clip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp">
android:layout_marginStart="10dp"
android:layout_marginBottom="12dp"
android:layout_marginEnd="20dp">
<!--android:background="@color/transparent"-->

<ImageView
Expand Down
Loading