lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move compose components

Browse Source
This commit is contained in:
MM20 2021-09-25 19:55:48 +02:00
parent 518bfd9eab
commit 36ff52cd2b
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
9 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/src/main/java/de/mm20/launcher2/ui/SearchBar.kt → ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt
View File

@ -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.ExperimentalAnimationGraphicsApi
import androidx.compose.animation.graphics.res.animatedVectorResource 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.material.icons.rounded.Search
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.alpha
import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.ExperimentalGraphicsApi
import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle 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.ExperimentalPagerApi
import com.google.accompanist.pager.PagerState import com.google.accompanist.pager.PagerState
import de.mm20.launcher2.search.SearchViewModel import de.mm20.launcher2.search.SearchViewModel
import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.locals.LocalWindowSize import de.mm20.launcher2.ui.locals.LocalWindowSize
/** /**

2
ui/src/main/java/de/mm20/launcher2/ui/SearchColumn.kt → ui/src/main/java/de/mm20/launcher2/ui/component/SearchColumn.kt
View File

@ -1,4 +1,4 @@
package de.mm20.launcher2.ui package de.mm20.launcher2.ui.component
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background import androidx.compose.foundation.background

5
ui/src/main/java/de/mm20/launcher2/ui/WidgetColumn.kt → ui/src/main/java/de/mm20/launcher2/ui/component/WidgetColumn.kt
View File

@ -1,4 +1,4 @@
package de.mm20.launcher2.ui package de.mm20.launcher2.ui.component
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.ExperimentalAnimationApi
@ -21,8 +21,9 @@ import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import com.google.accompanist.insets.navigationBarsPadding import com.google.accompanist.insets.navigationBarsPadding
import com.google.accompanist.systemuicontroller.rememberSystemUiController 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.locals.LocalWindowSize
import de.mm20.launcher2.ui.component.NavBarSpacer
import de.mm20.launcher2.ui.widget.WidgetCard import de.mm20.launcher2.ui.widget.WidgetCard
import de.mm20.launcher2.widgets.Widget import de.mm20.launcher2.widgets.Widget
import de.mm20.launcher2.widgets.WidgetViewModel import de.mm20.launcher2.widgets.WidgetViewModel

7
ui/src/main/java/de/mm20/launcher2/ui/LauncherMainScreen.kt → ui/src/main/java/de/mm20/launcher2/ui/screens/LauncherMainScreen.kt
View File

@ -1,4 +1,4 @@
package de.mm20.launcher2.ui package de.mm20.launcher2.ui.screens
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.ExperimentalAnimationApi
@ -13,12 +13,17 @@ import androidx.compose.runtime.*
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.google.accompanist.insets.systemBarsPadding import com.google.accompanist.insets.systemBarsPadding
import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.ExperimentalPagerApi
import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPager
import com.google.accompanist.pager.rememberPagerState import com.google.accompanist.pager.rememberPagerState
import com.google.accompanist.systemuicontroller.rememberSystemUiController 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.locals.LocalWindowSize
import de.mm20.launcher2.ui.toPixels
import kotlinx.coroutines.InternalCoroutinesApi import kotlinx.coroutines.InternalCoroutinesApi
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine

1
ui/src/main/java/de/mm20/launcher2/ui/search/ApplicationResults.kt
View File

@ -7,7 +7,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import de.mm20.launcher2.applications.AppViewModel import de.mm20.launcher2.applications.AppViewModel
import de.mm20.launcher2.ui.SectionDivider
@Composable @Composable
fun applicationResults(): LazyListScope.(listState: LazyListState) -> Unit { fun applicationResults(): LazyListScope.(listState: LazyListState) -> Unit {

2
ui/src/main/java/de/mm20/launcher2/ui/search/CalculatorItem.kt
View File

@ -15,7 +15,7 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import de.mm20.launcher2.calculator.CalculatorViewModel import de.mm20.launcher2.calculator.CalculatorViewModel
import de.mm20.launcher2.ui.SectionDivider import de.mm20.launcher2.ui.component.SectionDivider
@Composable @Composable
fun calculatorItem(): LazyListScope.() -> Unit { fun calculatorItem(): LazyListScope.() -> Unit {

2
ui/src/main/java/de/mm20/launcher2/ui/search/SearchableGrid.kt
View File

@ -18,7 +18,7 @@ import androidx.compose.ui.viewinterop.AndroidView
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import com.google.accompanist.insets.LocalWindowInsets import com.google.accompanist.insets.LocalWindowInsets
import de.mm20.launcher2.search.data.Searchable 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.ktx.toDp
import de.mm20.launcher2.ui.legacy.search.SearchGridView import de.mm20.launcher2.ui.legacy.search.SearchGridView
import de.mm20.launcher2.ui.locals.LocalWindowSize import de.mm20.launcher2.ui.locals.LocalWindowSize

2
ui/src/main/java/de/mm20/launcher2/ui/search/SearchableList.kt
View File

@ -4,7 +4,7 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import de.mm20.launcher2.search.data.Searchable import de.mm20.launcher2.search.data.Searchable
import de.mm20.launcher2.ui.SectionDivider import de.mm20.launcher2.ui.component.SectionDivider
fun LazyListScope.SearchableList( fun LazyListScope.SearchableList(
items: List<Searchable> items: List<Searchable>

2
ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaResult.kt
View File

@ -7,7 +7,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel 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 import de.mm20.launcher2.wikipedia.WikipediaViewModel
@Composable @Composable