From 36ff52cd2b02251ee6b957a3c32486b8ba130700 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 25 Sep 2021 19:55:48 +0200 Subject: [PATCH] Move compose components --- .../java/de/mm20/launcher2/ui/{ => component}/SearchBar.kt | 5 ++--- .../de/mm20/launcher2/ui/{ => component}/SearchColumn.kt | 2 +- .../de/mm20/launcher2/ui/{ => component}/WidgetColumn.kt | 5 +++-- .../mm20/launcher2/ui/{ => screens}/LauncherMainScreen.kt | 7 ++++++- .../java/de/mm20/launcher2/ui/search/ApplicationResults.kt | 1 - .../java/de/mm20/launcher2/ui/search/CalculatorItem.kt | 2 +- .../java/de/mm20/launcher2/ui/search/SearchableGrid.kt | 2 +- .../java/de/mm20/launcher2/ui/search/SearchableList.kt | 2 +- .../java/de/mm20/launcher2/ui/search/WikipediaResult.kt | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) rename ui/src/main/java/de/mm20/launcher2/ui/{ => component}/SearchBar.kt (96%) rename ui/src/main/java/de/mm20/launcher2/ui/{ => component}/SearchColumn.kt (98%) rename ui/src/main/java/de/mm20/launcher2/ui/{ => component}/WidgetColumn.kt (97%) rename ui/src/main/java/de/mm20/launcher2/ui/{ => screens}/LauncherMainScreen.kt (94%) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/SearchBar.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt similarity index 96% rename from ui/src/main/java/de/mm20/launcher2/ui/SearchBar.kt rename to ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt index 5fcae94d..9e97a7b8 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/SearchBar.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui +package de.mm20.launcher2.ui.component import androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi import androidx.compose.animation.graphics.res.animatedVectorResource @@ -11,11 +11,9 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Search import androidx.compose.runtime.* import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.focus.onFocusChanged -import androidx.compose.ui.graphics.ExperimentalGraphicsApi import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -26,6 +24,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.PagerState import de.mm20.launcher2.search.SearchViewModel +import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.locals.LocalWindowSize /** diff --git a/ui/src/main/java/de/mm20/launcher2/ui/SearchColumn.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/SearchColumn.kt similarity index 98% rename from ui/src/main/java/de/mm20/launcher2/ui/SearchColumn.kt rename to ui/src/main/java/de/mm20/launcher2/ui/component/SearchColumn.kt index 696c014e..364ee8b9 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/SearchColumn.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/SearchColumn.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui +package de.mm20.launcher2.ui.component import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background diff --git a/ui/src/main/java/de/mm20/launcher2/ui/WidgetColumn.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/WidgetColumn.kt similarity index 97% rename from ui/src/main/java/de/mm20/launcher2/ui/WidgetColumn.kt rename to ui/src/main/java/de/mm20/launcher2/ui/component/WidgetColumn.kt index c6395c42..f329b96e 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/WidgetColumn.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/WidgetColumn.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui +package de.mm20.launcher2.ui.component import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi @@ -21,8 +21,9 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.google.accompanist.insets.navigationBarsPadding import com.google.accompanist.systemuicontroller.rememberSystemUiController +import de.mm20.launcher2.ui.ClockWidget +import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.locals.LocalWindowSize -import de.mm20.launcher2.ui.component.NavBarSpacer import de.mm20.launcher2.ui.widget.WidgetCard import de.mm20.launcher2.widgets.Widget import de.mm20.launcher2.widgets.WidgetViewModel diff --git a/ui/src/main/java/de/mm20/launcher2/ui/LauncherMainScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/screens/LauncherMainScreen.kt similarity index 94% rename from ui/src/main/java/de/mm20/launcher2/ui/LauncherMainScreen.kt rename to ui/src/main/java/de/mm20/launcher2/ui/screens/LauncherMainScreen.kt index 4c856314..4a9d1d70 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/LauncherMainScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/screens/LauncherMainScreen.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui +package de.mm20.launcher2.ui.screens import androidx.activity.compose.BackHandler import androidx.compose.animation.ExperimentalAnimationApi @@ -13,12 +13,17 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp +import androidx.navigation.NavController import com.google.accompanist.insets.systemBarsPadding import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.rememberPagerState import com.google.accompanist.systemuicontroller.rememberSystemUiController +import de.mm20.launcher2.ui.component.SearchBar +import de.mm20.launcher2.ui.component.SearchColumn +import de.mm20.launcher2.ui.component.WidgetColumn import de.mm20.launcher2.ui.locals.LocalWindowSize +import de.mm20.launcher2.ui.toPixels import kotlinx.coroutines.InternalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.combine diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/ApplicationResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/ApplicationResults.kt index 927c572d..5687d6b5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/search/ApplicationResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/search/ApplicationResults.kt @@ -7,7 +7,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.lifecycle.viewmodel.compose.viewModel import de.mm20.launcher2.applications.AppViewModel -import de.mm20.launcher2.ui.SectionDivider @Composable fun applicationResults(): LazyListScope.(listState: LazyListState) -> Unit { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt index 2686a0d4..9fdbcf83 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import de.mm20.launcher2.calculator.CalculatorViewModel -import de.mm20.launcher2.ui.SectionDivider +import de.mm20.launcher2.ui.component.SectionDivider @Composable fun calculatorItem(): LazyListScope.() -> Unit { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableGrid.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableGrid.kt index f532d5e7..55e97290 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableGrid.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableGrid.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.zIndex import com.google.accompanist.insets.LocalWindowInsets import de.mm20.launcher2.search.data.Searchable -import de.mm20.launcher2.ui.SectionDivider +import de.mm20.launcher2.ui.component.SectionDivider import de.mm20.launcher2.ui.ktx.toDp import de.mm20.launcher2.ui.legacy.search.SearchGridView import de.mm20.launcher2.ui.locals.LocalWindowSize diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableList.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableList.kt index d6c4bd81..45dcb381 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableList.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/search/SearchableList.kt @@ -4,7 +4,7 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import de.mm20.launcher2.search.data.Searchable -import de.mm20.launcher2.ui.SectionDivider +import de.mm20.launcher2.ui.component.SectionDivider fun LazyListScope.SearchableList( items: List diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaResult.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaResult.kt index 90c57069..d9cfdb16 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaResult.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaResult.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import de.mm20.launcher2.ui.SectionDivider +import de.mm20.launcher2.ui.component.SectionDivider import de.mm20.launcher2.wikipedia.WikipediaViewModel @Composable