fenix/Simple-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Launcher.git synced 2025-04-26 15:48:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle dragging items into folders

Browse Source
This commit is contained in:
Ensar Sarajčić 2023-08-18 17:17:59 +02:00
parent 62686f48c3
commit c83e7a5226
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/launcher/interfaces/HomeScreenGridItemsDao.kt
View File

@ -45,7 +45,7 @@ interface HomeScreenGridItemsDao {
fun deleteItemsByParentPackageName(packageName: String) fun deleteItemsByParentPackageName(packageName: String)
@Query("UPDATE home_screen_grid_items SET `left` = `left` + :shiftBy WHERE parent_id == :folderId AND `left` > :shiftFrom AND id != :excludingId") @Query("UPDATE home_screen_grid_items SET `left` = `left` + :shiftBy WHERE parent_id == :folderId AND `left` > :shiftFrom AND id != :excludingId")
fun shiftFolderItems(folderId: Long, shiftFrom: Int, shiftBy: Int, excludingId: Long) fun shiftFolderItems(folderId: Long, shiftFrom: Int, shiftBy: Int, excludingId: Long? = null)
@Transaction @Transaction
fun deleteByPackageName(packageName: String) { fun deleteByPackageName(packageName: String) {

37
app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt
View File

@ -81,6 +81,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
private var currentlyOpenFolder: HomeScreenGridItem? = null private var currentlyOpenFolder: HomeScreenGridItem? = null
private var draggingLeftFolderAt: Long? = null private var draggingLeftFolderAt: Long? = null
private var draggingEnteredNewFolderAt: Long? = null
// apply fake margins at the home screen. Real ones would cause the icons be cut at dragging at screen sides // apply fake margins at the home screen. Real ones would cause the icons be cut at dragging at screen sides
var sideMargins = Rect() var sideMargins = Rect()
@ -300,6 +301,28 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
} }
draggedItemCurrentCoords = Pair(x, y) draggedItemCurrentCoords = Pair(x, y)
val center = gridCenters.minBy {
abs(it.first - draggedItemCurrentCoords.first + sideMargins.left) + abs(it.second - draggedItemCurrentCoords.second + sideMargins.top)
}
val coveredCell = getClosestGridCells(center)
if (coveredCell != null) {
val coveredFolder = gridItems.firstOrNull { it.type == ITEM_TYPE_FOLDER && it.left == coveredCell.first && it.top == coveredCell.second }
if (coveredFolder != null) {
draggingEnteredNewFolderAt.also {
if (it == null) {
draggingEnteredNewFolderAt = System.currentTimeMillis()
} else if (System.currentTimeMillis() - it > PAGE_CHANGE_HOLD_THRESHOLD) {
openFolder(coveredFolder)
}
}
} else {
draggingEnteredNewFolderAt = null
}
} else {
draggingEnteredNewFolderAt = null
}
if (x > right - sideMargins.right - cellWidth / 2) { if (x > right - sideMargins.right - cellWidth / 2) {
doWithPageChangeDelay(PageChangeArea.RIGHT) { doWithPageChangeDelay(PageChangeArea.RIGHT) {
nextOrAdditionalPage() nextOrAdditionalPage()
@ -618,7 +641,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
gridItems.filter { it.parentId == oldParentId && it.left > oldLeft && it.id != id }.forEach { gridItems.filter { it.parentId == oldParentId && it.left > oldLeft && it.id != id }.forEach {
it.left -= 1 it.left -= 1
} }
context.homeScreenGridItemsDB.shiftFolderItems(oldParentId, oldLeft, -1, id!!) context.homeScreenGridItemsDB.shiftFolderItems(oldParentId, oldLeft, -1, id)
} }
if (newParentId != null && gridItems.any { it.parentId == newParentId && it.left == left }) { if (newParentId != null && gridItems.any { it.parentId == newParentId && it.left == left }) {
@ -626,7 +649,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
it.left += 1 it.left += 1
} }
context.homeScreenGridItemsDB.shiftFolderItems(newParentId, left - 1, +1, id!!) context.homeScreenGridItemsDB.shiftFolderItems(newParentId, left - 1, +1, id)
} }
} }
} }
@ -669,6 +692,16 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
} }
} }
} }
ensureBackgroundThread {
if (newParentId != null && gridItems.any { it.parentId == newParentId && it.left == finalXIndex }) {
gridItems.filter { it.parentId == newParentId && it.left >= finalXIndex }.forEach {
it.left += 1
}
context.homeScreenGridItemsDB.shiftFolderItems(newParentId, left - 1, +1)
}
}
} }
draggedItem = null draggedItem = null