From 41707672ce910b67b40c199983da7b82cf1e4e4b Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 11 Apr 2022 22:16:34 +0200 Subject: [PATCH] Move LauncherTheme to theme package --- .../de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt | 2 +- .../java/de/mm20/launcher2/ui/launcher/search/SearchBarView.kt | 2 +- .../java/de/mm20/launcher2/ui/launcher/search/SearchView.kt | 2 +- .../java/de/mm20/launcher2/ui/launcher/widgets/WidgetsView.kt | 2 +- .../ui/launcher/widgets/picker/PickAppWidgetActivity.kt | 2 +- .../main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt | 2 +- .../main/java/de/mm20/launcher2/ui/{ => theme}/LauncherTheme.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename ui/src/main/java/de/mm20/launcher2/ui/{ => theme}/LauncherTheme.kt (98%) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt index 7c414145..12fa71cc 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsView.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties -import de.mm20.launcher2.ui.LauncherTheme +import de.mm20.launcher2.ui.theme.LauncherTheme import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.base.ProvideSettings import de.mm20.launcher2.ui.ktx.toPixels diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBarView.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBarView.kt index 64e1e36d..ba830067 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBarView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBarView.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.platform.ComposeView import androidx.lifecycle.MutableLiveData import de.mm20.launcher2.preferences.LauncherDataStore import de.mm20.launcher2.preferences.Settings -import de.mm20.launcher2.ui.LauncherTheme +import de.mm20.launcher2.ui.theme.LauncherTheme import de.mm20.launcher2.ui.locals.LocalCardStyle import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchView.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchView.kt index 2eb6e652..533b4500 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchView.kt @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.ui.Modifier import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.unit.dp -import de.mm20.launcher2.ui.LauncherTheme +import de.mm20.launcher2.ui.theme.LauncherTheme import de.mm20.launcher2.ui.base.ProvideSettings import de.mm20.launcher2.ui.launcher.search.apps.AppResults import de.mm20.launcher2.ui.launcher.search.appshortcuts.AppShortcutResults diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsView.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsView.kt index aa4d9e03..94f0993d 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsView.kt @@ -42,7 +42,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import de.mm20.launcher2.ui.ClockWidget -import de.mm20.launcher2.ui.LauncherTheme +import de.mm20.launcher2.ui.theme.LauncherTheme import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.base.ProvideSettings import de.mm20.launcher2.ui.ktx.toDp diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt index 3075b7aa..6c362b95 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt @@ -18,7 +18,7 @@ import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import de.mm20.launcher2.ui.LauncherTheme +import de.mm20.launcher2.ui.theme.LauncherTheme import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.base.BaseActivity import de.mm20.launcher2.ui.base.ProvideSettings diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt index 29922899..08866267 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt @@ -15,7 +15,7 @@ import de.mm20.launcher2.licenses.AppLicense import de.mm20.launcher2.licenses.OpenSourceLicenses import de.mm20.launcher2.preferences.LauncherDataStore import de.mm20.launcher2.preferences.Settings -import de.mm20.launcher2.ui.LauncherTheme +import de.mm20.launcher2.ui.theme.LauncherTheme import de.mm20.launcher2.ui.base.BaseActivity import de.mm20.launcher2.ui.locals.LocalCardStyle import de.mm20.launcher2.ui.locals.LocalNavController diff --git a/ui/src/main/java/de/mm20/launcher2/ui/LauncherTheme.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt similarity index 98% rename from ui/src/main/java/de/mm20/launcher2/ui/LauncherTheme.kt rename to ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt index 31b59cd6..3b191ac3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/LauncherTheme.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui +package de.mm20.launcher2.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme