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 427d6f0..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/Matewave - 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 f4ad43c..9b77a66 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/Matewave). +Issues and pull requests go to the repository on [GitHub](https://github.com/kalarina-bit/Matewave). ## Ways to help diff --git a/README.md b/README.md index 9619250..7cc0e2e 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,12 @@ Play against the AI, solve puzzles, learn openings, or play friends nearby over Bluetooth and Wi-Fi/LAN.
+ + > [!IMPORTANT] -> **Matewave 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/Matewave/issues) or [GitHub](https://github.com/kalarina-bit/Matewave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me). +> **Matewave 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/Matewave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me). > [!NOTE] > **Looking for designers!** Matewave 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 @@
-
@@ -51,7 +54,7 @@
- **[F-Droid](https://f-droid.org/packages/cc.skysparkle.matewave/)** — install and update through the F-Droid client.
- **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/kalarina-bit/Matewave)** — 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/Matewave/releases/latest) or [Gitea](https://git.skysparkle.cc/kalarina/Matewave/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/Matewave/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
@@ -82,7 +85,13 @@ Nearby multiplayer needs two physical devices — the emulator has no real Bluet
## 🤝 Contributing
-Bug reports, puzzle and opening fixes, translation fixes and pull requests are welcome in the [issue tracker](https://git.skysparkle.cc/kalarina/Matewave/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, puzzle and opening fixes, translation fixes and pull requests are welcome in the [issue tracker](https://github.com/kalarina-bit/Matewave/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes.
+
+## ☕ Support
+
+Matewave 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.
+
+
## 📄 License
diff --git a/app/src/main/java/cc/skysparkle/matewave/settings/AppLinks.kt b/app/src/main/java/cc/skysparkle/matewave/settings/AppLinks.kt
index 90ccc5d..c141936 100644
--- a/app/src/main/java/cc/skysparkle/matewave/settings/AppLinks.kt
+++ b/app/src/main/java/cc/skysparkle/matewave/settings/AppLinks.kt
@@ -6,8 +6,10 @@ import android.net.Uri
/** External links of the app, kept in one place. */
object AppLinks {
- const val REPOSITORY = "https://git.skysparkle.cc/kalarina/Matewave"
- const val REPOSITORY_LABEL = "git.skysparkle.cc/kalarina/Matewave"
+ const val REPOSITORY = "https://github.com/kalarina-bit/Matewave"
+ const val REPOSITORY_LABEL = "github.com/kalarina-bit/Matewave"
+ const val DONATE = "https://ko-fi.com/skysparkle"
+ const val DONATE_LABEL = "ko-fi.com/skysparkle"
const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en"
/** Opens a link in the browser; does nothing if no app can open it. */
diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt
index 3d78787..c30af3a 100644
--- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt
+++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt
@@ -178,6 +178,23 @@ fun SettingsScreen(
onClick = { showAbout = true }
)
}
+
+ // Donation plaque with the app icon, last on the screen so it never gets in the way
+ ListGroup {
+ ListRow(
+ title = stringResource(R.string.support_title),
+ subtitle = stringResource(R.string.support_text),
+ leading = {
+ Image(
+ painter = painterResource(R.drawable.ic_launcher_card),
+ contentDescription = null,
+ modifier = Modifier.size(36.dp).clip(RoundedCornerShape(10.dp))
+ )
+ },
+ trailing = { cc.skysparkle.matewave.ui.components.AppIcon(R.drawable.ic_heart, size = 22.dp, tint = DonateRed) },
+ onClick = { cc.skysparkle.matewave.settings.AppLinks.open(context, cc.skysparkle.matewave.settings.AppLinks.DONATE) }
+ )
+ }
}
if (showAbout) {
@@ -232,6 +249,12 @@ fun SettingsScreen(
onOpenLicenses()
}
)
+ AboutRow(
+ iconRes = R.drawable.ic_heart,
+ title = stringResource(R.string.support_button),
+ subtitle = cc.skysparkle.matewave.settings.AppLinks.DONATE_LABEL,
+ onClick = { cc.skysparkle.matewave.settings.AppLinks.open(context, cc.skysparkle.matewave.settings.AppLinks.DONATE) }
+ )
AboutRow(
iconRes = R.drawable.ic_repo,
title = stringResource(R.string.settings_repo_title),
@@ -242,6 +265,8 @@ fun SettingsScreen(
}
}
+private val DonateRed = Color(0xFFFF6B8A)
+
@Composable
private fun AboutRow(iconRes: Int, title: String, subtitle: String, onClick: () -> Unit) {
val rowShape = RoundedCornerShape(12.dp)
diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml
new file mode 100644
index 0000000..5b74be0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_heart.xml
@@ -0,0 +1,10 @@
+
+