From 5c0d142fd958e1bab97946cc7be12ee86744d528 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Mon, 3 Jan 2022 20:41:43 +0100
Subject: [PATCH] Fix weather widget package

---
 .../launcher2/ui/launcher/widgets/weather/WeatherWidget.kt    | 3 +--
 .../java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt  | 3 +--
 ui/src/main/java/de/mm20/launcher2/ui/widget/WidgetCard.kt    | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
index 812a9168..ada73f25 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
@@ -1,4 +1,4 @@
-package de.mm20.launcher2.ui.widget
+package de.mm20.launcher2.ui.launcher.widgets.weather
 
 import android.content.Context
 import android.content.Intent
@@ -28,7 +28,6 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import de.mm20.launcher2.ktx.tryStartActivity
 import de.mm20.launcher2.ui.R
-import de.mm20.launcher2.ui.launcher.widgets.weather.WeatherWidgetWM
 import de.mm20.launcher2.ui.weather.AnimatedWeatherIcon
 import de.mm20.launcher2.ui.weather.WeatherIcon
 import de.mm20.launcher2.weather.DailyForecast
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt
index 55c19fe9..52c0172b 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt
@@ -2,7 +2,6 @@ package de.mm20.launcher2.ui.legacy.widget
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.View
 import android.widget.FrameLayout
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.LocalContentColor
@@ -11,7 +10,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.ComposeView
 import de.mm20.launcher2.ui.LegacyLauncherTheme
 import de.mm20.launcher2.ui.R
-import de.mm20.launcher2.ui.widget.WeatherWidget
+import de.mm20.launcher2.ui.launcher.widgets.weather.WeatherWidget
 
 class WeatherWidget : LauncherWidget {
 
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/widget/WidgetCard.kt b/ui/src/main/java/de/mm20/launcher2/ui/widget/WidgetCard.kt
index d3e017ee..12a8f337 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/widget/WidgetCard.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/widget/WidgetCard.kt
@@ -3,7 +3,6 @@ package de.mm20.launcher2.ui.widget
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.animateIntOffsetAsState
-import androidx.compose.foundation.gestures.draggable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
@@ -11,11 +10,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Card
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
-import de.mm20.launcher2.ui.ktx.toIntOffset
+import de.mm20.launcher2.ui.launcher.widgets.weather.WeatherWidget
 import de.mm20.launcher2.widgets.Widget
 import de.mm20.launcher2.widgets.WidgetType