Skip to content

Commit e657857

Browse files
committed
Remove destination
1 parent 8176be6 commit e657857

3 files changed

Lines changed: 15 additions & 23 deletions

File tree

shared/src/commonMain/kotlin/site/remlit/snowdrop/App.kt

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ import kotlinx.serialization.Serializable
6767
import org.jetbrains.compose.resources.painterResource
6868
import site.remlit.snowdrop.component.AppTheme
6969
import site.remlit.snowdrop.component.Avatar
70-
import site.remlit.snowdrop.model.ui.Destination
7170
import site.remlit.snowdrop.util.ExternalUriHandler
7271
import site.remlit.snowdrop.util.LocalNavController
7372
import site.remlit.snowdrop.util.SnackbarController
@@ -107,40 +106,40 @@ import kotlin.time.Duration.Companion.milliseconds
107106

108107

109108
@Serializable
110-
object StartRoute : Destination(0)
109+
object StartRoute
111110
@Serializable
112-
object LoginRoute : Destination(1)
111+
object LoginRoute
113112
@Serializable
114-
object TimelineRoute : Destination(2)
113+
object TimelineRoute
115114
@Serializable
116-
object NotificationsRoute : Destination(3)
115+
object NotificationsRoute
117116
@Serializable
118-
object ExploreRoute : Destination(4)
117+
object ExploreRoute
119118
@Serializable
120-
object MyProfileRoute : Destination(5)
119+
object MyProfileRoute
121120
@Serializable
122-
data class ProfileRoute(val id: String) : Destination(6)
121+
data class ProfileRoute(val id: String)
123122
@Serializable
124-
data class ThreadRoute(val id: String) : Destination(7)
123+
data class ThreadRoute(val id: String)
125124
@Serializable
126125
data class StatusInteractionDetailRoute(
127126
val id: String,
128127
val type: InteractionViewType
129-
) : Destination(9)
128+
)
130129
@Serializable
131130
data class ComposeRoute(
132131
val inReplyToId: String? = null,
133132
val cw: String = "",
134133
val content: String = ""
135-
) : Destination(10)
134+
)
136135

137136
@Serializable
138-
object SettingsRoute : Destination(100)
137+
object SettingsRoute
139138

140139
@Serializable
141-
object DebugRoute : Destination(1000)
140+
object DebugRoute
142141
@Serializable
143-
data class DebugStorageRoute(val storage: Int) : Destination(1001)
142+
data class DebugStorageRoute(val storage: Int)
144143

145144

146145
@Composable

shared/src/commonMain/kotlin/site/remlit/snowdrop/model/ui/Destination.kt

Lines changed: 0 additions & 6 deletions
This file was deleted.

shared/src/commonMain/kotlin/site/remlit/snowdrop/util/Route.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package site.remlit.snowdrop.util
22

33
import androidx.navigation.NavDestination
44
import androidx.navigation.NavDestination.Companion.hasRoute
5-
import site.remlit.snowdrop.model.ui.Destination
65

7-
inline fun <reified T : Destination> atRoute(
6+
inline fun <reified T : Any> atRoute(
87
c: NavDestination?
98
): Boolean {
109
if (c == null) return false
1110
return c.hasRoute<T>()
12-
}
11+
}

0 commit comments

Comments
 (0)