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 0dfed57..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/Sparkledns - 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 8f299e0..db75a1f 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/Sparkledns). +Issues and pull requests go to the repository on [GitHub](https://github.com/kalarina-bit/Sparkledns). ## Ways to help diff --git a/README.md b/README.md index eb3802d..a05014f 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,12 @@ A local VPN that captures only DNS traffic and sends every query to the DoH server you choose (RFC 8484). Everything else goes through your normal connection.

+

+ Support me on Ko-fi +

+ > [!IMPORTANT] -> **SparkleDNS 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/Sparkledns/issues) or [GitHub](https://github.com/kalarina-bit/Sparkledns/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me). +> **SparkleDNS 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/Sparkledns/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me). > [!NOTE] > **Looking for designers!** SparkleDNS 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

@@ -49,7 +52,7 @@ - **[F-Droid](https://f-droid.org/packages/cc.skysparkle.sparkledns/)** — install and update through the F-Droid client. - **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/kalarina-bit/Sparkledns)** — 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/Sparkledns/releases/latest) or [Gitea](https://git.skysparkle.cc/kalarina/Sparkledns/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/Sparkledns/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 @@ -83,7 +86,7 @@ Requires JDK 17+ and Android SDK 36. ## 🤝 Contributing -Bug reports, DoH server and blocklist suggestions, translation fixes and pull requests are welcome in the [issue tracker](https://git.skysparkle.cc/kalarina/Sparkledns/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, DoH server and blocklist suggestions, translation fixes and pull requests are welcome in the [issue tracker](https://github.com/kalarina-bit/Sparkledns/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes. ## 💙 Sponsor @@ -95,6 +98,12 @@ Bug reports, DoH server and blocklist suggestions, translation fixes and pull re SparkleDNS is sponsored and supported by Skysparkle — independent encrypted DNS from Lithuania and the app’s default DoH server.

+## ☕ Support + +SparkleDNS 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 [GNU General Public License v3.0 only](LICENSE). diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt index ef0997b..c3c85cd 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt @@ -30,6 +30,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -53,7 +54,8 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp private const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en" -private const val SOURCE_CODE = "https://git.skysparkle.cc/kalarina/Sparkledns" +private const val SOURCE_CODE = "https://github.com/kalarina-bit/Sparkledns" +private const val DONATE = "https://ko-fi.com/skysparkle" private const val APACHE_2 = "Apache License 2.0" private const val APACHE_2_URL = "https://www.apache.org/licenses/LICENSE-2.0" @@ -156,6 +158,8 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) { } } + SupportCard(onDonate = { openUrl(context, DONATE) }) + OutlinedButton(onClick = { openUrl(context, PRIVACY_POLICY) }, modifier = Modifier.fillMaxWidth()) { Icon(painterResource(R.drawable.ic_policy), contentDescription = null, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) @@ -192,6 +196,43 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) { } } +// The server costs money every month; the card asks for help without getting in the way +@Composable +private fun SupportCard(onDonate: () -> Unit) { + val context = LocalContext.current + Card(Modifier.fillMaxWidth()) { + Row( + modifier = Modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Image( + remember { AppLogo.get(context) }, + contentDescription = null, + modifier = Modifier.size(48.dp), + ) + Spacer(Modifier.width(14.dp)) + Column(Modifier.weight(1f)) { + Text(stringResource(R.string.support_title), style = MaterialTheme.typography.titleMedium) + Text( + stringResource(R.string.support_text), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + Button( + onClick = onDonate, + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + ) { + Icon(painterResource(R.drawable.ic_donate), contentDescription = null, modifier = Modifier.size(18.dp)) + Spacer(Modifier.width(8.dp)) + Text(stringResource(R.string.support_button)) + } + } +} + @Composable private fun LicensesScreen(modifier: Modifier, onBack: () -> Unit) { 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 e6eb888..2efd2a4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -158,4 +158,7 @@ Weiter Starten Überspringen, ich wähle einen anderen Server + SparkleDNS unterstützen + SparkleDNS ist kostenlos, quelloffen und werbefrei. Spenden finanzieren den Skysparkle-Server und halten die App am Leben. + 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 dd9f5e5..00d004e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -158,4 +158,7 @@ 次へ 開始 スキップして別のサーバーを選ぶ + SparkleDNS を応援する + SparkleDNS は無料・オープンソースで、広告もありません。寄付は Skysparkle サーバーの運営とアプリの開発に使われます。 + Ko-fi で寄付する diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index b6d4d8c..57e27a5 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -158,4 +158,7 @@ Toliau Pradėti Praleisti, pasirinksiu kitą serverį + Paremti SparkleDNS + SparkleDNS nemokama, atvirojo kodo ir be reklamų. Aukos padengia Skysparkle serverio išlaidas ir padeda programėlei 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 7b0e75f..04dd05f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -158,4 +158,7 @@ Далее Начать Пропустить, выберу другой сервер + Поддержать SparkleDNS + SparkleDNS бесплатное, с открытым кодом и без рекламы. Пожертвования оплачивают сервер Skysparkle и помогают приложению развиваться. + Пожертвовать через Ko-fi diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 8b309ec..e1c5289 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -158,4 +158,7 @@ 下一步 开始 跳过,我选择其他服务器 + 支持 SparkleDNS + SparkleDNS 免费、开源且无广告。捐助用于支付 Skysparkle 服务器的费用,让应用持续发展。 + 通过 Ko-fi 捐助 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d0268a..002da78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -159,4 +159,7 @@ Next Start Skip, I\'ll choose another server + Support SparkleDNS + SparkleDNS is free, open source and has no ads. Donations pay for the Skysparkle server and keep the app 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