Migrate to dev04

Author: zsoltk

app/build.gradle

@@ -32,7 +32,9 @@ android {
     buildFeatures {
         compose true
     }
-
+    composeOptions {
+        kotlinCompilerExtensionVersion "0.1.0-dev04"
+    }
 }
 
 dependencies {
@@ -42,12 +44,12 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation "androidx.lifecycle:lifecycle-livedata:2.1.0"
-    implementation 'androidx.ui:ui-framework:0.1.0-dev03'
-    implementation 'androidx.ui:ui-layout:0.1.0-dev03'
-    implementation 'androidx.ui:ui-foundation:0.1.0-dev03'
-    implementation 'androidx.ui:ui-material:0.1.0-dev03'
-    implementation 'androidx.ui:ui-tooling:0.1.0-dev03'
-    implementation 'com.github.zsoltk:compose-router:0.3.1'
+    implementation 'androidx.ui:ui-framework:0.1.0-dev04'
+    implementation 'androidx.ui:ui-layout:0.1.0-dev04'
+    implementation 'androidx.ui:ui-foundation:0.1.0-dev04'
+    implementation 'androidx.ui:ui-material:0.1.0-dev04'
+    implementation 'androidx.ui:ui-tooling:0.1.0-dev04'
+    implementation 'com.github.zsoltk:compose-router:0.4.0'
     implementation "io.reactivex.rxjava2:rxjava:2.2.17"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     testImplementation 'junit:junit:4.12'

app/src/main/java/com/github/zsoltk/pokedex/Theme.kt

@@ -1,19 +1,9 @@
 package com.github.zsoltk.pokedex
 
-import android.graphics.Paint
-import android.graphics.Rect
-import androidx.compose.Composable
-import androidx.compose.memo
-import androidx.compose.unaryPlus
-import androidx.ui.core.Draw
 import androidx.ui.graphics.Color
-import androidx.ui.layout.Arrangement
-import androidx.ui.layout.Container
-import androidx.ui.layout.Row
-import androidx.ui.material.ColorPalette
-import androidx.ui.tooling.preview.Preview
+import androidx.ui.material.lightColorPalette
 
-val lightThemeColors = ColorPalette(
+val lightThemeColors = lightColorPalette(
     primary = Color.White,
     primaryVariant = Color(0xFFC20029),
     onPrimary = Color.Black,
@@ -26,17 +16,3 @@ val lightThemeColors = ColorPalette(
     error = Color(0xFFD00036),
     onError = Color.White
 )
-
-@Preview
-@Composable
-fun bla() {
-    val paint = +memo { Paint().apply { color = 0xFFFA6555.toInt() } }
-    Container(expanded = true) {
-        Row(arrangement = Arrangement.Center) {
-            Draw { canvas, parentSize ->
-                //        paint.color = +colorResource(R.color.red)
-                canvas.nativeCanvas.drawRect(Rect(0, 0, 100, 4), paint)
-            }
-        }
-    }
-}

app/src/main/java/com/github/zsoltk/pokedex/common/HorizontalRuler.kt

@@ -1,15 +1,15 @@
 package com.github.zsoltk.pokedex.common
 
 import androidx.compose.Composable
-import androidx.ui.core.Dp
-import androidx.ui.core.dp
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Arrangement
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.layout.Row
-import androidx.ui.layout.WidthSpacer
+import androidx.ui.layout.Spacer
 import androidx.ui.material.surface.Surface
+import androidx.ui.unit.Dp
+import androidx.ui.unit.dp
 
 @Composable
 fun HorizontalRuler(
@@ -19,7 +19,7 @@ fun HorizontalRuler(
     centered: Boolean = true
 ) {
     Row(
-        modifier = ExpandedWidth,
+        modifier = LayoutWidth.Fill,
         arrangement = if (centered) Arrangement.Center else Arrangement.Begin
     ) {
         Surface(color = color) {
@@ -28,7 +28,7 @@ fun HorizontalRuler(
                 width = width,
                 height = height
             ) {
-                WidthSpacer(width = 1.dp)
+                Spacer(modifier = LayoutWidth(1.dp))
             }
         }
     }

app/src/main/java/com/github/zsoltk/pokedex/common/Image.kt

@@ -1,14 +1,13 @@
 package com.github.zsoltk.pokedex.common
 
 import androidx.compose.Composable
-import androidx.compose.unaryPlus
 import androidx.ui.foundation.DrawImage
 import androidx.ui.graphics.Color
 import androidx.ui.res.loadImageResource
 
 @Composable
 fun LoadImage(imageResId: Int, tint: Color? = null) {
-    (+loadImageResource(imageResId)).resource.resource?.let {
+    loadImageResource(imageResId).resource.resource?.let {
         DrawImage(
             image = it,
             tint = tint

app/src/main/java/com/github/zsoltk/pokedex/common/Observe.kt

@@ -1,9 +1,11 @@
 package com.github.zsoltk.pokedex.common
 
 import androidx.annotation.CheckResult
+import androidx.compose.Composable
 import androidx.compose.effectOf
 import androidx.compose.memo
 import androidx.compose.onCommit
+import androidx.compose.remember
 import androidx.compose.state
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
@@ -18,16 +20,17 @@ sealed class AsyncState<T> {
 
 /**
  * Based on https://medium.com/swlh/android-mvi-with-jetpack-compose-b0890f5156ac
+ * Adapted for 0.1.0-dev04
  */
-@CheckResult(suggest = "+")
-fun <T> observe(data: LiveData<T>) = effectOf<T?> {
-    var result by +state { data.value }
-    val observer = +memo { Observer<T> { result = it } }
+@Composable
+fun <T> observe(data: LiveData<T>): T? {
+    var result by state { data.value }
+    val observer = remember { Observer<T> { result = it } }
 
-    +onCommit(data) {
+    onCommit(data) {
         data.observeForever(observer)
         onDispose { data.removeObserver(observer) }
     }
 
-    result
+    return result
 }

app/src/main/java/com/github/zsoltk/pokedex/common/PokeBall.kt

@@ -2,10 +2,10 @@ package com.github.zsoltk.pokedex.common
 
 import androidx.compose.Composable
 import androidx.ui.core.Opacity
-import androidx.ui.core.dp
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Container
 import androidx.ui.tooling.preview.Preview
+import androidx.ui.unit.dp
 import com.github.zsoltk.pokedex.R
 
 @Composable

app/src/main/java/com/github/zsoltk/pokedex/common/PokeBallBackground.kt

@@ -1,19 +1,19 @@
 package com.github.zsoltk.pokedex.common
 
 import androidx.compose.Composable
-import androidx.compose.unaryPlus
 import androidx.ui.core.Alignment
-import androidx.ui.core.dp
 import androidx.ui.layout.Container
-import androidx.ui.layout.StackChildren
+import androidx.ui.layout.EdgeInsets
 import androidx.ui.res.colorResource
+import androidx.ui.unit.dp
 import com.github.zsoltk.pokedex.R
 
 @Composable
-fun StackChildren.PokeBallBackground() {
-    positioned(
-        topInset =(-70).dp,
-        rightInset = (-90).dp
+fun PokeBallBackground() {
+    Container(
+        alignment = Alignment.TopRight,
+        padding = EdgeInsets(top = (-70).dp, right = (-90).dp),
+        expanded = true
     ) {
         Container(
             width = 240.dp,
@@ -22,7 +22,7 @@ fun StackChildren.PokeBallBackground() {
             alignment = Alignment.TopRight
         ) {
             PokeBallLarge(
-                +colorResource(
+                colorResource(
                     R.color.grey_100
                 )
             )

app/src/main/java/com/github/zsoltk/pokedex/common/PokemonTypeLabels.kt

@@ -1,20 +1,21 @@
 package com.github.zsoltk.pokedex.common
 
 import androidx.compose.Composable
-import androidx.compose.unaryPlus
-import androidx.ui.core.Dp
 import androidx.ui.core.Text
-import androidx.ui.core.TextUnit
-import androidx.ui.core.dp
-import androidx.ui.core.sp
 import androidx.ui.foundation.shape.corner.RoundedCornerShape
 import androidx.ui.graphics.Color
-import androidx.ui.layout.FixedSpacer
+import androidx.ui.layout.LayoutHeight
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.layout.Padding
+import androidx.ui.layout.Spacer
 import androidx.ui.material.surface.Surface
 import androidx.ui.res.colorResource
 import androidx.ui.text.TextStyle
 import androidx.ui.text.font.FontFamily
+import androidx.ui.unit.Dp
+import androidx.ui.unit.TextUnit
+import androidx.ui.unit.dp
+import androidx.ui.unit.sp
 import com.github.zsoltk.pokedex.R
 
 data class TypeLabelMetrics(
@@ -39,7 +40,7 @@ fun PokemonTypeLabels(types: List<String>?, metrics: TypeLabelMetrics) {
         ) {
             PokemonTypeLabel(it, metrics)
         }
-        FixedSpacer(width = metrics.elementSpacing, height = metrics.elementSpacing)
+        Spacer(modifier = LayoutWidth(metrics.elementSpacing) + LayoutHeight(metrics.elementSpacing))
     }
 }
 
@@ -56,7 +57,7 @@ fun PokemonTypeLabel(text: String, metrics: TypeLabelMetrics) {
             style = TextStyle(
                 fontFamily = FontFamily("Roboto"),
                 fontSize = metrics.fontSize,
-                color = +colorResource(R.color.white_1000)
+                color = colorResource(R.color.white_1000)
             )
         )
     }

app/src/main/java/com/github/zsoltk/pokedex/common/RemoveOnDev04.kt

@@ -5,6 +5,7 @@ import androidx.animation.Infinite
 import androidx.animation.LinearEasing
 import androidx.animation.transitionDefinition
 import androidx.compose.Composable
+import androidx.ui.animation.Transition
 import androidx.ui.core.Draw
 
 private val rotation = FloatPropKey()