Merge pull request #1254 from DimensionDev/bugfix/login_route

fix login route not trigger

Author: Tlaster

.github/workflows/android.yml

@@ -20,7 +20,7 @@ on:
 jobs:
   build:
     runs-on: [ubuntu-latest]
-    timeout-minutes: 30
+    timeout-minutes: 60
 
     steps:
       - uses: yumis-coconudge/clean-workspace-action@v1

app/src/main/java/dev/dimension/flare/ui/route/Route.kt

@@ -408,6 +408,7 @@ internal sealed interface Route : NavKey {
         public fun parse(url: String): Route? {
             val deeplinkRoute = DeeplinkRoute.parse(url) ?: return null
             return when (deeplinkRoute) {
+                is DeeplinkRoute.Login -> Route.ServiceSelect.Selection
                 is DeeplinkRoute.Callback -> null
                 is DeeplinkRoute.Compose.New ->
                     Route.Compose.New(accountType = deeplinkRoute.accountType)

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/route/DeeplinkRoute.kt

@@ -6,6 +6,9 @@ import io.ktor.http.Url
 import kotlinx.serialization.Serializable
 
 public sealed class DeeplinkRoute {
+    @Serializable
+    public data object Login : DeeplinkRoute()
+
     @Serializable
     public sealed class Callback : DeeplinkRoute() {
         @Serializable

desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Route.kt

@@ -243,6 +243,7 @@ internal sealed interface Route {
         public fun parse(url: String): Route? {
             val deeplinkRoute = DeeplinkRoute.parse(url) ?: return null
             return when (deeplinkRoute) {
+                is DeeplinkRoute.Login -> ServiceSelect
                 is DeeplinkRoute.Callback -> null
                 is DeeplinkRoute.Compose.New -> Compose.New(deeplinkRoute.accountType)
                 is DeeplinkRoute.Compose.Quote ->

gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx16g -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true

iosApp/flare/UI/Route/Route.swift

@@ -142,6 +142,8 @@ enum Route: Hashable {
                 return Route.search(search.accountType, search.query)
             case .status(let status):
                 return fromStatus(status)
+            case .login:
+                return Route.serviceSelect
             }
         } else {
             return nil