fenix/Simple-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Launcher.git synced 2025-06-05 21:59:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not use Rect at storing grid items

Browse Source
This commit is contained in:
tibbi
2022-09-17 22:34:51 +02:00
parent 05484a5b29
commit 0791197d66
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/launcher/models/HomeScreenGridItem.kt
View File

@ -1,5 +1,3 @@
package com.simplemobiletools.launcher.models package com.simplemobiletools.launcher.models
import android.graphics.Rect data class HomeScreenGridItem(var left: Int, val top: Int, val right: Int, val bottom: Int, val packageName: String)
data class HomeScreenGridItem(var rect: Rect, val packageName: String)

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

@ -5,7 +5,6 @@ import android.content.Context
import android.graphics.Canvas import android.graphics.Canvas
import android.graphics.Color import android.graphics.Color
import android.graphics.Paint import android.graphics.Paint
import android.graphics.Rect
import android.telecom.TelecomManager import android.telecom.TelecomManager
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
@ -59,12 +58,11 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Vie
for (i in 0 until COLUMN_COUNT - 1) { for (i in 0 until COLUMN_COUNT - 1) {
val drawableX = rowXCoords[i] + iconMargin val drawableX = rowXCoords[i] + iconMargin
val drawableY = rowYCoords[COLUMN_COUNT - 1] + rowHeight - iconSize - iconMargin * 2 val drawableY = rowYCoords[COLUMN_COUNT - 1] + rowHeight - iconSize - iconMargin * 2
val rect = Rect(drawableX, drawableY, drawableX + rowWidth, drawableY + rowHeight)
dialerDrawable!!.setBounds(rect.left, rect.top, drawableX + iconSize, drawableY + iconSize) dialerDrawable!!.setBounds(drawableX, drawableY, drawableX + iconSize, drawableY + iconSize)
dialerDrawable!!.draw(canvas) dialerDrawable!!.draw(canvas)
val gridItem = HomeScreenGridItem(rect, defaultDialerPackage) val gridItem = HomeScreenGridItem(drawableX, drawableY, drawableX + rowWidth, drawableY + rowHeight, defaultDialerPackage)
gridItems.add(gridItem) gridItems.add(gridItem)
} }
} }
@ -72,8 +70,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Vie
fun gridClicked(x: Float, y: Float, callback: (packageName: String) -> Unit) { fun gridClicked(x: Float, y: Float, callback: (packageName: String) -> Unit) {
for (gridItem in gridItems) { for (gridItem in gridItems) {
val rect = gridItem.rect if (x >= gridItem.left && x <= gridItem.right && y >= gridItem.top && y <= gridItem.bottom) {
if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) {
callback(gridItem.packageName) callback(gridItem.packageName)
break break
} }