diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt index fc98d5c..5304dc6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt @@ -179,6 +179,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel val frameRect = Rect(viewX, viewY, viewX + widgetView.width, viewY + widgetView.height) resize_frame.updateFrameCoords(frameRect) resize_frame.beVisible() + resize_frame.z = 1f // make sure the frame isnt behind the widget itself resize_frame.onClickListener = { hideResizeLines() } diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt index 94069ff..c9c3611 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt @@ -10,7 +10,6 @@ import com.simplemobiletools.commons.extensions.performHapticFeedback import com.simplemobiletools.launcher.helpers.MAX_ALLOWED_MOVE_PX class MyAppWidgetHostView(context: Context) : AppWidgetHostView(context) { - private var MAX_CLICK_DURATION = 150 private var longPressHandler = Handler() private var actionDownCoords = PointF() private var currentCoords = PointF() diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetResizeFrame.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetResizeFrame.kt index 887b939..d05beb6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetResizeFrame.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetResizeFrame.kt @@ -15,9 +15,11 @@ class MyAppWidgetResizeFrame(context: Context, attrs: AttributeSet, defStyle: In constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0) private var resizeWidgetLinePaint: Paint + private var resizeWidgetLineDotPaint: Paint private var actionDownCoords = PointF() private var actionDownMS = 0L private var MAX_CLICK_DURATION = 150 + private val lineDotRadius = context.resources.getDimension(R.dimen.resize_frame_dot_radius) var onClickListener: (() -> Unit)? = null init { @@ -28,6 +30,10 @@ class MyAppWidgetResizeFrame(context: Context, attrs: AttributeSet, defStyle: In strokeWidth = context.resources.getDimension(R.dimen.tiny_margin) style = Paint.Style.STROKE } + + resizeWidgetLineDotPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.WHITE + } } fun updateFrameCoords(coords: Rect) { @@ -65,7 +71,11 @@ class MyAppWidgetResizeFrame(context: Context, attrs: AttributeSet, defStyle: In override fun onDraw(canvas: Canvas) { super.onDraw(canvas) if (x != 0f || y != 0f) { - canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), resizeWidgetLinePaint) + canvas.drawRect(lineDotRadius, lineDotRadius, width.toFloat() - lineDotRadius, height.toFloat() - lineDotRadius, resizeWidgetLinePaint) + canvas.drawCircle(lineDotRadius, height / 2f, lineDotRadius, resizeWidgetLineDotPaint) + canvas.drawCircle(width / 2f, lineDotRadius, lineDotRadius, resizeWidgetLineDotPaint) + canvas.drawCircle(width - lineDotRadius, height / 2f, lineDotRadius, resizeWidgetLineDotPaint) + canvas.drawCircle(width / 2f, height - lineDotRadius, lineDotRadius, resizeWidgetLineDotPaint) } } } diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d33a44e..713f9f2 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -4,4 +4,5 @@ 50dp 140dp 10dp + 8dp