From 05d4936c9000dadeb6b3106a22a81ffbe7757f61 Mon Sep 17 00:00:00 2001
From: kalarina
-
@@ -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.
## db^>V5dMPa=jIV;d!4dwGymdj0XB7&25m1LAJ1!tM3r#&ah?2Mg;e?
zPn@E^iDw}TNi &;r}VHhkcgtL7anZ{M)8DP{VUAP3TYhUcM>
zcLNXCnt2R8m#66pHmBD5Z4WhsC==BSpDM{xaa2xq2cLncLY@3)A<3z=e`hP~(J+4^
z9>iS4(c_7GQ49MG;&+S2gDved)&Kc!FDGv>`XUK|swrCT^RA#JP2WB;bR$DLLS;9N
zH|C=~>`#K|FYVbseaSWV 8x6r!4f10_fDot67%sVXBm88E(}+zb?C}B~O8sWsE`r}#fMG0DS7f|iveYB;
z-$7jpc<;?PU0BQiT6Y2^c9O4h3#*~RXn}}GP>He;oK60dE3e!SJfTRjq!EExj5c5-
zwQJtztsMp>M@}bStT>PT;;}Yq6=z<7sIaZ!bT2p(QE*rQNYFfJeiCBTI<~Mseex-Y
zMmz#v3KqVXveq4DAsnobyG*2S;}2BFz+d2BRz(n7M7g4cF9APJg@9WBXp8BM&7MKY
zANrm-l(Xx1dM{(E=|q$5g4bdL3%|YBi2ODwFO%u*1KPINMRi6m=v6_WGVT#0Q>BM5
z4SNtqdU4h#)N&GW8btu%4kJi{Mm?jT*=ANunOReH^PBM_0TJGdrs?ihRbqm-wuF!w
z$02qtIveg}sY(Nhq6H&;HdI6;J3nWZNFM9yHyhs*U^kQbVVqUoj>fkUr@r7nSVeYe
zrii^@r&-=Sy~0L5IA0qWURxTf#lGynu@Ovrosr>tf8_>TatUJl?&-z5eRsL)%x>wy
zV2c_OfM=XU90nwzB47F^=L_fg1UPozW9xzz2meewveHeN>K0t=!es53pv8wskWdw#
zU3z#Rbj5ZP-66+%Q9l!hzQB}B^|{_IjzVgk9p8Qd&N}5+rRNf3D_}LRWY((?FBHvm
z4Z*$JVr)Y%n3}wpr|+`IZfOGmDl6`kj*Y2R#)IbSuvKwfDb%A-0>)L4?~caRCa0}6
zk_=b=boS>99tGX6x;ZPbiI2Xq5Pd1wcA7a^E;}y|8SsX-jF(g>jqI004{HOmclP&2
zj2Ks>p>oUzy|rri5&48N+^w*0p9qi;eu+MKrGiL{)i2HPKgC3EX`|`ocWw@vaRBeB
zN2g4h;~{80E?C`4I52yFyKhZC8_kX0;Xuw`ID8)Av%e;ih`jjno??;lMk3#E4;@cz
zS#()Dpk~t1pxU<8TUlvSnhX?bnFx|Bo2Uqz$z8r6OGN=W1RWWBn=o8jWa7-6kI?-I
zkeH;+E|d4mXa5dZY)i|KkV%8-cm?`e-z$N6P7S;r*RY}|{udK5MVjbv;SY{W;OUxK
zM*(adzG$9#A8^K208OT4{VZ%CYORnk_u6aZkgP?7GC{s=+*L?JdG@Nh+%3NU2&J_(jH
zJL}KRqGzZG_zFK*eF25Uj9*~D!5S;0iXt1!kn+ p4C`hPcOG
zsuZFt48I{PRw~5DEVC#C0{Yt`rG49 |YJOMb5m89b$v$B
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 @@
+
+
s`q#BP{3+Vs(#>`yC%9IGi2WGwKYAnEe}E2L4+Kf!
ze-kX8P~3e_Fj;*u_2Z!)PCNtICm9S>k9c(fjR<5#5*3PfX6y%EliI1?1Y_H
Oj>YD%P#B!sih0hjFZdY
zAoiM8?i{X{JRK~`u*f@I(p0Z+7mJlT`PzPWF(3AK#Wmr2`O+Jnme|poz26s*GZBw9
z1MdeYW72@Pm3lL9&6cbrgJv1E_6DSM6kbfCNu}AuLlJ`nW!kpptA(pX;(>@|X(
)&F~Yp!BEm4hmZb5%IG}7=nhRTv
zEG5L#Zap-zdrU7{mAp2mSvX$nfZ&wgC;Emko`e6JfY(7gkq1g(5TOV=Rxc2dxDU$V
zSi;z>j>4XDic}+2R{q(;DK