Update to Compose + UI v0.1.0-dev12 (#621)

* Update to Compose + UI v0.1.0-dev12 * Remove custom paddingHV * Repeat after me: padding after clickable
chrisbanes · May 29, 2020 · 17d4a49 · 17d4a49
1 parent f1b4bd9
commit 17d4a49
Show file tree

Hide file tree

Showing 32 changed files with 233 additions and 457 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,9 @@ play-account.json
 
 # Do not commit firebase config
 google-services.json
+
+# VS Code config
+org.eclipse.buildship.core.prefs
+.classpath
+.project
+bin/
diff --git a/app/build.gradle b/app/build.gradle
@@ -186,8 +186,8 @@ dependencies {
     implementation project(':ui-recommended')
     implementation project(':ui-search')
 
-    implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
+    implementation Libs.AndroidX.Lifecycle.livedata
+    implementation Libs.AndroidX.Lifecycle.viewmodel
 
     implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.browser

diff --git a/base-android/src/main/java/app/tivi/util/Event.kt b/base-android/src/main/java/app/tivi/util/Event.kt
diff --git a/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt b/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt
@@ -53,7 +53,7 @@ object Libs {
     }
 
     object Accompanist {
-        private const val version = "0.1.2"
+        private const val version = "0.1.3-SNAPSHOT"
         const val mdcTheme = "dev.chrisbanes.accompanist:accompanist-mdc-theme:$version"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
@@ -134,7 +134,8 @@ object Libs {
         object Lifecycle {
             private const val version = "2.2.0"
             const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
-            const val viewmodelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
+            const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
+            const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
 
         object Room {
@@ -152,7 +153,7 @@ object Libs {
         }
 
         object Compose {
-            const val version = "0.1.0-dev11"
+            const val version = "0.1.0-dev12"
             const val kotlinCompilerVersion = "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
 
             const val runtime = "androidx.compose:compose-runtime:$version"

diff --git a/common-entrygrid/build.gradle b/common-entrygrid/build.gradle
@@ -52,8 +52,8 @@ dependencies {
     implementation project(':common-layouts')
     implementation project(':common-databinding')
 
-    implementation Libs.AndroidX.Lifecycle.extensions
-    implementation Libs.AndroidX.Lifecycle.viewmodelKtx
+    implementation Libs.AndroidX.Lifecycle.livedata
+    implementation Libs.AndroidX.Lifecycle.viewmodel
 
     implementation Libs.AndroidX.Paging.runtime
 

diff --git a/common-ui-compose/build.gradle b/common-ui-compose/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     api project(':common-imageloading')
 
     implementation Libs.AndroidX.coreKtx
+    implementation Libs.AndroidX.Lifecycle.livedata
 
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.UI.foundation

diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/ComposeTypedArray.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/ComposeTypedArray.kt
diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/ExpandingSummary.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/ExpandingSummary.kt
@@ -22,18 +22,14 @@ import androidx.compose.setValue
 import androidx.compose.state
 import androidx.compose.stateFor
 import androidx.ui.core.Modifier
-import androidx.ui.foundation.Box
-import androidx.ui.foundation.Clickable
 import androidx.ui.foundation.Text
-import androidx.ui.material.EmphasisAmbient
+import androidx.ui.foundation.clickable
 import androidx.ui.material.MaterialTheme
-import androidx.ui.material.ProvideEmphasis
-import androidx.ui.material.ripple.ripple
 import androidx.ui.text.TextStyle
 import androidx.ui.text.style.TextOverflow
 
 @Composable
-fun ExpandingSummary(
+fun ExpandingText(
     text: String,
     textStyle: TextStyle = MaterialTheme.typography.body2,
     expandable: Boolean = true,
@@ -42,25 +38,21 @@ fun ExpandingSummary(
     modifier: Modifier = Modifier
 ) {
     var canTextExpand by stateFor(text) { true }
+    var expanded by state { false }
 
-    Box(modifier = Modifier.ripple(bounded = true, enabled = expandable && canTextExpand)) {
-        var expanded by state { false }
-
-        Clickable(onClick = { expanded = !expanded }, enabled = expandable && canTextExpand) {
-            ProvideEmphasis(emphasis = EmphasisAmbient.current.high) {
-                Text(
-                    text = text,
-                    style = textStyle,
-                    overflow = TextOverflow.Ellipsis,
-                    maxLines = if (expanded) expandedMaxLines else collapsedMaxLines,
-                    modifier = modifier,
-                    onTextLayout = {
-                        if (!expanded) {
-                            canTextExpand = it.hasVisualOverflow
-                        }
-                    }
-                )
+    Text(
+        text = text,
+        style = textStyle,
+        overflow = TextOverflow.Ellipsis,
+        maxLines = if (expanded) expandedMaxLines else collapsedMaxLines,
+        modifier = Modifier.clickable(
+            onClick = { expanded = !expanded },
+            enabled = expandable && canTextExpand
+        ).plus(modifier),
+        onTextLayout = {
+            if (!expanded) {
+                canTextExpand = it.hasVisualOverflow
             }
         }
-    }
+    )
 }
diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/PopupMenu.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/PopupMenu.kt
@@ -23,9 +23,8 @@ import androidx.ui.animation.Crossfade
 import androidx.ui.core.Alignment
 import androidx.ui.core.Modifier
 import androidx.ui.core.Popup
-import androidx.ui.core.PopupProperties
-import androidx.ui.foundation.Clickable
 import androidx.ui.foundation.Text
+import androidx.ui.foundation.clickable
 import androidx.ui.layout.Column
 import androidx.ui.layout.padding
 import androidx.ui.layout.preferredSizeIn
@@ -35,7 +34,6 @@ import androidx.ui.material.EmphasisAmbient
 import androidx.ui.material.MaterialTheme
 import androidx.ui.material.ProvideEmphasis
 import androidx.ui.material.Surface
-import androidx.ui.material.ripple.ripple
 import androidx.ui.unit.IntPx
 import androidx.ui.unit.IntPxPosition
 import androidx.ui.unit.dp
@@ -51,10 +49,8 @@ fun PopupMenu(
         Popup(
             alignment = alignment,
             offset = offset,
-            popupProperties = PopupProperties(
-                isFocusable = true,
-                onDismissRequest = { visible.value = false }
-            )
+            isFocusable = true,
+            onDismissRequest = { visible.value = false }
         ) {
             Crossfade(current = visible.value) {
                 Surface(
@@ -67,25 +63,23 @@ fun PopupMenu(
                             .preferredSizeIn(minWidth = 96.dp, maxWidth = 192.dp)
                     ) {
                         items.forEach { item ->
-                            Clickable(
-                                onClick = {
-                                    item.onClick?.invoke()
-                                    visible.value = false
-                                },
-                                enabled = item.enabled,
-                                modifier = Modifier.ripple(enabled = item.enabled)
-                            ) {
-                                val emphasis = when {
-                                    item.enabled -> EmphasisAmbient.current.high
-                                    else -> EmphasisAmbient.current.disabled
-                                }
-                                ProvideEmphasis(emphasis) {
-                                    Text(
-                                        text = item.title,
-                                        style = MaterialTheme.typography.body1,
-                                        modifier = Modifier.padding(16.dp)
-                                    )
-                                }
+                            val emphasis = when {
+                                item.enabled -> EmphasisAmbient.current.high
+                                else -> EmphasisAmbient.current.disabled
+                            }
+                            ProvideEmphasis(emphasis) {
+                                Text(
+                                    text = item.title,
+                                    style = MaterialTheme.typography.body1,
+                                    modifier = Modifier.clickable(
+                                            onClick = {
+                                                item.onClick?.invoke()
+                                                visible.value = false
+                                            },
+                                            enabled = item.enabled
+                                        )
+                                        .padding(16.dp)
+                                )
                             }
                         }
                     }

diff --git a/common-ui-compose/src/main/java/app/tivi/common/compose/ambients.kt b/common-ui-compose/src/main/java/app/tivi/common/compose/ambients.kt
@@ -16,20 +16,7 @@
 
 package app.tivi.common.compose
 
-import androidx.compose.Composable
-import androidx.compose.Providers
 import androidx.compose.staticAmbientOf
 import app.tivi.util.TiviDateFormatter
 
 val TiviDateFormatterAmbient = staticAmbientOf<TiviDateFormatter>()
-
-@Composable
-fun WrapWithAmbients(
-    tiviDateFormatter: TiviDateFormatter,
-    insetsHolder: InsetsHolder,
-    content: @Composable () -> Unit
-) = Providers(
-    TiviDateFormatterAmbient provides tiviDateFormatter,
-    InsetsAmbient provides insetsHolder,
-    children = content
-)