Migrate from android views to compose (#329)

* Make composable welcome screen * Select available document types from supported countries * Navigate to document capture methods * Pick and upload images * Manually take photos and upload them for verification * Navigate to the confirmation screen * Scan verification documents * Check pending requirements and navigate appropriately * Show progress indicator when uploading documents * Update CameraViews and Document and Face Analysis tools to work with compse * Move navigation utilities to navigation package * Display Error screen when there is camera timeout * Update how navigation routes are handled * Ensure loading screen is displayed * Load svg flag images * Update countries screen us * Complete the verification process * Update welcome screen to pass identity verification result * Update WelcomeScreen.kt * Create Welcome view tests * Create test app * Add document selection screen tests * Add tests for Manual Capture Screen * Tests for Document Capture Method Screen * Test Confirmation screen UI * Add support screen * Check if camera permissions have been allowed * Update implementation of how to navigate to Error Screens * Navigate to requirement errors * Delete android views and fragment * Build view for ID number verification * Migrate from Id number verification to compose * Compose tax pin verification views * Check if client application is supported * Cancel the flow on back press * Navigate up to resolve error * Use Single line text Textfields * Fix formatting issues * Resolve formating issues * Ignore compose dialect * Update test cases * Fix failing tests --------- Co-authored-by: Seth Onyango <[email protected]>
faluapp · Nov 18, 2024 · 5d05d8a · 5d05d8a
1 parent fa07948
commit 5d05d8a
Show file tree

Hide file tree

Showing 162 changed files with 6,105 additions and 5,880 deletions.
diff --git a/.codespellrc b/.codespellrc
@@ -1,2 +1,3 @@
 [codespell]
-skip = .git,countries.json
+skip = .git,countries.json,libs.versions.toml
+ignore-words-list = OptIn,expresso,statics
diff --git a/.editorconfig b/.editorconfig
@@ -16,5 +16,8 @@ ij_smart_tabs = false
 ij_visual_guides = none
 ij_wrap_on_typing = false
 
-[*.{kt,kts}]
-disabled_rules = import-ordering
+[{*.kt,*.kts}]
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_packages_to_use_import_on_demand = unset
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
diff --git a/.kotlin/sessions/kotlin-compiler-2172790541716978083.salive b/.kotlin/sessions/kotlin-compiler-2172790541716978083.salive
diff --git a/.kotlin/sessions/kotlin-compiler-7060104201537045237.salive b/.kotlin/sessions/kotlin-compiler-7060104201537045237.salive
diff --git a/build-config/klint.gradle.kts b/build-config/klint.gradle.kts
@@ -1,7 +1,7 @@
 val ktlint by configurations.creating
 
 dependencies {
-    ktlint("com.pinterest:ktlint:0.34.2")
+    ktlint("com.pinterest:ktlint:0.48.2")
 }
 
 tasks {
@@ -19,8 +19,9 @@ tasks {
     val ktlintFormat by creating(JavaExec::class) {
         group = "formatting"
         description = "Fix Kotlin code style deviations."
-        mainClass.set("com.pinterest.ktlint.Main")
         classpath = configurations["ktlint"]
-        args("-F", "src/**/*.kt")
+        jvmArgs = listOf("--add-opens=java.base/java.lang=ALL-UNNAMED")
+        setProperty("mainClass", "com.pinterest.ktlint.Main")
+        args = listOf("-F", "src/**/*.kt")
     }
 }
diff --git a/falu-core/build.gradle.kts b/falu-core/build.gradle.kts
@@ -11,7 +11,7 @@ apply {
 apply(from = "${rootDir}/build-config/klint.gradle.kts")
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = project.properties["FALU_SDK_NAMESPACE"].toString()
 
     val publishVersionCode: String by project.extra

diff --git a/falu-core/src/main/java/io/falu/core/ApiKeyValidator.kt b/falu-core/src/main/java/io/falu/core/ApiKeyValidator.kt
@@ -7,15 +7,13 @@ class ApiKeyValidator {
 
     fun requireValid(apiKey: String?): String {
         require(!apiKey.isNullOrBlank()) {
-            "Invalid Publishable Key: " +
-                    "You must use a valid FALU API key to make a FALU API request. " +
-                    "For more info, see https://falu.io"
+            "Invalid Publishable Key: You must use a valid FALU API key to make a FALU API request. " +
+                "For more info, see https://falu.io"
         }
 
         require(!apiKey.startsWith("sk_")) {
-            "Invalid Publishable Key: " +
-                    "You are using a secret key instead of a publishable one. " +
-                    "For more info, see https://falu.io"
+            "Invalid Publishable Key: You are using a secret key instead of a publishable one. " +
+                "For more info, see https://falu.io"
         }
 
         return apiKey

diff --git a/falu-core/src/main/java/io/falu/core/ApiVersionInterceptor.kt b/falu-core/src/main/java/io/falu/core/ApiVersionInterceptor.kt
@@ -14,7 +14,6 @@ class ApiVersionInterceptor(private val code: String) : Interceptor {
             .request()
             .newBuilder()
             .header("X-Falu-Version", code)
-
             .build()
 
         return chain.proceed(request)

diff --git a/falu-core/src/main/java/io/falu/core/AppDetailsInterceptor.kt b/falu-core/src/main/java/io/falu/core/AppDetailsInterceptor.kt
@@ -38,7 +38,7 @@ class AppDetailsInterceptor(private val context: Context) : Interceptor {
         val versionRelease = Build.VERSION.RELEASE
 
         return "falu-android/${BuildConfig.FALU_VERSION_NAME} (Android $versionRelease; $manufacturer $model) " +
-                "$packageName/${context.appVersionName}"
+            "$packageName/${context.appVersionName}"
     }
 
     private val packageName: String

diff --git a/falu-core/src/main/java/io/falu/core/exceptions/ApiConnectionException.kt b/falu-core/src/main/java/io/falu/core/exceptions/ApiConnectionException.kt
@@ -20,8 +20,8 @@ class ApiConnectionException(
             ).joinToString(" ")
             return ApiConnectionException(
                 "IOException during API request to $displayUrl: ${e.message}. " +
-                        "Please check your internet connection and try again. " +
-                        "If this problem persists, let us know at [email protected].",
+                    "Please check your internet connection and try again. " +
+                    "If this problem persists, let us know at [email protected].",
                 e
             )
         }

diff --git a/falu-core/src/main/java/io/falu/core/exceptions/AuthenticationException.kt b/falu-core/src/main/java/io/falu/core/exceptions/AuthenticationException.kt
@@ -8,7 +8,8 @@ import java.net.HttpURLConnection
  * No valid API key provided.
  */
 class AuthenticationException
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) constructor(problem: HttpApiResponseProblem) :
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+constructor(problem: HttpApiResponseProblem) :
     FaluException(
         problem,
         HttpURLConnection.HTTP_UNAUTHORIZED

diff --git a/falu-core/src/main/java/io/falu/core/exceptions/FaluException.kt b/falu-core/src/main/java/io/falu/core/exceptions/FaluException.kt
@@ -22,10 +22,8 @@ abstract class FaluException(
     }
 
     private fun typedEquals(ex: FaluException): Boolean {
-        return problem == ex.problem &&
-                statusCode == ex.statusCode &&
-                errorCode == ex.errorCode &&
-                message == ex.message
+        return problem == ex.problem && statusCode == ex.statusCode && errorCode == ex.errorCode &&
+            message == ex.message
     }
 
     override fun equals(other: Any?): Boolean {

diff --git a/falu-core/src/test/java/io/falu/core/NetworkRetriesInterceptorTest.kt b/falu-core/src/test/java/io/falu/core/NetworkRetriesInterceptorTest.kt
@@ -3,15 +3,15 @@ package io.falu.core
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
+import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mockito
 import org.mockito.Mockito.`when`
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 import kotlin.test.BeforeTest
-import org.junit.Test
-import org.mockito.Mockito
 import kotlin.test.assertEquals
-import org.mockito.kotlin.times
-import org.mockito.kotlin.verify
 
 @RunWith(RobolectricTestRunner::class)
 class NetworkRetriesInterceptorTest {

diff --git a/falu/build.gradle.kts b/falu/build.gradle.kts
@@ -7,7 +7,7 @@ id("com.android.library")
 apply(from = "${rootDir}/build-config/klint.gradle.kts")
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = project.properties["FALU_SDK_NAMESPACE"].toString()
 
     defaultConfig {

diff --git a/falu/src/main/java/io/falu/android/models/payments/Payment.kt b/falu/src/main/java/io/falu/android/models/payments/Payment.kt
@@ -2,9 +2,9 @@ package io.falu.android.models.payments
 
 import com.google.gson.annotations.JsonAdapter
 import io.falu.core.models.FaluModel
-import java.util.Date
 import kotlinx.parcelize.Parcelize
 import software.tingle.api.adapters.ISO8601DateAdapter
+import java.util.Date
 
 /**
  * [The payment object](https://falu.io)

diff --git a/falu/src/main/java/io/falu/android/models/payments/PaymentFailure.kt b/falu/src/main/java/io/falu/android/models/payments/PaymentFailure.kt
@@ -1,8 +1,8 @@
 package io.falu.android.models.payments
 
 import android.os.Parcelable
-import java.util.Date
 import kotlinx.parcelize.Parcelize
+import java.util.Date
 
 /**
  * [The Payment Failure object](https://falu.io)

diff --git a/falu/src/main/java/io/falu/android/networking/BaseApiRepository.kt b/falu/src/main/java/io/falu/android/networking/BaseApiRepository.kt
@@ -3,12 +3,12 @@ package io.falu.android.networking
 import android.content.Context
 import io.falu.core.exceptions.ApiException
 import io.falu.core.exceptions.FaluException
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import software.tingle.api.ResourceResponse
+import kotlin.coroutines.CoroutineContext
 
 /**
  * A base class for Falu-related API requests.

diff --git a/falu/src/test/java/io/falu/android/ApiKeyValidatorTests.kt b/falu/src/test/java/io/falu/android/ApiKeyValidatorTests.kt
@@ -1,9 +1,9 @@
 package io.falu.android
 
 import io.falu.core.ApiKeyValidator
-import kotlin.test.assertFailsWith
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import kotlin.test.assertFailsWith
 
 class ApiKeyValidatorTests {
 

diff --git a/falu/src/test/java/io/falu/android/FaluEndToEndTest.kt b/falu/src/test/java/io/falu/android/FaluEndToEndTest.kt
@@ -8,13 +8,13 @@ import io.falu.android.models.payments.Payment
 import io.falu.android.models.payments.PaymentRequest
 import io.falu.android.networking.FaluRepository
 import io.falu.core.ApiResultCallback
-import java.util.Date
-import kotlin.test.Test
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.junit.runner.RunWith
 import org.mockito.kotlin.mock
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import java.util.Date
+import kotlin.test.Test
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.O_MR1])
@@ -45,7 +45,6 @@ class FaluEndToEndTest {
 
     @Test
     fun `test mpesa payment works`() {
-
         val mpesa = MpesaPaymentRequest(
             phone = "+254712345678",
             reference = "254712345678",

diff --git a/falu/src/test/java/io/falu/android/MoneyPatternTests.kt b/falu/src/test/java/io/falu/android/MoneyPatternTests.kt
@@ -1,9 +1,9 @@
 package io.falu.android
 
 import io.falu.android.models.payments.Money
+import org.junit.Test
 import java.util.Currency
 import kotlin.test.assertEquals
-import org.junit.Test
 
 class MoneyPatternTests {
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,9 +28,16 @@ material = "1.12.0"
 joda = "2.13.0"
 nexus = "2.0.0"
 coil = "2.7.0"
+compose-bom = "2024.09.02"
+accompanist = "0.34.0"
+runtime-livedata = "1.7.2"
+ui-test-junit4-android = "1.7.2"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
+androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
+androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 abstractions = { module = "software.tingle:abstractions", version.ref = "abstractions" }
 junit = { module = "junit:junit", version.ref = "junit" }
@@ -73,19 +80,33 @@ androidx-test-runner = { module = "androidx.test:runner", version.ref = "android
 androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" }
 coil-ktx = { module = "io.coil-kt:coil", version.ref = "coil" }
 coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil" }
+coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
+
+compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
+compose-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+runtime = { module = "androidx.compose.runtime:runtime" }
+ui-tests = { module = "androidx.compose.ui:ui-test-junit4" }
+ui-tests-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
+material3 = { module = "androidx.compose.material3:material3" }
+accompanist = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
+compose-activity = { module = "androidx.activity:activity-compose" }
+compose-navigation = { module = "androidx.navigation:navigation-compose" }
 
 tensorflow-lite = { module = "org.tensorflow:tensorflow-lite", version.ref = "tensorflow-lite" }
 tensorflow-support = { module = "org.tensorflow:tensorflow-lite-support", version.ref = "tensorflow-support" }
 
 joda = { module = "joda-time:joda-time", version.ref = "joda" }
+androidx-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "runtime-livedata" }
+androidx-ui-test-junit4-android = { group = "androidx.compose.ui", name = "ui-test-junit4-android", version.ref = "ui-test-junit4-android" }
 
 [bundles]
 mokito = ["mokito-core", "mokito-inline"]
 kotlin-test = ["kotlin-test-junit", "kotlin-test-annotations"]
 androidx-lifecycle = ["androidx-livedata", "androidx-viewmodel", "androidx-runtime"]
 camera = ["androidx-camera-core", "androidx-camera-camera2", "androidx-camera-lifecycle", "androidx-camera-video", "androidx-camera-extensions", "androidx-camera-view"]
 navigation = ["androidx-navigation-fragment", "androidx-navigation-ui"]
-coil = ["coil-ktx", "coil-svg"]
+coil = ["coil-ktx", "coil-svg", "coil-compose"]
 
 [plugins]
-nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
+nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/identity-sample/build.gradle.kts b/identity-sample/build.gradle.kts
@@ -6,13 +6,13 @@ plugins {
 apply(from = "${rootDir}/build-config/klint.gradle.kts")
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = project.properties["FALU_SDK_NAMESPACE"].toString()
 
     defaultConfig {
         applicationId = "io.falu.identity.sample"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
 
         versionCode = 1
         versionName = "1.0"

diff --git a/identity-sample/src/main/java/io/falu/identity/VerificationViewModel.kt b/identity-sample/src/main/java/io/falu/identity/VerificationViewModel.kt
@@ -32,16 +32,18 @@ class VerificationViewModel(application: Application) : AndroidViewModel(applica
         allowIdNumberVerification: Boolean,
         allowTaxPin: Boolean
     ) = liveData {
-
         val request = IdentityVerificationCreationRequest(
             options = IdentityVerificationOptions(
                 allowUploads = allowUploads,
-                document = if (allowDrivingLicense || allowPassport || allowIdentityCard)
+                document = if (allowDrivingLicense || allowPassport || allowIdentityCard) {
                     generateDocumentOptions(
                         allowDrivingLicense,
                         allowPassport,
                         allowIdentityCard
-                    ) else null,
+                    )
+                } else {
+                    null
+                },
                 selfie = if (allowDocumentSelfie) IdentityVerificationOptionsForSelfie() else null,
                 idNumber = if (allowIdNumberVerification) IdentityVerificationOptionsForIdNumber() else null,
                 tax = if (allowTaxPin) IdentityVerificationOptionsForTax(allowed = mutableListOf("ken_pin")) else null
@@ -92,7 +94,7 @@ class VerificationViewModel(application: Application) : AndroidViewModel(applica
 
 class ApiClient : AbstractHttpApiClient(EmptyAuthenticationProvider()) {
     suspend fun createIdentityVerification(request: IdentityVerificationCreationRequest):
-            ResourceResponse<IdentityVerification> {
+        ResourceResponse<IdentityVerification> {
         val builder = Request.Builder()
             .url("https://identity-verification.hst-smpls.falu.io/identity/create-verification")
             .post(makeJson(request).toRequestBody(MEDIA_TYPE_JSON))

diff --git a/identity/build.gradle.kts b/identity/build.gradle.kts
@@ -2,12 +2,13 @@ plugins {
     id("com.android.library")
     kotlin("android")
     id("kotlin-parcelize")
+    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = "${rootDir}/build-config/klint.gradle.kts")
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = project.properties["FALU_SDK_NAMESPACE"].toString()
 
     defaultConfig {
@@ -46,6 +47,7 @@ android {
     buildFeatures {
         viewBinding = true
         buildConfig = true
+        compose = true
     }
 
     lint.enable += "Interoperability"
@@ -73,6 +75,18 @@ dependencies {
     implementation(libs.constraint)
     implementation(libs.androidx.appcompat)
 
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.preview)
+    implementation(libs.material3)
+    implementation(libs.compose.activity)
+    implementation(libs.compose.navigation)
+    implementation(libs.runtime)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.accompanist)
+    implementation(libs.androidx.runtime.livedata)
+    implementation(libs.androidx.ui.test.junit4.android)
+    implementation(libs.androidx.ui.tooling.preview)
+
     implementation(libs.tensorflow.lite)
     implementation(libs.tensorflow.support)
 
@@ -85,6 +99,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.joda)
     implementation(libs.bundles.coil)
+    implementation(libs.androidx.browser)
 
     testImplementation(libs.junit)
     testImplementation(libs.bundles.mokito)
@@ -98,7 +113,9 @@ dependencies {
     testImplementation(libs.androidx.espresso.core)
     testImplementation(libs.androidx.fragment.testing)
     testImplementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.browser)
+    testImplementation(libs.ui.tests)
+    testImplementation(libs.ui.tests.manifest)
+    testImplementation(libs.androidx.ui.tooling)
 
     androidTestImplementation(libs.androidx.test.rules)
     androidTestImplementation(libs.androidx.test.runner)