From f4e843f114ce04b744a74e108ab697adde09ff8f Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 21 Feb 2023 15:11:34 -0500 Subject: [PATCH] Fix package names --- .../tachiyomi/presentation/widget/UpdatesGridGlanceWidget.kt | 2 ++ .../tachiyomi/presentation/widget/components/LockedWidget.kt | 2 +- .../presentation/widget/components/UpdatesMangaCover.kt | 2 +- .../tachiyomi/presentation/widget/components/UpdatesWidget.kt | 4 ++-- .../java/tachiyomi/presentation/widget/util/GlanceUtils.kt | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/UpdatesGridGlanceWidget.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/UpdatesGridGlanceWidget.kt index 03b50d848..b467651d8 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/UpdatesGridGlanceWidget.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/UpdatesGridGlanceWidget.kt @@ -32,6 +32,8 @@ import tachiyomi.presentation.widget.components.CoverHeight import tachiyomi.presentation.widget.components.CoverWidth import tachiyomi.presentation.widget.components.LockedWidget import tachiyomi.presentation.widget.components.UpdatesWidget +import tachiyomi.presentation.widget.util.appWidgetBackgroundRadius +import tachiyomi.presentation.widget.util.calculateRowAndColumnCount import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/LockedWidget.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/LockedWidget.kt index 8768f8c13..730ab0670 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/LockedWidget.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/LockedWidget.kt @@ -18,7 +18,7 @@ import androidx.glance.unit.ColorProvider import tachiyomi.core.Constants import tachiyomi.presentation.widget.ContainerModifier import tachiyomi.presentation.widget.R -import tachiyomi.presentation.widget.stringResource +import tachiyomi.presentation.widget.util.stringResource @Composable fun LockedWidget() { diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesMangaCover.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesMangaCover.kt index 58bcd3635..888acec88 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesMangaCover.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesMangaCover.kt @@ -11,7 +11,7 @@ import androidx.glance.layout.ContentScale import androidx.glance.layout.fillMaxSize import androidx.glance.layout.size import tachiyomi.presentation.widget.R -import tachiyomi.presentation.widget.appWidgetInnerRadius +import tachiyomi.presentation.widget.util.appWidgetInnerRadius val CoverWidth = 58.dp val CoverHeight = 87.dp diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesWidget.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesWidget.kt index ac9508abd..9d5ce0590 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesWidget.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/components/UpdatesWidget.kt @@ -20,8 +20,8 @@ import androidx.glance.text.Text import tachiyomi.core.Constants import tachiyomi.presentation.widget.ContainerModifier import tachiyomi.presentation.widget.R -import tachiyomi.presentation.widget.calculateRowAndColumnCount -import tachiyomi.presentation.widget.stringResource +import tachiyomi.presentation.widget.util.calculateRowAndColumnCount +import tachiyomi.presentation.widget.util.stringResource @Composable fun UpdatesWidget(data: List>?) { diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/util/GlanceUtils.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/util/GlanceUtils.kt index dc131941d..fe8360a0e 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/util/GlanceUtils.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/util/GlanceUtils.kt @@ -1,4 +1,4 @@ -package tachiyomi.presentation.widget +package tachiyomi.presentation.widget.util import androidx.annotation.StringRes import androidx.compose.runtime.Composable @@ -6,6 +6,7 @@ import androidx.compose.ui.unit.DpSize import androidx.glance.GlanceModifier import androidx.glance.LocalContext import androidx.glance.appwidget.cornerRadius +import tachiyomi.presentation.widget.R fun GlanceModifier.appWidgetBackgroundRadius(): GlanceModifier { return this.cornerRadius(R.dimen.appwidget_background_radius)