Skip to content

Commit 57680c1

Browse files
omkar-tenkaleomkar-tenkale
committed
update imports
1 parent c96d331 commit 57680c1

File tree

13 files changed

+34
-39
lines changed

13 files changed

+34
-39
lines changed

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("root.publication")
2+
// id("root.publication")
33
//trick: for the same plugin versions in all sub-modules
44
alias(libs.plugins.androidLibrary) apply false
55
alias(libs.plugins.kotlinMultiplatform) apply false

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/RideNode.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ import dev.omkartenkale.nodal.sample.ride.nodes.root.loggedin.ride.request.RideR
1717
import dev.omkartenkale.nodal.sample.ride.nodes.root.loggedin.ride.request.addRequestRideNode
1818
import kotlinx.coroutines.flow.launchIn
1919
import kotlinx.coroutines.flow.onEach
20+
import nodal.ride.generated.resources.Res
21+
import nodal.ride.generated.resources.google_map
2022
import org.jetbrains.compose.resources.ExperimentalResourceApi
2123
import org.jetbrains.compose.resources.painterResource
22-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
23-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.google_map
24-
2524
class RideNode: Node() {
2625

2726
private lateinit var layer: UI.Layer

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/active/assigned/pickup/PrePickupNode.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import dev.omkartenkale.nodal.Node
1212
import dev.omkartenkale.nodal.compose.UI
1313
import dev.omkartenkale.nodal.compose.draw
1414
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.nonExpandingSheetState
15+
import nodal.ride.generated.resources.Res
16+
import nodal.ride.generated.resources.driver_arriving
1517
import org.jetbrains.compose.resources.ExperimentalResourceApi
1618
import org.jetbrains.compose.resources.painterResource
17-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
18-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.driver_arriving
19-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.finding_driver
20-
2119
class PrePickupNode() : Node(/*dismissible = false*/) {
2220

2321
private lateinit var layer: UI.Layer

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/active/driversearch/DriverSearchNode.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ import dev.omkartenkale.nodal.Node
1414
import dev.omkartenkale.nodal.compose.UI
1515
import dev.omkartenkale.nodal.compose.draw
1616
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.alwaysIntermediatelyExpandedSheetState
17+
import nodal.ride.generated.resources.Res
18+
import nodal.ride.generated.resources.finding_driver
1719
import org.jetbrains.compose.resources.ExperimentalResourceApi
1820
import org.jetbrains.compose.resources.painterResource
19-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
20-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.finding_driver
21-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.google_map
22-
2321
class DriverSearchNode() : Node() {
2422

2523
private lateinit var layer: UI.Layer

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/completed/DriverRatingNode.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ import dev.omkartenkale.nodal.compose.UI
2222
import dev.omkartenkale.nodal.compose.draw
2323
import dev.omkartenkale.nodal.misc.VoidCallback
2424
import dev.omkartenkale.nodal.util.addChild
25+
import nodal.ride.generated.resources.Res
26+
import nodal.ride.generated.resources.rate_driver
2527
import org.jetbrains.compose.resources.ExperimentalResourceApi
2628
import org.jetbrains.compose.resources.painterResource
27-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
28-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.finding_driver
29-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.rate_driver
3029

3130
class DriverRatedCallback(block: () -> Unit) : VoidCallback by VoidCallback(block)
3231

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/request/RequestRideNode.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ import dev.omkartenkale.nodal.sample.ride.nodes.root.loggedin.ride.request.selec
4040
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.alwaysIntermediatelyExpandedSheetState
4141
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.nonExpandingSheetState
4242
import dev.omkartenkale.nodal.util.child
43+
import nodal.ride.generated.resources.Res
44+
import nodal.ride.generated.resources.submit_button
4345
import org.jetbrains.compose.resources.ExperimentalResourceApi
4446
import org.jetbrains.compose.resources.painterResource
45-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
46-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.submit_button
4747

4848
data class RideRequest(
4949
val rideType: String,

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/request/select/paymentmode/PaymentModeSelectionNode.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ import dev.omkartenkale.nodal.compose.draw
1515
import dev.omkartenkale.nodal.misc.Callback
1616
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.nonExpandingSheetState
1717
import dev.omkartenkale.nodal.util.addChild
18+
import nodal.ride.generated.resources.Res
19+
import nodal.ride.generated.resources.payment_methods
1820
import org.jetbrains.compose.resources.ExperimentalResourceApi
1921
import org.jetbrains.compose.resources.painterResource
20-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
21-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.driver_arriving
22-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.payment_methods
2322

2423
fun Node.addPaymentSelectionSelectionNode(onPaymentModeSelected: (String) -> Unit) =
2524
addChild<PaymentModeSelectionNode>(PaymentModeSelectionCallback { onPaymentModeSelected(it) })

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/request/select/paymentmode/SelectedPaymentModeNode.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ import androidx.compose.ui.unit.dp
2121
import dev.omkartenkale.nodal.Node
2222
import dev.omkartenkale.nodal.misc.Callback
2323
import dev.omkartenkale.nodal.util.addChild
24+
import nodal.ride.generated.resources.Res
25+
import nodal.ride.generated.resources.add_payment
2426
import org.jetbrains.compose.resources.ExperimentalResourceApi
2527
import org.jetbrains.compose.resources.painterResource
26-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
27-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.add_payment
28-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.confirm_otp
2928

3029
fun Node.addSelectedPaymentModeNode(onPaymentModeChanged: (String) -> Unit) =
3130
addChild<SelectedPaymentModeNode>(PaymentModeChangedCallback { onPaymentModeChanged(it) })

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/request/select/ride/RideSelectionNode.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ import dev.omkartenkale.nodal.misc.Callback
2424
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.alwaysIntermediatelyExpandedSheetState
2525
import dev.omkartenkale.nodal.util.addChild
2626
import kotlinx.coroutines.launch
27+
import nodal.ride.generated.resources.Res
28+
import nodal.ride.generated.resources.ride_estimates
2729
import org.jetbrains.compose.resources.ExperimentalResourceApi
2830
import org.jetbrains.compose.resources.painterResource
29-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
30-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.ride_estimates
31-
3231

3332
fun Node.addRideSelectionNode(rideSelectedCallback: (String) -> Unit) =
3433
addChild<RideSelectionNode>(RideBookedCallback { rideSelectedCallback(it) })

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/request/select/route/AddressSelectionNode.kt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ import androidx.compose.ui.layout.ContentScale
77
import com.skydoves.flexible.bottomsheet.material.FlexibleBottomSheet
88
import com.skydoves.flexible.core.rememberFlexibleBottomSheetState
99
import dev.omkartenkale.nodal.Node
10+
import dev.omkartenkale.nodal.compose.UI
1011
import dev.omkartenkale.nodal.compose.draw
1112
import dev.omkartenkale.nodal.misc.Callback
1213
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.nonExpandingSheetState
1314
import dev.omkartenkale.nodal.util.addChild
15+
import nodal.ride.generated.resources.Res
16+
import nodal.ride.generated.resources.address_selection
1417
import org.jetbrains.compose.resources.ExperimentalResourceApi
1518
import org.jetbrains.compose.resources.painterResource
16-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
17-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.address_selection
18-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.route_selection
19-
2019

2120
fun Node.selectAddress(onAddressSelected: (String) -> Unit) =
2221
addChild<AddressSelectionNode>(AddressSelectionCallback { onAddressSelected(it) })
@@ -27,9 +26,11 @@ class AddressSelectionNode : Node() {
2726

2827
private val onAddressSelected by dependencies<AddressSelectionCallback>()
2928

29+
private lateinit var layer: UI.Layer
30+
3031
override fun onAdded() {
3132

32-
draw {
33+
layer = ui.draw {
3334
FlexibleBottomSheet(
3435
onDismissRequest = {
3536
removeSelf()
@@ -48,4 +49,9 @@ class AddressSelectionNode : Node() {
4849
}
4950
}
5051
}
52+
53+
override fun onRemoved() {
54+
super.onRemoved()
55+
layer.destroy()
56+
}
5157
}

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedin/ride/request/select/route/RouteSelectionNode.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ import dev.omkartenkale.nodal.compose.draw
1414
import dev.omkartenkale.nodal.misc.Callback
1515
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.nonExpandingSheetState
1616
import dev.omkartenkale.nodal.util.addChild
17+
import nodal.ride.generated.resources.Res
18+
import nodal.ride.generated.resources.route_selection
1719
import org.jetbrains.compose.resources.ExperimentalResourceApi
1820
import org.jetbrains.compose.resources.painterResource
19-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
20-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.driver_arriving
21-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.route_selection
2221

2322
data class SelectedRoute(val pickup: SelectedPickup, val destination: SelectedDestination)
2423
data class SelectedPickup(val address: String, val coordinates: Float)

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedout/ConfirmOtpNode.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import dev.omkartenkale.nodal.compose.UI
2424
import dev.omkartenkale.nodal.compose.draw
2525
import dev.omkartenkale.nodal.sample.ride.util.ui.bottomsheet.nonExpandingSheetState
2626
import kotlinx.coroutines.launch
27+
import nodal.ride.generated.resources.Res
28+
import nodal.ride.generated.resources.confirm_otp
2729
import org.jetbrains.compose.resources.ExperimentalResourceApi
2830
import org.jetbrains.compose.resources.painterResource
29-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
30-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.confirm_otp
3131

3232
@ExperimentalResourceApi
3333
class ConfirmOtpNode : Node() {

‎samples/ride/src/commonMain/kotlin/dev.omkartenkale.nodal.sample.ride/nodes/root/loggedout/LoggedOutNode.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ import dev.omkartenkale.nodal.compose.UI
1919
import dev.omkartenkale.nodal.compose.draw
2020
import dev.omkartenkale.nodal.misc.Callback
2121
import dev.omkartenkale.nodal.sample.ride.nodes.root.LoggedInCallback
22+
import nodal.ride.generated.resources.Res
23+
import nodal.ride.generated.resources.signup
2224
import org.jetbrains.compose.resources.ExperimentalResourceApi
2325
import org.jetbrains.compose.resources.painterResource
24-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.Res
25-
import org.jetbrains.kotlinx.multiplatform_library_template.ride.generated.resources.signup
26-
2726
class OTPConfirmedCallback(block: (String) -> Unit) : Callback<String> by Callback(block)
2827

2928
fun Node.addLoggedOutNode(onLoggedIn: (String) -> Unit) =

0 commit comments

Comments
 (0)