fixup!: (feat) widgets: properly migrate widget host (bde5d34a) · Commits · e / os / BlissLauncher3

bliss/src/foundation/e/bliss/widgets/WidgetContainer.kt

+11 −8

Original line number	Diff line number	Diff line
		@@ -200,7 +200,6 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) :
		mWidgetHost.startListening()
		loadWidgets()
		}

		return mWrapper
		}

		@@ -251,14 +250,18 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) :
		widgetsDbHelper
		.getWidgets()
		.sortedBy { it.position }
		.forEach { addView(it.widgetId, false) }
		.forEach { addView(it.widgetId) }
		} else {
		if (mOldWidgets.isNotEmpty()) {
		mOldWidgets
		.filter { mWidgetHost.appWidgetIds.contains(it.id) }
		.sortedWith(
		compareBy(BlissDbUtils.WidgetItems::order, BlissDbUtils.WidgetItems::id)
		)
		.forEach { addView(it.id, true) }
		} else {
		mWidgetHost.appWidgetIds.sorted().forEach { addView(it, true) }
		}
		}
		}