forked from androidx/androidx
-
Notifications
You must be signed in to change notification settings - Fork 81
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Implement PlatformLocale and StringDelegate for k/wasm (#561) * Workaround `isOnUiThread` (ui-test) for k/wasm browser target * Implement PlatformLocale and StringDelegate for k/wasm * Get rid of expect/actuals for jsWasmMain and use js(...) for a common implementation * use the list of preferred languages - `window.navigator.languages` * delete unused fun `currentLanguageTag` * Add a comment
- Loading branch information
Showing
4 changed files
with
121 additions
and
16 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
compose/ui/ui-text/src/jsMain/kotlin/androidx/compose/ui/text/intl/Actuals.js.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
/* | ||
* Copyright 2023 The Android Open Source Project | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package androidx.compose.ui.text.intl | ||
|
||
internal actual fun userPreferredLanguages(): List<String> { | ||
return getUserPreferredLanguagesAsArray().toList() | ||
} | ||
|
||
@Suppress("UnsafeCastFromDynamic") | ||
private fun getUserPreferredLanguagesAsArray(): Array<String> = | ||
js("window.navigator.languages") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
compose/ui/ui-text/src/wasmMain/kotlin/androidx/compose/ui/text/intl/Actuals.wasm.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/* | ||
* Copyright 2023 The Android Open Source Project | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package androidx.compose.ui.text.intl | ||
|
||
internal actual fun userPreferredLanguages(): List<String> { | ||
val jsStringArray = getUserPreferredLanguagesAsArray() | ||
return buildList<String> { | ||
repeat(jsStringArray.length) { | ||
add(jsStringArray[it].toString()) | ||
} | ||
} | ||
} | ||
|
||
private fun getUserPreferredLanguagesAsArray(): JsArray<JsString> = | ||
js("window.navigator.languages") |