Skip to content

Commit

Permalink
Removes extension function StateFlow.collectAsStateMultiplatform
Browse files Browse the repository at this point in the history 
Use StateFlow.collectAsStateWithLifecycle() instead
  • Loading branch information
@Tweener
Tweener committed Nov 19, 2024
1 parent 2288688 commit dbd02e1
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 125 deletions.
17 changes: 0 additions & 17 deletions .../androidMain/kotlin/com/tweener/czan/_internal/kotlinextensions/FlowExtensions.android.kt
View file

This file was deleted.

11 changes: 1 addition & 10 deletions czan/src/commonMain/kotlin/com/tweener/czan/_internal/kotlinextensions/FlowExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ package com.tweener.czan._internal.kotlinextensions

import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.State
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.EmptyCoroutineContext
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.StateFlow

/**
* @author Vivien Mahe
Expand All @@ -17,12 +13,7 @@ import kotlinx.coroutines.flow.StateFlow
inline fun <T> SharedFlow<T>.subscribe(crossinline action: (T) -> Unit) {
with(this) {
LaunchedEffect(this) {
this@with.collect { action.invoke(it) }
this@with.collect { action(it) }
}
}
}

@Composable
expect fun <T> StateFlow<T>.collectAsStateMultiplatform(
context: CoroutineContext = EmptyCoroutineContext,
): State<T>
26 changes: 16 additions & 10 deletions czan/src/commonMain/kotlin/com/tweener/czan/_internal/kotlinextensions/StringExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,14 @@ package com.tweener.czan._internal.kotlinextensions

import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.font.FontWeight

/**
* Applies a [FontWeight.Bold] to the given [substrings] to be found in this String.
*
* @author Vivien Mahe
* @since 19/03/2024
*/
fun String.bold(
vararg substrings: String
): AnnotatedString {
fun String.applySpanStyle(spanStyle: SpanStyle, vararg substrings: String): AnnotatedString {
val spanStyles = substrings.toList().map { text ->
with(this.indexOf(text)) {
AnnotatedString.Range(
item = SpanStyle(fontWeight = FontWeight.Bold),
item = spanStyle,
start = this,
end = this + text.length
)
Expand All @@ -25,3 +18,16 @@ fun String.bold(

return AnnotatedString(text = this, spanStyles = spanStyles)
}

/**
* Applies a [FontWeight.Bold] to the given [substrings] to be found in this String.
*/
fun String.bold(vararg substrings: String): AnnotatedString =
applySpanStyle(spanStyle = SpanStyle(fontWeight = FontWeight.Bold), substrings = substrings)

/**
* Applies a [FontStyle.Italic] to the given [substrings] to be found in this String.
*/
fun String.italic(vararg substrings: String): AnnotatedString =
applySpanStyle(spanStyle = SpanStyle(fontStyle = FontStyle.Italic), substrings = substrings)

17 changes: 0 additions & 17 deletions czan/src/iosMain/kotlin/com/tweener/czan/_internal.kotlinextensions/FlowExtensions.ios.kt
View file

This file was deleted.

17 changes: 0 additions & 17 deletions czan/src/jsMain/kotlin/com/tweener/czan/_internal.kotlinextensions/FlowExtensions.js.kt
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rc/wasmJsMain/kotlin/com/tweener/czan/_internal.kotlinextensions/FlowExtensions.wasmJs.kt
View file

This file was deleted.

37 changes: 0 additions & 37 deletions kotlin-js-store/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,6 @@
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==

[email protected]:
version "3.0.0"
resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
dependencies:
event-target-shim "^5.0.0"

accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
Expand Down Expand Up @@ -1015,11 +1008,6 @@ etag@~1.8.1:
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==

event-target-shim@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==

eventemitter3@^4.0.0:
version "4.0.7"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
Expand Down Expand Up @@ -1863,13 +1851,6 @@ neo-async@^2.6.2:
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==

[email protected]:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
dependencies:
whatwg-url "^5.0.0"

node-forge@^1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
Expand Down Expand Up @@ -2553,11 +2534,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==

tr46@~0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==

type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
Expand Down Expand Up @@ -2646,11 +2622,6 @@ wbuf@^1.1.0, wbuf@^1.7.3:
dependencies:
minimalistic-assert "^1.0.0"

webidl-conversions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==

[email protected]:
version "5.1.4"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
Expand Down Expand Up @@ -2782,14 +2753,6 @@ websocket-extensions@>=0.1.1:
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==

whatwg-url@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
dependencies:
tr46 "~0.0.3"
webidl-conversions "^3.0.0"

which@^1.2.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
Expand Down

0 comments on commit dbd02e1

Please sign in to comment.