diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..cce07d4 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +ko_fi: skysparkle diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index b0c50ff..ebbf898 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - - name: Main repository on git.skysparkle.cc - url: https://git.skysparkle.cc/kalarina/Fogwave - about: This GitHub repository is a mirror. Issues are welcome here and on Gitea. + - name: Support the project on Ko-fi + url: https://ko-fi.com/skysparkle + about: Donations keep the apps and the Skysparkle server running. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7635fa3..ee6cf75 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thanks for wanting to help! This guide explains where to contribute, what fits t ## Where to contribute -Issues and pull requests go to the repository on [Gitea](https://git.skysparkle.cc/kalarina/Fogwave). +Issues and pull requests go to the repository on [GitHub](https://github.com/kalarina-bit/Fogwave). ## Ways to help diff --git a/README.md b/README.md index 3768187..c565633 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,12 @@ Listen to Lithuania's favorite stations in one tap.

+

+ Support me on Ko-fi +

+ > [!IMPORTANT] -> **Fogwave is coming to Google Play!** The app is now in closed testing there ahead of the public release. Ideas, wishes and suggestions for improvement are very welcome — send them wherever is easiest for you: an issue on [Gitea](https://git.skysparkle.cc/kalarina/Fogwave/issues) or [GitHub](https://github.com/kalarina-bit/Fogwave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me). +> **Fogwave is coming to Google Play!** The app is now in closed testing there ahead of the public release. Ideas, wishes and suggestions for improvement are very welcome — send them wherever is easiest for you: an [issue on GitHub](https://github.com/kalarina-bit/Fogwave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me). > [!NOTE] > **Looking for designers!** Fogwave is looking for volunteer designers to help with icons, logos, animations, cover art (store graphics) and UI design. This is unpaid help for an open-source project. If you're interested, write to [cuken107@proton.me](mailto:cuken107@proton.me). @@ -23,7 +27,6 @@ Get it on F-Droid Get it on Obtainium Get it on GitHub - Get it on Gitea

@@ -52,7 +55,7 @@ - **[F-Droid](https://f-droid.org/packages/cc.skysparkle.fogwave/)** — install and update through the F-Droid client. - **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/kalarina-bit/Fogwave)** — installs the APK straight from GitHub releases and keeps it up to date. -- **Manually** — download the latest APK from [GitHub](https://github.com/kalarina-bit/Fogwave/releases/latest) or [Gitea](https://git.skysparkle.cc/kalarina/Fogwave/releases), allow installs from unknown sources for the app you open it with (Settings → Apps → Special access → Install unknown apps), then open the `.apk` and confirm. +- **Manually** — download the latest APK from [GitHub Releases](https://github.com/kalarina-bit/Fogwave/releases/latest), allow installs from unknown sources for the app you open it with (Settings → Apps → Special access → Install unknown apps), then open the `.apk` and confirm. ## Verifying a download @@ -88,7 +91,13 @@ Release builds are signed only when a keystore is supplied through the `KEYSTORE ## 🤝 Contributing -Bug reports, station suggestions, translation fixes and pull requests are welcome in the [issue tracker](https://git.skysparkle.cc/kalarina/Fogwave/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes. To open an issue or a pull request, [create an account](https://git.skysparkle.cc/user/sign_up) on this Gitea. +Bug reports, station suggestions, translation fixes and pull requests are welcome in the [issue tracker](https://github.com/kalarina-bit/Fogwave/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes. + +## ☕ Support + +Fogwave is free, open source and has no ads. If it is useful to you, you can support the project on [Ko-fi](https://ko-fi.com/skysparkle) — donations pay for the Skysparkle server and the time spent on the apps. + +Support me on Ko-fi ## 📄 License diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt index 5f6be60..acf2ddc 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt @@ -49,7 +49,8 @@ import cc.skysparkle.fogwave.ui.theme.AppThemeState import cc.skysparkle.fogwave.ui.theme.GeoColors import cc.skysparkle.fogwave.ui.theme.LocalGeoColors -private const val REPOSITORY_URL = "https://git.skysparkle.cc/kalarina/Fogwave" +private const val REPOSITORY_URL = "https://github.com/kalarina-bit/Fogwave" +private const val DONATE_URL = "https://ko-fi.com/skysparkle" private const val PRIVACY_POLICY_URL = "https://skysparkle.cc/privacy?lang=en" @Composable @@ -64,6 +65,7 @@ fun AboutPanel(modifier: Modifier = Modifier) { verticalArrangement = Arrangement.spacedBy(10.dp) ) { AppHeader() + SupportCard(onDonate = { context.openUrl(DONATE_URL) }) SectionLabel(stringResource(R.string.about_appearance)) GroupCard { @@ -168,6 +170,57 @@ private fun AppHeader() { } } +/** Asks for a donation: the app icon, a short note and one button. */ +@Composable +private fun SupportCard(onDonate: () -> Unit) { + val colors = LocalGeoColors.current + GroupCard(contentPadding = 16.dp) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(14.dp) + ) { + Box( + modifier = Modifier + .size(44.dp) + .clip(RoundedCornerShape(14.dp)) + .background(colors.primaryContainer), + contentAlignment = Alignment.Center + ) { + AppIcon(resId = R.drawable.ic_fogwave_logo, size = 32.dp) + } + Column(modifier = Modifier.weight(1f)) { + RowTitle(stringResource(R.string.support_title)) + RowSubtitle(stringResource(R.string.support_text), maxLines = 4) + } + } + Row( + modifier = Modifier + .padding(top = 14.dp) + .fillMaxWidth() + .height(46.dp) + .clip(CircleShape) + .background(colors.accentLavender) + .clickable( + onClickLabel = stringResource(R.string.about_open_in_browser), + role = Role.Button, + onClick = onDonate + ) + .testTag("donate_button"), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally) + ) { + AppIcon(resId = R.drawable.ic_heart_fill, tint = colors.onAccentLavender, size = 18.dp) + Text( + text = stringResource(R.string.support_button), + style = MaterialTheme.typography.labelLarge.copy( + fontWeight = FontWeight.Bold, + color = colors.onAccentLavender + ) + ) + } + } +} + @Composable private fun StylePicker() { val context = LocalContext.current diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 31c0d55..487fcdf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -129,4 +129,7 @@ %1$s dB %1$s Hz %1$s kHz + Fogwave unterstützen + Fogwave ist kostenlos, quelloffen und werbefrei. Wenn dir die App gefällt, hilft eine kleine Spende, das Projekt weiterzuführen. + Auf Ko-fi spenden diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bf204a6..165ca4a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -128,4 +128,7 @@ %1$s dB %1$s Hz %1$s kHz + Fogwave を応援する + Fogwave は無料・オープンソースで、広告もありません。気に入っていただけたら、少額の寄付がプロジェクトの継続を支えます。 + Ko-fi で寄付する diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 87b3c5d..ac9ffc2 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -131,4 +131,7 @@ %1$s dB %1$s Hz %1$s kHz + Paremti Fogwave + Fogwave nemokama, atvirojo kodo ir be reklamų. Jei programėlė patinka, nedidelė auka padeda projektui gyvuoti. + Paaukoti per Ko-fi diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 352710e..676681f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -131,4 +131,7 @@ %1$s дБ %1$s Гц %1$s кГц + Поддержать Fogwave + Fogwave бесплатное, с открытым кодом и без рекламы. Если приложение нравится, небольшое пожертвование помогает проекту развиваться. + Пожертвовать через Ko-fi diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 13052fb..9952177 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -128,4 +128,7 @@ %1$s dB %1$s Hz %1$s kHz + 支持 Fogwave + Fogwave 免费、开源且无广告。如果你喜欢它,一笔小小的捐助能帮助项目持续下去。 + 通过 Ko-fi 捐助 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b323216..2ce2500 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -130,4 +130,7 @@ %1$s dB %1$s Hz %1$s kHz + Support Fogwave + Fogwave is free, open source and has no ads. If you enjoy it, a small donation helps keep the project going. + Donate on Ko-fi diff --git a/assets/get-it-on-gitea.png b/assets/get-it-on-gitea.png deleted file mode 100644 index 2843501..0000000 Binary files a/assets/get-it-on-gitea.png and /dev/null differ