Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Antoine Jaury
|
b5d44e9ee3 | ||
|
Antoine Jaury
|
5c6892efb7 | ||
|
Antoine Jaury
|
e0edc52c6b | ||
|
Antoine Jaury
|
6f0787b10d | ||
|
Antoine Jaury
|
d843aabe19 |
@@ -32,6 +32,3 @@ data/resources/src/commonMain/composeResources/files/records.json
|
||||
keystore.properties
|
||||
*.jks
|
||||
*.keystore
|
||||
|
||||
# Secrets — see docs/sentry-glitchtip.md (the .example template stays versioned)
|
||||
.sentryclirc
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
; Template for the local `.sentryclirc` used by sentry-cli to upload debug symbols
|
||||
; to GlitchTip. Copy it to `.sentryclirc` at the repository root and fill in the token:
|
||||
;
|
||||
; cp .sentryclirc.example .sentryclirc
|
||||
; chmod 600 .sentryclirc
|
||||
;
|
||||
; `.sentryclirc` is git-ignored and must never be committed — it holds a credential.
|
||||
; See docs/sentry-glitchtip.md for the full procedure.
|
||||
|
||||
[auth]
|
||||
; Created in GlitchTip under your user menu > Profile > Auth Tokens.
|
||||
token=<your-glitchtip-auth-token>
|
||||
|
||||
[defaults]
|
||||
url=https://eu.glitchtip.com/
|
||||
org=kerlenn-sten-kidna
|
||||
project=chom-bev-e-brezhoneg
|
||||
+1
-15
@@ -7,20 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Changed
|
||||
|
||||
- show on boarding as a modal on large screens
|
||||
- limit player controller size
|
||||
- browse the web pages inside the app on web, instead of only linking to them
|
||||
- embed web pages inside the app on web
|
||||
|
||||
### Fixed
|
||||
|
||||
- Desktop: audio playback failed with *Failed to play audio* on every record,
|
||||
because the JDK cannot decode the `.m4a` (AAC) recordings on its own.
|
||||
- add emoji fallback for web
|
||||
- correct seeking to a sentence on web
|
||||
|
||||
## [1.0.0-alpha02] - 2026-08-04
|
||||
|
||||
### Added
|
||||
@@ -78,7 +64,7 @@ First public release of **Chom Bev e Brezhoneg**.
|
||||
- Targets Android, iOS, Desktop (JVM) and Web (JS + Wasm), all sharing the same
|
||||
Compose Multiplatform UI. Only Android has been deeply tested for this version.
|
||||
- Audio playback backed by ExoPlayer (Android), AVFoundation (iOS), the browser
|
||||
audio APIs (Web) and `javax.sound.sampled` (Desktop).
|
||||
audio APIs (Web) and VorbisSPI (Desktop).
|
||||
- Light and dark themes; interface localised in French and Breton.
|
||||
- Modular architecture: `core`, `data` and `feature` modules glued by a thin
|
||||
`shared` module, with Koin dependency injection validated at build time.
|
||||
|
||||
@@ -93,24 +93,8 @@ See [Resource's README.md](data/resources/README.md) to handle the resource file
|
||||
audio files,
|
||||
and subtitles).
|
||||
|
||||
## Documentation
|
||||
|
||||
- [Crash reporting — Sentry SDK on GlitchTip](./docs/sentry-glitchtip.md): DSN configuration,
|
||||
`.sentryclirc` setup, and the iOS Archive procedure for uploading dSYM files.
|
||||
|
||||
## Crash reporting
|
||||
|
||||
Crashes are reported with the Sentry Kotlin Multiplatform SDK to a [GlitchTip](https://glitchtip.com)
|
||||
instance. The DSN is read from `local.properties` and never committed, so a fresh clone builds and
|
||||
runs with crash reporting disabled until you configure it. See
|
||||
[docs/sentry-glitchtip.md](./docs/sentry-glitchtip.md).R
|
||||
|
||||
## License
|
||||
|
||||
The web build bundles a subset of [Noto Color Emoji](https://github.com/googlefonts/noto-emoji),
|
||||
licensed under the SIL Open Font License 1.1
|
||||
([data/resources/licenses/NotoColorEmoji-OFL.txt](./data/resources/licenses/NotoColorEmoji-OFL.txt)).
|
||||
|
||||
This project is licensed under the Apache License 2.0. See the [LICENSE](LICENSE) file for details.
|
||||
|
||||
```
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
# Android app
|
||||
|
||||
## Crash logging
|
||||
|
||||
GlitchTip is configured in the project. It uses the open source solution Senstry to log crashes
|
||||
generated by the app and send them to GlitchTip on a European server.
|
||||
|
||||
## StrictMode (debug builds)
|
||||
|
||||
The app enables Android [StrictMode](https://developer.android.com/reference/android/os/StrictMode)
|
||||
|
||||
@@ -12,11 +12,7 @@ plugins {
|
||||
// Apply Google Services only when the Firebase config is present: google-services.json is not
|
||||
// tracked in git (see google-services.example.json), so builds must work without it.
|
||||
if (file("google-services.json").exists()) {
|
||||
apply(
|
||||
plugin = libs.plugins.googleServices
|
||||
.get()
|
||||
.pluginId,
|
||||
)
|
||||
apply(plugin = libs.plugins.googleServices.get().pluginId)
|
||||
}
|
||||
|
||||
kotlin {
|
||||
@@ -31,6 +27,9 @@ dependencies {
|
||||
implementation(libs.androidx.activity.compose)
|
||||
implementation(libs.compose.uiToolingPreview)
|
||||
debugImplementation(libs.compose.uiTooling)
|
||||
|
||||
// Crash logging
|
||||
implementation(libs.glitchtips)
|
||||
}
|
||||
|
||||
android {
|
||||
@@ -50,8 +49,12 @@ android {
|
||||
libs.versions.androidTargetSdk
|
||||
.get()
|
||||
.toInt()
|
||||
versionCode = 2
|
||||
versionName = "1.0.0-beta01"
|
||||
versionCode = 1
|
||||
versionName = "1.0.0-alpha01"
|
||||
|
||||
// Crash-reporting DSN, kept out of the public repo: read from local.properties
|
||||
// (glitchtip.dsn=...). Empty when absent, which disables the Sentry SDK.
|
||||
manifestPlaceholders["glitchtipDsn"] = localProperty("glitchtip.dsn") ?: ""
|
||||
}
|
||||
packaging {
|
||||
resources {
|
||||
@@ -69,3 +72,12 @@ android {
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
}
|
||||
|
||||
/** Reads a key from the root local.properties, or null when the file or key is absent. */
|
||||
fun localProperty(key: String): String? {
|
||||
val file = rootProject.file("local.properties")
|
||||
if (!file.exists()) return null
|
||||
return Properties()
|
||||
.apply { file.inputStream().use { load(it) } }
|
||||
.getProperty(key)
|
||||
}
|
||||
|
||||
@@ -20,6 +20,11 @@
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<!-- Injected from local.properties (glitchtip.dsn); an empty DSN disables the SDK. -->
|
||||
<meta-data android:name="io.sentry.dsn" android:value="${glitchtipDsn}" />
|
||||
<meta-data android:name="io.sentry.traces.sample-rate" android:value="0.01" />
|
||||
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -10,11 +10,10 @@ class ChomBevApp : Application() {
|
||||
if (isDebuggable()) {
|
||||
enableStrictMode()
|
||||
}
|
||||
|
||||
SentryHelper.initializeSentry()
|
||||
}
|
||||
|
||||
private fun isDebuggable(): Boolean = applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
|
||||
private fun isDebuggable(): Boolean =
|
||||
applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
|
||||
|
||||
/**
|
||||
* Enables StrictMode for debug builds only. All violations are logged
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
import java.util.Properties
|
||||
|
||||
/**
|
||||
* Injects build-time secrets into `commonMain` so they stay out of version control.
|
||||
*
|
||||
* Each secret is read from the environment first (CI), then from `local.properties`
|
||||
* (local development), and defaults to an empty string when neither provides it —
|
||||
* consumers are expected to degrade gracefully rather than fail.
|
||||
*
|
||||
* The values are emitted as a generated `BuildSecrets` object, available to every
|
||||
* Kotlin target of the module.
|
||||
*/
|
||||
|
||||
plugins {
|
||||
id("org.jetbrains.kotlin.multiplatform")
|
||||
}
|
||||
|
||||
val secretsPackage = "bzh.ajaury.chombev"
|
||||
|
||||
private val localProperties: Provider<Properties> =
|
||||
providers
|
||||
.fileContents(layout.settingsDirectory.file("local.properties"))
|
||||
.asText
|
||||
.map { text -> Properties().apply { load(text.reader()) } }
|
||||
|
||||
/** Resolves a secret from [environmentVariable], falling back to [localPropertyKey], then to an empty string. */
|
||||
fun secret(
|
||||
environmentVariable: String,
|
||||
localPropertyKey: String,
|
||||
): Provider<String> =
|
||||
providers
|
||||
.environmentVariable(environmentVariable)
|
||||
.orElse(localProperties.map { properties -> properties.getProperty(localPropertyKey).orEmpty() })
|
||||
.orElse("")
|
||||
|
||||
// GlitchTip DSN, consumed by initializeSentry() in the shared module.
|
||||
val glitchtipDsn: Provider<String> = secret(environmentVariable = "GLITCHTIP_DSN", localPropertyKey = "glitchtip.dsn")
|
||||
|
||||
val generateBuildSecrets =
|
||||
tasks.register("generateBuildSecrets") {
|
||||
description = "Generates the BuildSecrets object from local.properties and environment variables."
|
||||
|
||||
// Escaped here so the value can be inlined as-is in a Kotlin string literal.
|
||||
val dsn =
|
||||
glitchtipDsn.map { value ->
|
||||
value
|
||||
.replace("\\", "\\\\")
|
||||
.replace("\"", "\\\"")
|
||||
.replace("$", "\${'$'}")
|
||||
}
|
||||
val outputDir = layout.buildDirectory.dir("generated/secrets/commonMain/kotlin")
|
||||
// Kept in locals so the execution-time action never captures the script instance.
|
||||
val packageName = secretsPackage
|
||||
val packagePath = packageName.replace('.', '/')
|
||||
|
||||
inputs.property("glitchtipDsn", dsn)
|
||||
outputs.dir(outputDir)
|
||||
|
||||
doLast {
|
||||
val file =
|
||||
outputDir
|
||||
.get()
|
||||
.asFile
|
||||
.resolve("$packagePath/BuildSecrets.kt")
|
||||
file.parentFile.mkdirs()
|
||||
file.writeText(
|
||||
"""
|
||||
package $packageName
|
||||
|
||||
// Generated by the `gwenedeg.secrets` convention plugin. Do not edit.
|
||||
internal object BuildSecrets {
|
||||
const val GLITCHTIP_DSN: String = "${dsn.get()}"
|
||||
}
|
||||
|
||||
""".trimIndent(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
sourceSets.commonMain {
|
||||
kotlin.srcDir(generateBuildSecrets)
|
||||
}
|
||||
}
|
||||
@@ -14,8 +14,8 @@ kotlin {
|
||||
implementation(libs.media3.common)
|
||||
}
|
||||
jvmMain.dependencies {
|
||||
// Desktop audio: AAC/MP4 SPI so javax.sound.sampled can decode .m4a
|
||||
implementation(libs.jaad)
|
||||
// Desktop audio: Ogg Vorbis SPI so javax.sound.sampled can decode .ogg
|
||||
implementation(libs.vorbisspi)
|
||||
}
|
||||
// webMain is the js + wasmJs intermediate source set from the default hierarchy template.
|
||||
webMain.dependencies {
|
||||
|
||||
+2
@@ -1,5 +1,6 @@
|
||||
package bzh.ajaury.chombev.player.di
|
||||
|
||||
import bzh.ajaury.chombev.core.logging.di.loggingModule
|
||||
import bzh.ajaury.chombev.player.data.IosAudioPlayer
|
||||
import bzh.ajaury.chombev.player.data.IosAudioSessionManager
|
||||
import bzh.ajaury.chombev.player.domain.AudioPlayer
|
||||
@@ -10,6 +11,7 @@ import org.koin.core.module.dsl.singleOf
|
||||
import org.koin.dsl.module
|
||||
|
||||
actual val audioPlayerModule: Module = module {
|
||||
includes(loggingModule)
|
||||
singleOf(::IosAudioPlayer) { bind<AudioPlayer>() }
|
||||
singleOf(::IosAudioSessionManager) { bind<AudioSessionManager>() }
|
||||
}
|
||||
|
||||
+3
-3
@@ -18,9 +18,9 @@ import kotlin.time.Duration.Companion.microseconds
|
||||
/**
|
||||
* Desktop [AudioPlayer] backed by [javax.sound.sampled].
|
||||
*
|
||||
* The JDK decodes neither AAC nor its MP4 container, so the `.m4a` recordings are decoded to PCM by
|
||||
* the jaad AAC provider on the classpath, which [AudioSystem] discovers automatically. Loading then
|
||||
* works the same as for any natively supported format.
|
||||
* The Ogg Vorbis recordings are decoded to PCM by the VorbisSPI providers on the classpath, which
|
||||
* the JDK [AudioSystem] discovers automatically, so loading works the same as any natively
|
||||
* supported format.
|
||||
*/
|
||||
internal class JvmAudioPlayer : AudioPlayer {
|
||||
private var clip: Clip? = null
|
||||
|
||||
+1
-2
@@ -24,8 +24,7 @@ internal class WebAudioPlayer : AudioPlayer {
|
||||
get() = (audio?.duration?.takeIf { it.isFinite() } ?: 0.0).seconds
|
||||
|
||||
override fun seekTo(position: Duration) {
|
||||
audio?.currentTime = position.inWholeMilliseconds.toDouble() / 1000
|
||||
audio?.play()
|
||||
audio?.currentTime = position.inWholeMicroseconds.toDouble()
|
||||
}
|
||||
|
||||
override fun load(uri: String) {
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
This Font Software is licensed under the SIL Open Font License,
|
||||
Version 1.1.
|
||||
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font
|
||||
creation efforts of academic and linguistic communities, and to
|
||||
provide a free and open framework in which fonts may be shared and
|
||||
improved in partnership with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply to
|
||||
any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software
|
||||
components as distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to,
|
||||
deleting, or substituting -- in part or in whole -- any of the
|
||||
components of the Original Version, by changing formats or by porting
|
||||
the Font Software to a new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed,
|
||||
modify, redistribute, and sell modified and unmodified copies of the
|
||||
Font Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components, in
|
||||
Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the
|
||||
corresponding Copyright Holder. This restriction only applies to the
|
||||
primary font name as presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created using
|
||||
the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -0,0 +1,44 @@
|
||||
<vector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="450dp"
|
||||
android:height="450dp"
|
||||
android:viewportWidth="64"
|
||||
android:viewportHeight="64">
|
||||
<path
|
||||
android:pathData="M56.25,18V46L32,60 7.75,46V18L32,4Z"
|
||||
android:fillColor="#6075f2"/>
|
||||
<path
|
||||
android:pathData="m41.5,26.5v11L32,43V60L56.25,46V18Z"
|
||||
android:fillColor="#6b57ff"/>
|
||||
<path
|
||||
android:pathData="m32,43 l-9.5,-5.5v-11L7.75,18V46L32,60Z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:centerX="23.131"
|
||||
android:centerY="18.441"
|
||||
android:gradientRadius="42.132"
|
||||
android:type="radial">
|
||||
<item android:offset="0" android:color="#FF5383EC"/>
|
||||
<item android:offset="0.867" android:color="#FF7F52FF"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:pathData="M22.5,26.5 L32,21 41.5,26.5 56.25,18 32,4 7.75,18Z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:startX="44.172"
|
||||
android:startY="4.377"
|
||||
android:endX="17.973"
|
||||
android:endY="34.035"
|
||||
android:type="linear">
|
||||
<item android:offset="0" android:color="#FF33C3FF"/>
|
||||
<item android:offset="0.878" android:color="#FF5383EC"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:pathData="m32,21 l9.526,5.5v11L32,43 22.474,37.5v-11z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
@@ -42,7 +42,6 @@
|
||||
<string name="onboarding_level_advanced_description">Tizh boas, hep ehan etre ar frazennoù</string>
|
||||
<string name="onboarding_next">War-lerc\'h</string>
|
||||
<string name="onboarding_start">Kregiñ</string>
|
||||
<string name="onboarding_close">Serriñ</string>
|
||||
|
||||
<string name="player_back">Distreiñ</string>
|
||||
<string name="player_previous_sentence">Frazenn a-raok</string>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<string name="nav_deepen">Approfondir</string>
|
||||
<string name="nav_about">À propos</string>
|
||||
|
||||
<string name="web_unavailable_message">Impossible d'afficher cette page ici.</string>
|
||||
<string name="web_unavailable_message">Impossible d\'afficher cette page ici.</string>
|
||||
<string name="web_open_in_browser">Ouvrir dans le navigateur</string>
|
||||
|
||||
<string name="subtitle_preferences_title">Sous-titres</string>
|
||||
@@ -42,7 +42,6 @@
|
||||
<string name="onboarding_level_advanced_description">Vitesse normale, sans pause</string>
|
||||
<string name="onboarding_next">Suivant</string>
|
||||
<string name="onboarding_start">Commencer</string>
|
||||
<string name="onboarding_close">Fermer</string>
|
||||
|
||||
<string name="player_back">Retour</string>
|
||||
<string name="player_previous_sentence">Phrase précédente</string>
|
||||
|
||||
Binary file not shown.
@@ -1,164 +0,0 @@
|
||||
# Crash reporting — Sentry SDK on GlitchTip
|
||||
|
||||
Chom Bev reports crashes and handled errors with the
|
||||
[Sentry Kotlin Multiplatform SDK](https://docs.sentry.io/platforms/kotlin/guides/kotlin-multiplatform/),
|
||||
but sends them to [GlitchTip](https://glitchtip.com) instead of Sentry. GlitchTip is an
|
||||
open-source, Sentry-API-compatible backend, so the Sentry SDKs and `glitchtip-cli` work against
|
||||
it unchanged — only the DSN (and the CLI's `url`) point somewhere else.
|
||||
|
||||
Our instance is the hosted EU one: <https://eu.glitchtip.com>.
|
||||
|
||||
| | |
|
||||
|-----------------------|------------------------------------------------------------------------------------------------------|
|
||||
| SDK | `io.sentry.kotlin.multiplatform` (see `sentry` in `gradle/libs.versions.toml`) |
|
||||
| Gradle plugin | `io.sentry.kotlin.multiplatform.gradle`, applied in `shared/build.gradle.kts` |
|
||||
| iOS native dependency | `sentry-cocoa` via Swift Package Manager, declared in the Xcode project |
|
||||
| Initialisation | `initializeSentry()` in `shared/src/commonMain/kotlin/bzh/ajaury/chombev/SentryHelper.kt` |
|
||||
| Called from | `ChomBevApp.onCreate()` (Android), `AppDelegate.application(_:didFinishLaunchingWithOptions:)` (iOS) |
|
||||
|
||||
There are two distinct pieces of configuration, and they are easy to confuse:
|
||||
|
||||
1. **The DSN** — where the *app* sends events at runtime. Injected at build time from
|
||||
`local.properties`. See [Runtime configuration](#1-runtime-configuration--the-dsn).
|
||||
2. **The auth token** — how *your machine or CI* uploads debug symbols to GlitchTip.
|
||||
Stored in `.sentryclirc`. See [CLI configuration](#2-cli-configuration--sentryclirc).
|
||||
|
||||
Neither is committed.
|
||||
|
||||
---
|
||||
|
||||
## 1. Runtime configuration — the DSN
|
||||
|
||||
The DSN is a write-only endpoint URL identifying the GlitchTip project. It is kept out of
|
||||
version control by the `gwenedeg.secrets` convention plugin
|
||||
(`build-logic/src/main/kotlin/gwenedeg.secrets.gradle.kts`), which reads it at build
|
||||
time and generates an internal `BuildSecrets` object into `commonMain`.
|
||||
|
||||
### Setup
|
||||
|
||||
Add the DSN to `local.properties` at the repository root (this file is git-ignored):
|
||||
|
||||
```properties
|
||||
glitchtip.dsn=https://<key>@eu.glitchtip.com/<project-id>
|
||||
```
|
||||
|
||||
Find the value in GlitchTip under **Settings → Projects → _Chom Bev e Brezhoneg_ → Client Keys (DSN)**.
|
||||
|
||||
On CI, set the `GLITCHTIP_DSN` environment variable instead — it takes precedence over
|
||||
`local.properties`.
|
||||
|
||||
### Behaviour when it is missing
|
||||
|
||||
`initializeSentry()` returns early when the DSN is blank, so a fresh clone builds and runs
|
||||
with crash reporting simply disabled. No placeholder or dummy DSN is needed.
|
||||
|
||||
### Adding other secrets
|
||||
|
||||
Extend the `secret(environmentVariable, localPropertyKey)` helper in the convention plugin
|
||||
rather than hardcoding values in Kotlin sources.
|
||||
|
||||
---
|
||||
|
||||
## 2. CLI configuration — `.sentryclirc`
|
||||
|
||||
`sentry-cli` needs an auth token to upload debug symbols. It reads its settings from a
|
||||
`.sentryclirc` INI file in the current working directory (and from `~/.sentryclirc`),
|
||||
or from environment variables.
|
||||
|
||||
> **`.sentryclirc` contains a credential and must never be committed.**
|
||||
> It is listed in `.gitignore`. Only `.sentryclirc.example` is versioned.
|
||||
|
||||
### Setup
|
||||
|
||||
```bash
|
||||
cp .sentryclirc.example .sentryclirc
|
||||
chmod 600 .sentryclirc
|
||||
```
|
||||
|
||||
Then edit `.sentryclirc` and replace the token placeholder:
|
||||
|
||||
```ini
|
||||
[auth]
|
||||
token=<your-glitchtip-auth-token>
|
||||
|
||||
[defaults]
|
||||
url=https://eu.glitchtip.com/
|
||||
org=kerlenn-sten-kidna
|
||||
project=chom-bev-e-brezhoneg
|
||||
```
|
||||
|
||||
- `url` is mandatory: without it `glitchtip-cli` talks to sentry.io, not GlitchTip.
|
||||
- `org` and `project` are the *slugs* shown in the GlitchTip URLs, not the display names.
|
||||
|
||||
### Creating the token
|
||||
|
||||
In GlitchTip: **user menu → Profile → Auth Tokens → Create New Token**. Grant it at least
|
||||
`project:read`, `project:write` and `project:releases`. Copy the token immediately — it is
|
||||
shown only once.
|
||||
|
||||
### On CI
|
||||
|
||||
Do not write the file. Export the equivalent environment variables, sourced from your CI
|
||||
secret store:
|
||||
|
||||
```bash
|
||||
export SENTRY_URL=https://eu.glitchtip.com/
|
||||
export SENTRY_ORG=kerlenn-sten-kidna
|
||||
export SENTRY_PROJECT=chom-bev-e-brezhoneg
|
||||
export SENTRY_AUTH_TOKEN=***
|
||||
```
|
||||
|
||||
### Installing glitchtip-cli
|
||||
|
||||
```bash
|
||||
curl -fsSL https://glitchtip.com/install.sh | sh
|
||||
```
|
||||
|
||||
Check that the configuration resolves:
|
||||
|
||||
```bash
|
||||
glitchtip-cli info
|
||||
```
|
||||
|
||||
It should print the GlitchTip URL and report the token as valid.
|
||||
|
||||
---
|
||||
|
||||
## 3. iOS Archive — uploading dSYM files
|
||||
|
||||
### Why this is needed
|
||||
|
||||
A release iOS binary ships without symbol names. Without the matching dSYM, GlitchTip shows
|
||||
crash frames as raw memory addresses. Uploading the dSYM lets it resolve them back to
|
||||
function names and line numbers.
|
||||
|
||||
The shared Kotlin framework is linked **statically** (`isStatic = true` in
|
||||
`shared/build.gradle.kts`), so Kotlin/Native frames end up in the app's own dSYM — there is
|
||||
no separate framework dSYM to upload.
|
||||
|
||||
### Prerequisites
|
||||
|
||||
You need `glitchtip-cli` installed and `.sentryclirc` filled in ([section 2](#2-cli-configuration--sentryclirc)).
|
||||
|
||||
### Upload after an archive
|
||||
|
||||
1. **Product → Archive** in Xcode.
|
||||
2. In the Organizer, right-click the archive → **Show in Finder**.
|
||||
3. Right-click the `.xcarchive` → **Show Package Contents**.
|
||||
4. Upload the `dSYMs` folder:
|
||||
|
||||
```bash
|
||||
cd /path/to/Gwenedeg
|
||||
glitchtip-cli debug-files upload /path/to/Gwenedeg.xcarchive/dSYMs
|
||||
```
|
||||
|
||||
Add `--include-sources` if you also want source context attached to native frames.
|
||||
|
||||
## 4. References
|
||||
|
||||
- [Sentry — Kotlin Multiplatform SDK](https://docs.sentry.io/platforms/kotlin/guides/kotlin-multiplatform/)
|
||||
- [Sentry — Uploading debug symbols for Apple platforms](https://docs.sentry.io/platforms/apple/guides/ios/dsym/)
|
||||
- [Sentry — data collected by the SDK](https://docs.sentry.io/platforms/kotlin/guides/kotlin-multiplatform/data-management/data-collected/)
|
||||
- [GlitchTip documentation](https://glitchtip.com/documentation)
|
||||
- [GlitchTip CLI documentation](https://glitchtip.com/documentation/cli)
|
||||
- [Kotlin — symbolicating iOS crash reports](https://kotlinlang.org/docs/native-ios-symbolication.html)
|
||||
+59
-152
@@ -1,27 +1,20 @@
|
||||
package bzh.ajaury.chombev.onboarding.ui
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.sizeIn
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.pager.HorizontalPager
|
||||
import androidx.compose.foundation.pager.rememberPagerState
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.Hearing
|
||||
import androidx.compose.material.icons.filled.Speed
|
||||
import androidx.compose.material.icons.filled.Subtitles
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
@@ -30,8 +23,6 @@ import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.window.Dialog
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import bzh.ajaury.chombev.onboarding.model.OnboardingLevel
|
||||
import bzh.ajaury.chombev.onboarding.ui.components.OnboardingInfoPage
|
||||
@@ -40,7 +31,6 @@ import bzh.ajaury.chombev.onboarding.ui.components.OnboardingPageIndicator
|
||||
import bzh.ajaury.chombev.onboarding.ui.viewmodel.OnboardingUiState
|
||||
import bzh.ajaury.chombev.onboarding.ui.viewmodel.OnboardingViewModel
|
||||
import bzh.ajaury.chombev.resources.generated.resources.Res
|
||||
import bzh.ajaury.chombev.resources.generated.resources.onboarding_close
|
||||
import bzh.ajaury.chombev.resources.generated.resources.onboarding_goal_description
|
||||
import bzh.ajaury.chombev.resources.generated.resources.onboarding_goal_title
|
||||
import bzh.ajaury.chombev.resources.generated.resources.onboarding_next
|
||||
@@ -56,156 +46,93 @@ import org.koin.compose.viewmodel.koinViewModel
|
||||
private const val PAGE_COUNT = 4
|
||||
private const val LEVEL_PAGE_INDEX = PAGE_COUNT - 1
|
||||
|
||||
private val DIALOG_MAX_WIDTH = 560.dp
|
||||
private val DIALOG_MAX_HEIGHT = 680.dp
|
||||
private const val DIALOG_WINDOW_FRACTION = 0.9f
|
||||
|
||||
@Composable
|
||||
fun OnboardingScreen(
|
||||
showAsDialog: Boolean = false,
|
||||
viewModel: OnboardingViewModel = koinViewModel(),
|
||||
) {
|
||||
fun OnboardingScreen(viewModel: OnboardingViewModel = koinViewModel()) {
|
||||
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
|
||||
|
||||
OnboardingScreen(
|
||||
uiState = uiState,
|
||||
showAsDialog = showAsDialog,
|
||||
onLevelSelected = viewModel::selectLevel,
|
||||
onFinish = viewModel::completeOnboarding,
|
||||
onDismiss = viewModel::skipOnboarding,
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun OnboardingScreen(
|
||||
uiState: OnboardingUiState,
|
||||
showAsDialog: Boolean = false,
|
||||
onLevelSelected: (OnboardingLevel) -> Unit = {},
|
||||
onFinish: () -> Unit = {},
|
||||
onDismiss: () -> Unit = {},
|
||||
) {
|
||||
if (showAsDialog) {
|
||||
Dialog(
|
||||
onDismissRequest = onDismiss,
|
||||
// The content sizes itself against the window rather than the platform default width.
|
||||
properties = DialogProperties(usePlatformDefaultWidth = false),
|
||||
) {
|
||||
Surface(
|
||||
modifier = Modifier
|
||||
.sizeIn(maxWidth = DIALOG_MAX_WIDTH, maxHeight = DIALOG_MAX_HEIGHT)
|
||||
.fillMaxSize(fraction = DIALOG_WINDOW_FRACTION),
|
||||
shape = MaterialTheme.shapes.extraLarge,
|
||||
color = MaterialTheme.colorScheme.surfaceContainerHigh,
|
||||
) {
|
||||
OnboardingContent(
|
||||
uiState = uiState,
|
||||
onLevelSelected = onLevelSelected,
|
||||
onFinish = onFinish,
|
||||
onClose = onDismiss,
|
||||
)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Scaffold { innerPadding ->
|
||||
OnboardingContent(
|
||||
uiState = uiState,
|
||||
modifier = Modifier.padding(innerPadding),
|
||||
onLevelSelected = onLevelSelected,
|
||||
onFinish = onFinish,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun OnboardingContent(
|
||||
uiState: OnboardingUiState,
|
||||
modifier: Modifier = Modifier,
|
||||
onLevelSelected: (OnboardingLevel) -> Unit = {},
|
||||
onFinish: () -> Unit = {},
|
||||
onClose: (() -> Unit)? = null,
|
||||
) {
|
||||
val pagerState = rememberPagerState(pageCount = { PAGE_COUNT })
|
||||
val scope = rememberCoroutineScope()
|
||||
val isLastPage = pagerState.currentPage == LEVEL_PAGE_INDEX
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.padding(24.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
if (onClose != null) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.End,
|
||||
) {
|
||||
IconButton(onClick = onClose) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.Close,
|
||||
contentDescription = stringResource(Res.string.onboarding_close),
|
||||
Scaffold { innerPadding ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.padding(innerPadding)
|
||||
.fillMaxSize()
|
||||
.padding(24.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
HorizontalPager(
|
||||
state = pagerState,
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.fillMaxWidth(),
|
||||
) { page ->
|
||||
when (page) {
|
||||
0 -> OnboardingInfoPage(
|
||||
icon = Icons.Filled.Hearing,
|
||||
title = stringResource(Res.string.onboarding_goal_title),
|
||||
description = stringResource(Res.string.onboarding_goal_description),
|
||||
)
|
||||
|
||||
1 -> OnboardingInfoPage(
|
||||
icon = Icons.Filled.Subtitles,
|
||||
title = stringResource(Res.string.onboarding_subtitles_title),
|
||||
description = stringResource(Res.string.onboarding_subtitles_description),
|
||||
)
|
||||
|
||||
2 -> OnboardingInfoPage(
|
||||
icon = Icons.Filled.Speed,
|
||||
title = stringResource(Res.string.onboarding_playback_title),
|
||||
description = stringResource(Res.string.onboarding_playback_description),
|
||||
)
|
||||
|
||||
else -> OnboardingLevelPage(
|
||||
selectedLevel = uiState.selectedLevel,
|
||||
onLevelSelected = onLevelSelected,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HorizontalPager(
|
||||
state = pagerState,
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.fillMaxWidth(),
|
||||
) { page ->
|
||||
when (page) {
|
||||
0 -> OnboardingInfoPage(
|
||||
icon = Icons.Filled.Hearing,
|
||||
title = stringResource(Res.string.onboarding_goal_title),
|
||||
description = stringResource(Res.string.onboarding_goal_description),
|
||||
)
|
||||
OnboardingPageIndicator(
|
||||
pageCount = PAGE_COUNT,
|
||||
currentPage = pagerState.currentPage,
|
||||
)
|
||||
|
||||
1 -> OnboardingInfoPage(
|
||||
icon = Icons.Filled.Subtitles,
|
||||
title = stringResource(Res.string.onboarding_subtitles_title),
|
||||
description = stringResource(Res.string.onboarding_subtitles_description),
|
||||
)
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
2 -> OnboardingInfoPage(
|
||||
icon = Icons.Filled.Speed,
|
||||
title = stringResource(Res.string.onboarding_playback_title),
|
||||
description = stringResource(Res.string.onboarding_playback_description),
|
||||
)
|
||||
|
||||
else -> OnboardingLevelPage(
|
||||
selectedLevel = uiState.selectedLevel,
|
||||
onLevelSelected = onLevelSelected,
|
||||
Button(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
onClick = {
|
||||
if (isLastPage) {
|
||||
onFinish()
|
||||
} else {
|
||||
scope.launch {
|
||||
pagerState.animateScrollToPage(pagerState.currentPage + 1)
|
||||
}
|
||||
}
|
||||
},
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(
|
||||
if (isLastPage) Res.string.onboarding_start else Res.string.onboarding_next,
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
OnboardingPageIndicator(
|
||||
pageCount = PAGE_COUNT,
|
||||
currentPage = pagerState.currentPage,
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Button(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
onClick = {
|
||||
if (isLastPage) {
|
||||
onFinish()
|
||||
} else {
|
||||
scope.launch {
|
||||
pagerState.animateScrollToPage(pagerState.currentPage + 1)
|
||||
}
|
||||
}
|
||||
},
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(
|
||||
if (isLastPage) Res.string.onboarding_start else Res.string.onboarding_next,
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -221,23 +148,3 @@ private fun OnboardingScreenPreview() {
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
private fun OnboardingContentAsDialogPreview() {
|
||||
MaterialTheme {
|
||||
Surface(
|
||||
modifier = Modifier.sizeIn(maxWidth = DIALOG_MAX_WIDTH, maxHeight = DIALOG_MAX_HEIGHT),
|
||||
shape = MaterialTheme.shapes.extraLarge,
|
||||
color = MaterialTheme.colorScheme.surfaceContainerHigh,
|
||||
) {
|
||||
OnboardingContent(
|
||||
uiState = OnboardingUiState(
|
||||
isCompleted = false,
|
||||
selectedLevel = OnboardingLevel.BEGINNER,
|
||||
),
|
||||
onClose = {},
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-6
@@ -36,12 +36,6 @@ class OnboardingViewModel(
|
||||
selectedLevel.value = level
|
||||
}
|
||||
|
||||
fun skipOnboarding() {
|
||||
viewModelScope.launch {
|
||||
preferencesRepository.setOnboardingCompleted()
|
||||
}
|
||||
}
|
||||
|
||||
fun completeOnboarding() {
|
||||
val level = selectedLevel.value
|
||||
viewModelScope.launch {
|
||||
|
||||
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
@@ -49,7 +48,7 @@ fun PlayerControl(
|
||||
)
|
||||
|
||||
Row(
|
||||
modifier = Modifier.widthIn(max = 350.dp).fillMaxWidth(),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
// Left region: the speed button is centered in the space left of the transport group.
|
||||
|
||||
@@ -14,15 +14,6 @@ kotlin {
|
||||
implementation(libs.compose.uiToolingPreview)
|
||||
implementation(libs.androidx.webkit)
|
||||
}
|
||||
// webMain is the js + wasmJs intermediate source set from the default hierarchy template.
|
||||
webMain.dependencies {
|
||||
// DOM access (document, navigator) to embed the page in an <iframe>
|
||||
implementation(libs.kotlinx.browser)
|
||||
}
|
||||
wasmJsMain {
|
||||
// HTMLIFrameElement interop on Wasm requires this opt-in.
|
||||
languageSettings.optIn("kotlin.js.ExperimentalWasmJsInterop")
|
||||
}
|
||||
commonMain.dependencies {
|
||||
// Core modules
|
||||
implementation(projects.core.logging)
|
||||
|
||||
@@ -4,12 +4,11 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
|
||||
/**
|
||||
* Embeds a live web page. Android and iOS use their native web view, the web uses an `<iframe>`
|
||||
* overlaying the Compose canvas, and all three honour [darkTheme] so the page matches the app's
|
||||
* light/dark appearance — as far as the page itself allows. Desktop, which has no web view to
|
||||
* embed, falls back to [WebViewUnavailable] and offers to open the page in the system browser.
|
||||
* Embeds a live web page. Platforms with a native web view (Android, iOS) render the page inline,
|
||||
* honouring [darkTheme] so the page matches the app's light/dark appearance; the others fall back to
|
||||
* [WebViewUnavailable], which offers to open the page in the system browser.
|
||||
*
|
||||
* When [url] cannot be reached, the embedded views swap in [offlineHtml] — a bundled offline
|
||||
* When [url] cannot be reached, the native web views swap in [offlineHtml] — a bundled offline
|
||||
* snapshot — so the page still shows content. When it is `null` no fallback is loaded.
|
||||
*
|
||||
* [onLoadingStateChange] reports whether a page is currently loading, so the caller can show a
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
package bzh.ajaury.chombev.web.ui
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.ui.Modifier
|
||||
|
||||
@Composable
|
||||
actual fun PlatformWebView(
|
||||
url: String,
|
||||
offlineHtml: String?,
|
||||
darkTheme: Boolean,
|
||||
onLoadingStateChange: (Boolean) -> Unit,
|
||||
modifier: Modifier,
|
||||
) {
|
||||
// The Compose canvas can't host an iframe cleanly; nothing loads, so report done and open in browser.
|
||||
LaunchedEffect(Unit) { onLoadingStateChange(false) }
|
||||
WebViewUnavailable(url = url, modifier = modifier)
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package bzh.ajaury.chombev.web.ui
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.ui.Modifier
|
||||
|
||||
@Composable
|
||||
actual fun PlatformWebView(
|
||||
url: String,
|
||||
offlineHtml: String?,
|
||||
darkTheme: Boolean,
|
||||
onLoadingStateChange: (Boolean) -> Unit,
|
||||
modifier: Modifier,
|
||||
) {
|
||||
// The Compose canvas can't host an iframe cleanly; nothing loads, so report done and open in browser.
|
||||
LaunchedEffect(Unit) { onLoadingStateChange(false) }
|
||||
WebViewUnavailable(url = url, modifier = modifier)
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
package bzh.ajaury.chombev.web.ui
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.rememberUpdatedState
|
||||
import androidx.compose.ui.ExperimentalComposeUiApi
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.viewinterop.HtmlElementView
|
||||
import kotlinx.browser.document
|
||||
import kotlinx.browser.window
|
||||
import org.w3c.dom.HTMLIFrameElement
|
||||
|
||||
/**
|
||||
* Scripts, forms and target=_blank links keep the embedded site usable; top-level navigation is
|
||||
* withheld, so a framed page cannot replace the app with itself.
|
||||
*/
|
||||
private const val IFRAME_SANDBOX =
|
||||
"allow-scripts allow-same-origin allow-forms allow-popups allow-popups-to-escape-sandbox"
|
||||
|
||||
/**
|
||||
* Embeds the page in an `<iframe>`. [HtmlElementView] overlays the element on the Compose canvas and
|
||||
* keeps it aligned with this composable's bounds, so the page is browsed inside the app rather than
|
||||
* in a separate tab.
|
||||
*/
|
||||
@OptIn(ExperimentalComposeUiApi::class)
|
||||
@Composable
|
||||
actual fun PlatformWebView(
|
||||
url: String,
|
||||
offlineHtml: String?,
|
||||
darkTheme: Boolean,
|
||||
onLoadingStateChange: (Boolean) -> Unit,
|
||||
modifier: Modifier,
|
||||
) {
|
||||
// The element outlives recompositions, so its load listener has to read the latest callback.
|
||||
val currentOnLoadingStateChange by rememberUpdatedState(onLoadingStateChange)
|
||||
|
||||
HtmlElementView(
|
||||
modifier = modifier,
|
||||
factory = {
|
||||
(document.createElement("iframe") as HTMLIFrameElement).apply {
|
||||
setAttribute("sandbox", IFRAME_SANDBOX)
|
||||
setAttribute("referrerpolicy", "no-referrer")
|
||||
style.border = "none"
|
||||
style.width = "100%"
|
||||
style.height = "100%"
|
||||
addEventListener("load") { currentOnLoadingStateChange(false) }
|
||||
}
|
||||
},
|
||||
// Re-applied on recomposition, but only the theme changes without reloading the page: `src`
|
||||
// is left alone unless it actually differs.
|
||||
update = { iframe ->
|
||||
// Propagating a colour scheme is all a cross-origin frame allows; a page with
|
||||
// `prefers-color-scheme` styles then matches the app.
|
||||
iframe.style.setProperty("color-scheme", if (darkTheme) "dark" else "light")
|
||||
|
||||
if (offlineHtml != null && !window.navigator.onLine) {
|
||||
// The snapshots use absolute URLs, so they need no base URL to render correctly.
|
||||
if (iframe.srcdoc != offlineHtml) iframe.srcdoc = offlineHtml
|
||||
} else if (iframe.src != url) {
|
||||
currentOnLoadingStateChange(true)
|
||||
iframe.src = url
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
@@ -1,8 +1,5 @@
|
||||
#Kotlin
|
||||
kotlin.code.style=official
|
||||
# Install the JS/Wasm build dependencies with npm instead of Yarn Classic, which is unmaintained and
|
||||
# warns about a deprecated Node API (DEP0169) on recent Node versions.
|
||||
kotlin.js.yarn=false
|
||||
kotlin.daemon.jvmargs=-Xmx6G
|
||||
|
||||
#Gradle
|
||||
|
||||
@@ -8,5 +8,5 @@ toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/109553caae279a6
|
||||
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/b62178ff26b34365c61e54dea2180e32/redirect
|
||||
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/f2dede3f3c566068b401dc14a9646d39/redirect
|
||||
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/9eb5d45802b65696ed3ce0f14bb1e4ff/redirect
|
||||
toolchainVendor=AZUL
|
||||
toolchainVendor=AMAZON
|
||||
toolchainVersion=21
|
||||
+17
-17
@@ -1,29 +1,29 @@
|
||||
[versions]
|
||||
agp = "9.3.1"
|
||||
agp = "9.2.1"
|
||||
androidCompileSdk = "37"
|
||||
androidMinSdk = "24"
|
||||
androidTargetSdk = "37"
|
||||
androidxActivity = "1.13.0"
|
||||
androidxLifecycle = "2.11.0"
|
||||
androidxLifecycle = "2.11.0-rc01"
|
||||
androidxWebkit = "1.16.0"
|
||||
composeIconsExtended = "1.7.3"
|
||||
media3 = "1.10.1"
|
||||
navigation3 = "1.1.1"
|
||||
composeMultiplatform = "1.11.1"
|
||||
datastore = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/datastore
|
||||
composeIconsExtended = "1.7.3"
|
||||
glitchtips = "8.47.0"
|
||||
googleServices = "4.5.0"
|
||||
jaad = "0.9.4"
|
||||
kermit = "2.1.0"
|
||||
koin = "4.2.2"
|
||||
kotlin = "2.4.10"
|
||||
kotlinSerialization = "2.4.10"
|
||||
kotlinWrappers = "2026.8.0"
|
||||
kotlin = "2.4.0"
|
||||
kotlinWrappers = "2026.7.0"
|
||||
kotlinxBrowser = "0.5.0"
|
||||
kotlinxCoroutines = "1.11.0"
|
||||
kotlinSerialization = "2.4.0"
|
||||
kotlinxSerializationJson = "1.11.0"
|
||||
material3 = "1.11.0-alpha07"
|
||||
media3 = "1.11.0"
|
||||
navigation3 = "1.1.1"
|
||||
okio = "3.18.1"
|
||||
sentry = "0.27.0"
|
||||
koin = "4.2.2"
|
||||
kermit = "2.1.0"
|
||||
vorbisspi = "1.0.3.3"
|
||||
datastore = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/datastore
|
||||
okio = "3.17.0"
|
||||
|
||||
[libraries]
|
||||
# Gradle plugin artifacts, used by build-logic convention plugins only
|
||||
@@ -44,7 +44,7 @@ compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.re
|
||||
compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" }
|
||||
compose-uiTooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "composeMultiplatform" }
|
||||
compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" }
|
||||
jaad = { module = "com.tianscar.javasound:jaad", version.ref = "jaad" }
|
||||
glitchtips = { module = "io.sentry:sentry-android", version.ref = "glitchtips" }
|
||||
koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin" }
|
||||
koin-compose = { module = "io.insert-koin:koin-compose" }
|
||||
koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel" }
|
||||
@@ -64,6 +64,7 @@ lifecycle-viewmodelNavigation3 = { module = "org.jetbrains.androidx.lifecycle:li
|
||||
media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
|
||||
media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
|
||||
navigation3 = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "navigation3" }
|
||||
vorbisspi = { module = "com.googlecode.soundlibs:vorbisspi", version.ref = "vorbisspi" }
|
||||
wrappers-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser", version.ref = "kotlinWrappers" }
|
||||
|
||||
[plugins]
|
||||
@@ -74,5 +75,4 @@ composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "k
|
||||
googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }
|
||||
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
|
||||
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
||||
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization"}
|
||||
sentry = { id = "io.sentry.kotlin.multiplatform.gradle", version.ref = "sentry" }
|
||||
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization"}
|
||||
@@ -6,12 +6,8 @@
|
||||
objectVersion = 77;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
F36B7319302CAEC900B3E490 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = F36B7318302CAEC900B3E490 /* Sentry */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
9DA43AABF87DF46F5E794E72 /* Chom Bev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Chom Bev.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
9DA43AABF87DF46F5E794E72 /* Gwenedeg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gwenedeg.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
|
||||
@@ -45,7 +41,6 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
F36B7319302CAEC900B3E490 /* Sentry in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -55,7 +50,7 @@
|
||||
47B0C8770C82BEADFE13EF77 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
9DA43AABF87DF46F5E794E72 /* Chom Bev.app */,
|
||||
9DA43AABF87DF46F5E794E72 /* Gwenedeg.app */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
@@ -90,10 +85,9 @@
|
||||
);
|
||||
name = iosApp;
|
||||
packageProductDependencies = (
|
||||
F36B7318302CAEC900B3E490 /* Sentry */,
|
||||
);
|
||||
productName = iosApp;
|
||||
productReference = 9DA43AABF87DF46F5E794E72 /* Chom Bev.app */;
|
||||
productReference = 9DA43AABF87DF46F5E794E72 /* Gwenedeg.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
@@ -120,9 +114,6 @@
|
||||
);
|
||||
mainGroup = A562F15E4A0F12F420BB5B12;
|
||||
minimizedProjectReferenceProxies = 1;
|
||||
packageReferences = (
|
||||
F36B7317302CAEC900B3E490 /* XCRemoteSwiftPackageReference "sentry-cocoa" */,
|
||||
);
|
||||
preferredProjectObjectVersion = 77;
|
||||
productRefGroup = 47B0C8770C82BEADFE13EF77 /* Products */;
|
||||
projectDirPath = "";
|
||||
@@ -185,7 +176,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = 492RZGQ5SU;
|
||||
DEVELOPMENT_TEAM = "$(TEAM_ID)";
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = iosApp/Info.plist;
|
||||
@@ -278,7 +269,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = 492RZGQ5SU;
|
||||
DEVELOPMENT_TEAM = "$(TEAM_ID)";
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = iosApp/Info.plist;
|
||||
@@ -377,25 +368,6 @@
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
|
||||
/* Begin XCRemoteSwiftPackageReference section */
|
||||
F36B7317302CAEC900B3E490 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/getsentry/sentry-cocoa";
|
||||
requirement = {
|
||||
kind = exactVersion;
|
||||
version = 8.58.2;
|
||||
};
|
||||
};
|
||||
/* End XCRemoteSwiftPackageReference section */
|
||||
|
||||
/* Begin XCSwiftPackageProductDependency section */
|
||||
F36B7318302CAEC900B3E490 /* Sentry */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = F36B7317302CAEC900B3E490 /* XCRemoteSwiftPackageReference "sentry-cocoa" */;
|
||||
productName = Sentry;
|
||||
};
|
||||
/* End XCSwiftPackageProductDependency section */
|
||||
};
|
||||
rootObject = 50584B9465876AB65BD227D3 /* Project object */;
|
||||
}
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
//
|
||||
// AppDelegate.swift
|
||||
// iosApp
|
||||
//
|
||||
// Created by Antoine Jaury on 12/08/2026.
|
||||
//
|
||||
import UIKit
|
||||
import Shared
|
||||
|
||||
final class AppDelegate: NSObject, UIApplicationDelegate {
|
||||
|
||||
|
||||
func application(_ application: UIApplication,
|
||||
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
|
||||
SentryHelper().initializeSentry()
|
||||
return true
|
||||
}
|
||||
}
|
||||
@@ -2,10 +2,6 @@ import SwiftUI
|
||||
|
||||
@main
|
||||
struct iOSApp: App {
|
||||
|
||||
@UIApplicationDelegateAdaptor(AppDelegate.self)
|
||||
private var appDelegate
|
||||
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@js-joda/core@3.2.0":
|
||||
version "3.2.0"
|
||||
resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
|
||||
integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2,8 +2,6 @@ plugins {
|
||||
id("gwenedeg.kmp.library")
|
||||
id("gwenedeg.compose")
|
||||
alias(libs.plugins.kotlinSerialization)
|
||||
id("gwenedeg.secrets")
|
||||
alias(libs.plugins.sentry)
|
||||
}
|
||||
|
||||
kotlin {
|
||||
@@ -65,6 +63,7 @@ kotlin {
|
||||
|
||||
// DI
|
||||
implementation(project.dependencies.platform(libs.koin.bom))
|
||||
implementation(libs.koin.core)
|
||||
implementation(libs.koin.core.viewmodel)
|
||||
implementation(libs.koin.compose)
|
||||
implementation(libs.koin.compose.viewmodel)
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
package bzh.ajaury.chombev.theme
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
|
||||
/** No-op: Android supplies the system emoji font. */
|
||||
@Composable
|
||||
internal actual fun RegisterEmojiFallbackFont() = Unit
|
||||
@@ -10,10 +10,7 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateListOf
|
||||
import androidx.compose.runtime.saveable.rememberSerializable
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.platform.LocalWindowInfo
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import androidx.navigation3.runtime.NavEntry
|
||||
import androidx.navigation3.runtime.metadata
|
||||
@@ -30,7 +27,6 @@ import bzh.ajaury.chombev.onboarding.ui.viewmodel.OnboardingViewModel
|
||||
import bzh.ajaury.chombev.player.ui.PlayerScreen
|
||||
import bzh.ajaury.chombev.records.ui.RecordsScreen
|
||||
import bzh.ajaury.chombev.theme.ChomBevTheme
|
||||
import bzh.ajaury.chombev.theme.RegisterEmojiFallbackFont
|
||||
import bzh.ajaury.chombev.web.model.WebPage
|
||||
import bzh.ajaury.chombev.web.ui.WebViewScreen
|
||||
import org.koin.compose.KoinApplication
|
||||
@@ -38,9 +34,6 @@ import org.koin.compose.viewmodel.koinViewModel
|
||||
import org.koin.dsl.koinConfiguration
|
||||
import org.koin.dsl.module
|
||||
|
||||
private val WIDE_WINDOW_MIN_WIDTH = 840.dp
|
||||
private val WIDE_WINDOW_MIN_HEIGHT = 600.dp
|
||||
|
||||
val appModule = module {
|
||||
includes(
|
||||
loggingModule,
|
||||
@@ -60,37 +53,24 @@ fun App() {
|
||||
val darkTheme = isSystemInDarkTheme()
|
||||
|
||||
ChomBevTheme(darkTheme = darkTheme) {
|
||||
RegisterEmojiFallbackFont()
|
||||
|
||||
val onboardingViewModel: OnboardingViewModel = koinViewModel()
|
||||
val onboardingUiState by onboardingViewModel.uiState.collectAsStateWithLifecycle()
|
||||
|
||||
val showOnboardingAsDialog = isWideWindow()
|
||||
when (onboardingUiState.isCompleted) {
|
||||
// The persisted flag is still being read: render nothing rather than flashing
|
||||
// either screen.
|
||||
null -> Unit
|
||||
|
||||
val isOnboardingVisible = onboardingUiState.isCompleted == false
|
||||
val isMainContentVisible = onboardingUiState.isCompleted == true ||
|
||||
(isOnboardingVisible && showOnboardingAsDialog)
|
||||
// First launch: onboarding replaces the whole UI. Completing it flips the persisted
|
||||
// flag, which switches to the main content automatically.
|
||||
false -> OnboardingScreen()
|
||||
|
||||
if (isMainContentVisible) {
|
||||
MainNavigation(darkTheme = darkTheme)
|
||||
}
|
||||
|
||||
if (isOnboardingVisible) {
|
||||
OnboardingScreen(showAsDialog = showOnboardingAsDialog)
|
||||
true -> MainNavigation(darkTheme = darkTheme)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun isWideWindow(): Boolean {
|
||||
val containerSize = LocalWindowInfo.current.containerSize
|
||||
return with(LocalDensity.current) {
|
||||
containerSize.width.toDp() >= WIDE_WINDOW_MIN_WIDTH &&
|
||||
containerSize.height.toDp() >= WIDE_WINDOW_MIN_HEIGHT
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun MainNavigation(darkTheme: Boolean) {
|
||||
val serializer = SnapshotStateListSerializer<Route>()
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package bzh.ajaury.chombev
|
||||
|
||||
import io.sentry.kotlin.multiplatform.Sentry
|
||||
|
||||
object SentryHelper {
|
||||
fun initializeSentry() {
|
||||
// The DSN is injected at build time from local.properties (or the GLITCHTIP_DSN
|
||||
// environment variable) so it never lands in version control. Without it, crash
|
||||
// reporting is simply disabled.
|
||||
val dsn = BuildSecrets.GLITCHTIP_DSN
|
||||
if (dsn.isBlank()) return
|
||||
|
||||
Sentry.init { options ->
|
||||
options.dsn = dsn
|
||||
options.debug = true
|
||||
options.sendDefaultPii = false
|
||||
options.enableAutoSessionTracking = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@ internal val md_light_background = Color(0xFFF5FAFB)
|
||||
internal val md_light_onBackground = Color(0xFF171D1E)
|
||||
internal val md_light_surface = Color(0xFFF5FAFB)
|
||||
internal val md_light_onSurface = Color(0xFF171D1E)
|
||||
internal val md_light_surfaceVariant = Color(0xFF91949C)
|
||||
internal val md_light_surfaceVariant = Color(0xFFDBE4E6)
|
||||
internal val md_light_onSurfaceVariant = Color(0xFF3F484A)
|
||||
|
||||
internal val md_light_outline = Color(0xFF6F797B)
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
package bzh.ajaury.chombev.theme
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
|
||||
/**
|
||||
* Makes colour emoji renderable on platforms whose font manager has no emoji font of its own.
|
||||
*
|
||||
* Android, iOS and Desktop resolve emoji through the system fonts, so their implementations do
|
||||
* nothing. Only the web needs a bundled font: Skia runs in the browser without any system font
|
||||
* manager, and the default font baked into skiko has no emoji glyphs — they come out as tofu boxes.
|
||||
*
|
||||
* Emits nothing; call it once, high in the composition.
|
||||
*/
|
||||
@Composable
|
||||
internal expect fun RegisterEmojiFallbackFont()
|
||||
@@ -1,7 +0,0 @@
|
||||
package bzh.ajaury.chombev.theme
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
|
||||
/** No-op: iOS supplies Apple Color Emoji. */
|
||||
@Composable
|
||||
internal actual fun RegisterEmojiFallbackFont() = Unit
|
||||
@@ -1,7 +0,0 @@
|
||||
package bzh.ajaury.chombev.theme
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
|
||||
/** No-op: The desktop JVM resolves emoji through the system font manager. */
|
||||
@Composable
|
||||
internal actual fun RegisterEmojiFallbackFont() = Unit
|
||||
@@ -1,34 +0,0 @@
|
||||
package bzh.ajaury.chombev.theme
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.ui.platform.LocalFontFamilyResolver
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.platform.Font
|
||||
import bzh.ajaury.chombev.resources.generated.resources.Res
|
||||
import bzh.ajaury.chombev.resources.generated.resources.noto_color_emoji
|
||||
import org.jetbrains.compose.resources.getFontResourceBytes
|
||||
import org.jetbrains.compose.resources.rememberResourceEnvironment
|
||||
|
||||
private const val EMOJI_FONT_IDENTITY = "NotoColorEmoji"
|
||||
|
||||
/**
|
||||
* Loads the bundled Noto Color Emoji subset and hands it to the font resolver.
|
||||
*
|
||||
* Resolving a font is what registers its typeface with Skia's fallback provider — Compose builds
|
||||
* its [org.jetbrains.skia.paragraph.FontCollection] on a `FontMgrWithFallback` fed by every font
|
||||
* the app has loaded — so a single [androidx.compose.ui.text.font.FontFamily.Resolver.preload] is
|
||||
* enough for emoji to appear in any `Text`, without touching the screens that display them.
|
||||
*/
|
||||
@Composable
|
||||
internal actual fun RegisterEmojiFallbackFont() {
|
||||
val resourceEnvironment = rememberResourceEnvironment()
|
||||
val fontFamilyResolver = LocalFontFamilyResolver.current
|
||||
|
||||
LaunchedEffect(resourceEnvironment, fontFamilyResolver) {
|
||||
val fontBytes = getFontResourceBytes(resourceEnvironment, Res.font.noto_color_emoji)
|
||||
fontFamilyResolver.preload(
|
||||
FontFamily(Font(identity = EMOJI_FONT_IDENTITY, data = fontBytes)),
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user