From 023f5c06b5016aac4f13be63fffd9a5b6c5be512 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 29 Jan 2022 19:25:48 +0100 Subject: [PATCH] Move weather icon components to components package --- .../ui/{ => component}/weather/AnimatedWeatherIcon.kt | 3 +-- .../mm20/launcher2/ui/{ => component}/weather/WeatherIcon.kt | 2 +- .../launcher2/ui/launcher/widgets/weather/WeatherWidget.kt | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) rename ui/src/main/java/de/mm20/launcher2/ui/{ => component}/weather/AnimatedWeatherIcon.kt (99%) rename ui/src/main/java/de/mm20/launcher2/ui/{ => component}/weather/WeatherIcon.kt (99%) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/weather/AnimatedWeatherIcon.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt similarity index 99% rename from ui/src/main/java/de/mm20/launcher2/ui/weather/AnimatedWeatherIcon.kt rename to ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt index 47b96193..d4317c62 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/weather/AnimatedWeatherIcon.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui.weather +package de.mm20.launcher2.ui.component.weather import androidx.compose.animation.Crossfade import androidx.compose.animation.animateColor @@ -27,7 +27,6 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.res.colorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import de.mm20.launcher2.ui.* import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.icons.* import kotlin.math.PI diff --git a/ui/src/main/java/de/mm20/launcher2/ui/weather/WeatherIcon.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt similarity index 99% rename from ui/src/main/java/de/mm20/launcher2/ui/weather/WeatherIcon.kt rename to ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt index 07bad8b5..38085449 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/weather/WeatherIcon.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui.weather +package de.mm20.launcher2.ui.component.weather import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.offset 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 6e4bbd54..c1d1e8c8 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 @@ -31,8 +31,8 @@ import de.mm20.launcher2.ktx.tryStartActivity import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.common.WeatherLocationSearchDialog import de.mm20.launcher2.ui.component.MissingPermissionBanner -import de.mm20.launcher2.ui.weather.AnimatedWeatherIcon -import de.mm20.launcher2.ui.weather.WeatherIcon +import de.mm20.launcher2.ui.component.weather.AnimatedWeatherIcon +import de.mm20.launcher2.ui.component.weather.WeatherIcon import de.mm20.launcher2.weather.DailyForecast import de.mm20.launcher2.weather.Forecast import java.text.DateFormat