cilly/Banksia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: more renames in preparation of repositories

Browse source
This commit is contained in:
LavaDesu 2025-08-05 14:36:38 +10:00
parent 75995e8985
commit ccc748dc1f
Signed by: cilly
GPG key ID: 6500251E087653C9
21 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
composeApp/src/androidMain/kotlin/moe/lava/banksia/ui/platform/maps/Maps.android.kt
View file

@ -46,6 +46,7 @@ import moe.lava.banksia.ui.components.RouteIcon
import moe.lava.banksia.ui.platform.BanksiaTheme import moe.lava.banksia.ui.platform.BanksiaTheme
import moe.lava.banksia.ui.state.MapState import moe.lava.banksia.ui.state.MapState
import moe.lava.banksia.util.BoxedValue import moe.lava.banksia.util.BoxedValue
import moe.lava.banksia.util.Point
fun Point.toLatLng(): LatLng = LatLng(this.lat, this.lng) fun Point.toLatLng(): LatLng = LatLng(this.lat, this.lng)

2
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/App.kt
View file

@ -47,9 +47,9 @@ import moe.lava.banksia.ui.layout.InfoPanel
import moe.lava.banksia.ui.layout.Searcher import moe.lava.banksia.ui.layout.Searcher
import moe.lava.banksia.ui.platform.BanksiaTheme import moe.lava.banksia.ui.platform.BanksiaTheme
import moe.lava.banksia.ui.platform.maps.Maps import moe.lava.banksia.ui.platform.maps.Maps
import moe.lava.banksia.ui.platform.maps.Point
import moe.lava.banksia.ui.platform.maps.getScreenHeight import moe.lava.banksia.ui.platform.maps.getScreenHeight
import moe.lava.banksia.ui.state.InfoPanelState import moe.lava.banksia.ui.state.InfoPanelState
import moe.lava.banksia.util.Point
import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.painterResource
import kotlin.coroutines.cancellation.CancellationException import kotlin.coroutines.cancellation.CancellationException
import kotlin.math.roundToInt import kotlin.math.roundToInt

8
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/BanksiaViewModel.kt
View file

