diff --git a/app/build.gradle b/app/build.gradle index 209459e0..b301b756 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.30.12' + implementation 'com.simplemobiletools:commons:5.30.29' implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation 'androidx.documentfile:documentfile:1.0.1' diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt index 5808a888..16787b8b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt @@ -15,6 +15,8 @@ import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor import com.simplemobiletools.commons.extensions.removeBit +import com.simplemobiletools.commons.interfaces.ItemMoveCallback +import com.simplemobiletools.commons.interfaces.ItemTouchHelperContract import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.dialogs.RenameChecklistItemDialog @@ -22,8 +24,6 @@ import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize import com.simplemobiletools.notes.pro.helpers.DONE_CHECKLIST_ITEM_ALPHA import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener -import com.simplemobiletools.notes.pro.interfaces.ItemMoveCallback -import com.simplemobiletools.notes.pro.interfaces.ItemTouchHelperContract import com.simplemobiletools.notes.pro.interfaces.StartReorderDragListener import com.simplemobiletools.notes.pro.models.ChecklistItem import kotlinx.android.synthetic.main.item_checklist.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ItemMoveCallback.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ItemMoveCallback.kt deleted file mode 100644 index 5d2cb329..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ItemMoveCallback.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.simplemobiletools.notes.pro.interfaces - -import androidx.recyclerview.widget.ItemTouchHelper -import androidx.recyclerview.widget.RecyclerView -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter - -open class ItemMoveCallback(private val mAdapter: ItemTouchHelperContract) : ItemTouchHelper.Callback() { - override fun isLongPressDragEnabled() = false - - override fun isItemViewSwipeEnabled() = false - - override fun onSwiped(viewHolder: RecyclerView.ViewHolder, i: Int) {} - - override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int { - val dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN - return makeMovementFlags(dragFlags, 0) - } - - override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean { - mAdapter.onRowMoved(viewHolder.adapterPosition, target.adapterPosition) - return true - } - - override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) { - if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) { - if (viewHolder is MyRecyclerViewAdapter.ViewHolder) { - mAdapter.onRowSelected(viewHolder) - } - } - super.onSelectedChanged(viewHolder, actionState) - } - - override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) { - super.clearView(recyclerView, viewHolder) - if (viewHolder is MyRecyclerViewAdapter.ViewHolder) { - mAdapter.onRowClear(viewHolder) - } - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ItemTouchHelperContract.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ItemTouchHelperContract.kt deleted file mode 100644 index 5c2e1627..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ItemTouchHelperContract.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.simplemobiletools.notes.pro.interfaces - -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter - -interface ItemTouchHelperContract { - fun onRowMoved(fromPosition: Int, toPosition: Int) - - fun onRowSelected(myViewHolder: MyRecyclerViewAdapter.ViewHolder?) - - fun onRowClear(myViewHolder: MyRecyclerViewAdapter.ViewHolder?) -} diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 333dbf03..01d43463 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -63,7 +63,7 @@ Como cambio a cor dos widgets? - No caso de que teñas só un widget activo, podes crealo de novo ou usar o botón nos axustes do app para personalizalo. + No caso de que teñas só un widget activo, podes crealo de novo ou usar o botón nos axustes do app para personalizalo. Simple Notes Pro: To-do list organizer and planner diff --git a/build.gradle b/build.gradle index a2957c73..fb7b645e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong