Update to compose dev10

kartoffelsup · May 1, 2020 · 754e261 · 754e261
1 parent 2b1e9c9
commit 754e261
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,12 +24,9 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-        debug {
-            minifyEnabled false
-            useProguard false
-        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -66,7 +63,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5"
 
-    implementation 'com.google.firebase:firebase-messaging:20.1.5'
+    implementation 'com.google.firebase:firebase-messaging:20.1.6'
     implementation 'org.greenrobot:eventbus:3.2.0'
 
     implementation("io.arrow-kt:arrow-fx:$arrow_version"){
@@ -80,8 +77,8 @@ dependencies {
     }
 
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinx_serialization_version")
-    implementation("io.github.kartoffelsup:nuntius-api:0.0.1-SNAPSHOT")
-    implementation("io.github.kartoffelsup:nuntius-api-client-jvm:0.0.1-SNAPSHOT")
+    implementation("io.github.kartoffelsup:nuntius-api-jvm:0.0.1-SNAPSHOT")
+    implementation("io.github.kartoffelsup:nuntius-api-client-jvm:0.0.2-SNAPSHOT")
 
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -38,6 +38,8 @@
 -keepclasseswithmembers class io.github.kartoffelsup.nuntius.** {
     kotlinx.serialization.KSerializer serializer(...);
 }
--keepclassmembers class io.github.kartoffelsup.nuntius.client.NuntiusApiService {
+-keep class io.github.kartoffelsup.nuntius.client.NuntiusApiService {
     *;
-}
+}
+-verbose
+-printusage
diff --git a/app/src/main/java/io/github/kartoffelsup/nuntius/data/user/UserService.kt b/app/src/main/java/io/github/kartoffelsup/nuntius/data/user/UserService.kt
@@ -1,8 +1,8 @@
 package io.github.kartoffelsup.nuntius.data.user
 
-import arrow.core.*
-import arrow.core.extensions.fx
-import arrow.fx.IO
+import arrow.core.Either
+import arrow.core.left
+import arrow.core.right
 import io.github.kartoffelsup.nuntius.api.user.request.LoginRequest
 import io.github.kartoffelsup.nuntius.api.user.request.UpdateNotificationTokenRequest
 import io.github.kartoffelsup.nuntius.api.user.result.FailedLogin

diff --git a/app/src/main/java/io/github/kartoffelsup/nuntius/ui/message/MessageScreen.kt b/app/src/main/java/io/github/kartoffelsup/nuntius/ui/message/MessageScreen.kt
@@ -88,7 +88,7 @@ fun MessageScreen(state: MessageScreenState) {
                     state.messageFieldState.value
                 },
                 textStyle = currentTextStyle(),
-                onFocus = {
+                onFocusChange = {
                     state.messageFieldState.initial = false
                 },
                 onValueChange = { text -> state.messageFieldState.value = text }

diff --git a/app/src/main/java/io/github/kartoffelsup/nuntius/ui/user/LoginForm.kt b/app/src/main/java/io/github/kartoffelsup/nuntius/ui/user/LoginForm.kt
@@ -199,11 +199,8 @@ private fun FormField(
                     keyboardType = keyboardType,
                     imeAction = imeAction,
                     onImeActionPerformed = onImeActionPerformed,
-                    onFocus = {
-                        fieldState.focused = true
-                    },
-                    onBlur = {
-                        fieldState.focused = false
+                    onFocusChange = {
+                        fieldState.focused = it
                     },
                     onValueChange = { newValue ->
                         fieldState.touched = true

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = "1.3.72"
-    def compose_release_version = "dev09"
+    def compose_release_version = "dev10"
     ext.compose_version = "0.1.0-$compose_release_version"
     ext.compose_compiler_extension_version = "0.1.0-$compose_release_version"
     ext.arrow_version = "0.10.5"
@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-alpha05'
+        classpath 'com.android.tools.build:gradle:4.1.0-alpha08'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.gms:google-services:4.3.3"