fenix/Simple-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Launcher.git synced 2025-04-03 12:51:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix shortcut pin intent handling

Browse Source
This commit is contained in:
Ensar Sarajčić 2023-07-19 16:30:21 +02:00
parent 3742762220
commit 6ac3d0f86c
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt
View File

@ -101,6 +101,25 @@ class MainActivity : SimpleActivity(), FlingListener {
fragment.beVisible()
}
handleIntentAction(intent)
home_screen_grid.itemClickListener = {
performItemClick(it)
}
home_screen_grid.itemLongClickListener = {
performItemLongClick(home_screen_grid.getClickableRect(it).left.toFloat(), it)
}
}
override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
if (intent != null) {
handleIntentAction(intent)
}
}
private fun handleIntentAction(intent: Intent) {
if (intent.action == LauncherApps.ACTION_CONFIRM_PIN_SHORTCUT) {
val launcherApps = applicationContext.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
val item = launcherApps.getPinItemRequest(intent)
@ -132,24 +151,19 @@ class MainActivity : SimpleActivity(), FlingListener {
icon
)
runOnUiThread {
home_screen_grid.skipToPage(page)
}
// delay showing the shortcut both to let the user see adding it in realtime and hackily avoid concurrent modification exception at HomeScreenGrid
Thread.sleep(2000)
try {
item.accept()
home_screen_grid.storeAndShowGridItem(gridItem, navigateToPage = true)
home_screen_grid.storeAndShowGridItem(gridItem)
} catch (ignored: IllegalStateException) {
}
}
}
home_screen_grid.itemClickListener = {
performItemClick(it)
}
home_screen_grid.itemLongClickListener = {
performItemLongClick(home_screen_grid.getClickableRect(it).left.toFloat(), it)
}
}
private fun findFirstEmptyCell(): Pair<Int, Rect> {
@ -169,7 +183,7 @@ class MainActivity : SimpleActivity(), FlingListener {
for (checkedXCell in 0 until ROW_COUNT - 1) {
val wantedCell = Triple(page, checkedXCell, checkedYCell)
if (!occupiedCells.contains(wantedCell)) {
return Pair(page, Rect(wantedCell.first, wantedCell.second, wantedCell.first, wantedCell.second))
return Pair(page, Rect(wantedCell.second, wantedCell.third, wantedCell.second, wantedCell.third))
}
}
}

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

@ -368,13 +368,10 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
}
}
fun storeAndShowGridItem(item: HomeScreenGridItem, navigateToPage: Boolean = false) {
fun storeAndShowGridItem(item: HomeScreenGridItem) {
val newId = context.homeScreenGridItemsDB.insert(item)
item.id = newId
gridItems.add(item)
if (navigateToPage) {
skipToPage(item.page)
}
redrawGrid()
}
@ -903,8 +900,8 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
return false
}
private fun skipToPage(targetPage: Int): Boolean {
if (targetPage < getMaxPage() + 1) {
fun skipToPage(targetPage: Int): Boolean {
if (currentPage != targetPage && targetPage < getMaxPage() + 1) {
lastPage = currentPage
currentPage = targetPage
handlePageChange()