@ -15,14 +15,13 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.datetime.Clock import kotlinx.datetime.Clock
import kotlinx.datetime.Instant import kotlinx.datetime.Instant
import moe.lava.banksia.api.ptv.PtvService import moe.lava.banksia.data.ptv.PtvService
import moe.lava.banksia.api.ptv.structures.PtvRoute import moe.lava.banksia.data.ptv.structures.PtvRoute
import moe.lava.banksia.api.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType
import moe.lava.banksia.ui.components.getUIProperties import moe.lava.banksia.ui.components.getUIProperties
import moe.lava.banksia.ui.platform.maps.CameraPosition import moe.lava.banksia.ui.platform.maps.CameraPosition
import moe.lava.banksia.ui.platform.maps.CameraPositionBounds import moe.lava.banksia.ui.platform.maps.CameraPositionBounds
import moe.lava.banksia.ui.platform.maps.Marker import moe.lava.banksia.ui.platform.maps.Marker
import moe.lava.banksia.ui.platform.maps.Point
import moe.lava.banksia.ui.platform.maps.Polyline import moe.lava.banksia.ui.platform.maps.Polyline
import moe.lava.banksia.ui.state.InfoPanelState import moe.lava.banksia.ui.state.InfoPanelState
import moe.lava.banksia.ui.state.MapState import moe.lava.banksia.ui.state.MapState
@ -30,6 +29,7 @@ import moe.lava.banksia.ui.state.SearchState
import moe.lava.banksia.util.BoxedValue import moe.lava.banksia.util.BoxedValue
import moe.lava.banksia.util.BoxedValue.Companion.box import moe.lava.banksia.util.BoxedValue.Companion.box
import moe.lava.banksia.util.LoopFlow.Companion.waitUntilSubscribed import moe.lava.banksia.util.LoopFlow.Companion.waitUntilSubscribed
import moe.lava.banksia.util.Point
import moe.lava.banksia.util.log import moe.lava.banksia.util.log
sealed class BanksiaEvent { sealed class BanksiaEvent {

2
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/components/RouteIcon.kt
View file

@ -11,7 +11,7 @@ import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import moe.lava.banksia.api.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType
import moe.lava.banksia.resources.Res import moe.lava.banksia.resources.Res
import moe.lava.banksia.resources.bus import moe.lava.banksia.resources.bus
import moe.lava.banksia.resources.bus_background import moe.lava.banksia.resources.bus_background

2
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/platform/maps/CameraPosition.kt
View file

@ -1,5 +1,7 @@
package moe.lava.banksia.ui.platform.maps package moe.lava.banksia.ui.platform.maps
import moe.lava.banksia.util.Point
data class CameraPosition( data class CameraPosition(
val centre: Point = Point(-37.8136, 144.9631), val centre: Point = Point(-37.8136, 144.9631),
val bounds: CameraPositionBounds? = null, val bounds: CameraPositionBounds? = null,

2
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/platform/maps/CameraPositionBounds.kt
View file

@ -1,3 +1,5 @@
package moe.lava.banksia.ui.platform.maps package moe.lava.banksia.ui.platform.maps
import moe.lava.banksia.util.Point
data class CameraPositionBounds(val northeast: Point, val southwest: Point) data class CameraPositionBounds(val northeast: Point, val southwest: Point)

1
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/platform/maps/Maps.kt
View file

@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.Flow
import moe.lava.banksia.ui.BanksiaEvent import moe.lava.banksia.ui.BanksiaEvent
import moe.lava.banksia.ui.state.MapState import moe.lava.banksia.ui.state.MapState
import moe.lava.banksia.util.BoxedValue import moe.lava.banksia.util.BoxedValue
import moe.lava.banksia.util.Point
@Composable @Composable
expect fun getScreenHeight(): Int expect fun getScreenHeight(): Int

3
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/platform/maps/Marker.kt
View file

@ -1,7 +1,8 @@
package moe.lava.banksia.ui.platform.maps package moe.lava.banksia.ui.platform.maps
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import moe.lava.banksia.api.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType
import moe.lava.banksia.util.Point
sealed class Marker { sealed class Marker {
abstract val point: Point abstract val point: Point

1
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/platform/maps/Polyline.kt
View file

@ -1,5 +1,6 @@
package moe.lava.banksia.ui.platform.maps package moe.lava.banksia.ui.platform.maps
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import moe.lava.banksia.util.Point
data class Polyline(val points: List<Point>, val colour: Color) data class Polyline(val points: List<Point>, val colour: Color)

2
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/state/InfoPanelState.kt
View file

@ -1,6 +1,6 @@
package moe.lava.banksia.ui.state package moe.lava.banksia.ui.state
import moe.lava.banksia.api.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType
sealed class InfoPanelState { sealed class InfoPanelState {
abstract val loading: Boolean abstract val loading: Boolean

4
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/state/SearchState.kt
View file

@ -1,6 +1,6 @@
package moe.lava.banksia.ui.state package moe.lava.banksia.ui.state
import moe.lava.banksia.api.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType
data class SearchState( data class SearchState(
val entries: List<SearchEntry> = listOf(), val entries: List<SearchEntry> = listOf(),
@ -12,4 +12,4 @@ data class SearchState(
val routeId: Int, val routeId: Int,
val routeType: PtvRouteType, val routeType: PtvRouteType,
) )
} }

1
composeApp/src/iosMain/kotlin/moe/lava/banksia/ui/platform/maps/Maps.ios.kt
View file

@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.Flow
import moe.lava.banksia.ui.BanksiaEvent import moe.lava.banksia.ui.BanksiaEvent
import moe.lava.banksia.ui.state.MapState import moe.lava.banksia.ui.state.MapState
import moe.lava.banksia.util.BoxedValue import moe.lava.banksia.util.BoxedValue
import moe.lava.banksia.util.Point
@OptIn(ExperimentalComposeUiApi::class) @OptIn(ExperimentalComposeUiApi::class)
@Composable @Composable

14
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/PtvService.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/PtvService.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv package moe.lava.banksia.data.ptv
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.call.body import io.ktor.client.call.body
@ -18,12 +18,12 @@ import kotlinx.coroutines.delay
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import moe.lava.banksia.Constants import moe.lava.banksia.Constants
import moe.lava.banksia.api.ptv.structures.PtvDeparture import moe.lava.banksia.data.ptv.structures.PtvDeparture
import moe.lava.banksia.api.ptv.structures.PtvDirection import moe.lava.banksia.data.ptv.structures.PtvDirection
import moe.lava.banksia.api.ptv.structures.PtvRoute import moe.lava.banksia.data.ptv.structures.PtvRoute
import moe.lava.banksia.api.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType
import moe.lava.banksia.api.ptv.structures.PtvRun import moe.lava.banksia.data.ptv.structures.PtvRun
import moe.lava.banksia.api.ptv.structures.PtvStop import moe.lava.banksia.data.ptv.structures.PtvStop
import moe.lava.banksia.util.CacheMap import moe.lava.banksia.util.CacheMap
import moe.lava.banksia.util.LoopFlow.Companion.initWith import moe.lava.banksia.util.LoopFlow.Companion.initWith
import moe.lava.banksia.util.error import moe.lava.banksia.util.error

2
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/structures/PtvDeparture.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDeparture.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

2
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/structures/PtvDirection.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvDirection.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

2
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/structures/PtvGeopath.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvGeopath.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

2
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/structures/PtvRoute.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRoute.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

2
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/structures/PtvRouteType.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRouteType.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.serialization.KSerializer import kotlinx.serialization.KSerializer
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

2
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/structures/PtvRun.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvRun.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.datetime.Instant import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDateTime import kotlinx.datetime.LocalDateTime

2
shared/src/commonMain/kotlin/moe/lava/banksia/api/ptv/structures/PtvStop.kt → shared/src/commonMain/kotlin/moe/lava/banksia/data/ptv/structures/PtvStop.kt
View file

@ -1,4 +1,4 @@
package moe.lava.banksia.api.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

2
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/platform/maps/Point.kt → shared/src/commonMain/kotlin/moe/lava/banksia/util/Point.kt
View file

@ -1,3 +1,3 @@
package moe.lava.banksia.ui.platform.maps package moe.lava.banksia.util
data class Point(val lat: Double, val lng: Double) data class Point(val lat: Double, val lng: Double)