From e83aef8d9db7bfa073a664dbdda16e9682aae5e3 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Sep 2022 11:17:20 +0200 Subject: [PATCH] lets not add any extra margin to widgets --- .../launcher/helpers/Constants.kt | 2 + .../launcher/helpers/MyAppWidgetHost.kt | 6 --- .../launcher/views/HomeScreenGrid.kt | 42 +++++++++---------- app/src/main/res/values/dimens.xml | 1 - 4 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/launcher/helpers/MyAppWidgetHost.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Constants.kt index de03ae5..b6f1623 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Constants.kt @@ -16,3 +16,5 @@ const val REQUEST_CONFIGURE_WIDGET = 51 const val ITEM_TYPE_ICON = 0 const val ITEM_TYPE_WIDGET = 1 const val ITEM_TYPE_SHORTCUT = 2 + +const val WIDGET_HOST_ID = 12345 diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/MyAppWidgetHost.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/MyAppWidgetHost.kt deleted file mode 100644 index e39571b..0000000 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/MyAppWidgetHost.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.simplemobiletools.launcher.helpers - -import android.appwidget.AppWidgetHost -import android.content.Context - -class MyAppWidgetHost(context: Context, hostId: Int) : AppWidgetHost(context, hostId) 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 51b1b7c..695de72 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt @@ -1,6 +1,7 @@ package com.simplemobiletools.launcher.views import android.annotation.SuppressLint +import android.appwidget.AppWidgetHost import android.appwidget.AppWidgetManager import android.content.Context import android.graphics.Canvas @@ -28,7 +29,6 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0) private var iconMargin = context.resources.getDimension(R.dimen.icon_side_margin).toInt() - private var widgetMargin = context.resources.getDimension(R.dimen.widget_side_margin).toInt() private var labelSideMargin = context.resources.getDimension(R.dimen.small_margin).toInt() private var roundedCornerRadius = context.resources.getDimension(R.dimen.activity_margin) private var textPaint: TextPaint @@ -171,21 +171,21 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel redrawIcons = true } else if (draggedItem != null) { // we are dragging a new item at the home screen from the All Apps fragment - val newHomeScreenGridItem = - HomeScreenGridItem( - null, - xIndex, - yIndex, - xIndex + 1, - yIndex + 1, - 1, - 1, - draggedItem!!.packageName, - draggedItem!!.title, - draggedItem!!.type, - "", - draggedItem!!.drawable - ) + val newHomeScreenGridItem = HomeScreenGridItem( + null, + xIndex, + yIndex, + xIndex + 1, + yIndex + 1, + 1, + 1, + draggedItem!!.packageName, + draggedItem!!.title, + draggedItem!!.type, + "", + draggedItem!!.drawable + ) + ensureBackgroundThread { val newId = context.homeScreenGridItemsDB.insert(newHomeScreenGridItem) newHomeScreenGridItem.id = newId @@ -239,7 +239,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel val infoList = AppWidgetManager.getInstance(context).installedProviders val appWidgetProviderInfo = infoList.firstOrNull { it.provider.shortClassName == draggedItem?.shortClassName } if (appWidgetProviderInfo != null) { - val appWidgetHost = MyAppWidgetHost(context, 12345) + val appWidgetHost = AppWidgetHost(context, WIDGET_HOST_ID) val appWidgetId = appWidgetHost.allocateAppWidgetId() val appWidgetManager = AppWidgetManager.getInstance(context) val canCreateWidget = appWidgetManager.bindAppWidgetIdIfAllowed(appWidgetId, appWidgetProviderInfo.provider) @@ -248,10 +248,10 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel appWidgetHost.startAppWidgetConfigureActivityForResult(context as MainActivity, appWidgetId, 0, REQUEST_CONFIGURE_WIDGET, null) } else { val widgetView = appWidgetHost.createView(context, appWidgetId, appWidgetProviderInfo) - widgetView.x = widgetRect.left * rowWidth + sideMargins.left.toFloat() + widgetMargin - widgetView.y = widgetRect.top * rowHeight + sideMargins.top.toFloat() + widgetMargin - val widgetWidth = draggedItem!!.widthCells * rowWidth - widgetMargin * 2 - val widgetHeight = draggedItem!!.heightCells * rowHeight - widgetMargin * 2 + widgetView.x = widgetRect.left * rowWidth + sideMargins.left.toFloat() + widgetView.y = widgetRect.top * rowHeight + sideMargins.top.toFloat() + val widgetWidth = draggedItem!!.widthCells * rowWidth + val widgetHeight = draggedItem!!.heightCells * rowHeight addView(widgetView, widgetWidth, widgetHeight) } } diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c2b661f..9b26dc1 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -4,5 +4,4 @@ 50dp 140dp 10dp - 6dp