From d1244ae1981fcb51291c6068e2b88404267f19e1 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 24 Sep 2021 21:29:25 +0200 Subject: [PATCH] Wikipedia: always show card background (Compose) --- .../mm20/launcher2/ui/search/WikipediaItem.kt | 3 +-- .../launcher2/ui/search/WikipediaResult.kt | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaItem.kt index 11b7899c..f3bd8f85 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/search/WikipediaItem.kt @@ -28,12 +28,11 @@ fun WikipediaItem( initialRepresentation: Representation, onRepresentationChange: ((Representation) -> Unit) ) { - val hPadding = if (initialRepresentation == Representation.Full) 8.dp else 16.dp Column( modifier = Modifier ) { Column( - modifier = Modifier.padding(start = hPadding, end = hPadding, top = 16.dp) + modifier = Modifier.padding(start = 16.dp, end = 24.dp, top = 16.dp) ) { Text( text = wikipedia.label, 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 e043c9fb..90c57069 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 @@ -1,9 +1,11 @@ package de.mm20.launcher2.ui.search import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.material.Card import androidx.compose.runtime.Composable 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.wikipedia.WikipediaViewModel @@ -15,12 +17,16 @@ fun wikipediaResult(): LazyListScope.() -> Unit { return { wikipedia?.let { item { - WikipediaItem( - wikipedia = it, - representation = Representation.Full, - initialRepresentation = Representation.Full, - onRepresentationChange = {} - ) + Card( + elevation = 0.dp + ) { + WikipediaItem( + wikipedia = it, + representation = Representation.Full, + initialRepresentation = Representation.Full, + onRepresentationChange = {} + ) + } } SectionDivider() }