92 Commits
Author SHA1 Message Date
kalarina 0ceeb84e98 Fix unreadable app names on the Apps screen (#6) 2026-11-06 17:16:51 +02:00
kalarina 5ddff1b257 Release 1.1.3 2026-11-06 16:15:02 +02:00
kalarina bc9d855997 Name other sites in Company dominance
The share outside the known companies is now split by site names taken from
the domains of recent queries (cdn.example.co.uk shows as Example). Domains
are read only from the in-memory log; the saved statistics still keep numbers
only.
2026-11-06 16:11:58 +02:00
kalarina 8f4355a624 Group recent activity by domain
Queries for the same domain (A, AAAA, HTTPS and other types) now share one
row that shows all requested types, the number of queries and the status
and time of the newest one. Refs #4
2026-11-05 19:08:33 +02:00
kalarina 359bd09b9e Add GitHub issue and pull request templates 2026-11-05 18:44:17 +02:00
kalarina d09a6bac6b Update README screenshots 2026-11-03 13:08:44 +02:00
kalarina 25dcb5cb7f Update store screenshots 2026-11-03 13:06:47 +02:00
kalarina 95c4a1b1ba Fit the German 1.0.10 changelog into 500 characters 2026-11-03 12:45:59 +02:00
kalarina 33eca31c65 Add the 1.1.2 changelog and shorten the German 1.0.10 one to F-Droid's limit 2026-11-03 12:45:52 +02:00
kalarina 54b600b1ca Release v1.1.2 2026-11-02 16:01:22 +02:00
kalarina 5ff10463a3 Release 1.1.1 2026-10-31 09:58:49 +02:00
kalarina 1ec3cf780a Use filled Material Symbols icons 2026-10-31 09:58:49 +02:00
kalarina 2057ce8e8d Sharper screenshots 2026-10-31 09:38:07 +02:00
kalarina 482d3b22a1 Update screenshots 2026-10-30 21:42:35 +02:00
kalarina 107f07cf55 Release 1.1.0 2026-10-30 20:08:37 +02:00
kalarina 1db29ee44a Redesign the app
New look based on the SparkleDNS concept: a dark theme, a floating
bottom panel with Home, Activity and Settings, and pages for the
blocklists, apps and About.

- Home: big ON/OFF switch, the current server, 24-hour stats and chart
- Activity: requests, blocked, average time and cache share for 24 hours
  or 7 days, company dominance, and the live log with search and filter
- Blocklists: HaGeZi Pro preset next to Pro++ and TIF, lists can be
  switched off without deleting them, automatic updates (daily or
  weekly, optionally Wi-Fi only) through JobScheduler
- Settings: server list, custom server, server test and per-app DNS
- Hourly numbers for the charts are kept on the device, without domains

The server list now ships with the app; it is no longer downloaded
from the repository.
2026-10-30 19:58:08 +02:00
kalarina 43f0d42d65 Release 1.0.10 2026-10-25 16:47:56 +02:00
kalarina 2b0f842579 Remove the GitHub Actions workflows 2026-10-25 14:54:42 +02:00
kalarina 17ede339fa Show own blocked domains as lazy list rows
All own domains were composed at once when the Blocklist tab opened.
The rows keep the look of the card they were in.
2026-10-25 14:50:49 +02:00
kalarina ac643caf03 Download blocklists again only when they changed
Updates send the stored ETag / Last-Modified, and a 304 answer keeps the
list on disk. Before, every update fetched every list in full.
2026-10-25 14:49:14 +02:00
kalarina 0ceae2f557 Read tile settings off the main thread
Opening the quick settings panel could start a fresh process whose
first tile update read SharedPreferences and servers.txt on the main
thread.
2026-10-25 14:48:46 +02:00
kalarina df41b44302 Tell the user when no app can open a link
Privacy policy, donation, source code and license links silently did
nothing on devices without a browser.
2026-10-25 14:48:16 +02:00
kalarina 4619292174 Ignore repeated taps on Connect, Disconnect and Switch
A quick double tap could start the connection twice, open the VPN
dialog twice, or turn the VPN back on right after switching it off.
The buttons are disabled until the VPN state changes (at most 5 s).
2026-10-25 14:47:57 +02:00
kalarina cff974851a Render app icons at their on-screen size
Icons were always drawn at 96 px: blurry on screens where 40 dp is
larger, wasted memory where it is smaller. The cache is now limited to
10 MB instead of 256 entries.
2026-10-25 14:47:28 +02:00
kalarina d9080195ab Let R8 obfuscate release builds
Shrinks the dex further. Crash reports keep file names and line
numbers; the mapping file restores the names and is kept with the CI
artifacts.
2026-10-25 14:46:33 +02:00
kalarina 026c2c9493 Package only the app's own languages
Library translations for other languages made up a large part of
resources.arsc while the app shows English in those languages anyway.
2026-10-25 14:46:22 +02:00
kalarina 8907f4cf96 Benchmark: warm the emulator up first and run three rounds by default
Two identical APKs differed by 9% in median cold start without it.
2026-10-25 13:39:11 +02:00
kalarina 9aceaaa200 CI: report the size of the packaged baseline profile 2026-10-25 13:39:11 +02:00
kalarina 9e744b309e Benchmark: compile with the baseline profile only, find off-screen rows
The app is now compiled the way Macrobenchmark's Partial mode does it,
so runs compare baseline profiles instead of what the JIT learned in a
warm-up run. Tapping a row scrolls the list when the row is off screen.
2026-10-25 12:35:23 +02:00
kalarina 603e90dcca Mention unit tests and the benchmark in CONTRIBUTING 2026-10-25 12:30:38 +02:00
kalarina e7105b0245 Benchmark: measure memory kept in the background after the Apps tab 2026-10-25 12:29:41 +02:00
kalarina 25e359595b Free decoded app icons once the UI is hidden
The VPN service keeps the process alive in the background, and with it
up to 256 icon bitmaps from the Apps tab.
2026-10-25 12:29:31 +02:00
kalarina 9f9c79cf2b Keep server test results and collapsed app groups across rotation 2026-10-25 12:28:49 +02:00
kalarina 447a309f69 Refuse blocklists with more than 4 million domains
A wrong URL pointing at a huge file could otherwise run the app out of
memory while parsing it.
2026-10-25 12:28:15 +02:00
kalarina 8b975c77ce Show the last app list at once when the Apps tab opens again
The list is still reloaded in the background on every visit; it no
longer starts from the loading placeholder each time.
2026-10-25 12:28:15 +02:00
kalarina 04ef7adb44 Trim Compose work in lists and frequent recompositions
contentType for lazy list items, a set for the own-domain lookup per
Monitor row, the group chevron animated in the draw phase, the custom
URL check remembered and the number format reused.
2026-10-25 12:27:50 +02:00
kalarina f236136919 Log VPN setup and tunnel write errors instead of dropping them silently 2026-10-25 12:27:24 +02:00
kalarina a33a945477 Store launcher icon and logo as lossless WebP
Pixel-identical to the PNGs, 108 KB smaller.
2026-10-25 12:27:01 +02:00
kalarina 8502860512 Add workflow that records a baseline profile on an emulator 2026-10-25 12:26:33 +02:00
kalarina 50f069731c Add LeakCanary to debug builds 2026-10-25 12:25:23 +02:00
kalarina 37653792fd Enable StrictMode in debug builds 2026-10-25 12:25:23 +02:00
kalarina 2cb3439efd Fail lookups that waited too long in the worker queue
With a slow server all 16 workers can be busy for up to 8 s each, and
queries kept piling up long after the asking app had retried or given
up, delaying every newer one.
2026-10-25 12:25:11 +02:00
kalarina 8ac908e684 Drop pooled DoH connections when the default network changes
After a switch between Wi-Fi and mobile data, HTTP/2 lookups could keep
using a connection of the old network until they timed out.
2026-10-25 12:24:09 +02:00
kalarina 5a1bf79e4b Derive all OkHttp clients from one shared base client
The DoH transport keeps its own connection pool and no longer creates
the dispatcher's thread pool only to shut it down.
2026-10-25 12:23:46 +02:00
kalarina 5f56c471ce Keep own blocked domains apart from downloaded lists
Adding or removing one own domain re-sorted the whole combined set,
allocating 8 bytes per entry of every list each time. Lists are now
merged in linear time and own domains are looked up in their own array.
2026-10-25 12:23:21 +02:00
kalarina 87feb7f483 Stop UI updates while the app is in the background
Home and Monitor polled the query log every second and Home queried
ConnectivityManager every 3 s, and kept doing so while the activity
was stopped. The log now signals changes (still at most once a second),
Private DNS comes from a network callback, and all flows are collected
with collectAsStateWithLifecycle.
2026-10-25 12:21:47 +02:00
kalarina a63184830d Run CI for every push instead of queueing them 2026-10-25 12:20:05 +02:00
kalarina 4e99ef1211 Load blocklists at background thread priority 2026-10-25 12:19:49 +02:00
kalarina fa6398c40e Load settings, server list and crash report off the main thread at startup
The first composition of Home read SharedPreferences, servers.txt and
last_crash.txt on the main thread.
2026-10-25 12:19:49 +02:00
kalarina 778ce20f6e Close DoH connections off the main thread when a session stops 2026-10-25 12:19:21 +02:00
kalarina 7da1a34495 Build the DoH transport on the first query instead of the main thread
Creating HttpEngine for HTTP/3 servers (the default one included) ran
inside onStartCommand on every connect and server switch.
2026-10-25 12:19:00 +02:00
kalarina bac4ccf26e Show an error instead of crashing when blocklist changes cannot be saved 2026-10-25 12:18:17 +02:00
kalarina e601b2dbaa Keep the tunnel reader alive on bad packets, disconnect if it dies
Before, any unexpected error ended the reader while the VPN stayed up,
so DNS stopped working for the whole device without any sign of it.
2026-10-25 12:18:17 +02:00
kalarina 8c6bb33527 Add unit tests for packet parsing, DNS cache, blocklist parser and server list
DnsCache takes its clock as a parameter so expiry can be tested.
2026-10-25 12:16:46 +02:00
kalarina 43e57c9357 Add emulator benchmark that compares two revisions 2026-10-25 12:13:31 +02:00
kalarina 87d9afd55b Add CI that builds and unit-tests every pushed commit 2026-10-25 12:00:26 +02:00
kalarina 7a2c7eccb3 Use GPL-3.0-only license wording 2026-10-21 14:50:38 +00:00
kalarina dbc3454742 Make star request platform-neutral 2026-10-20 13:06:24 +00:00
kalarina ad798f0a79 Add star request to README 2026-10-20 12:59:48 +00:00
kalarina 9604d07cea Changelog for 1.0.9 in all languages, mention donation links 2026-10-16 17:06:56 +00:00
kalarina b13adc5340 Add donation links to servers next to the privacy policy 2026-10-16 17:02:29 +00:00
kalarina 5f2dbccebf Point Obtainium links to Gitea 2026-10-16 11:59:23 +00:00
kalarina bab6c754dc Redesign README: store badges, release badge, install options 2026-10-16 11:51:04 +00:00
kalarina ddc219d01f Upload files to "assets" 2026-10-16 11:43:09 +00:00
kalarina 275eb3ab0b Upload files to "assets" 2026-10-16 11:40:39 +00:00
kalarina 62c941a07b Release 1.0.9 2026-10-15 13:43:22 +00:00
kalarina e039ab0d46 Remove HTTP/3 badge from the server list 2026-10-14 13:35:32 +00:00
kalarina 032a49f1f8 New privacy policy icon on servers, shorter About description 2026-10-14 12:12:17 +00:00
kalarina 9ca55a4d40 Simpler server list format, document adding servers in CONTRIBUTING 2026-10-14 11:03:35 +00:00
kalarina 00e30cb858 Mention new servers in the 1.0.7 changelog 2026-10-14 10:56:09 +00:00
kalarina 41a8f94f65 Update server list button and privacy policy links on Home 2026-10-14 10:55:35 +00:00
kalarina 6bd72d3583 Independent DoH servers and a server list synced from the repository 2026-10-14 10:55:04 +00:00
kalarina 59194a7914 Remove VirusTotal workflow 2026-10-14 10:42:10 +00:00
kalarina 0f8bb8dc9d Read VirusTotal key from secret 2026-10-14 10:20:55 +00:00
kalarina 8bccbe597c Update .gitea/workflows/virustotal.yml 2026-10-14 10:11:07 +00:00
kalarina 73959b16b2 Scan release APKs with VirusTotal 2026-10-14 09:23:23 +00:00
kalarina 838507ec63 Release 1.0.7 2026-10-13 17:01:47 +00:00
kalarina 3de0f84aab Update CONTRIBUTING for six languages 2026-10-13 16:52:03 +00:00
kalarina 9b40f7e7af Add missing blocklist hint key 2026-10-13 15:53:37 +00:00
kalarina eda2353cf4 Add German, Japanese, Lithuanian and Chinese translations 2026-10-13 15:52:34 +00:00
kalarina 728dbba49b Add German, Japanese, Lithuanian and Chinese UI, closable hint cards, drop license row from About 2026-10-13 15:50:05 +00:00
kalarina 91f7d99508 Update store descriptions in six languages 2026-10-13 14:51:40 +00:00
kalarina 442aad40ac Remove duplicate account note from CONTRIBUTING 2026-10-12 13:37:30 +00:00
kalarina 6dbe67e5c0 Update README 2026-10-12 13:35:33 +00:00
kalarina d036bbe93a Update README 2026-10-12 13:34:15 +00:00
kalarina 42326e0933 Use Gitea as the only contribution channel 2026-10-11 14:11:14 +00:00
kalarina 9dda504172 Add contributing guide and issue/PR templates 2026-10-11 14:01:49 +00:00
kalarina 44790eb68f Restructure README 2026-10-11 13:46:53 +00:00
kalarina 149d08b082 Add minimum Android version to README 2026-10-11 13:41:08 +00:00
kalarina 25b6dc7d6c Normalize line endings via .gitattributes 2026-10-11 12:52:58 +03:00
kalarina 00d15bac74 Remove fdroid recipe, state GPL-3.0-or-later, format key fingerprint
The build recipe now lives in fdroiddata, so the outdated copy in
fdroid/ is removed. README states the license as GPL-3.0-or-later to
match the F-Droid metadata and shows the signing certificate
fingerprint in colon-separated form.
2026-10-10 15:25:26 +00:00
kalarina f438d44e03 Verify downloads by signing key and fix app name in README
README now tells users to verify the APK signing certificate instead
of a checksum from the Releases page, uses the real APK file name and
spells the app name as SparkleDNS.
2026-10-10 15:19:37 +00:00
194 changed files with 6449 additions and 1762 deletions
+2
View File
@@ -0,0 +1,2 @@
* text=auto eol=lf
*.bat text eol=crlf
+28
View File
@@ -0,0 +1,28 @@
---
name: Bug report
about: Something doesn't work as expected
title: "[Bug] "
---
**What happened**
**Steps to reproduce**
1.
2.
3.
**What you expected**
**Environment**
- App version:
- Installed from: Gitea / F-Droid
- Device and Android version:
- DoH server in use:
- Network: Wi-Fi / mobile data
**Screenshots or logs** (optional — please remove domains you don't want to share)
@@ -0,0 +1,15 @@
---
name: DoH server or blocklist
about: Suggest a DoH server or blocklist preset
title: "[Preset] "
---
- Type: DoH server / blocklist
- Name:
- URL:
- Homepage or documentation:
- Privacy policy (DoH servers) or license (blocklists):
- Donation page (DoH servers, optional):
- [ ] DoH server: public and supports RFC 8484
- [ ] Blocklist: public and actively maintained
+18
View File
@@ -0,0 +1,18 @@
---
name: Feature request
about: Suggest an idea that fits the app
title: "[Feature] "
---
<!-- Please check the "Out of scope" list in CONTRIBUTING.md before opening this. -->
**What problem does this solve**
**Proposed solution**
**Alternatives you considered**
- [ ] I'd like to implement this myself
+12
View File
@@ -0,0 +1,12 @@
---
name: Translation fix
about: Report a wrong or awkward translation
title: "[Translation] "
---
<!-- Currently supported: English, Russian. For a new language, open a feature request first. -->
- Language:
- Screen or place in the app:
- Current text:
- Suggested text:
+17
View File
@@ -0,0 +1,17 @@
## What does this change
## Related issue
Closes #
## Checklist
- [ ] Discussed in an issue first (not needed for small fixes)
- [ ] `./gradlew assembleDebug` builds
- [ ] Tested on a device or emulator (Android version: )
- [ ] DNS queries only go to the selected DoH server
- [ ] No ads, analytics, trackers or Google Play Services / Firebase dependencies
- [ ] New strings added to `values/strings.xml` (missing translations noted below)
- [ ] Screenshots added for UI changes
- [ ] I agree that my contribution is licensed under GPL-3.0-or-later
+28
View File
@@ -0,0 +1,28 @@
---
name: Bug report
about: Something doesn't work as expected
title: "[Bug] "
---
**What happened**
**Steps to reproduce**
1.
2.
3.
**What you expected**
**Environment**
- App version:
- Installed from: Gitea / GitHub / F-Droid / Google Play
- Device and Android version:
- DoH server in use:
- Network: Wi-Fi / mobile data
**Screenshots or logs** (optional — please remove domains you don't want to share)
+5
View File
@@ -0,0 +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.
@@ -0,0 +1,15 @@
---
name: DoH server or blocklist
about: Suggest a DoH server or blocklist preset
title: "[Preset] "
---
- Type: DoH server / blocklist
- Name:
- URL:
- Homepage or documentation:
- Privacy policy (DoH servers) or license (blocklists):
- Donation page (DoH servers, optional):
- [ ] DoH server: public and supports RFC 8484
- [ ] Blocklist: public and actively maintained
+18
View File
@@ -0,0 +1,18 @@
---
name: Feature request
about: Suggest an idea that fits the app
title: "[Feature] "
---
<!-- Please check the "Out of scope" list in CONTRIBUTING.md before opening this. -->
**What problem does this solve**
**Proposed solution**
**Alternatives you considered**
- [ ] I'd like to implement this myself
+12
View File
@@ -0,0 +1,12 @@
---
name: Translation fix
about: Report a wrong or awkward translation
title: "[Translation] "
---
<!-- Currently supported: English, Russian. For a new language, open a feature request first. -->
- Language:
- Screen or place in the app:
- Current text:
- Suggested text:
+17
View File
@@ -0,0 +1,17 @@
## What does this change
## Related issue
Closes #
## Checklist
- [ ] Discussed in an issue first (not needed for small fixes)
- [ ] `./gradlew assembleDebug` builds
- [ ] Tested on a device or emulator (Android version: )
- [ ] DNS queries only go to the selected DoH server
- [ ] No ads, analytics, trackers or Google Play Services / Firebase dependencies
- [ ] New strings added to `values/strings.xml` (missing translations noted below)
- [ ] Screenshots added for UI changes
- [ ] I agree that my contribution is licensed under GPL-3.0-or-later
+84
View File
@@ -0,0 +1,84 @@
# Contributing to SparkleDNS
Thanks for wanting to help! This guide explains where to contribute, what fits the project and how to send changes.
## Where to contribute
Issues and pull requests go to the repository on [Gitea](https://git.skysparkle.cc/kalarina/Sparkledns).
## Ways to help
- **Report a bug** — use the *Bug report* template.
- **Add a DoH server** — open an issue with the *DoH server or blocklist* template, see [Adding a DoH server](#adding-a-doh-server).
- **Suggest a blocklist** — use the *DoH server or blocklist* template.
- **Suggest a feature** — use the *Feature request* template; check [Out of scope](#out-of-scope) first.
- **Fix a translation** — use the *Translation fix* template or send a pull request.
- **Write code** — see [Pull requests](#pull-requests).
## Before you start
- **Small changes** (typos, obvious bugs, translation fixes): send a pull request directly.
- **Anything bigger** (new features, UI changes, new dependencies): open an issue first and wait for a go-ahead, so your work isn't wasted.
## Ground rules
- No ads, analytics, telemetry, trackers or accounts.
- DNS queries may only go to the DoH server the user selected — never anywhere else.
- No Google Play Services, Firebase or other proprietary libraries — the app must stay buildable for F-Droid.
- New dependencies must be open source and justified in the pull request.
- Be respectful in issues and reviews.
## Out of scope
These will not be accepted:
- Changing the default DoH server.
- Logging, uploading or sharing users' DNS queries.
- Features that require Google Play Services or a proprietary SDK.
## Adding a DoH server
Servers ship with the app in [`Providers.kt`](app/src/main/java/cc/skysparkle/sparkledns/Providers.kt), so a new server reaches users with the next release. The app never downloads a server list.
To suggest a server, open an issue with the *DoH server or blocklist* template, or send a pull request that adds one entry to `Providers.builtIn` with the server's name, DoH URL, privacy policy link, bootstrap IPs, whether it supports HTTP/3 and, optionally, the operator's own donation page.
The server must:
- be public and free, without an account;
- support RFC 8484;
- publish what it logs, and not sell or share query data;
- be run by a non-profit, a community or an individual rather than a large company.
Before sending, check that it works: in the app choose **Custom server**, enter the URL and tap **Test server**.
If you are unsure whether a server fits, open an issue with the *DoH server or blocklist* template first.
## Blocklists
Blocklist presets must be public, actively maintained and licensed for this kind of use. Use the *DoH server or blocklist* template and include a link to the list's homepage.
## Translations
SparkleDNS is available in exactly six languages: English, Russian, German, Japanese, Lithuanian and Chinese. Fixes to these are welcome; new languages are not accepted.
- App strings: `app/src/main/res/values-<lang>/strings.xml` (English is `values/`).
- Store listing: `fastlane/metadata/android/<locale>/`.
If your code adds new strings, add them to `values/strings.xml`. Translations for the other languages are welcome but not required — mention missing ones in the pull request.
## Pull requests
1. Fork the repository and create a branch from `main`.
2. Keep one topic per pull request.
3. Follow the existing Kotlin and Jetpack Compose style; keep comments short and in English; don't reformat unrelated code.
4. Make sure `./gradlew assembleDebug testDebugUnitTest` passes, and test on a device or emulator. For changes that may affect speed or memory, `scripts/bench.sh` compares two APKs on a rooted device or emulator (`scripts/bench-build.sh` builds them from two revisions).
5. Write short, plain commit messages in English (for example `Fix tunnel restart after server switch`).
6. Add screenshots for UI changes.
## Security
Please don't post details of security issues publicly. Open a short issue titled "Security contact" without any details, and the maintainer will reach out privately.
## License
By contributing, you agree that your contribution is licensed under the [GNU General Public License v3.0 or later](LICENSE), the same as the rest of the project.
+1 -2
View File
@@ -636,8 +636,7 @@ the "copyright" line and a pointer to where the full notice is found.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, version 3 of the License.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
+48 -51
View File
@@ -1,87 +1,84 @@
<p align="center"> <p align="center">
<img src="assets/icon-rounded.png" width="128" alt="Sparkledns icon"> <img src="assets/icon-rounded.png" width="112" alt="SparkleDNS icon">
</p> </p>
<h1 align="center">SparkleDns</h1> <h1 align="center">SparkleDNS</h1>
<p align="center"> <p align="center">
<a href="https://git.skysparkle.cc/kalarina/Sparkledns/releases"><img src="assets/get-it-on-gitea.png" height="60" alt="Get it on Gitea"></a> <b>A lightweight DNS-over-HTTPS client for Android.</b><br>
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.
</p> </p>
<p align="center"> <p align="center">
<img src="https://img.shields.io/github/downloads/kalarina-bit/Sparkledns/latest/total?label=downloads&color=2e7d32&labelColor=1b1b1b" alt="downloads counter"> <a href="https://github.com/kalarina-bit/Sparkledns/releases/latest"><img src="https://img.shields.io/github/v/release/kalarina-bit/Sparkledns?style=for-the-badge&label=release&labelColor=1b1b1b&color=2e7d32" alt="Latest release"></a>
</p> </p>
**Lightweight DNS-over-HTTPS client for Android** (Kotlin, Jetpack Compose). <p align="center">
<a href="https://f-droid.org/packages/cc.skysparkle.sparkledns/"><img src="assets/get-it-on%20(1).png" height="56" alt="Get it on F-Droid"></a>
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.skysparkle.cc/kalarina/Sparkledns"><img src="assets/badge_obtainium.png" height="56" alt="Get it on Obtainium"></a>
<a href="https://github.com/kalarina-bit/Sparkledns/releases/latest"><img src="assets/get-it-on-github.png" height="56" alt="Get it on GitHub"></a>
<a href="https://git.skysparkle.cc/kalarina/Sparkledns/releases"><img src="assets/get-it-on-gitea.png" height="56" alt="Get it on Gitea"></a>
</p>
The app starts a local VPN that captures only DNS traffic and forwards every query to the selected DoH server (RFC 8484) — everything else goes through your normal connection. <p align="center">
<img src="assets/screenshots/1-private-dns-left.png" width="160" alt="Private DNS in one tap"><img src="assets/screenshots/2-private-dns-right.png" width="160" alt="You're protected">
<img src="assets/screenshots/3-see-every-request.png" width="160" alt="See every request">
<img src="assets/screenshots/4-block-ads-and-trackers.png" width="160" alt="Block ads and trackers">
</p>
## Features > [!TIP]
> If you find SparkleDNS useful, please consider giving it a ⭐ — it helps others discover the project.
## ✨ Features
- 🔌 **One-tap connect/disconnect**, with a Quick Settings tile - 🔌 **One-tap connect/disconnect**, with a Quick Settings tile
- 🔄 **Switch servers on the fly** — the tunnel restarts automatically - 🔄 **Switch servers on the fly** — the tunnel restarts automatically
- 🚀 **Built-in server test** showing protocol and latency - 🚀 **Built-in server test** showing protocol and latency
- 📊 **Live query monitor** with stats, filters and one-tap blocking - 📊 **Activity** — 24-hour and 7-day charts, share of the biggest companies, and a live log with filters and one-tap blocking. Numbers stay on the device
- 📱 **Per-app DNS** — chosen apps bypass the tunnel - 📱 **Per-app DNS** — chosen apps bypass the tunnel
- 🚫 **Custom blocklists** — your own domains plus hosts/domain/AdBlock lists by URL (HaGeZi Pro++ and TIF presets) - 🚫 **Custom blocklists** — your own domains plus hosts/domain/AdBlock lists by URL (HaGeZi Pro, Pro++ and TIF presets), updated automatically every day or week, on Wi-Fi only if you like
- 🔓 **No analytics, no Google Play Services** - 🔓 **No analytics, no Google Play Services**
## Screenshots ## <img src="assets/icon-install.png" width="32" alt=""> Installation
<p align="center"> - **[F-Droid](https://f-droid.org/packages/cc.skysparkle.sparkledns/)** — install and update through the F-Droid client.
<img src="assets/screenshots/1-your-dns-your-choice.png" width="200" alt="Your DNS, your choice"> - **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.skysparkle.cc/kalarina/Sparkledns)** — installs the APK straight from Gitea releases and keeps it up to date.
<img src="assets/screenshots/2-protected.png" width="200" alt="Protected via SkySparkle"> - **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.
<img src="assets/screenshots/3-stay-informed.png" width="200" alt="Stay informed">
<img src="assets/screenshots/4-block-your-way.png" width="200" alt="Block your way">
<img src="assets/screenshots/5-choose-your-own-route.png" width="200" alt="Choose your own route">
</p>
## Installation ## <img src="assets/icon-verify.png" width="32" alt=""> Verifying a download
<img src="assets/icon-install.png" width="36" align="left"> Every official APK is signed with the same key. Check it before installing:
1. Download the APK for the version you want from the [Releases page](https://github.com/kalarina-bit/Sparkledns/releases).
2. On your Android device, allow installs from unknown sources for the app you use to open the file (Settings → Apps → Special access → Install unknown apps).
3. Open the downloaded `.apk` file and confirm the install.
## Verifying a download
<img src="assets/icon-verify.png" width="36" align="left">
Compare the SHA-256 checksum of the downloaded APK against the value shown for that version on the [Releases page](https://github.com/kalarina-bit/Sparkledns/releases):
```sh ```sh
sha256sum Sparkledns-vX.X.X.apk apksigner verify --print-certs SparkleDNS-v<version>.apk
``` ```
## Building from source The SHA-256 fingerprint of the signing certificate must be:
```
42:F6:30:63:4B:D0:F8:7F:49:17:85:A8:84:87:70:E4:45:96:7B:36:F1:02:8E:FD:16:F8:F9:52:01:27:3A:29
```
`apksigner` prints the same value in lowercase without colons. On Android you can check it with [AppVerifier](https://github.com/soupslurpr/AppVerifier) (app ID `cc.skysparkle.sparkledns`).
## <img src="assets/icon-structure.png" width="32" alt=""> Building from source
Requires JDK 17+ and Android SDK 36.
```sh ```sh
./gradlew assembleRelease ./gradlew assembleRelease
``` ```
Or open the project in Android Studio and run the `app` configuration. Requires Android 8.0 (API 26) or newer; HTTP/3 requires Android 14. ### Releasing
The version lives in `app/build.gradle.kts` (`versionName`, `versionCode = major * 10000 + minor * 100 + patch`). For every release, add `fastlane/metadata/android/<locale>/changelogs/<versionCode>.txt` and tag the commit as `v<versionName>` (for example `v1.0.6`) — F-Droid detects new releases from these tags. 1. Bump `versionName` and `versionCode` in `app/build.gradle.kts` (`versionCode = major * 10000 + minor * 100 + patch`).
2. Add `fastlane/metadata/android/<locale>/changelogs/<versionCode>.txt`.
3. Tag the commit as `v<versionName>` (for example `v1.0.9`) — F-Droid detects new releases from these tags, so upload the signed APK to the release right away.
## Repository structure ## 🤝 Contributing
<img src="assets/icon-structure.png" width="36" align="left"> 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.
``` ## 📄 License
.
├── app/ # Android app source (Kotlin, Jetpack Compose)
├── assets/ # README images
│ └── screenshots/ # App screenshots
├── fastlane/ # F-Droid store listing, screenshots and changelogs
├── fdroid/ # Build recipe for fdroiddata
├── gradle/ # Gradle wrapper
├── LICENSE # GNU GPLv3
└── README.md
```
APK builds are published as assets on the [Releases page](https://github.com/kalarina-bit/Sparkledns/releases), not stored in this repository. [GNU General Public License v3.0 only](LICENSE).
## License
This project is licensed under the **GNU General Public License v3.0** — see the [LICENSE](LICENSE) file for details.
+36 -3
View File
@@ -13,8 +13,8 @@ android {
targetSdk = 36 targetSdk = 36
// Single source of truth: the About screen reads these through BuildConfig. // Single source of truth: the About screen reads these through BuildConfig.
// Kept as plain literals so F-Droid can detect new versions. Code = major * 10000 + minor * 100 + patch. // Kept as plain literals so F-Droid can detect new versions. Code = major * 10000 + minor * 100 + patch.
versionCode = 10006 versionCode = 10103
versionName = "1.0.6" versionName = "1.1.3"
} }
buildTypes { buildTypes {
@@ -27,6 +27,12 @@ android {
} }
} }
androidResources {
// Only the languages the app itself is translated to; library strings for other
// languages were unused weight, as the app falls back to English there anyway
localeFilters += listOf("en", "de", "ja", "lt", "ru", "zh")
}
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
@@ -42,6 +48,26 @@ android {
includeInApk = false includeInApk = false
includeInBundle = false includeInBundle = false
} }
packaging {
resources {
// Library files the app never reads: Kotlin metadata for reflection, the coroutines debug
// agent, version markers for tooling and OkHttp's public suffix list, which only cookies use
excludes += listOf(
"/META-INF/*.version",
"/META-INF/*.kotlin_module",
"/kotlin/**",
"/kotlin-tooling-metadata.json",
"/DebugProbesKt.bin",
"/okhttp3/internal/publicsuffix/**",
)
}
}
testOptions {
// android.util.Log and friends are no-ops in JVM unit tests
unitTests.isReturnDefaultValues = true
}
} }
dependencies { dependencies {
@@ -49,6 +75,13 @@ dependencies {
implementation("androidx.activity:activity-compose:1.10.1") implementation("androidx.activity:activity-compose:1.10.1")
implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui")
implementation("androidx.compose.material3:material3") implementation("androidx.compose.material3:material3")
// Already pulled in by Compose at this version; declared because the app uses it directly
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
implementation("com.squareup.okhttp3:okhttp:4.12.0") implementation("com.squareup.okhttp3:okhttp:4.12.0")
}
// Debug builds only, never part of a release
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
testImplementation("junit:junit:4.13.2")
}
+3 -2
View File
@@ -1,3 +1,4 @@
# Readable stack traces in crash reports # File names and line numbers stay in stack traces, names are obfuscated. To read a crash
# report, build the same release (builds are reproducible) and run
# retrace app/build/outputs/mapping/release/mapping.txt crash.txt
-keepattributes SourceFile,LineNumberTable -keepattributes SourceFile,LineNumberTable
-dontobfuscate
+7
View File
@@ -7,6 +7,8 @@
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
<!-- Keeps the scheduled blocklist update after a reboot -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<!-- Lists launcher apps for per-app DNS settings without QUERY_ALL_PACKAGES --> <!-- Lists launcher apps for per-app DNS settings without QUERY_ALL_PACKAGES -->
<queries> <queries>
@@ -51,6 +53,11 @@
android:value="Local DNS-over-HTTPS VPN that keeps encrypted DNS active while the user has it enabled" /> android:value="Local DNS-over-HTTPS VPN that keeps encrypted DNS active while the user has it enabled" />
</service> </service>
<service
android:name=".BlocklistUpdateJob"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE" />
<service <service
android:name=".DnsTileService" android:name=".DnsTileService"
android:exported="true" android:exported="true"
@@ -1,9 +1,12 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.content.ActivityNotFoundException
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.util.Log
import android.widget.Toast
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
@@ -37,6 +40,7 @@ import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
@@ -50,7 +54,6 @@ import androidx.compose.ui.unit.dp
private const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en" 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://git.skysparkle.cc/kalarina/Sparkledns"
private const val APP_LICENSE = "GPL-3.0-or-later"
private const val APACHE_2 = "Apache License 2.0" private const val APACHE_2 = "Apache License 2.0"
private const val APACHE_2_URL = "https://www.apache.org/licenses/LICENSE-2.0" private const val APACHE_2_URL = "https://www.apache.org/licenses/LICENSE-2.0"
@@ -71,6 +74,7 @@ private val Frameworks = listOf(
OpenSourceItem("AndroidX Activity", "The Android Open Source Project", APACHE_2, APACHE_2_URL, "https://developer.android.com/jetpack/androidx/releases/activity"), OpenSourceItem("AndroidX Activity", "The Android Open Source Project", APACHE_2, APACHE_2_URL, "https://developer.android.com/jetpack/androidx/releases/activity"),
OpenSourceItem("OkHttp", "Square, Inc.", APACHE_2, APACHE_2_URL, "https://square.github.io/okhttp/"), OpenSourceItem("OkHttp", "Square, Inc.", APACHE_2, APACHE_2_URL, "https://square.github.io/okhttp/"),
OpenSourceItem("Okio", "Square, Inc.", APACHE_2, APACHE_2_URL, "https://square.github.io/okio/"), OpenSourceItem("Okio", "Square, Inc.", APACHE_2, APACHE_2_URL, "https://square.github.io/okio/"),
OpenSourceItem("Material Symbols", "Google", APACHE_2, APACHE_2_URL, "https://github.com/google/material-design-icons"),
OpenSourceItem( OpenSourceItem(
"Android HttpEngine (Cronet)", "The Chromium Authors", "BSD 3-Clause", "Android HttpEngine (Cronet)", "The Chromium Authors", "BSD 3-Clause",
"https://chromium.googlesource.com/chromium/src/+/main/LICENSE", "https://developer.android.com/reference/android/net/http/HttpEngine", "https://chromium.googlesource.com/chromium/src/+/main/LICENSE", "https://developer.android.com/reference/android/net/http/HttpEngine",
@@ -123,7 +127,7 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) {
verticalArrangement = Arrangement.spacedBy(12.dp), verticalArrangement = Arrangement.spacedBy(12.dp),
) { ) {
Image( Image(
painterResource(R.drawable.app_logo), remember { AppLogo.get(context) },
contentDescription = null, contentDescription = null,
modifier = Modifier modifier = Modifier
.size(104.dp) .size(104.dp)
@@ -149,18 +153,17 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) {
InfoRow(stringResource(R.string.about_version), BuildConfig.VERSION_NAME) InfoRow(stringResource(R.string.about_version), BuildConfig.VERSION_NAME)
InfoRow(stringResource(R.string.about_protocol), "DNS-over-HTTPS (RFC 8484)") InfoRow(stringResource(R.string.about_protocol), "DNS-over-HTTPS (RFC 8484)")
InfoRow("HTTP/3", http3) InfoRow("HTTP/3", http3)
InfoRow(stringResource(R.string.about_license), APP_LICENSE)
} }
} }
OutlinedButton(onClick = { openUrl(context, PRIVACY_POLICY) }, modifier = Modifier.fillMaxWidth()) { OutlinedButton(onClick = { openUrl(context, PRIVACY_POLICY) }, modifier = Modifier.fillMaxWidth()) {
Icon(painterResource(R.drawable.ic_shield_search), contentDescription = null, modifier = Modifier.size(18.dp)) Icon(painterResource(R.drawable.ic_policy), contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.about_privacy_policy)) Text(stringResource(R.string.about_privacy_policy))
} }
OutlinedButton(onClick = { openUrl(context, SOURCE_CODE) }, modifier = Modifier.fillMaxWidth()) { OutlinedButton(onClick = { openUrl(context, SOURCE_CODE) }, modifier = Modifier.fillMaxWidth()) {
Icon(painterResource(R.drawable.ic_android), contentDescription = null, modifier = Modifier.size(18.dp)) Icon(painterResource(R.drawable.ic_code), contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.about_source)) Text(stringResource(R.string.about_source))
} }
@@ -265,8 +268,13 @@ private fun InfoRow(label: String, value: String) {
} }
} }
private fun openUrl(context: Context, url: String) { internal fun openUrl(context: Context, url: String) {
runCatching { try {
context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
} catch (_: ActivityNotFoundException) {
// Without a browser the tap used to do nothing at all
Toast.makeText(context, R.string.no_browser, Toast.LENGTH_SHORT).show()
} catch (e: RuntimeException) {
Log.w("SparkleDNS", "Cannot open $url", e)
} }
} }
@@ -0,0 +1,607 @@
package cc.skysparkle.sparkledns
import android.content.ClipData
import android.content.ClipboardManager
import android.widget.Toast
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.structuralEqualityPolicy
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
private enum class ActivityFilter(@StringRes val label: Int) {
ALL(R.string.mon_all),
BLOCKED(R.string.status_blocked),
CACHED(R.string.status_cached),
ERRORS(R.string.mon_errors),
}
private val TimeFormat = SimpleDateFormat("HH:mm:ss", Locale.ROOT)
// Colors of the company slices, then the rest
private val SliceColors = listOf(Palette.Accent, Color(0xFFE6E8EE), Color(0xFF7C69E8), Color(0xFFC9A36A))
private val OtherColor = Palette.Track
private class Slice(val label: String, val share: Float, val color: Color)
// One row of the log: every query for a domain, shown by its newest one. A data class, so a
// rebuilt list with the same groups counts as unchanged.
private data class DomainGroup(val latest: QueryEntry, val types: List<Int>, val count: Int)
// The log is newest first, so the first entry of a domain is its newest one and the groups come
// out in the order their domains were last asked for. Names differ only in letter case when a
// resolver randomizes it, so they are compared in lower case.
private fun groupByDomain(entries: List<QueryEntry>): List<DomainGroup> {
class Builder(val latest: QueryEntry) {
val types = LinkedHashSet<Int>()
var count = 0
}
val groups = LinkedHashMap<String, Builder>()
for (entry in entries) {
val group = groups.getOrPut(entry.domain.lowercase(Locale.ROOT)) { Builder(entry) }
group.types += entry.type
group.count++
}
// Types in numeric order: A, then AAAA, then HTTPS
return groups.values.map { DomainGroup(it.latest, it.types.sorted(), it.count) }
}
@Composable
fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) {
val context = LocalContext.current
val scope = rememberCoroutineScope()
val custom by Blocklist.custom.collectAsStateWithLifecycle()
val customSet = remember(custom) { custom.toHashSet() }
var period by rememberSaveable { mutableStateOf(StatsPeriod.DAY) }
var entries by remember { mutableStateOf(QueryLog.snapshot()) }
var summary by remember { mutableStateOf(StatsStore.summary(period.hours)) }
var filter by rememberSaveable { mutableStateOf(ActivityFilter.ALL) }
var search by rememberSaveable { mutableStateOf("") }
OnQueryLogChange {
entries = QueryLog.snapshot()
summary = StatsStore.summary(period.hours)
}
val statsVersion by StatsStore.version.collectAsStateWithLifecycle()
LaunchedEffect(period, statsVersion) { summary = StatsStore.summary(period.hours) }
// Filtered and grouped by domain again only when the log, the filter or the search changes,
// and the list below is updated only when the result differs: new entries that the filter
// hides change nothing
val visible by remember {
derivedStateOf(structuralEqualityPolicy()) {
val term = search.trim()
val matching = entries.filter { e ->
val matchesFilter = when (filter) {
ActivityFilter.ALL -> true
ActivityFilter.BLOCKED -> e.status == QueryStatus.BLOCKED
ActivityFilter.CACHED -> e.status == QueryStatus.CACHED
ActivityFilter.ERRORS -> e.status == QueryStatus.FAILED
}
matchesFilter && (term.isEmpty() || e.domain.contains(term, ignoreCase = true))
}
groupByDomain(matching)
}
}
val canClear by remember { derivedStateOf { entries.isNotEmpty() } }
fun toggleBlock(domain: String, unblock: Boolean) {
scope.launch {
val result = withContext(Dispatchers.IO) {
tryEdit {
if (unblock) {
Blocklist.removeCustom(context, domain)
true
} else {
Blocklist.addCustom(context, domain)
}
}
}
val ok = result.getOrElse {
showEditError(context, it)
return@launch
}
val message = when {
!ok -> context.getString(R.string.bl_invalid)
unblock -> context.getString(R.string.mon_unblocked, domain)
else -> context.getString(R.string.mon_blocked_added, domain)
}
Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
}
}
fun copy(domain: String) {
context.getSystemService(ClipboardManager::class.java)
.setPrimaryClip(ClipData.newPlainText("domain", domain))
}
val wide = windowWidth() >= WideLayoutWidth
val side = sidePadding(windowWidth(), if (wide) MaxWideContentWidth else MaxContentWidth)
val clear = {
QueryLog.clear()
entries = emptyList()
}
// The log rows, shared by the one- and two-column layouts
val log: LazyListScope.() -> Unit = {
item(key = "recent") {
RecentHeader(canClear, clear, Modifier.padding(top = if (wide) 0.dp else 24.dp))
}
item(key = "search") {
LogSearch(
search = search,
onSearch = { search = it },
filter = filter,
onFilter = { filter = it },
modifier = Modifier.padding(top = 6.dp, bottom = 4.dp),
)
}
if (visible.isEmpty()) {
item(key = "empty") {
EmptyState(
R.drawable.ic_tab_monitor,
stringResource(if (entries.isEmpty()) R.string.mon_empty else R.string.mon_no_match),
)
}
}
// Keyed by domain, so a new query for a domain moves its row to the top instead of adding one
itemsIndexed(
visible,
key = { _, group -> "domain:" + group.latest.domain.lowercase(Locale.ROOT) },
contentType = { _, _ -> "query" },
) { index, group ->
val entry = group.latest
val blockedByMe = entry.domain in customSet
QueryRow(
modifier = Modifier.animateItem(),
entry = entry,
types = group.types,
count = group.count,
first = index == 0,
blockedByMe = blockedByMe,
onBlock = { toggleBlock(entry.domain, unblock = false) },
onUnblock = { toggleBlock(entry.domain, unblock = true) },
onCopy = { copy(entry.domain) },
)
}
}
if (wide) {
Row(
modifier = modifier.padding(horizontal = side),
horizontalArrangement = Arrangement.spacedBy(24.dp),
) {
Column(
Modifier
.weight(1f)
.fillMaxHeight()
.verticalScroll(rememberScrollState())
.padding(top = 16.dp, bottom = bottomPadding),
) {
ActivityHeader(period) { period = it }
ActivityStats(summary, Modifier.padding(top = 20.dp))
CompanyCard(summary, entries, Modifier.padding(top = 20.dp))
}
LazyColumn(
modifier = Modifier
.weight(1f)
.fillMaxHeight(),
contentPadding = PaddingValues(top = 16.dp, bottom = bottomPadding),
content = log,
)
}
} else {
LazyColumn(
modifier = modifier,
contentPadding = PaddingValues(start = side, end = side, top = 16.dp, bottom = bottomPadding),
) {
item(key = "header") { ActivityHeader(period) { period = it } }
item(key = "stats") { ActivityStats(summary, Modifier.padding(top = 20.dp)) }
item(key = "companies") { CompanyCard(summary, entries, Modifier.padding(top = 20.dp)) }
log()
}
}
}
@Composable
private fun ActivityHeader(period: StatsPeriod, onPeriod: (StatsPeriod) -> Unit) {
Row(
modifier = Modifier
.fillMaxWidth()
.heightIn(min = 44.dp),
verticalAlignment = Alignment.CenterVertically,
) {
ScreenTitle(stringResource(R.string.tab_activity), Modifier.weight(1f))
PeriodChip(period, onPeriod)
}
}
@Composable
private fun ActivityStats(summary: StatsSummary, modifier: Modifier = Modifier) {
Row(
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 4.dp),
horizontalArrangement = Arrangement.spacedBy(6.dp),
) {
StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f))
StatBlock(formatCompact(summary.blocked), stringResource(R.string.mon_blocked), Modifier.weight(1f))
StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f))
val cache = if (summary.total == 0L) 0 else summary.cached * 100 / summary.total
StatBlock("$cache%", stringResource(R.string.mon_cached), Modifier.weight(1f))
}
}
@Composable
private fun RecentHeader(canClear: Boolean, onClear: () -> Unit, modifier: Modifier = Modifier) {
Row(
modifier = modifier
.fillMaxWidth()
.heightIn(min = 44.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
stringResource(R.string.recent_title),
color = Palette.Fg,
fontSize = 17.sp,
fontWeight = FontWeight.ExtraBold,
modifier = Modifier.weight(1f),
)
IconButton(onClick = onClear, enabled = canClear) {
Icon(
painterResource(R.drawable.ic_delete_sweep),
contentDescription = stringResource(R.string.mon_clear),
tint = Palette.Fg2,
modifier = Modifier.size(20.dp),
)
}
}
}
@Composable
private fun LogSearch(
search: String,
onSearch: (String) -> Unit,
filter: ActivityFilter,
onFilter: (ActivityFilter) -> Unit,
modifier: Modifier = Modifier,
) {
var menu by remember { mutableStateOf(false) }
SearchField(
value = search,
onValueChange = onSearch,
placeholder = stringResource(R.string.mon_search),
modifier = modifier,
trailing = {
Box {
IconButton(onClick = { menu = true }) {
Icon(
painterResource(R.drawable.ic_filter),
contentDescription = stringResource(R.string.filter),
tint = if (filter == ActivityFilter.ALL) Palette.Fg2 else Palette.Accent,
modifier = Modifier.size(18.dp),
)
}
DropdownMenu(expanded = menu, onDismissRequest = { menu = false }) {
ActivityFilter.entries.forEach { option ->
DropdownMenuItem(
text = {
Text(
stringResource(option.label),
color = if (option == filter) Palette.Accent else Palette.Fg,
fontWeight = if (option == filter) FontWeight.Bold else FontWeight.Normal,
)
},
onClick = {
onFilter(option)
menu = false
},
)
}
}
}
},
)
}
// Below this many requests the shares say more about chance than about habits
private const val MIN_COMPANY_REQUESTS = 50L
@Composable
private fun CompanyCard(summary: StatsSummary, recent: List<QueryEntry>, modifier: Modifier = Modifier) {
val other = stringResource(R.string.companies_other)
val slices = remember(summary, recent, other) { companySlices(summary, recent, other) }
Column(
modifier = modifier
.fillMaxWidth()
.appCard()
.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
Text(stringResource(R.string.companies_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold)
Text(stringResource(R.string.companies_desc), color = Palette.Fg2, fontSize = 12.sp, lineHeight = 17.sp)
Spacer(Modifier.size(10.dp))
if (summary.total < MIN_COMPANY_REQUESTS) {
Text(
stringResource(R.string.companies_wait, summary.total, MIN_COMPANY_REQUESTS),
color = Palette.Fg3,
fontSize = 13.sp,
)
LinearProgressIndicator(
progress = { summary.total.toFloat() / MIN_COMPANY_REQUESTS },
modifier = Modifier
.fillMaxWidth()
.padding(top = 10.dp, bottom = 4.dp),
color = Palette.Accent,
trackColor = Palette.Track,
)
} else {
Row(verticalAlignment = Alignment.CenterVertically) {
Donut(slices, Modifier.size(104.dp))
Spacer(Modifier.width(20.dp))
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(8.dp)) {
slices.forEach { slice ->
Row(verticalAlignment = Alignment.CenterVertically) {
Box(
Modifier
.size(8.dp)
.clip(CircleShape)
.background(slice.color)
)
Spacer(Modifier.width(8.dp))
Text(
slice.label,
color = Palette.Fg,
fontSize = 12.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f),
)
Text(percentLabel(slice.share), color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold)
}
}
}
}
}
}
}
// Whole percents; a sliver above zero shows as "<1%" rather than "0%"
private fun percentLabel(share: Float): String {
val percent = share * 100f
return if (percent < 1f) "<1%" else "${Math.round(percent)}%"
}
// Shares of the known companies over the period. The statistics keep no domains, so the share
// left over is split by the names of the recent queries to other domains, from the log in memory.
// Then the four largest slices and everything else; empty slices are left out.
private fun companySlices(summary: StatsSummary, recent: List<QueryEntry>, otherLabel: String): List<Slice> {
if (summary.total == 0L) return emptyList()
val shares = HashMap<String, Float>()
for (company in Company.entries) {
val count = summary.companies[company.ordinal]
if (count > 0) shares[company.label] = count.toFloat() / summary.total
}
val unknownShare = (1f - shares.values.sum()).coerceAtLeast(0f)
val names = HashMap<String, Int>()
var unknownCount = 0
for (entry in recent) {
if (Companies.of(entry.domain) != null) continue
unknownCount++
Companies.nameOf(entry.domain)?.let { names.merge(it, 1, Int::plus) }
}
// Queries without a name (local names, reverse lookups) stay in the rest
if (unknownCount > 0) {
for ((name, count) in names) shares.merge(name, unknownShare * count / unknownCount, Float::plus)
}
val slices = shares.entries
.sortedByDescending { it.value }
.take(SliceColors.size)
.mapIndexed { index, (label, share) -> Slice(label, share, SliceColors[index]) }
val rest = (1f - slices.sumOf { it.share.toDouble() }.toFloat()).coerceAtLeast(0f)
return if (rest >= 0.005f) slices + Slice(otherLabel, rest, OtherColor) else slices
}
@Composable
private fun Donut(slices: List<Slice>, modifier: Modifier = Modifier) {
// The ring's geometry is worked out when the size changes, not every frame
Spacer(
modifier.drawWithCache {
val width = 14.dp.toPx()
val stroke = Stroke(width = width)
val diameter = size.minDimension - width
val topLeft = Offset((size.width - diameter) / 2f, (size.height - diameter) / 2f)
val arcSize = Size(diameter, diameter)
onDrawBehind {
drawArc(OtherColor, 0f, 360f, useCenter = false, topLeft = topLeft, size = arcSize, style = stroke)
var start = -90f
slices.forEach { slice ->
val sweep = slice.share * 360f
if (sweep > 0f) {
drawArc(slice.color, start, sweep, useCenter = false, topLeft = topLeft, size = arcSize, style = stroke)
}
start += sweep
}
}
}
)
}
@Composable
private fun QueryRow(
modifier: Modifier,
entry: QueryEntry,
types: List<Int>,
count: Int,
first: Boolean,
blockedByMe: Boolean,
onBlock: () -> Unit,
onUnblock: () -> Unit,
onCopy: () -> Unit,
) {
var menu by remember { mutableStateOf(false) }
val (avatarBackground, avatarColor) = when (entry.status) {
QueryStatus.BLOCKED -> Palette.Blocked.copy(alpha = 0.14f) to Palette.Blocked
QueryStatus.CACHED -> CachedColor.copy(alpha = 0.14f) to CachedColor
QueryStatus.FAILED -> WarningColor.copy(alpha = 0.14f) to WarningColor
QueryStatus.OK -> Color(0xFF2A2C33) to Palette.Fg
}
val detail = when (entry.status) {
QueryStatus.OK -> stringResource(R.string.mon_ms, entry.latencyMs)
QueryStatus.CACHED -> stringResource(R.string.status_cached)
QueryStatus.BLOCKED -> stringResource(if (blockedByMe) R.string.bl_my else R.string.tab_blocklist)
QueryStatus.FAILED -> stringResource(R.string.status_failed)
}
// "A, AAAA, HTTPS · ×3 · 256 ms"; the status and time are those of the newest query
val typeNames = types.joinToString(", ") { DnsMessage.typeName(it) }
val summary = if (count > 1) "$typeNames · ×$count · $detail" else "$typeNames · $detail"
Box(modifier.fillMaxWidth()) {
Column {
if (!first) HorizontalDivider(color = Palette.Line)
Row(
modifier = Modifier
.fillMaxWidth()
.clickable { menu = true }
.padding(vertical = 10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Box(
modifier = Modifier
.size(34.dp)
.clip(CircleShape)
.background(avatarBackground),
contentAlignment = Alignment.Center,
) {
Text(initialOf(entry.domain), color = avatarColor, fontSize = 13.sp, fontWeight = FontWeight.ExtraBold)
}
Spacer(Modifier.width(12.dp))
Column(Modifier.weight(1f)) {
Text(
entry.domain,
color = Palette.Fg,
fontSize = 14.sp,
fontWeight = FontWeight.Bold,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(
summary,
color = Palette.Fg3,
fontSize = 12.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
Spacer(Modifier.width(8.dp))
Column(horizontalAlignment = Alignment.End) {
if (entry.status == QueryStatus.BLOCKED) {
Text(stringResource(R.string.status_blocked), color = Palette.Blocked, fontSize = 12.sp, fontWeight = FontWeight.Bold)
} else if (entry.status == QueryStatus.FAILED) {
Text(stringResource(R.string.status_failed), color = WarningColor, fontSize = 12.sp, fontWeight = FontWeight.Bold)
}
Text(TimeFormat.format(Date(entry.time)), color = Palette.Fg3, fontSize = 12.sp)
}
}
}
DropdownMenu(expanded = menu, onDismissRequest = { menu = false }) {
if (blockedByMe) {
DropdownMenuItem(
text = { Text(stringResource(R.string.mon_unblock)) },
leadingIcon = { MenuIcon(R.drawable.ic_check) },
onClick = {
menu = false
onUnblock()
},
)
} else if (entry.status != QueryStatus.BLOCKED) {
DropdownMenuItem(
text = { Text(stringResource(R.string.mon_block)) },
leadingIcon = { MenuIcon(R.drawable.ic_tab_block) },
onClick = {
menu = false
onBlock()
},
)
}
DropdownMenuItem(
text = { Text(stringResource(R.string.copy)) },
leadingIcon = { MenuIcon(R.drawable.ic_copy) },
onClick = {
menu = false
onCopy()
},
)
}
}
}
@Composable
private fun MenuIcon(@DrawableRes icon: Int) {
Icon(painterResource(icon), contentDescription = null, tint = Palette.Fg2, modifier = Modifier.size(20.dp))
}
// First letter of the main part of a domain: "a" for app-measurement.com, "g" for www.google.com
private fun initialOf(domain: String): String {
val parts = domain.split('.').filter { it.isNotEmpty() }
val main = if (parts.size >= 2) parts[parts.size - 2] else parts.firstOrNull().orEmpty()
return main.firstOrNull { it.isLetterOrDigit() }?.toString() ?: "·"
}
@@ -4,85 +4,194 @@ import androidx.activity.compose.BackHandler
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInHorizontally import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.slideOutHorizontally
import androidx.compose.animation.togetherWith import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.selection.selectableGroup
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
private enum class Tab(@StringRes val label: Int, @DrawableRes val icon: Int) { // The three tabs of the bottom panel, then the pages opened from them
HOME(R.string.tab_home, R.drawable.ic_tab_home), private enum class Screen(@StringRes val label: Int, @DrawableRes val icon: Int, val isTab: Boolean) {
MONITOR(R.string.tab_monitor, R.drawable.ic_tab_monitor), HOME(R.string.tab_home, R.drawable.ic_tab_home, true),
APPS(R.string.tab_apps, R.drawable.ic_tab_apps), ACTIVITY(R.string.tab_activity, R.drawable.ic_tab_monitor, true),
BLOCKLIST(R.string.tab_blocklist, R.drawable.ic_tab_block), SETTINGS(R.string.tab_settings, R.drawable.ic_tab_settings, true),
ABOUT(R.string.tab_about, R.drawable.ic_tab_info), BLOCKLIST(R.string.blocklist_title, R.drawable.ic_tab_block, false),
APPS(R.string.settings_apps, R.drawable.ic_tab_apps, false),
ABOUT(R.string.tab_about, R.drawable.ic_tab_info, false),
} }
private val Tabs = Screen.entries.filter { it.isTab }
@Composable @Composable
fun AppShell() { fun AppShell() {
var tab by rememberSaveable { mutableStateOf(Tab.HOME) } var tab by rememberSaveable { mutableStateOf(Screen.HOME) }
var page by rememberSaveable { mutableStateOf<Screen?>(null) }
val current = page ?: tab
// Back leads to Home first; only Home closes the app // Back closes an open page first, then leads to Home; only Home closes the app
BackHandler(enabled = tab != Tab.HOME) { tab = Tab.HOME } BackHandler(enabled = page == null && tab != Screen.HOME) { tab = Screen.HOME }
BackHandler(enabled = page != null) { page = null }
Scaffold( val navInset = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
bottomBar = { // Room under the last item of a tab, so it can scroll clear of the floating panel
NavigationBar { val tabBottom = navInset + 112.dp
Tab.entries.forEach { item -> val pageBottom = navInset + 24.dp
NavigationBarItem(
selected = tab == item, Box(
onClick = { tab = item }, Modifier
icon = { Icon(painterResource(item.icon), contentDescription = null) }, .fillMaxSize()
label = { .background(Palette.Bg)
Text(stringResource(item.label), maxLines = 1, overflow = TextOverflow.Ellipsis) ) {
},
)
}
}
},
) { padding ->
// Screens drift a little in the direction of the tab that was picked and cross-fade
AnimatedContent( AnimatedContent(
targetState = tab, targetState = current,
transitionSpec = { transitionSpec = {
val forward = targetState.ordinal > initialState.ordinal // Pages slide in from the side; tabs drift a little towards the tab that was picked
val shift = { width: Int -> if (forward) width / 8 else -width / 8 } val pageMove = targetState.isTab != initialState.isTab
val forward = if (pageMove) !targetState.isTab else targetState.ordinal > initialState.ordinal
val divisor = if (pageMove) 3 else 8
val shift = { width: Int -> if (forward) width / divisor else -width / divisor }
(fadeIn(Motion.enterFade) + slideInHorizontally(Motion.slide) { shift(it) }) togetherWith (fadeIn(Motion.enterFade) + slideInHorizontally(Motion.slide) { shift(it) }) togetherWith
(fadeOut(Motion.exitFade) + slideOutHorizontally(Motion.slide) { -shift(it) }) (fadeOut(Motion.exitFade) + slideOutHorizontally(Motion.slide) { -shift(it) })
}, },
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(padding) .statusBarsPadding()
.consumeWindowInsets(padding)
.imePadding(), .imePadding(),
label = "tabs", label = "screens",
) { current -> ) { screen ->
val modifier = Modifier.fillMaxSize() val modifier = Modifier.fillMaxSize()
when (current) { when (screen) {
Tab.HOME -> HomeScreen(modifier) Screen.HOME -> HomeScreen(
Tab.MONITOR -> MonitorScreen(modifier) bottomPadding = tabBottom,
Tab.APPS -> AppsScreen(modifier) onOpenBlocklist = { page = Screen.BLOCKLIST },
Tab.BLOCKLIST -> BlocklistScreen(modifier) onOpenServers = { tab = Screen.SETTINGS },
Tab.ABOUT -> AboutScreen(modifier) modifier = modifier,
)
Screen.ACTIVITY -> ActivityScreen(bottomPadding = tabBottom, modifier = modifier)
Screen.SETTINGS -> SettingsScreen(
bottomPadding = tabBottom,
onOpenApps = { page = Screen.APPS },
onOpenAbout = { page = Screen.ABOUT },
modifier = modifier,
)
Screen.BLOCKLIST -> BlocklistScreen(bottomPadding = pageBottom, onBack = { page = null }, modifier = modifier)
Screen.APPS -> SubPage(stringResource(R.string.settings_apps), onBack = { page = null }, modifier = modifier) {
AppsScreen(Modifier.fillMaxSize())
}
Screen.ABOUT -> SubPage(stringResource(R.string.tab_about), onBack = { page = null }, modifier = modifier) {
AboutScreen(Modifier.fillMaxSize())
}
}
}
AnimatedVisibility(
visible = page == null,
enter = fadeIn(Motion.enterFade),
exit = fadeOut(Motion.exitFade),
modifier = Modifier.align(Alignment.BottomCenter),
) {
Box(contentAlignment = Alignment.BottomCenter) {
// Content scrolling under the panel fades out instead of being cut off
Box(
Modifier
.fillMaxWidth()
.height(120.dp + navInset)
.background(Brush.verticalGradient(0f to Color.Transparent, 0.7f to Palette.Bg))
)
NavPill(
current = tab,
onSelect = { tab = it },
modifier = Modifier
.navigationBarsPadding()
.padding(bottom = 20.dp),
)
} }
} }
} }
} }
// Floating bottom panel: dark, with the picked tab lit in the accent color
@Composable
private fun NavPill(current: Screen, onSelect: (Screen) -> Unit, modifier: Modifier = Modifier) {
val shape = RoundedCornerShape(30.dp)
Row(
modifier = modifier
.shadow(18.dp, shape)
.clip(shape)
.background(Palette.Nav)
.border(1.dp, Color.White.copy(alpha = 0.07f), shape)
.padding(6.dp)
.selectableGroup(),
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Tabs.forEach { item -> NavItem(item, selected = item == current, onSelect = onSelect) }
}
}
// One tab of the panel. Its own composable, so a color animation recomposes only the tabs that
// change instead of the whole panel; the background is read only when drawing.
@Composable
private fun NavItem(item: Screen, selected: Boolean, onSelect: (Screen) -> Unit) {
val background by animateColorAsState(
if (selected) Palette.AccentSoft else Color.Transparent,
animationSpec = Motion.color,
label = "navBackground",
)
val tint by animateColorAsState(
if (selected) Palette.Accent else Palette.NavIcon,
animationSpec = Motion.color,
label = "navTint",
)
val label = stringResource(item.label)
Box(
modifier = Modifier
.size(width = 58.dp, height = 44.dp)
.clip(RoundedCornerShape(22.dp))
.drawBehind { drawRect(background) }
.selectable(selected = selected, onClick = { onSelect(item) }, role = Role.Tab)
.semantics { contentDescription = label },
contentAlignment = Alignment.Center,
) {
Icon(painterResource(item.icon), contentDescription = null, tint = tint, modifier = Modifier.size(22.dp))
}
}
@@ -33,32 +33,33 @@ import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Switch
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.material3.TriStateCheckbox import androidx.compose.material3.TriStateCheckbox
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.produceState import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.Role
import androidx.compose.ui.state.ToggleableState import androidx.compose.ui.state.ToggleableState
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -77,27 +78,39 @@ private enum class AppGroup(@StringRes val label: Int, @DrawableRes val icon: In
private class AppItem(val label: String, val packageName: String, val group: AppGroup) private class AppItem(val label: String, val packageName: String, val group: AppGroup)
// Decoded icons survive scrolling and tab switches instead of being rendered again every time // Decoded icons survive scrolling and tab switches instead of being rendered again every time.
private val IconCache = LruCache<String, ImageBitmap>(256) // Limited by memory rather than count, since icon size now follows the screen density.
private val IconCache = object : LruCache<String, ImageBitmap>(10 * 1024 * 1024) {
override fun sizeOf(key: String, value: ImageBitmap) = value.width * value.height * 4
}
internal fun clearAppIconCache() = IconCache.evictAll()
// Shown right away when the tab opens again, while the list is read anew in the background.
// Only touched on the main thread.
private var lastAppList: List<AppItem>? = null
@Composable @Composable
fun AppsScreen(modifier: Modifier = Modifier) { fun AppsScreen(modifier: Modifier = Modifier) {
val context = LocalContext.current val context = LocalContext.current
val prefs = remember { Prefs(context) } val prefs = remember { Prefs(context) }
val active by DohVpnService.active.collectAsState() val active by DohVpnService.active.collectAsStateWithLifecycle()
val activeExcluded by DohVpnService.activeExcluded.collectAsState() val activeExcluded by DohVpnService.activeExcluded.collectAsStateWithLifecycle()
var apps by remember { mutableStateOf<List<AppItem>?>(null) } var apps by remember { mutableStateOf(lastAppList) }
var excluded by remember { mutableStateOf(prefs.excludedApps) } var excluded by remember { mutableStateOf(prefs.excludedApps) }
var search by rememberSaveable { mutableStateOf("") } var search by rememberSaveable { mutableStateOf("") }
var collapsed by remember { mutableStateOf(setOf(AppGroup.SYSTEM)) } var collapsed by rememberSaveable(stateSaver = CollapsedSaver) { mutableStateOf(setOf(AppGroup.SYSTEM)) }
val pending = active != null && excluded != activeExcluded val pending = active != null && excluded != activeExcluded
var showAppsHint by remember { mutableStateOf(!prefs.isHintDismissed(HINT_APPS)) }
// Closing the "reconnect" card hides it until the selection changes again
var pendingDismissedFor by remember { mutableStateOf<Set<String>?>(null) }
// Uninstalled apps may still be in the saved set; count only the ones on the device // Uninstalled apps may still be in the saved set; count only the ones on the device
val excludedCount = apps?.count { it.packageName in excluded } ?: excluded.size val excludedCount = apps?.count { it.packageName in excluded } ?: excluded.size
val searching = search.isNotBlank() val searching = search.isNotBlank()
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
apps = withContext(Dispatchers.IO) { loadApps(context) } apps = withContext(Dispatchers.IO) { loadApps(context) }.also { lastAppList = it }
} }
val groups = remember(apps, search) { val groups = remember(apps, search) {
@@ -122,8 +135,21 @@ fun AppsScreen(modifier: Modifier = Modifier) {
) { ) {
item { item {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
HintCard(stringResource(R.string.apps_hint), icon = R.drawable.ic_tab_info) AnimatedVisibility(visible = showAppsHint, enter = Motion.expandIn, exit = Motion.collapseOut) {
AnimatedVisibility(visible = pending, enter = Motion.expandIn, exit = Motion.collapseOut) { HintCard(
stringResource(R.string.apps_hint),
icon = R.drawable.ic_tab_info,
onDismiss = {
showAppsHint = false
prefs.dismissHint(HINT_APPS)
},
)
}
AnimatedVisibility(
visible = pending && excluded != pendingDismissedFor,
enter = Motion.expandIn,
exit = Motion.collapseOut,
) {
HintCard( HintCard(
text = stringResource(R.string.apps_pending), text = stringResource(R.string.apps_pending),
icon = R.drawable.ic_refresh, icon = R.drawable.ic_refresh,
@@ -133,6 +159,7 @@ fun AppsScreen(modifier: Modifier = Modifier) {
Text(stringResource(R.string.reconnect)) Text(stringResource(R.string.reconnect))
} }
}, },
onDismiss = { pendingDismissedFor = excluded },
) )
} }
} }
@@ -171,7 +198,7 @@ fun AppsScreen(modifier: Modifier = Modifier) {
groups.forEach { (group, items) -> groups.forEach { (group, items) ->
val expanded = searching || group !in collapsed val expanded = searching || group !in collapsed
item(key = "group:${group.name}") { item(key = "group:${group.name}", contentType = "group") {
GroupHeader( GroupHeader(
modifier = Modifier.animateItem(), modifier = Modifier.animateItem(),
group = group, group = group,
@@ -188,7 +215,7 @@ fun AppsScreen(modifier: Modifier = Modifier) {
) )
} }
if (expanded) { if (expanded) {
itemsIndexed(items, key = { _, app -> app.packageName }) { index, app -> itemsIndexed(items, key = { _, app -> app.packageName }, contentType = { _, _ -> "app" }) { index, app ->
AppRow( AppRow(
modifier = Modifier.animateItem(), modifier = Modifier.animateItem(),
app = app, app = app,
@@ -220,7 +247,8 @@ private fun GroupHeader(
else -> ToggleableState.Indeterminate else -> ToggleableState.Indeterminate
} }
val chevron by animateFloatAsState(if (expanded) 180f else 0f, Motion.rotation, label = "chevron") // Read only in the draw phase, so the animation does not recompose the header every frame
val chevron = animateFloatAsState(if (expanded) 180f else 0f, Motion.rotation, label = "chevron")
Row( Row(
modifier = modifier modifier = modifier
@@ -250,7 +278,7 @@ private fun GroupHeader(
modifier = Modifier modifier = Modifier
.padding(end = 8.dp) .padding(end = 8.dp)
.size(22.dp) .size(22.dp)
.rotate(chevron), .graphicsLayer { rotationZ = chevron.value },
) )
} }
} }
@@ -258,12 +286,15 @@ private fun GroupHeader(
@Composable @Composable
private fun AppRow(modifier: Modifier, app: AppItem, enabled: Boolean, last: Boolean, onToggle: (Boolean) -> Unit) { private fun AppRow(modifier: Modifier, app: AppItem, enabled: Boolean, last: Boolean, onToggle: (Boolean) -> Unit) {
val context = LocalContext.current val context = LocalContext.current
val icon by produceState<ImageBitmap?>(IconCache.get(app.packageName), app.packageName) { // Rendered at the size it is shown (40 dp), so icons stay sharp on dense screens
val iconPx = with(LocalDensity.current) { 40.dp.roundToPx() }
val cacheKey = "${app.packageName}@$iconPx"
val icon by produceState<ImageBitmap?>(IconCache.get(cacheKey), cacheKey) {
if (value != null) return@produceState if (value != null) return@produceState
value = withContext(Dispatchers.IO) { value = withContext(Dispatchers.IO) {
runCatching { context.packageManager.getApplicationIcon(app.packageName).toImageBitmap(96) } runCatching { context.packageManager.getApplicationIcon(app.packageName).toImageBitmap(iconPx) }
.getOrNull() .getOrNull()
?.also { IconCache.put(app.packageName, it) } ?.also { IconCache.put(cacheKey, it) }
} }
} }
@@ -306,7 +337,7 @@ private fun AppRow(modifier: Modifier, app: AppItem, enabled: Boolean, last: Boo
) )
} }
Spacer(Modifier.width(12.dp)) Spacer(Modifier.width(12.dp))
Switch(checked = enabled, onCheckedChange = null) AppSwitch(checked = enabled, onCheckedChange = null)
} }
} }
} }
@@ -345,3 +376,11 @@ private fun Drawable.toImageBitmap(size: Int): ImageBitmap {
draw(canvas) draw(canvas)
return bitmap.asImageBitmap() return bitmap.asImageBitmap()
} }
// Collapsed groups survive rotation and process death
private val CollapsedSaver = Saver<Set<AppGroup>, String>(
save = { groups -> groups.joinToString(",") { it.name } },
restore = { saved -> saved.split(',').mapNotNull { name -> AppGroup.entries.firstOrNull { it.name == name } }.toSet() },
)
private const val HINT_APPS = "apps"
@@ -0,0 +1,66 @@
package cc.skysparkle.sparkledns
import android.app.job.JobInfo
import android.app.job.JobParameters
import android.app.job.JobScheduler
import android.app.job.JobService
import android.content.ComponentName
import android.content.Context
import android.util.Log
import java.util.concurrent.TimeUnit
enum class UpdateInterval(val days: Long) { OFF(0), DAILY(1), WEEKLY(7) }
// Downloads newer versions of the user's blocklists in the background. Uses the system
// JobScheduler, so the app needs no extra library and nothing runs while the conditions are not met.
object AutoUpdate {
private const val JOB_ID = 4201
// JobInfo.networkType is deprecated in favour of NetworkRequest, which needs API 28
@Suppress("DEPRECATION")
fun apply(context: Context) {
val prefs = Prefs(context)
val scheduler = context.getSystemService(JobScheduler::class.java) ?: return
val interval = prefs.updateInterval
if (interval == UpdateInterval.OFF) {
scheduler.cancel(JOB_ID)
return
}
val period = TimeUnit.DAYS.toMillis(interval.days)
val network = if (prefs.updateWifiOnly) JobInfo.NETWORK_TYPE_UNMETERED else JobInfo.NETWORK_TYPE_ANY
// Scheduling the same job again would start its period over, so an unchanged one is kept
val existing = scheduler.getPendingJob(JOB_ID)
if (existing != null && existing.intervalMillis == period && existing.networkType == network) return
val job = JobInfo.Builder(JOB_ID, ComponentName(context, BlocklistUpdateJob::class.java))
.setPeriodic(period)
.setRequiredNetworkType(network)
.setRequiresBatteryNotLow(true)
.setPersisted(true)
.build()
try {
scheduler.schedule(job)
} catch (e: RuntimeException) {
Log.w("SparkleDNS", "Cannot schedule blocklist updates", e)
}
}
}
class BlocklistUpdateJob : JobService() {
override fun onStartJob(params: JobParameters): Boolean {
Thread({
val ok = try {
Blocklist.updateAllNow(applicationContext)
} catch (e: Exception) {
Log.w("SparkleDNS", "Blocklist update failed", e)
false
}
// A failed run is retried later with the system's back-off
jobFinished(params, !ok)
}, "blocklist-update").start()
return true
}
// Downloads cannot be cut short halfway; the next run picks up where this one stopped
override fun onStopJob(params: JobParameters): Boolean = true
}
@@ -1,6 +1,9 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.content.Context import android.content.Context
import android.content.SharedPreferences
import android.util.Log
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
@@ -21,14 +24,17 @@ import java.nio.channels.FileChannel
import java.security.MessageDigest import java.security.MessageDigest
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
data class RemoteList(val url: String, val count: Int, val updated: Long) // A switched-off list keeps its file, so switching it on again needs no download
data class RemoteList(val url: String, val count: Int, val updated: Long, val enabled: Boolean = true)
// Blocks a domain together with all its subdomains. Changes apply instantly, no reconnect needed. // Blocks a domain together with all its subdomains. Changes apply instantly, no reconnect needed.
// Domains are kept as sorted 64-bit hashes: about 8 bytes per entry, so million-entry lists fit easily. // Domains are kept as sorted 64-bit hashes: about 8 bytes per entry, so million-entry lists fit easily.
object Blocklist { object Blocklist {
const val ALL_LISTS = "*" const val ALL_LISTS = "*"
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) private val scope = CoroutineScope(
SupervisorJob() + Dispatchers.IO + CoroutineExceptionHandler { _, e -> Log.e("SparkleDNS", "Blocklist task failed", e) }
)
private val lock = Any() private val lock = Any()
private val _enabled = MutableStateFlow(true) private val _enabled = MutableStateFlow(true)
@@ -51,26 +57,25 @@ object Blocklist {
private val _error = MutableStateFlow<String?>(null) private val _error = MutableStateFlow<String?>(null)
val error: StateFlow<String?> = _error val error: StateFlow<String?> = _error
// Downloaded lists and own domains are kept apart, so editing a few own domains
// does not rebuild a set that can hold millions of entries
@Volatile @Volatile
private var hashes = LongArray(0)
private var listHashes = LongArray(0) private var listHashes = LongArray(0)
@Volatile
private var customHashes = LongArray(0)
private var loaded = false private var loaded = false
fun isBlocked(name: String): Boolean { // False until the saved lists have been read at start-up
if (!_enabled.value) return false private val _ready = MutableStateFlow(false)
val set = hashes val ready: StateFlow<Boolean> = _ready
if (set.isEmpty()) return false
val domain = name.trimEnd('.')
var start = 0
while (true) {
if (set.binarySearch(DomainHash.of(domain, start)) >= 0) return true
val dot = domain.indexOf('.', start)
if (dot < 0) return false
start = dot + 1
}
}
fun reload(context: Context) = synchronized(lock) { load(BlocklistStore(context)) } fun isBlocked(name: String): Boolean = _enabled.value && isBlockedIn(name, listHashes, customHashes)
// Reads the saved lists unless something did already, such as the background update job
fun ensureLoaded(context: Context) {
synchronized(lock) { ensureLoaded(BlocklistStore(context)) }
}
fun setEnabled(context: Context, value: Boolean) { fun setEnabled(context: Context, value: Boolean) {
BlocklistStore(context).enabled = value BlocklistStore(context).enabled = value
@@ -84,7 +89,7 @@ object Blocklist {
val updated = (_custom.value + domain).distinct().sorted() val updated = (_custom.value + domain).distinct().sorted()
store.saveCustom(updated) store.saveCustom(updated)
_custom.value = updated _custom.value = updated
combine() updateCustomHashes()
true true
} }
@@ -94,7 +99,7 @@ object Blocklist {
val updated = _custom.value - domain val updated = _custom.value - domain
store.saveCustom(updated) store.saveCustom(updated)
_custom.value = updated _custom.value = updated
combine() updateCustomHashes()
} }
fun removeList(context: Context, url: String) = synchronized(lock) { fun removeList(context: Context, url: String) = synchronized(lock) {
@@ -107,6 +112,15 @@ object Blocklist {
reloadListHashes(store) reloadListHashes(store)
} }
fun setListEnabled(context: Context, url: String, value: Boolean) = synchronized(lock) {
val store = BlocklistStore(context)
ensureLoaded(store)
val updated = _lists.value.map { if (it.url == url) it.copy(enabled = value) else it }
store.saveLists(updated)
_lists.value = updated
reloadListHashes(store)
}
// Downloads run in the background, outside the lock, so editing own domains never waits for them. // Downloads run in the background, outside the lock, so editing own domains never waits for them.
// Returns false when another download is already running. // Returns false when another download is already running.
fun download(context: Context, url: String): Boolean { fun download(context: Context, url: String): Boolean {
@@ -114,9 +128,10 @@ object Blocklist {
if (target.isEmpty() || !_busy.compareAndSet(null, target)) return false if (target.isEmpty() || !_busy.compareAndSet(null, target)) return false
_error.value = null _error.value = null
val store = BlocklistStore(context.applicationContext) val store = BlocklistStore(context.applicationContext)
val previous = _lists.value.firstOrNull { it.url == target }
scope.launch { scope.launch {
try { try {
val list = store.download(target) val list = store.download(target, previous)
commit(store, listOf(list)) commit(store, listOf(list))
} catch (e: Exception) { } catch (e: Exception) {
_error.value = e.message ?: e.javaClass.simpleName _error.value = e.message ?: e.javaClass.simpleName
@@ -127,22 +142,25 @@ object Blocklist {
return true return true
} }
// Switched-off lists are skipped: nobody uses them until they are switched on again
fun updateAll(context: Context): Boolean { fun updateAll(context: Context): Boolean {
if (_lists.value.isEmpty() || !_busy.compareAndSet(null, ALL_LISTS)) return false val current = _lists.value.filter { it.enabled }
if (current.isEmpty() || !_busy.compareAndSet(null, ALL_LISTS)) return false
_error.value = null _error.value = null
val store = BlocklistStore(context.applicationContext) val store = BlocklistStore(context.applicationContext)
val urls = _lists.value.map { it.url }
scope.launch { scope.launch {
try { try {
val fresh = urls.mapNotNull { url -> val fresh = current.mapNotNull { list ->
try { try {
store.download(url) store.download(list.url, list)
} catch (e: Exception) { } catch (e: Exception) {
if (_error.value == null) _error.value = e.message ?: e.javaClass.simpleName if (_error.value == null) _error.value = e.message ?: e.javaClass.simpleName
null null
} }
} }
commit(store, fresh) commit(store, fresh)
} catch (e: IOException) {
_error.value = e.message ?: e.javaClass.simpleName
} finally { } finally {
_busy.value = null _busy.value = null
} }
@@ -150,10 +168,38 @@ object Blocklist {
return true return true
} }
// Blocking, for the background update job. Returns false when a list could not be downloaded.
fun updateAllNow(context: Context): Boolean {
val store = BlocklistStore(context.applicationContext)
synchronized(lock) { ensureLoaded(store) }
val current = _lists.value.filter { it.enabled }
// Nothing to do, or the user is updating right now
if (current.isEmpty() || !_busy.compareAndSet(null, ALL_LISTS)) return true
var ok = true
try {
val fresh = current.mapNotNull { list ->
try {
store.download(list.url, list)
} catch (e: Exception) {
Log.w("SparkleDNS", "Cannot update ${list.url}", e)
ok = false
null
}
}
commit(store, fresh)
} catch (e: IOException) {
Log.w("SparkleDNS", "Cannot save updated lists", e)
ok = false
} finally {
_busy.value = null
}
return ok
}
private fun commit(store: BlocklistStore, fresh: List<RemoteList>) = synchronized(lock) { private fun commit(store: BlocklistStore, fresh: List<RemoteList>) = synchronized(lock) {
ensureLoaded(store) ensureLoaded(store)
val byUrl = fresh.associateBy { it.url } val byUrl = fresh.associateBy { it.url }
val kept = _lists.value.map { byUrl[it.url] ?: it } val kept = _lists.value.map { old -> byUrl[old.url]?.copy(enabled = old.enabled) ?: old }
val added = fresh.filter { new -> kept.none { it.url == new.url } } val added = fresh.filter { new -> kept.none { it.url == new.url } }
val updated = kept + added val updated = kept + added
store.saveLists(updated) store.saveLists(updated)
@@ -169,43 +215,93 @@ object Blocklist {
_enabled.value = store.enabled _enabled.value = store.enabled
_custom.value = store.loadCustom() _custom.value = store.loadCustom()
_lists.value = store.loadLists() _lists.value = store.loadLists()
val custom = _custom.value
customHashes = LongArray(custom.size) { DomainHash.of(custom[it]) }.sortUnique()
reloadListHashes(store) reloadListHashes(store)
loaded = true loaded = true
_ready.value = true
} }
private fun reloadListHashes(store: BlocklistStore) { private fun reloadListHashes(store: BlocklistStore) {
listHashes = merge(_lists.value.map { store.loadListHashes(it.url) }) listHashes = mergeSorted(_lists.value.filter { it.enabled }.map { store.loadListHashes(it.url) })
combine() _total.value = unionSize(listHashes, customHashes)
} }
private fun combine() { private fun updateCustomHashes() {
val custom = _custom.value val custom = _custom.value
hashes = if (custom.isEmpty()) { customHashes = LongArray(custom.size) { DomainHash.of(custom[it]) }.sortUnique()
listHashes _total.value = unionSize(listHashes, customHashes)
} else {
merge(listOf(listHashes, LongArray(custom.size) { DomainHash.of(custom[it]) }))
}
_total.value = hashes.size
} }
}
private fun merge(parts: List<LongArray>): LongArray { // True when the name or one of its parent domains is in either sorted hash set. Runs for every
val nonEmpty = parts.filter { it.isNotEmpty() } // query, so trailing dots are skipped by index rather than trimmed off a copy of the name.
if (nonEmpty.size <= 1) return nonEmpty.firstOrNull() ?: LongArray(0) // stored lists are already sorted internal fun isBlockedIn(name: String, lists: LongArray, custom: LongArray): Boolean {
val all = LongArray(nonEmpty.sumOf { it.size }) if (lists.isEmpty() && custom.isEmpty()) return false
var pos = 0 val end = nameEnd(name)
nonEmpty.forEach { it.copyInto(all, pos); pos += it.size } var start = 0
return all.sortUnique() while (true) {
val hash = DomainHash.of(name, start, end)
if (lists.binarySearch(hash) >= 0 || custom.binarySearch(hash) >= 0) return true
val dot = name.indexOf('.', start)
if (dot < 0 || dot >= end) return false
start = dot + 1
} }
} }
// Length of the name without trailing dots
internal fun nameEnd(name: String): Int {
var end = name.length
while (end > 0 && name[end - 1] == '.') end--
return end
}
// Number of distinct entries in both sorted sets; the custom set is small
internal fun unionSize(lists: LongArray, custom: LongArray): Int =
lists.size + custom.count { lists.binarySearch(it) < 0 }
// Merges sorted, duplicate-free arrays in linear time instead of sorting their concatenation
internal fun mergeSorted(parts: List<LongArray>): LongArray {
var arrays = parts.filter { it.isNotEmpty() }.map { if (it.isSortedUnique()) it else it.copyOf().sortUnique() }
if (arrays.isEmpty()) return LongArray(0)
while (arrays.size > 1) {
arrays = arrays.chunked(2).map { if (it.size == 2) mergeTwo(it[0], it[1]) else it[0] }
}
return arrays[0]
}
private fun mergeTwo(a: LongArray, b: LongArray): LongArray {
val out = LongArray(a.size + b.size)
var i = 0
var j = 0
var n = 0
while (i < a.size && j < b.size) {
val x = a[i]
val y = b[j]
when {
x < y -> { out[n++] = x; i++ }
x > y -> { out[n++] = y; j++ }
else -> { out[n++] = x; i++; j++ }
}
}
while (i < a.size) out[n++] = a[i++]
while (j < b.size) out[n++] = b[j++]
return if (n == out.size) out else out.copyOf(n)
}
private fun LongArray.isSortedUnique(): Boolean {
for (i in 1 until size) if (this[i - 1] >= this[i]) return false
return true
}
internal object DomainHash { internal object DomainHash {
private const val FNV_OFFSET = -3750763034362895579L // 0xcbf29ce484222325 private const val FNV_OFFSET = -3750763034362895579L // 0xcbf29ce484222325
private const val FNV_PRIME = 1099511628211L private const val FNV_PRIME = 1099511628211L
// FNV-1a over the domain starting at [start], so parent domains are hashed without substrings // FNV-1a over the characters from [start] to [end], so parent domains are hashed without substrings
fun of(s: String, start: Int = 0): Long { fun of(s: String, start: Int = 0, end: Int = s.length): Long {
var h = FNV_OFFSET var h = FNV_OFFSET
for (i in start until s.length) { for (i in start until end) {
h = h xor s[i].code.toLong() h = h xor s[i].code.toLong()
h *= FNV_PRIME h *= FNV_PRIME
} }
@@ -236,8 +332,12 @@ private fun LongArray.sortUnique(): LongArray {
} }
private class BlocklistStore(context: Context) { private class BlocklistStore(context: Context) {
private val dir = File(context.filesDir, "blocklist").apply { mkdirs() } private val appContext = context.applicationContext
private val sp = context.getSharedPreferences("blocklist", Context.MODE_PRIVATE)
// Created on first use: switching blocking on or off, which happens on the main thread,
// touches only the settings
private val dir by lazy { File(appContext.filesDir, "blocklist").apply { mkdirs() } }
private val sp = appContext.getSharedPreferences("blocklist", Context.MODE_PRIVATE)
var enabled: Boolean var enabled: Boolean
get() = sp.getBoolean("enabled", true) get() = sp.getBoolean("enabled", true)
@@ -260,7 +360,7 @@ private class BlocklistStore(context: Context) {
val array = JSONArray(raw) val array = JSONArray(raw)
(0 until array.length()).map { (0 until array.length()).map {
val o = array.getJSONObject(it) val o = array.getJSONObject(it)
RemoteList(o.getString("url"), o.getInt("count"), o.getLong("updated")) RemoteList(o.getString("url"), o.getInt("count"), o.getLong("updated"), o.getBoolean("enabled"))
} }
}.getOrDefault(emptyList()) }.getOrDefault(emptyList())
} }
@@ -268,14 +368,15 @@ private class BlocklistStore(context: Context) {
fun saveLists(lists: List<RemoteList>) { fun saveLists(lists: List<RemoteList>) {
val array = JSONArray() val array = JSONArray()
lists.forEach { lists.forEach {
array.put(JSONObject().put("url", it.url).put("count", it.count).put("updated", it.updated)) array.put(
JSONObject().put("url", it.url).put("count", it.count).put("updated", it.updated).put("enabled", it.enabled)
)
} }
sp.edit().putString("lists", array.toString()).commit() sp.edit().putString("lists", array.toString()).commit()
} }
fun loadListHashes(url: String): LongArray { fun loadListHashes(url: String): LongArray {
val file = binFile(url) val file = binFile(url)
if (!file.exists()) migrateText(url)?.let { return it }
if (!file.exists()) return LongArray(0) if (!file.exists()) return LongArray(0)
return runCatching { return runCatching {
FileInputStream(file).use { stream -> FileInputStream(file).use { stream ->
@@ -289,23 +390,38 @@ private class BlocklistStore(context: Context) {
fun deleteListFile(url: String) { fun deleteListFile(url: String) {
binFile(url).delete() binFile(url).delete()
textFile(url).delete() sp.edit().remove(etagKey(url)).remove(modifiedKey(url)).apply()
} }
fun download(url: String): RemoteList { // With the list already on disk the server is asked for a changed one only, so updating
val request = runCatching { Request.Builder().url(url).build() } // a list that did not change costs a few hundred bytes instead of megabytes
.getOrElse { throw IOException("Invalid URL") } fun download(url: String, previous: RemoteList? = null): RemoteList {
val builder = runCatching { Request.Builder().url(url) }.getOrElse { throw IOException("Invalid URL") }
if (previous != null && binFile(url).exists()) {
sp.getString(etagKey(url), null)?.let { builder.header("If-None-Match", it) }
sp.getString(modifiedKey(url), null)?.let { builder.header("If-Modified-Since", it) }
}
client.newCall(request).execute().use { response -> client.newCall(builder.build()).execute().use { response ->
if (response.code == 304 && previous != null) return previous.copy(updated = System.currentTimeMillis())
if (!response.isSuccessful) throw IOException("HTTP ${response.code}") if (!response.isSuccessful) throw IOException("HTTP ${response.code}")
val body = response.body ?: throw IOException("Empty response") val body = response.body ?: throw IOException("Empty response")
val parsed = LongList() val parsed = LongList()
body.charStream().buffered().useLines { lines -> body.charStream().buffered().useLines { lines ->
lines.forEach { line -> BlocklistParser.parseLine(line)?.let { parsed.add(DomainHash.of(it)) } } lines.forEach { line ->
val domain = BlocklistParser.parseLine(line) ?: return@forEach
// Far above the largest common lists; keeps a wrong URL from exhausting memory
if (parsed.size >= MAX_LIST_DOMAINS) throw IOException("List too large")
parsed.add(DomainHash.of(domain))
}
} }
val result = parsed.toArray().sortUnique() val result = parsed.toArray().sortUnique()
if (result.isEmpty()) throw IOException("No domains found") if (result.isEmpty()) throw IOException("No domains found")
write(url, result) write(url, result)
sp.edit()
.putOrRemove(etagKey(url), response.header("ETag"))
.putOrRemove(modifiedKey(url), response.header("Last-Modified"))
.apply()
return RemoteList(url, result.size, System.currentTimeMillis()) return RemoteList(url, result.size, System.currentTimeMillis())
} }
} }
@@ -322,26 +438,22 @@ private class BlocklistStore(context: Context) {
} }
} }
// Lists saved by older versions as plain text are converted once private fun etagKey(url: String) = "etag_${hash(url)}"
private fun migrateText(url: String): LongArray? { private fun modifiedKey(url: String) = "modified_${hash(url)}"
val text = textFile(url)
if (!text.exists()) return null private fun SharedPreferences.Editor.putOrRemove(key: String, value: String?) =
val result = text.readLines().map { DomainHash.of(it) }.toLongArray().sortUnique() if (value == null) remove(key) else putString(key, value)
runCatching { write(url, result) }
text.delete()
return result
}
private fun binFile(url: String) = File(dir, "list_${hash(url)}.bin") private fun binFile(url: String) = File(dir, "list_${hash(url)}.bin")
private fun textFile(url: String) = File(dir, "list_${hash(url)}.txt")
private fun hash(url: String) = MessageDigest.getInstance("SHA-256").digest(url.toByteArray()) private fun hash(url: String) = MessageDigest.getInstance("SHA-256").digest(url.toByteArray())
.take(8).joinToString("") { "%02x".format(it) } .take(8).joinToString("") { "%02x".format(it) }
companion object { companion object {
const val MAX_LIST_DOMAINS = 4_000_000
val client: OkHttpClient by lazy { val client: OkHttpClient by lazy {
OkHttpClient.Builder() Http.client.newBuilder()
.connectTimeout(15, TimeUnit.SECONDS)
.readTimeout(60, TimeUnit.SECONDS) .readTimeout(60, TimeUnit.SECONDS)
.build() .build()
} }
@@ -1,36 +1,46 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.content.Context
import android.net.Uri import android.net.Uri
import android.text.format.DateUtils
import android.widget.Toast
import androidx.annotation.StringRes
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateContentSize import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialog
import androidx.compose.material3.AssistChip import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Switch import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@@ -39,103 +49,192 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.text.DateFormat import java.io.IOException
import java.util.Date
private class Preset(val name: String, val url: String, @StringRes val description: Int)
private const val HAGEZI_HOME = "https://github.com/hagezi/dns-blocklists"
// Offered on Home when no list is switched on
internal const val HAGEZI_PRO_URL = "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.txt"
private val Presets = listOf( private val Presets = listOf(
"HaGeZi Pro++" to "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.plus.txt", Preset("HaGeZi Pro", HAGEZI_PRO_URL, R.string.preset_pro_desc),
"HaGeZi TIF" to "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt", Preset("HaGeZi Pro++", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/pro.plus.txt", R.string.preset_proplus_desc),
Preset("HaGeZi TIF", "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/tif.txt", R.string.preset_tif_desc),
) )
private val TopShape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp)
private val BottomShape = RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp)
@Composable @Composable
fun BlocklistScreen(modifier: Modifier = Modifier) { fun BlocklistScreen(bottomPadding: Dp, onBack: () -> Unit, modifier: Modifier = Modifier) {
val context = LocalContext.current val context = LocalContext.current
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val prefs = remember { Prefs(context) }
val side = sidePadding(windowWidth())
val enabled by Blocklist.enabled.collectAsState() val enabled by Blocklist.enabled.collectAsStateWithLifecycle()
val total by Blocklist.total.collectAsState() val custom by Blocklist.custom.collectAsStateWithLifecycle()
val custom by Blocklist.custom.collectAsState() val lists by Blocklist.lists.collectAsStateWithLifecycle()
val lists by Blocklist.lists.collectAsState() // Downloads live in Blocklist, so they keep running and stay visible when the page is closed
val busy by Blocklist.busy.collectAsStateWithLifecycle()
val error by Blocklist.error.collectAsStateWithLifecycle()
val shownError = rememberLast(error).orEmpty()
var search by rememberSaveable { mutableStateOf("") }
var domainsOpen by rememberSaveable { mutableStateOf(false) }
var domainInput by rememberSaveable { mutableStateOf("") } var domainInput by rememberSaveable { mutableStateOf("") }
var domainError by remember { mutableStateOf(false) } var domainError by remember { mutableStateOf(false) }
var urlInput by rememberSaveable { mutableStateOf("") } var showAddList by rememberSaveable { mutableStateOf(false) }
// Downloads live in Blocklist, so they keep running and stay visible across tab switches var showUpdates by rememberSaveable { mutableStateOf(false) }
val busy by Blocklist.busy.collectAsState() var interval by remember { mutableStateOf(prefs.updateInterval) }
val error by Blocklist.error.collectAsState() var wifiOnly by remember { mutableStateOf(prefs.updateWifiOnly) }
val lastError = remember { arrayOf("") } // kept while the card animates out
error?.let { lastError[0] = it } val term = search.trim()
fun matches(vararg texts: String) = term.isEmpty() || texts.any { it.contains(term, ignoreCase = true) }
val presetUrls = remember { Presets.map { it.url }.toSet() }
val ownLists = lists.filter { it.url !in presetUrls }
val shownDomains = if (term.isEmpty()) custom else custom.filter { it.contains(term, ignoreCase = true) }
fun addDomain() { fun addDomain() {
val input = domainInput val input = domainInput
if (input.isBlank()) return if (input.isBlank()) return
scope.launch { scope.launch {
val ok = withContext(Dispatchers.IO) { Blocklist.addCustom(context, input) } val result = withContext(Dispatchers.IO) { tryEdit { Blocklist.addCustom(context, input) } }
domainError = !ok result.onSuccess { ok ->
if (ok) domainInput = "" domainError = !ok
if (ok) domainInput = ""
}.onFailure { showEditError(context, it) }
} }
} }
fun addList() { LazyColumn(
val url = urlInput.trim() modifier = modifier,
if (url.isNotEmpty() && Blocklist.download(context, url)) urlInput = "" contentPadding = PaddingValues(start = side, end = side, bottom = bottomPadding),
}
Column(
modifier = modifier
.fillMaxSize()
.verticalScroll(rememberScrollState())
.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(12.dp),
) { ) {
Card(Modifier.fillMaxWidth()) { item(key = "header") {
Row(Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) { PageHeader(
IconBadge( title = stringResource(R.string.blocklist_title),
R.drawable.ic_tab_block, onBack = onBack,
tint = if (enabled) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.outline, action = {
size = 52.dp, AppSwitch(checked = enabled, onCheckedChange = { Blocklist.setEnabled(context, it) })
) },
Spacer(Modifier.width(16.dp)) )
Column(Modifier.weight(1f)) { }
Text(stringResource(R.string.bl_title), style = MaterialTheme.typography.titleMedium)
Text( item(key = "search") {
formatCount(total.toLong()), SearchField(
style = MaterialTheme.typography.headlineSmall, value = search,
fontWeight = FontWeight.SemiBold, onValueChange = { search = it },
) placeholder = stringResource(R.string.bl_search),
Text( modifier = Modifier.padding(top = 4.dp),
stringResource(R.string.bl_total_label), )
style = MaterialTheme.typography.bodySmall, }
color = MaterialTheme.colorScheme.onSurfaceVariant,
item(key = "updates") {
UpdatesRow(
interval = interval,
wifiOnly = wifiOnly,
onClick = { showUpdates = true },
modifier = Modifier.padding(top = 12.dp),
)
}
item(key = "error") {
AnimatedVisibility(visible = error != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
Box(Modifier.padding(top = 12.dp)) {
HintCard(
stringResource(R.string.bl_download_failed, shownError),
icon = R.drawable.ic_alert,
tint = Palette.Blocked,
) )
} }
Switch(checked = enabled, onCheckedChange = { Blocklist.setEnabled(context, it) })
} }
} }
HintCard(stringResource(R.string.bl_note), icon = R.drawable.ic_tab_info) items(Presets.filter { matches(it.name) }, key = { "preset:${it.url}" }) { preset ->
val list = lists.firstOrNull { it.url == preset.url }
val downloading = busy == preset.url || (busy == Blocklist.ALL_LISTS && list?.enabled == true)
BlocklistCard(
title = preset.name,
description = stringResource(preset.description),
source = "hagezi",
sourceUrl = HAGEZI_HOME,
info = listInfo(list, downloading),
checked = list?.enabled == true || busy == preset.url,
// A list that is not downloaded yet waits for a running download to finish
switchEnabled = list != null || busy == null,
progress = downloading,
onCheckedChange = { on ->
if (list == null) {
if (on) Blocklist.download(context, preset.url)
} else {
scope.editBlocklist(context) { Blocklist.setListEnabled(context, preset.url, on) }
}
},
modifier = Modifier
.animateItem()
.padding(top = 12.dp),
)
}
SectionHeader(stringResource(R.string.bl_my), icon = R.drawable.ic_tab_block) items(ownLists.filter { matches(it.url) }, key = { "list:${it.url}" }) { list ->
val uri = remember(list.url) { Uri.parse(list.url) }
val downloading = busy == list.url || (busy == Blocklist.ALL_LISTS && list.enabled)
BlocklistCard(
title = uri.lastPathSegment ?: uri.host ?: list.url,
description = stringResource(R.string.list_added_by_you),
source = uri.host ?: "",
sourceUrl = null,
info = listInfo(list, downloading),
checked = list.enabled,
switchEnabled = true,
progress = downloading,
onCheckedChange = { on -> scope.editBlocklist(context) { Blocklist.setListEnabled(context, list.url, on) } },
onDelete = if (busy == null) {
{ scope.editBlocklist(context) { Blocklist.removeList(context, list.url) } }
} else {
null
},
modifier = Modifier
.animateItem()
.padding(top = 12.dp),
)
}
Card(Modifier.fillMaxWidth()) { item(key = "domains") {
Column( MyDomainsHeader(
Modifier count = custom.size,
.animateContentSize(Motion.size) open = domainsOpen,
.padding(vertical = 8.dp) onToggle = { domainsOpen = !domainsOpen },
shape = if (domainsOpen) TopShape else CardShape,
modifier = Modifier.padding(top = 12.dp),
) { ) {
// Input to add a domain; the accent button matches the rest of the app
Row( Row(
modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 12.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
OutlinedTextField( OutlinedTextField(
@@ -144,205 +243,442 @@ fun BlocklistScreen(modifier: Modifier = Modifier) {
placeholder = { Text(stringResource(R.string.bl_domain_hint), maxLines = 1) }, placeholder = { Text(stringResource(R.string.bl_domain_hint), maxLines = 1) },
singleLine = true, singleLine = true,
isError = domainError, isError = domainError,
shape = RoundedCornerShape(14.dp),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done), keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(onDone = { addDomain() }), keyboardActions = KeyboardActions(onDone = { addDomain() }),
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
FilledTonalButton(onClick = ::addDomain, enabled = domainInput.isNotBlank()) { Button(
Icon(painterResource(R.drawable.ic_add_domain), contentDescription = null, modifier = Modifier.size(18.dp)) onClick = ::addDomain,
enabled = domainInput.isNotBlank(),
shape = RoundedCornerShape(14.dp),
contentPadding = PaddingValues(horizontal = 18.dp),
modifier = Modifier.height(56.dp),
) {
Icon(painterResource(R.drawable.ic_add), contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(6.dp)) Spacer(Modifier.width(6.dp))
Text(stringResource(R.string.add)) Text(stringResource(R.string.add), fontWeight = FontWeight.Bold)
} }
} }
AnimatedVisibility(visible = domainError, enter = Motion.expandIn, exit = Motion.collapseOut) { AnimatedVisibility(visible = domainError, enter = Motion.expandIn, exit = Motion.collapseOut) {
Text( Text(
stringResource(R.string.bl_invalid), stringResource(R.string.bl_invalid),
style = MaterialTheme.typography.bodySmall, color = Palette.Blocked,
color = MaterialTheme.colorScheme.error, fontSize = 12.sp,
modifier = Modifier.padding(horizontal = 16.dp), modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 8.dp),
) )
} }
if (custom.isEmpty()) { if (custom.isEmpty()) {
Text( Text(
stringResource(R.string.bl_empty_custom), stringResource(R.string.bl_empty_custom),
style = MaterialTheme.typography.bodySmall, color = Palette.Fg3,
color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 13.sp,
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 8.dp),
) )
} }
custom.forEach { domain ->
InsetDivider(16)
Row(
modifier = Modifier.padding(start = 16.dp, end = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(domain, modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.Ellipsis)
IconButton(onClick = { scope.launch(Dispatchers.IO) { Blocklist.removeCustom(context, domain) } }) {
Icon(painterResource(R.drawable.ic_delete), stringResource(R.string.delete), Modifier.size(20.dp))
}
}
}
} }
} }
SectionHeader( // Own domains are lazy rows, so hundreds of them are not all composed at once.
stringResource(R.string.bl_lists), // Together with the header above they look like one card.
icon = R.drawable.ic_list, if (domainsOpen) {
action = { itemsIndexed(shownDomains, key = { _, domain -> "domain:$domain" }, contentType = { _, _ -> "domain" }) { index, domain ->
TextButton( val last = index == shownDomains.lastIndex
onClick = { Blocklist.updateAll(context) }, DomainRow(
enabled = lists.isNotEmpty() && busy == null, domain = domain,
) { shape = if (last) BottomShape else RectangleShape,
Icon(painterResource(R.drawable.ic_refresh), contentDescription = null, modifier = Modifier.size(18.dp)) onDelete = { scope.editBlocklist(context) { Blocklist.removeCustom(context, domain) } },
Spacer(Modifier.width(6.dp)) modifier = Modifier.animateItem(),
Text(stringResource(if (busy == Blocklist.ALL_LISTS) R.string.bl_updating else R.string.bl_update_all)) )
} }
}, if (shownDomains.isEmpty()) {
) item(key = "domains-end") {
Box(
Card(Modifier.fillMaxWidth()) { Modifier
Column(
Modifier
.animateContentSize(Motion.size)
.padding(vertical = 8.dp)
) {
lists.forEachIndexed { index, list ->
if (index > 0) InsetDivider(68)
ListRow(
list = list,
updating = busy == list.url || busy == Blocklist.ALL_LISTS,
actionsEnabled = busy == null,
onRefresh = { Blocklist.download(context, list.url) },
onDelete = { scope.launch(Dispatchers.IO) { Blocklist.removeList(context, list.url) } },
)
}
if (lists.isNotEmpty()) InsetDivider(16)
Row(
modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
OutlinedTextField(
value = urlInput,
onValueChange = { urlInput = it },
placeholder = { Text(stringResource(R.string.bl_list_url), maxLines = 1) },
singleLine = true,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(onDone = { if (busy == null) addList() }),
modifier = Modifier.weight(1f),
)
Spacer(Modifier.width(8.dp))
FilledTonalButton(
onClick = ::addList,
enabled = urlInput.isNotBlank() && busy == null,
) {
Icon(painterResource(R.drawable.ic_add), contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(6.dp))
Text(stringResource(R.string.add))
}
}
// A new list being added has no row yet, so its progress shows under the input
val addingNew = busy != null && busy != Blocklist.ALL_LISTS && lists.none { it.url == busy }
AnimatedVisibility(visible = addingNew, enter = Motion.expandIn, exit = Motion.collapseOut) {
LinearProgressIndicator(
modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 4.dp), .height(8.dp)
.clip(BottomShape)
.background(Palette.Card)
) )
} }
} }
} }
val missingPresets = Presets.filter { (_, url) -> lists.none { it.url == url } } item(key = "add") {
AnimatedVisibility(visible = missingPresets.isNotEmpty(), enter = Motion.expandIn, exit = Motion.collapseOut) { Box(
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Modifier
SectionHeader(stringResource(R.string.bl_presets)) .fillMaxWidth()
Row( .padding(top = 24.dp),
modifier = Modifier.horizontalScroll(rememberScrollState()), contentAlignment = Alignment.Center,
horizontalArrangement = Arrangement.spacedBy(8.dp), ) {
Button(
onClick = { showAddList = true },
enabled = busy == null,
shape = RoundedCornerShape(24.dp),
contentPadding = PaddingValues(start = 16.dp, end = 22.dp),
modifier = Modifier.height(48.dp),
) { ) {
missingPresets.forEach { (name, url) -> Icon(painterResource(R.drawable.ic_add), contentDescription = null, modifier = Modifier.size(20.dp))
AssistChip( Spacer(Modifier.width(8.dp))
onClick = { Blocklist.download(context, url) }, Text(stringResource(R.string.bl_add_list), fontWeight = FontWeight.ExtraBold)
enabled = busy == null,
leadingIcon = {
Icon(painterResource(R.drawable.ic_add), contentDescription = null, modifier = Modifier.size(18.dp))
},
label = { Text(if (busy == url) stringResource(R.string.bl_updating) else name) },
)
}
} }
} }
} }
}
AnimatedVisibility(visible = error != null, enter = Motion.expandIn, exit = Motion.collapseOut) { if (showAddList) {
HintCard( AddListDialog(
stringResource(R.string.bl_download_failed, lastError[0]), busy = busy != null,
icon = R.drawable.ic_alert, onAdd = { url -> Blocklist.download(context, url) },
tint = MaterialTheme.colorScheme.error, onDismiss = { showAddList = false },
) )
} }
if (showUpdates) {
UpdatesDialog(
interval = interval,
wifiOnly = wifiOnly,
canUpdateNow = busy == null && lists.any { it.enabled },
onInterval = {
interval = it
prefs.updateInterval = it
AutoUpdate.apply(context)
},
onWifiOnly = {
wifiOnly = it
prefs.updateWifiOnly = it
AutoUpdate.apply(context)
},
onUpdateNow = {
Blocklist.updateAll(context)
showUpdates = false
},
onDismiss = { showUpdates = false },
)
} }
} }
@Composable @Composable
private fun InsetDivider(start: Int) { private fun listInfo(list: RemoteList?, downloading: Boolean): String = when {
HorizontalDivider( downloading -> stringResource(R.string.bl_updating)
modifier = Modifier.padding(start = start.dp), list == null -> stringResource(R.string.list_not_downloaded)
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f), else -> stringResource(
R.string.bl_list_info,
formatCount(list.count.toLong()),
DateUtils.getRelativeTimeSpanString(list.updated, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS).toString(),
) )
} }
@Composable @Composable
private fun ListRow( private fun UpdatesRow(interval: UpdateInterval, wifiOnly: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {
list: RemoteList, val shape = RoundedCornerShape(16.dp)
updating: Boolean, val label = stringResource(intervalLabel(interval))
actionsEnabled: Boolean, val wifi = stringResource(R.string.auto_wifi)
onRefresh: () -> Unit, val summary = if (interval != UpdateInterval.OFF && wifiOnly) "$label · $wifi" else label
onDelete: () -> Unit, Row(
) { modifier = modifier
val uri = remember(list.url) { Uri.parse(list.url) } .fillMaxWidth()
val title = uri.lastPathSegment ?: list.url .clip(shape)
val updated = remember(list.updated) { .border(1.dp, Palette.Line, shape)
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(Date(list.updated)) .clickable(onClick = onClick)
.padding(horizontal = 14.dp, vertical = 10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(painterResource(R.drawable.ic_update), contentDescription = null, tint = Palette.Accent, modifier = Modifier.size(20.dp))
Spacer(Modifier.width(12.dp))
Column(Modifier.weight(1f)) {
Text(stringResource(R.string.auto_update), color = Palette.Fg, fontSize = 14.sp, fontWeight = FontWeight.Bold)
Text(summary, color = Palette.Fg2, fontSize = 12.sp)
}
Chevron()
} }
}
Column { @StringRes
private fun intervalLabel(interval: UpdateInterval): Int = when (interval) {
UpdateInterval.OFF -> R.string.auto_off
UpdateInterval.DAILY -> R.string.auto_daily
UpdateInterval.WEEKLY -> R.string.auto_weekly
}
@Composable
private fun BlocklistCard(
title: String,
description: String,
source: String,
sourceUrl: String?,
info: String,
checked: Boolean,
switchEnabled: Boolean,
progress: Boolean,
onCheckedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
onDelete: (() -> Unit)? = null,
) {
val context = LocalContext.current
Column(
modifier = modifier
.fillMaxWidth()
.appCard()
.padding(start = 16.dp, end = 10.dp, top = 6.dp, bottom = 14.dp),
) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.heightIn(min = 48.dp)) {
Text(
title,
color = Palette.Fg,
fontSize = 15.sp,
fontWeight = FontWeight.ExtraBold,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f),
)
if (onDelete != null) DeleteButton(onDelete)
AppSwitch(checked = checked, onCheckedChange = onCheckedChange, enabled = switchEnabled)
}
Text(
description,
color = Palette.Fg2,
fontSize = 12.sp,
lineHeight = 17.sp,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.padding(end = 6.dp),
)
Row( Row(
modifier = Modifier.padding(start = 16.dp, end = 4.dp, top = 8.dp, bottom = 8.dp), modifier = Modifier.padding(top = 6.dp, end = 6.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
IconBadge(R.drawable.ic_list, size = 40.dp) if (source.isNotEmpty()) {
Spacer(Modifier.width(12.dp))
Column(Modifier.weight(1f)) {
Text(title, style = MaterialTheme.typography.titleSmall, maxLines = 1, overflow = TextOverflow.Ellipsis)
Text( Text(
uri.host ?: "", source,
style = MaterialTheme.typography.bodySmall, color = Palette.Accent,
color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp,
fontWeight = FontWeight.Bold,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis, modifier = if (sourceUrl != null) Modifier.clickable { openUrl(context, sourceUrl) } else Modifier,
)
Text(
if (updating) stringResource(R.string.bl_updating)
else stringResource(R.string.bl_list_info, formatCount(list.count.toLong()), updated),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
Text(" · ", color = Palette.Fg3, fontSize = 12.sp)
} }
IconButton(onClick = onRefresh, enabled = actionsEnabled) { Text(info, color = Palette.Fg3, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
Icon(painterResource(R.drawable.ic_refresh), stringResource(R.string.bl_update_all), Modifier.size(20.dp))
}
IconButton(onClick = onDelete, enabled = actionsEnabled) {
Icon(painterResource(R.drawable.ic_delete), stringResource(R.string.delete), Modifier.size(20.dp))
}
} }
AnimatedVisibility(visible = updating, enter = Motion.expandIn, exit = Motion.collapseOut) { AnimatedVisibility(visible = progress, enter = Motion.expandIn, exit = Motion.collapseOut) {
LinearProgressIndicator( LinearProgressIndicator(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(start = 68.dp, end = 16.dp, bottom = 8.dp), .padding(top = 10.dp, end = 6.dp),
color = Palette.Accent,
trackColor = Palette.Track,
) )
} }
} }
} }
@Composable
private fun MyDomainsHeader(
count: Int,
open: Boolean,
onToggle: () -> Unit,
shape: Shape,
modifier: Modifier = Modifier,
content: @Composable () -> Unit,
) {
val chevron by animateFloatAsState(if (open) 180f else 0f, Motion.rotation, label = "chevron")
Column(
modifier = modifier
.fillMaxWidth()
.clip(shape)
.background(Palette.Card),
) {
Row(
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = onToggle)
.padding(start = 16.dp, end = 14.dp, top = 14.dp, bottom = 14.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
Text(stringResource(R.string.bl_my), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.ExtraBold)
Text(
stringResource(R.string.my_domains_desc),
color = Palette.Fg2,
fontSize = 12.sp,
lineHeight = 17.sp,
)
}
Spacer(Modifier.width(10.dp))
Text(
formatCount(count.toLong()),
color = Palette.Accent,
fontSize = 12.sp,
fontWeight = FontWeight.Bold,
modifier = Modifier
.clip(RoundedCornerShape(10.dp))
.background(Palette.AccentSoft)
.padding(horizontal = 8.dp, vertical = 3.dp),
)
Spacer(Modifier.width(6.dp))
Icon(
painterResource(R.drawable.ic_expand),
contentDescription = null,
tint = Palette.Fg3,
modifier = Modifier
.size(20.dp)
.graphicsLayer { rotationZ = chevron },
)
}
AnimatedVisibility(visible = open, enter = Motion.expandIn, exit = Motion.collapseOut) {
Column { content() }
}
}
}
@Composable
private fun DomainRow(domain: String, shape: Shape, onDelete: () -> Unit, modifier: Modifier = Modifier) {
Column(
modifier
.fillMaxWidth()
.clip(shape)
.background(Palette.Card)
) {
ListDivider()
Row(
modifier = Modifier.padding(start = 16.dp, end = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
domain,
color = Palette.Fg,
fontSize = 14.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f),
)
DeleteButton(onDelete)
}
}
}
@Composable
private fun DeleteButton(onClick: () -> Unit) {
IconButton(onClick = onClick) {
Icon(
painterResource(R.drawable.ic_delete),
contentDescription = stringResource(R.string.delete),
tint = Palette.Fg3,
modifier = Modifier.size(20.dp),
)
}
}
@Composable
private fun AddListDialog(busy: Boolean, onAdd: (String) -> Boolean, onDismiss: () -> Unit) {
var url by rememberSaveable { mutableStateOf("") }
fun submit() {
if (url.isNotBlank() && onAdd(url.trim())) onDismiss()
}
AlertDialog(
onDismissRequest = onDismiss,
title = { Text(stringResource(R.string.bl_add_list)) },
text = {
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
Text(stringResource(R.string.bl_note), color = Palette.Fg2, fontSize = 13.sp)
OutlinedTextField(
value = url,
onValueChange = { url = it },
label = { Text(stringResource(R.string.bl_list_url)) },
placeholder = { Text("https://", maxLines = 1) },
singleLine = true,
shape = RoundedCornerShape(14.dp),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(onDone = { submit() }),
modifier = Modifier.fillMaxWidth(),
)
}
},
confirmButton = {
Button(onClick = ::submit, enabled = url.isNotBlank() && !busy, shape = RoundedCornerShape(14.dp)) {
Text(stringResource(R.string.add), fontWeight = FontWeight.Bold)
}
},
dismissButton = {
TextButton(onClick = onDismiss) { Text(stringResource(R.string.cancel)) }
},
containerColor = Palette.CardHigh,
)
}
@Composable
private fun UpdatesDialog(
interval: UpdateInterval,
wifiOnly: Boolean,
canUpdateNow: Boolean,
onInterval: (UpdateInterval) -> Unit,
onWifiOnly: (Boolean) -> Unit,
onUpdateNow: () -> Unit,
onDismiss: () -> Unit,
) {
AlertDialog(
onDismissRequest = onDismiss,
title = { Text(stringResource(R.string.auto_update)) },
text = {
Column {
UpdateInterval.entries.forEach { option ->
Row(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(12.dp))
.selectable(selected = option == interval, onClick = { onInterval(option) }, role = Role.RadioButton)
.padding(vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
RadioButton(selected = option == interval, onClick = null)
Spacer(Modifier.width(12.dp))
Text(stringResource(intervalLabel(option)), color = Palette.Fg, fontSize = 15.sp)
}
}
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp), color = Palette.Line)
val wifiEnabled = interval != UpdateInterval.OFF
Row(
modifier = Modifier
.fillMaxWidth()
.toggleable(value = wifiOnly, enabled = wifiEnabled, role = Role.Switch, onValueChange = onWifiOnly)
.graphicsLayer { alpha = if (wifiEnabled) 1f else 0.45f }
.padding(vertical = 6.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
Text(stringResource(R.string.auto_wifi), color = Palette.Fg, fontSize = 15.sp)
Text(stringResource(R.string.auto_wifi_desc), color = Palette.Fg3, fontSize = 12.sp)
}
Spacer(Modifier.width(12.dp))
AppSwitch(checked = wifiOnly, onCheckedChange = null, enabled = wifiEnabled)
}
}
},
confirmButton = {
TextButton(onClick = onDismiss) { Text(stringResource(R.string.done)) }
},
dismissButton = {
TextButton(onClick = onUpdateNow, enabled = canUpdateNow) { Text(stringResource(R.string.auto_update_now)) }
},
containerColor = Palette.CardHigh,
)
}
// Blocklist edits write to storage, which can fail (a full disk, for one)
internal inline fun <T> tryEdit(action: () -> T): Result<T> =
try {
Result.success(action())
} catch (e: IOException) {
Result.failure(e)
}
internal fun CoroutineScope.editBlocklist(context: Context, action: () -> Unit) = launch {
withContext(Dispatchers.IO) { tryEdit(action) }.onFailure { showEditError(context, it) }
}
internal fun showEditError(context: Context, error: Throwable) {
val reason = error.message ?: error.javaClass.simpleName
Toast.makeText(context, context.getString(R.string.test_fail, reason), Toast.LENGTH_LONG).show()
}
@@ -0,0 +1,115 @@
package cc.skysparkle.sparkledns
import java.util.Locale
import java.util.TreeMap
// The position of each company is saved in StatsStore: add new ones at the end only
enum class Company(val label: String) {
GOOGLE("Google"),
APPLE("Apple"),
META("Meta"),
AMAZON("Amazon"),
MICROSOFT("Microsoft"),
BYTEDANCE("ByteDance"),
X("X"),
YANDEX("Yandex"),
SAMSUNG("Samsung"),
XIAOMI("Xiaomi"),
}
// Tells which big company a domain belongs to, for the Company dominance card.
// Matches the domain and every parent of it against a small built-in table.
object Companies {
private const val GOOGLE_PREFIX = "google."
// Second-level labels that belong to a country's suffix: example.co.uk, example.com.br
private val COUNTRY_SECOND_LEVELS = setOf("co", "com", "net", "org", "gov", "edu", "ac", "or", "ne", "go")
// Names that are not public sites: reverse lookups and local networks
private val PRIVATE_TLDS = setOf("arpa", "local", "lan", "home", "internal", "localhost")
// Hashes of the domains, sorted, with the company of each at the same index: this runs for
// every query, and parent domains are looked up by hash without copying the name
private val hashes: LongArray
private val owners: Array<Company>
init {
val table = TreeMap<Long, Company>()
fun add(company: Company, vararg domains: String) = domains.forEach { table[DomainHash.of(it)] = company }
add(
Company.GOOGLE,
"google.com", "googleapis.com", "gstatic.com", "googleusercontent.com", "googlevideo.com",
"youtube.com", "youtu.be", "ytimg.com", "ggpht.com", "gvt1.com", "gvt2.com", "1e100.net",
"android.com", "googlesyndication.com", "googleadservices.com", "doubleclick.net",
"google-analytics.com", "googletagmanager.com", "googletagservices.com", "app-measurement.com",
"firebaseio.com", "firebase.com", "crashlytics.com", "withgoogle.com", "googlemail.com",
"gmail.com", "blogspot.com", "admob.com", "goo.gl",
)
add(
Company.APPLE,
"apple.com", "icloud.com", "icloud-content.com", "mzstatic.com", "apple-dns.net", "aaplimg.com",
"cdn-apple.com", "itunes.com", "me.com", "apple.news", "apple-cloudkit.com", "appleid.com",
)
add(
Company.META,
"facebook.com", "facebook.net", "fbcdn.net", "fbsbx.com", "fb.com", "instagram.com",
"cdninstagram.com", "whatsapp.com", "whatsapp.net", "messenger.com", "meta.com", "oculus.com",
"threads.net", "graph.facebook.com",
)
add(
Company.AMAZON,
"amazon.com", "amazonaws.com", "media-amazon.com", "ssl-images-amazon.com", "cloudfront.net",
"amazon-adsystem.com", "a2z.com", "primevideo.com", "aiv-cdn.net", "twitch.tv", "ttvnw.net",
"amazon.de", "amazon.co.uk", "amazontrust.com",
)
add(
Company.MICROSOFT,
"microsoft.com", "live.com", "outlook.com", "office.com", "office.net", "office365.com", "msn.com",
"bing.com", "windows.com", "windows.net", "windowsupdate.com", "azure.com", "azureedge.net",
"skype.com", "xbox.com", "xboxlive.com", "linkedin.com", "licdn.com", "github.com",
"githubusercontent.com", "msftncsi.com", "msedge.net", "microsoftonline.com", "sharepoint.com",
)
add(
Company.BYTEDANCE,
"tiktok.com", "tiktokv.com", "tiktokcdn.com", "tiktokcdn-us.com", "byteoversea.com",
"ibytedtos.com", "bytedance.com", "capcut.com", "byteimg.com",
)
add(Company.X, "twitter.com", "x.com", "twimg.com", "t.co")
add(Company.YANDEX, "yandex.ru", "yandex.net", "yandex.com", "ya.ru", "yastatic.net", "yandex.by", "yandex.kz")
add(Company.SAMSUNG, "samsung.com", "samsungapps.com", "samsungcloud.com", "samsungqbe.com", "samsungosp.com")
add(Company.XIAOMI, "xiaomi.com", "xiaomi.net", "mi.com", "miui.com", "mi-img.com")
hashes = table.keys.toLongArray()
owners = table.values.toTypedArray()
}
fun of(name: String): Company? {
// Names from the tunnel are lowercase already; anything else is lowercased once
val domain = if (name.any { it.isUpperCase() }) name.lowercase() else name
val end = nameEnd(domain)
var start = 0
while (start < end) {
val index = hashes.binarySearch(DomainHash.of(domain, start, end))
if (index >= 0) return owners[index]
// Google's country sites: google.de, google.co.uk, google.com.br
if (end - start - GOOGLE_PREFIX.length in 1..6 && domain.startsWith(GOOGLE_PREFIX, start)) return Company.GOOGLE
val dot = domain.indexOf('.', start)
if (dot < 0 || dot >= end) return null
start = dot + 1
}
return null
}
// A readable name for a domain of no known company, taken from its main label:
// "cdn.example.co.uk" gives "Example". Null for IP addresses, local names and bare labels.
fun nameOf(name: String): String? {
val labels = name.lowercase(Locale.ROOT).split('.').filter { it.isNotEmpty() }
if (labels.size < 2) return null
val tld = labels.last()
if (tld in PRIVATE_TLDS || tld.all { it.isDigit() }) return null
var index = labels.size - 2
if (tld.length == 2 && labels.size >= 3 && labels[index] in COUNTRY_SECOND_LEVELS) index--
return labels[index].replaceFirstChar { it.titlecase(Locale.ROOT) }
}
}
@@ -3,6 +3,10 @@ package cc.skysparkle.sparkledns
import android.app.Application import android.app.Application
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import android.os.Process
import android.os.StrictMode
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import java.io.File import java.io.File
import java.io.PrintWriter import java.io.PrintWriter
import java.io.StringWriter import java.io.StringWriter
@@ -10,8 +14,34 @@ import java.io.StringWriter
class SparkleApp : Application() { class SparkleApp : Application() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
if (BuildConfig.DEBUG) enableStrictMode()
CrashLog.install(this) CrashLog.install(this)
Thread({ runCatching { Blocklist.reload(this) } }, "blocklist-load").start() Thread({
// Reads what the first screen needs before it asks, so its first frame does not wait on storage
Prefs(this).providerId
CrashLog.load(this)
StatsStore.init(this)
AutoUpdate.apply(this)
// Lists can hold millions of entries; loading them should not take CPU from the first frames
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND)
runCatching { Blocklist.ensureLoaded(this) }
}, "startup-load").start()
}
// The VPN keeps the process running long after the screens are gone; decoded app icons
// (up to 10 MB) and the logo can be rendered again the next time they are shown
override fun onTrimMemory(level: Int) {
super.onTrimMemory(level)
if (level >= TRIM_MEMORY_UI_HIDDEN) {
clearAppIconCache()
AppLogo.clear()
}
}
// Debug builds only: logs disk and network access on the main thread, leaked closeables and the like
private fun enableStrictMode() {
StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build())
StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder().detectAll().penaltyLog().build())
} }
} }
@@ -19,13 +49,18 @@ class SparkleApp : Application() {
object CrashLog { object CrashLog {
private const val FILE_NAME = "last_crash.txt" private const val FILE_NAME = "last_crash.txt"
// Null when there is no report, and until the startup thread has read it
private val _report = MutableStateFlow<String?>(null)
val report: StateFlow<String?> = _report
fun install(context: Context) { fun install(context: Context) {
val file = File(context.filesDir, FILE_NAME) val appContext = context.applicationContext
val previous = Thread.getDefaultUncaughtExceptionHandler() val previous = Thread.getDefaultUncaughtExceptionHandler()
Thread.setDefaultUncaughtExceptionHandler { thread, error -> Thread.setDefaultUncaughtExceptionHandler { thread, error ->
runCatching { runCatching {
val trace = StringWriter().also { error.printStackTrace(PrintWriter(it)) }.toString() val trace = StringWriter().also { error.printStackTrace(PrintWriter(it)) }.toString()
file.writeText( // Looked up only now: install() runs on the main thread at start-up
File(appContext.filesDir, FILE_NAME).writeText(
"Thread: ${thread.name}\n" + "Thread: ${thread.name}\n" +
"Android ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT}), " + "Android ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT}), " +
"${Build.MANUFACTURER} ${Build.MODEL}\n\n$trace" "${Build.MANUFACTURER} ${Build.MODEL}\n\n$trace"
@@ -35,10 +70,14 @@ object CrashLog {
} }
} }
fun read(context: Context): String? = // Runs on the startup thread, so the main thread never reads the file
File(context.filesDir, FILE_NAME).takeIf { it.exists() }?.readText() fun load(context: Context) {
_report.value = runCatching { File(context.filesDir, FILE_NAME).takeIf { it.exists() }?.readText() }.getOrNull()
}
fun clear(context: Context) { fun clear(context: Context) {
File(context.filesDir, FILE_NAME).delete() _report.value = null
val appContext = context.applicationContext
Thread({ File(appContext.filesDir, FILE_NAME).delete() }, "crash-clear").start()
} }
} }
@@ -3,11 +3,14 @@ package cc.skysparkle.sparkledns
import android.os.SystemClock import android.os.SystemClock
// TTL-aware LRU cache of DNS responses, keyed by the question section // TTL-aware LRU cache of DNS responses, keyed by the question section
class DnsCache(private val maxEntries: Int = 2000) { class DnsCache(
private val maxEntries: Int = 2000,
private val clock: () -> Long = SystemClock::elapsedRealtime,
) {
private class Entry( private class Entry(
val response: ByteArray, val response: ByteArray,
val ttlOffsets: IntArray, // Offset and value of each TTL field, one pair after another
val ttls: IntArray, val ttls: IntArray,
val storedAt: Long, val storedAt: Long,
val expiresAt: Long, val expiresAt: Long,
@@ -19,7 +22,7 @@ class DnsCache(private val maxEntries: Int = 2000) {
fun get(query: ByteArray): ByteArray? { fun get(query: ByteArray): ByteArray? {
val key = keyOf(query) ?: return null val key = keyOf(query) ?: return null
val now = SystemClock.elapsedRealtime() val now = clock()
val entry = synchronized(map) { val entry = synchronized(map) {
val e = map[key] ?: return null val e = map[key] ?: return null
if (now >= e.expiresAt) { if (now >= e.expiresAt) {
@@ -32,7 +35,12 @@ class DnsCache(private val maxEntries: Int = 2000) {
out[0] = query[0] out[0] = query[0]
out[1] = query[1] out[1] = query[1]
val elapsed = ((now - entry.storedAt) / 1000).toInt() val elapsed = ((now - entry.storedAt) / 1000).toInt()
entry.ttlOffsets.forEachIndexed { i, off -> put32(out, off, maxOf(entry.ttls[i] - elapsed, 0)) } val ttls = entry.ttls
var i = 0
while (i < ttls.size) {
put32(out, ttls[i], maxOf(ttls[i + 1] - elapsed, 0))
i += 2
}
return out return out
} }
@@ -42,26 +50,32 @@ class DnsCache(private val maxEntries: Int = 2000) {
val rcode = response[3].toInt() and 0x0F val rcode = response[3].toInt() and 0x0F
if (rcode != 0 && rcode != 3) return // only NOERROR and NXDOMAIN if (rcode != 0 && rcode != 3) return // only NOERROR and NXDOMAIN
val records = parseTtls(response) ?: return val ttls = parseTtls(response) ?: return
val minTtl = if (records.first.isEmpty()) NO_RECORDS_TTL else records.second.min() var minTtl = if (ttls.isEmpty()) NO_RECORDS_TTL else Int.MAX_VALUE
var i = 1
while (i < ttls.size) {
minTtl = minOf(minTtl, ttls[i])
i += 2
}
val ttl = minOf(minTtl, MAX_TTL) val ttl = minOf(minTtl, MAX_TTL)
if (ttl <= 0) return if (ttl <= 0) return
val now = SystemClock.elapsedRealtime() val now = clock()
val entry = Entry(response.copyOf(), records.first, records.second, now, now + ttl * 1000L) val entry = Entry(response.copyOf(), ttls, now, now + ttl * 1000L)
synchronized(map) { map[key] = entry } synchronized(map) { map[key] = entry }
} }
// Offsets and values of every TTL field except the EDNS OPT pseudo-record // Offset and value of every TTL field except the EDNS OPT pseudo-record, as pairs in one array
private fun parseTtls(msg: ByteArray): Pair<IntArray, IntArray>? { private fun parseTtls(msg: ByteArray): IntArray? {
var pos = 12 var pos = 12
repeat(u16(msg, 4)) { repeat(u16(msg, 4)) {
pos = skipName(msg, pos) ?: return null pos = skipName(msg, pos) ?: return null
pos += 4 pos += 4
} }
val total = u16(msg, 6) + u16(msg, 8) + u16(msg, 10) val total = u16(msg, 6) + u16(msg, 8) + u16(msg, 10)
val offsets = ArrayList<Int>(total) // The counts come from the server; the array grows only if a message really has that many
val values = ArrayList<Int>(total) var ttls = IntArray(2 * minOf(total, 16))
var n = 0
repeat(total) { repeat(total) {
pos = skipName(msg, pos) ?: return null pos = skipName(msg, pos) ?: return null
if (pos + 10 > msg.size) return null if (pos + 10 > msg.size) return null
@@ -69,13 +83,14 @@ class DnsCache(private val maxEntries: Int = 2000) {
val ttlOffset = pos + 4 val ttlOffset = pos + 4
val rdLength = u16(msg, pos + 8) val rdLength = u16(msg, pos + 8)
if (type != TYPE_OPT) { if (type != TYPE_OPT) {
offsets += ttlOffset if (n == ttls.size) ttls = ttls.copyOf(n * 2)
values += minOf(u32(msg, ttlOffset), Int.MAX_VALUE.toLong()).toInt() ttls[n++] = ttlOffset
ttls[n++] = minOf(u32(msg, ttlOffset), Int.MAX_VALUE.toLong()).toInt()
} }
pos += 10 + rdLength pos += 10 + rdLength
if (pos > msg.size) return null if (pos > msg.size) return null
} }
return offsets.toIntArray() to values.toIntArray() return if (n == ttls.size) ttls else ttls.copyOf(n)
} }
private fun keyOf(query: ByteArray): String? { private fun keyOf(query: ByteArray): String? {
@@ -11,9 +11,11 @@ import android.service.quicksettings.Tile
import android.service.quicksettings.TileService import android.service.quicksettings.TileService
import android.util.Log import android.util.Log
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope import kotlinx.coroutines.MainScope
import kotlinx.coroutines.cancel import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
class DnsTileService : TileService() { class DnsTileService : TileService() {
@@ -32,7 +34,12 @@ class DnsTileService : TileService() {
override fun onStartListening() { override fun onStartListening() {
listening?.cancel() listening?.cancel()
listening = MainScope().also { scope -> listening = MainScope().also { scope ->
scope.launch { DohVpnService.active.collect { updateTile() } } scope.launch {
// The tile can start a fresh process: read settings from storage off the main thread,
// which also leaves them in memory for onClick
val prefs = withContext(Dispatchers.IO) { Prefs(applicationContext).also { it.providerId } }
DohVpnService.active.collect { updateTile(prefs) }
}
} }
} }
@@ -61,13 +68,13 @@ class DnsTileService : TileService() {
} }
} }
private fun updateTile() { private fun updateTile(prefs: Prefs) {
val tile = qsTile ?: return val tile = qsTile ?: return
val active = DohVpnService.active.value val active = DohVpnService.active.value
tile.state = if (active != null) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE tile.state = if (active != null) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
tile.label = getString(R.string.app_name) tile.label = getString(R.string.app_name)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
tile.subtitle = (active ?: Prefs(this).resolve()).displayName(this) tile.subtitle = (active ?: prefs.resolve()).displayName(this)
} }
tile.updateTile() tile.updateTile()
} }
@@ -1,6 +1,8 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.content.Context import android.content.Context
import android.net.ConnectivityManager
import android.net.Network
import android.net.http.HttpEngine import android.net.http.HttpEngine
import android.net.http.HttpException import android.net.http.HttpException
import android.net.http.UploadDataProvider import android.net.http.UploadDataProvider
@@ -10,10 +12,10 @@ import android.net.http.UrlResponseInfo
import android.os.Build import android.os.Build
import android.util.Log import android.util.Log
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import okhttp3.ConnectionPool
import okhttp3.Dns import okhttp3.Dns
import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.RequestBody.Companion.toRequestBody
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
@@ -27,6 +29,7 @@ import java.util.concurrent.ExecutionException
import java.util.concurrent.Executors import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException import java.util.concurrent.TimeoutException
import java.util.concurrent.atomic.AtomicBoolean
private const val DNS_MESSAGE = "application/dns-message" private const val DNS_MESSAGE = "application/dns-message"
private const val MAX_DNS_SIZE = 65535 private const val MAX_DNS_SIZE = 65535
@@ -36,17 +39,37 @@ private const val TAG = "SparkleDNS"
// everything else and older devices use OkHttp with HTTP/2. // everything else and older devices use OkHttp with HTTP/2.
class DohClient(context: Context, provider: DohProvider) { class DohClient(context: Context, provider: DohProvider) {
private val transport: Transport = createTransport(context.applicationContext, provider) private val appContext = context.applicationContext
val lastProtocol: String? get() = transport.lastProtocol // Built on the first query, i.e. on a worker thread: setting up HttpEngine takes long enough
// to stall the main thread, where the VPN service creates this client
private val transport = lazy { createTransport(appContext, provider) }
private val closed = AtomicBoolean(false)
private val released = AtomicBoolean(false)
val lastProtocol: String? get() = if (transport.isInitialized()) transport.value.lastProtocol else null
fun query(message: ByteArray): ByteArray { fun query(message: ByteArray): ByteArray {
val body = transport.query(message) if (closed.get()) throw IOException("Client closed")
val active = transport.value
// shutdown() may have run while the transport was being built
if (closed.get()) {
release()
throw IOException("Client closed")
}
val body = active.query(message)
if (!DnsMessage.isResponse(body)) throw IOException("Invalid DNS response") if (!DnsMessage.isResponse(body)) throw IOException("Invalid DNS response")
return body return body
} }
fun shutdown() = transport.shutdown() fun shutdown() {
closed.set(true)
if (transport.isInitialized()) release()
}
private fun release() {
if (released.compareAndSet(false, true)) transport.value.shutdown()
}
private fun createTransport(context: Context, provider: DohProvider): Transport { private fun createTransport(context: Context, provider: DohProvider): Transport {
if (provider.http3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { if (provider.http3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
@@ -56,7 +79,7 @@ class DohClient(context: Context, provider: DohProvider) {
Log.w(TAG, "HttpEngine unavailable, falling back to HTTP/2", e) Log.w(TAG, "HttpEngine unavailable, falling back to HTTP/2", e)
} }
} }
return OkHttpTransport(provider) return OkHttpTransport(context, provider)
} }
} }
@@ -66,17 +89,42 @@ private interface Transport {
fun shutdown() fun shutdown()
} }
private class OkHttpTransport(private val provider: DohProvider) : Transport { private class OkHttpTransport(context: Context, private val provider: DohProvider) : Transport {
private val url by lazy { provider.url.toHttpUrl() } private val url by lazy { provider.url.toHttpUrl() }
private val client = OkHttpClient.Builder() // Its own connection pool, so stopping a session drops only DoH connections
private val pool = ConnectionPool()
private val client = Http.client.newBuilder()
.connectionPool(pool)
.dns(BootstrapDns(provider.bootstrap)) .dns(BootstrapDns(provider.bootstrap))
.connectTimeout(5, TimeUnit.SECONDS) .connectTimeout(5, TimeUnit.SECONDS)
.readTimeout(5, TimeUnit.SECONDS) .readTimeout(5, TimeUnit.SECONDS)
.callTimeout(8, TimeUnit.SECONDS) .callTimeout(8, TimeUnit.SECONDS)
.build() .build()
// Pooled connections still belong to the previous network after a switch between Wi-Fi and
// mobile data, and lookups over them can hang until the timeout. Drop them whenever the default
// network changes. (HttpEngine for HTTP/3 follows network changes on its own.)
private val connectivity = context.getSystemService(ConnectivityManager::class.java)
private val networkCallback = object : ConnectivityManager.NetworkCallback() {
private var current: Network? = null
override fun onAvailable(network: Network) {
if (current != null && current != network) pool.evictAll()
current = network
}
override fun onLost(network: Network) {
if (network != current) return
current = null
pool.evictAll()
}
}
private val watchingNetwork =
connectivity != null && runCatching { connectivity.registerDefaultNetworkCallback(networkCallback) }.isSuccess
@Volatile @Volatile
override var lastProtocol: String? = null override var lastProtocol: String? = null
@@ -97,8 +145,8 @@ private class OkHttpTransport(private val provider: DohProvider) : Transport {
} }
override fun shutdown() { override fun shutdown() {
client.dispatcher.executorService.shutdown() if (watchingNetwork) runCatching { connectivity?.unregisterNetworkCallback(networkCallback) }
client.connectionPool.evictAll() pool.evictAll()
} }
private companion object { private companion object {
@@ -9,6 +9,8 @@ import android.content.pm.ServiceInfo
import android.graphics.drawable.Icon import android.graphics.drawable.Icon
import android.net.VpnService import android.net.VpnService
import android.os.Build import android.os.Build
import android.os.Handler
import android.os.Looper
import android.os.ParcelFileDescriptor import android.os.ParcelFileDescriptor
import android.os.SystemClock import android.os.SystemClock
import android.system.ErrnoException import android.system.ErrnoException
@@ -32,6 +34,14 @@ private const val WORKERS = 16
private const val TAG = "SparkleDNS" private const val TAG = "SparkleDNS"
private const val CHANNEL_ID = "vpn_status" private const val CHANNEL_ID = "vpn_status"
private const val NOTIFICATION_ID = 1 private const val NOTIFICATION_ID = 1
private const val MAX_BAD_PACKETS = 100
// Android's resolver retries after 5 s, so an older lookup no longer has anyone waiting for it
private const val QUEUE_TIMEOUT_MS = 5000L
// Closing TLS connections writes to the network, so sessions release their DoH client here
// rather than on the main thread, where the service stops them
private val closer = Executors.newSingleThreadExecutor { r -> Thread(r, "doh-close").apply { isDaemon = true } }
// Local VPN that routes only the fake DNS address into the tunnel; all other traffic is untouched // Local VPN that routes only the fake DNS address into the tunnel; all other traffic is untouched
class DohVpnService : VpnService() { class DohVpnService : VpnService() {
@@ -50,6 +60,7 @@ class DohVpnService : VpnService() {
} }
private var session: Session? = null private var session: Session? = null
private val mainHandler = Handler(Looper.getMainLooper())
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
if (intent?.action == ACTION_STOP) { if (intent?.action == ACTION_STOP) {
@@ -76,6 +87,7 @@ class DohVpnService : VpnService() {
override fun onDestroy() { override fun onDestroy() {
stopSession() stopSession()
StatsStore.flush()
super.onDestroy() super.onDestroy()
} }
@@ -97,18 +109,29 @@ class DohVpnService : VpnService() {
.allowFamily(OsConstants.AF_INET6) .allowFamily(OsConstants.AF_INET6)
// The app itself bypasses the VPN so it can resolve and reach the DoH server // The app itself bypasses the VPN so it can resolve and reach the DoH server
runCatching { builder.addDisallowedApplication(packageName) } runCatching { builder.addDisallowedApplication(packageName) }
excluded.forEach { runCatching { builder.addDisallowedApplication(it) } } .onFailure { Log.e(TAG, "Cannot exclude the app itself from the VPN", it) }
// Apps uninstalled since they were picked are simply skipped
excluded.forEach { app ->
runCatching { builder.addDisallowedApplication(app) }.onFailure { Log.i(TAG, "Not excluding $app: $it") }
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) builder.setMetered(false) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) builder.setMetered(false)
// The new interface replaces the old one in place, so DNS never leaks during a server switch // The new interface replaces the old one in place, so DNS never leaks during a server switch
val tun = runCatching { builder.establish() }.getOrNull() val tun = runCatching { builder.establish() }.onFailure { Log.e(TAG, "Cannot establish the VPN", it) }.getOrNull()
val previous = session val previous = session
if (tun == null) { if (tun == null) {
stopSession() stopSession()
stopSelf() stopSelf()
return return
} }
session = Session(tun, DohClient(this, provider)).also { it.start() } val next = try {
Session(tun, DohClient(this, provider), ::onSessionFailed)
} catch (e: IOException) {
// A tunnel nobody reads would swallow every DNS lookup on the device
runCatching { tun.close() }
throw e
}
session = next.also { it.start() }
runCatching { previous?.stop() } runCatching { previous?.stop() }
_active.value = provider _active.value = provider
@@ -127,6 +150,17 @@ class DohVpnService : VpnService() {
DnsTileService.refresh(this) DnsTileService.refresh(this)
} }
// The tunnel reader died while the session should be running. Dropping the VPN lets Android
// fall back to normal DNS instead of sending every lookup on the device into a dead tunnel.
private fun onSessionFailed(failed: Session) {
mainHandler.post {
if (session !== failed) return@post
Log.e(TAG, "Tunnel stopped working, disconnecting")
stopSession()
stopSelf()
}
}
private fun showNotification(provider: DohProvider) { private fun showNotification(provider: DohProvider) {
val manager = getSystemService(NotificationManager::class.java) ?: return val manager = getSystemService(NotificationManager::class.java) ?: return
manager.createNotificationChannel( manager.createNotificationChannel(
@@ -177,11 +211,16 @@ class DohVpnService : VpnService() {
private class Session( private class Session(
private val tun: ParcelFileDescriptor, private val tun: ParcelFileDescriptor,
private val doh: DohClient, private val doh: DohClient,
private val onFailure: (Session) -> Unit,
) { ) {
private val alive = AtomicBoolean(true) private val alive = AtomicBoolean(true)
private val pool = Executors.newFixedThreadPool(WORKERS) private val pool = Executors.newFixedThreadPool(WORKERS)
private val cache = DnsCache() private val cache = DnsCache()
private val output = FileOutputStream(tun.fileDescriptor) private val output = FileOutputStream(tun.fileDescriptor)
// stop() closes the write end, which wakes the reader at once. Otherwise the reader would have
// to wake up on a timer to notice that the session ended, also while the device sleeps.
private val wakeup = ParcelFileDescriptor.createPipe()
private val reader = Thread(::readLoop, "tun-reader") private val reader = Thread(::readLoop, "tun-reader")
fun start() = reader.start() fun start() = reader.start()
@@ -189,36 +228,80 @@ private class Session(
fun stop() { fun stop() {
if (!alive.getAndSet(false)) return if (!alive.getAndSet(false)) return
pool.shutdownNow() pool.shutdownNow()
doh.shutdown() runCatching { wakeup[1].close() }
runCatching { tun.close() } runCatching { tun.close() }
closer.execute {
try {
doh.shutdown()
} catch (e: Exception) {
Log.w(TAG, "DoH client shutdown failed", e)
}
}
} }
private fun readLoop() { private fun readLoop() {
val input = FileInputStream(tun.fileDescriptor) val input = FileInputStream(tun.fileDescriptor)
val buf = ByteArray(MTU) val buf = ByteArray(MTU)
val pollFd = StructPollfd().apply { val tunFd = StructPollfd().apply {
fd = tun.fileDescriptor fd = tun.fileDescriptor
events = OsConstants.POLLIN.toShort() events = OsConstants.POLLIN.toShort()
} }
val wakeupFd = StructPollfd().apply {
while (alive.get()) { fd = wakeup[0].fileDescriptor
try { events = OsConstants.POLLIN.toShort()
if (Os.poll(arrayOf(pollFd), 500) <= 0) continue
val n = input.read(buf)
if (n < 0) break
val query = Packet.parseDnsQuery(buf, n) ?: continue
dispatch(query)
} catch (e: ErrnoException) {
if (e.errno != OsConstants.EINTR) break
} catch (_: IOException) {
break
} catch (_: RejectedExecutionException) {
break
} catch (e: Exception) {
Log.e(TAG, "Tunnel reader failed", e)
break
}
} }
val fds = arrayOf(tunFd, wakeupFd)
var badPackets = 0
try {
while (alive.get()) {
val n = try {
// Sleeps until a packet arrives or stop() closes the pipe
if (Os.poll(fds, -1) <= 0) continue
if (wakeupFd.revents.toInt() != 0) {
// Only stop() touches the pipe, so this ends the loop
readerFailed(null)
return
}
input.read(buf)
} catch (e: ErrnoException) {
if (e.errno == OsConstants.EINTR) continue
readerFailed(e)
return
} catch (e: IOException) {
readerFailed(e)
return
}
if (n < 0) {
readerFailed(null)
return
}
try {
Packet.parseDnsQuery(buf, n)?.let(::dispatch)
badPackets = 0
} catch (e: RejectedExecutionException) {
readerFailed(e)
return
} catch (e: RuntimeException) {
// One packet the code cannot handle must not stop DNS for the whole device
Log.w(TAG, "Dropped a packet", e)
if (++badPackets >= MAX_BAD_PACKETS) {
readerFailed(e)
return
}
}
}
} finally {
runCatching { wakeup[0].close() }
}
}
// stop() closes the tunnel, which also ends the loop; only an unexpected end is a failure
private fun readerFailed(cause: Throwable?) {
if (!alive.get()) return
Log.e(TAG, "Tunnel reader stopped", cause)
onFailure(this)
} }
// Blocklist and cache are answered right here; only real lookups go to the worker pool // Blocklist and cache are answered right here; only real lookups go to the worker pool
@@ -235,12 +318,21 @@ private class Session(
QueryLog.add(question, QueryStatus.CACHED, 0) QueryLog.add(question, QueryStatus.CACHED, 0)
return return
} }
pool.execute { handle(query, question) } val queued = SystemClock.elapsedRealtime()
pool.execute { handle(query, question, queued) }
} }
private fun handle(query: UdpPacket, question: DnsMessage.Question?) { private fun handle(query: UdpPacket, question: DnsMessage.Question?, queued: Long) {
try { try {
val start = SystemClock.elapsedRealtime() val start = SystemClock.elapsedRealtime()
// On a slow network lookups pile up behind the workers. Answer the stale ones with
// SERVFAIL at once instead of spending a worker on them, so the queue drains.
if (start - queued > QUEUE_TIMEOUT_MS) {
if (!alive.get()) return
QueryLog.add(question, QueryStatus.FAILED, (start - queued).toInt())
DnsMessage.servfail(query.payload)?.let { write(query, it) }
return
}
var status = QueryStatus.OK var status = QueryStatus.OK
val answer = try { val answer = try {
doh.query(query.payload).also { cache.put(query.payload, it) } doh.query(query.payload).also { cache.put(query.payload, it) }
@@ -263,7 +355,9 @@ private class Session(
val packet = Packet.buildReply(query, DnsMessage.withId(payload, query.payload)) val packet = Packet.buildReply(query, DnsMessage.withId(payload, query.payload))
try { try {
synchronized(output) { output.write(packet) } synchronized(output) { output.write(packet) }
} catch (_: IOException) { } catch (e: IOException) {
// Expected while the session is being stopped
if (alive.get()) Log.w(TAG, "Cannot write an answer to the tunnel", e)
} }
} }
} }
@@ -0,0 +1,749 @@
package cc.skysparkle.sparkledns
import android.Manifest
import android.app.Activity
import android.content.ClipData
import android.content.ClipboardManager
import android.content.pm.PackageManager
import android.net.VpnService
import android.os.Build
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathEffect
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.TextLayoutResult
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.drawText
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.rememberTextMeasurer
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Date
import java.util.Locale
import java.util.TimeZone
import kotlin.math.ceil
import kotlin.math.roundToInt
private const val HOUR_MS = 3_600_000L
// One bar of the chart: an hour, or a day in the 7-day view
private data class Bar(val total: Long, val blocked: Long)
// Bars with the labels under them: the first hour of the day view, or every day of the week.
// A refresh that brings equal data leaves the chart alone.
private data class Chart(val period: StatsPeriod, val bars: List<Bar>, val labels: List<String>)
private val ChartLabelStyle = TextStyle(color = Palette.Fg3, fontSize = 10.sp)
// Where the three grip lines on the knob of the power switch sit, as fractions of its width
private val KnobLines = floatArrayOf(0.29f, 0.5f, 0.71f)
@Composable
fun HomeScreen(
bottomPadding: Dp,
onOpenBlocklist: () -> Unit,
onOpenServers: () -> Unit,
modifier: Modifier = Modifier,
) {
val context = LocalContext.current
val prefs = remember { Prefs(context) }
val haptics = LocalHapticFeedback.current
val scope = rememberCoroutineScope()
val active by DohVpnService.active.collectAsStateWithLifecycle()
val running = active != null
val lists by Blocklist.lists.collectAsStateWithLifecycle()
val total by Blocklist.total.collectAsStateWithLifecycle()
val blocking by Blocklist.enabled.collectAsStateWithLifecycle()
val listsReady by Blocklist.ready.collectAsStateWithLifecycle()
val download by Blocklist.busy.collectAsStateWithLifecycle()
val downloadError by Blocklist.error.collectAsStateWithLifecycle()
var period by rememberSaveable { mutableStateOf(StatsPeriod.DAY) }
var summary by remember { mutableStateOf(StatsStore.summary(period.hours)) }
var chartData by remember { mutableStateOf(buildChart(period)) }
fun refreshStats() {
summary = StatsStore.summary(period.hours)
chartData = buildChart(period)
}
OnQueryLogChange { refreshStats() }
val statsVersion by StatsStore.version.collectAsStateWithLifecycle()
LaunchedEffect(statsVersion, period) { refreshStats() }
// The server is picked in Settings; this screen is composed anew each time it is shown
val selected = remember { prefs.resolve() }
val canConnect = selected.id != Providers.CUSTOM_ID || selected.url.toHttpUrlOrNull()?.isHttps == true
val shown = active ?: selected
val usesHttp3 = shown.http3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
val crashReport by CrashLog.report.collectAsStateWithLifecycle()
val shownReport = rememberLast(crashReport).orEmpty() // kept while the card animates out
// Strict Private DNS makes Android ignore the VPN's DNS server; followed while Home is visible
val privateDnsHost by remember { privateDnsHosts(context) }.collectAsStateWithLifecycle(initialValue = null)
var busy by rememberVpnBusy(active)
val vpnPermission = rememberLauncherForActivityResult(
ActivityResultContracts.StartActivityForResult()
) {
if (it.resultCode == Activity.RESULT_OK) sendAction(context, DohVpnService.ACTION_START)
else busy = false
}
fun connectVpn() {
val permission = VpnService.prepare(context)
if (permission != null) vpnPermission.launch(permission)
else sendAction(context, DohVpnService.ACTION_START)
}
// The status notification is optional: connect whatever the user answers
val notificationPermission = rememberLauncherForActivityResult(
ActivityResultContracts.RequestPermission()
) { connectVpn() }
fun toggle() {
if (busy) return
busy = true
haptics.performHapticFeedback(if (running) HapticFeedbackType.ToggleOff else HapticFeedbackType.ToggleOn)
if (running) {
sendAction(context, DohVpnService.ACTION_STOP)
return
}
val needsNotificationPermission = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED
if (needsNotificationPermission) notificationPermission.launch(Manifest.permission.POST_NOTIFICATIONS)
else connectVpn()
}
// What the blocklist card offers: nothing, switching blocking back on, or a first list
val proList = lists.firstOrNull { it.url == HAGEZI_PRO_URL }
val offer = when {
!listsReady -> BlocklistOffer.NONE
!blocking -> BlocklistOffer.SWITCH_ON
total == 0 && lists.none { it.enabled } -> BlocklistOffer.FIRST_LIST
else -> BlocklistOffer.NONE
}
fun acceptOffer() {
when (offer) {
BlocklistOffer.SWITCH_ON -> Blocklist.setEnabled(context, true)
BlocklistOffer.FIRST_LIST ->
if (proList != null) scope.editBlocklist(context) { Blocklist.setListEnabled(context, HAGEZI_PRO_URL, true) }
else Blocklist.download(context, HAGEZI_PRO_URL)
BlocklistOffer.NONE -> Unit
}
}
val glow by animateFloatAsState(if (running) 1f else 0f, tween(600), label = "glow")
val wide = windowWidth() >= WideLayoutWidth
val side = sidePadding(windowWidth(), if (wide) MaxWideContentWidth else MaxContentWidth)
// A tall screen gets a taller chart instead of empty space under the content
val chartHeight = if (wide) {
(windowHeight() - 420.dp).coerceIn(160.dp, 360.dp)
} else {
(windowHeight() - 700.dp).coerceIn(150.dp, 320.dp)
}
val status: @Composable () -> Unit = {
StatusCard(
running = running,
providerName = shown.displayName(context),
http3 = usesHttp3,
enabled = !busy && (running || canConnect),
onToggle = ::toggle,
onOpenServers = onOpenServers,
)
PrivateDnsWarning(privateDnsHost, prefs)
}
val stats: @Composable () -> Unit = {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 4.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
StatBlock(formatCompact(summary.total), stringResource(R.string.stat_requests), Modifier.weight(1f))
StatBlock(
formatCompact(summary.blocked),
stringResource(R.string.mon_blocked),
Modifier.weight(1f),
valueColor = Palette.Accent,
)
StatBlock(stringResource(R.string.mon_ms, summary.avgLatencyMs), stringResource(R.string.stat_avg), Modifier.weight(1f))
}
}
val chart: @Composable () -> Unit = {
ChartSection(chartData, period, chartHeight, onPeriod = { period = it })
}
val blocklist: @Composable () -> Unit = {
BlocklistCard(
info = stringResource(R.string.home_lists_info, lists.count { it.enabled }, formatCount(total.toLong())),
offer = offer,
downloading = download == HAGEZI_PRO_URL,
error = if (offer == BlocklistOffer.FIRST_LIST) downloadError else null,
canAccept = download == null,
onAccept = ::acceptOffer,
onClick = onOpenBlocklist,
)
}
Column(
modifier = modifier
.verticalScroll(rememberScrollState())
.drawWithCache {
// Soft light behind the logo while protected. The gradient depends on the size only;
// the fade is applied as alpha when drawing.
val center = Offset(size.width / 2f, 0f)
val radius = size.width * 0.65f
val light = Brush.radialGradient(
colors = listOf(Palette.Accent.copy(alpha = 0.22f), Color.Transparent),
center = center,
radius = radius,
)
onDrawBehind {
if (glow > 0f) drawCircle(brush = light, radius = radius, center = center, alpha = glow)
}
}
.padding(start = side, end = side, top = 16.dp, bottom = bottomPadding),
verticalArrangement = Arrangement.spacedBy(20.dp),
) {
Image(
remember { AppLogo.get(context) },
contentDescription = null,
modifier = Modifier
.size(44.dp)
.align(Alignment.CenterHorizontally),
)
AnimatedVisibility(visible = crashReport != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
CrashCard(
report = shownReport,
onCopy = {
context.getSystemService(ClipboardManager::class.java)
.setPrimaryClip(ClipData.newPlainText("SparkleDNS crash", shownReport))
},
onDismiss = { CrashLog.clear(context) },
)
}
if (wide) {
Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) {
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(20.dp)) {
status()
blocklist()
}
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(20.dp)) {
stats()
chart()
}
}
} else {
status()
stats()
chart()
blocklist()
}
}
}
@Composable
private fun StatusCard(
running: Boolean,
providerName: String,
http3: Boolean,
enabled: Boolean,
onToggle: () -> Unit,
onOpenServers: () -> Unit,
) {
Column(
modifier = Modifier
.fillMaxWidth()
.appCard()
.padding(horizontal = 20.dp, vertical = 24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(6.dp),
) {
AnimatedContent(
targetState = running,
transitionSpec = { fadeIn(Motion.enterFade) togetherWith fadeOut(Motion.exitFade) },
label = "status",
) { on ->
Text(
stringResource(if (on) R.string.home_protected else R.string.home_unprotected),
color = Palette.Fg,
fontSize = 24.sp,
fontWeight = FontWeight.ExtraBold,
letterSpacing = (-0.3).sp,
textAlign = TextAlign.Center,
)
}
// Tapping the server opens the server list in Settings
val dot by animateColorAsState(if (running) Palette.Accent else Palette.Track, Motion.color, label = "dot")
Row(
modifier = Modifier
.clip(RoundedCornerShape(12.dp))
.clickable(onClickLabel = stringResource(R.string.change_server), onClick = onOpenServers)
.heightIn(min = 40.dp)
.padding(start = 10.dp, end = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Box(
Modifier
.size(7.dp)
.clip(CircleShape)
.drawBehind { drawRect(dot) }
)
Spacer(Modifier.width(8.dp))
val via = stringResource(R.string.home_via, providerName) + if (http3) " · HTTP/3" else ""
Text(
if (running) via else stringResource(R.string.home_off_desc),
color = Palette.Fg2,
fontSize = 13.sp,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.Center,
modifier = Modifier.weight(1f, fill = false),
)
Spacer(Modifier.width(2.dp))
Chevron(Modifier.size(16.dp))
}
Spacer(Modifier.height(8.dp))
PowerToggle(on = running, enabled = enabled, onToggle = onToggle)
}
}
// The big ON / OFF switch; the white knob slides across. The animated color and position are
// read only when drawing and placing, so the animation does not recompose the switch every frame.
@Composable
private fun PowerToggle(on: Boolean, enabled: Boolean, onToggle: () -> Unit) {
val track by animateColorAsState(if (on) Palette.Accent else Palette.Track, Motion.color, label = "track")
val knob by animateDpAsState(if (on) 70.dp else 0.dp, tween(320, easing = Motion.Emphasized), label = "knob")
val description = stringResource(if (on) R.string.disconnect else R.string.connect)
Box(
modifier = Modifier
.size(width = 120.dp, height = 50.dp)
.graphicsLayer { alpha = if (enabled) 1f else 0.5f }
.clip(RoundedCornerShape(25.dp))
.drawBehind { drawRect(track) }
.toggleable(value = on, enabled = enabled, role = Role.Switch, onValueChange = { onToggle() })
.semantics { contentDescription = description }
.padding(5.dp),
) {
Text(
stringResource(if (on) R.string.toggle_on else R.string.toggle_off),
color = if (on) Palette.AccentInk else Palette.Fg2,
fontSize = 15.sp,
fontWeight = FontWeight.ExtraBold,
letterSpacing = 0.6.sp,
modifier = Modifier
.align(if (on) Alignment.CenterStart else Alignment.CenterEnd)
.padding(horizontal = 12.dp),
)
Box(
modifier = Modifier
.offset { IntOffset(knob.roundToPx(), 0) }
.size(40.dp)
.clip(CircleShape)
.background(Color.White),
contentAlignment = Alignment.Center,
) {
Canvas(Modifier.size(14.dp)) {
val stroke = 1.6.dp.toPx()
KnobLines.forEach { fraction ->
drawLine(
color = Palette.Fg3,
start = Offset(size.width * fraction, size.height * 0.21f),
end = Offset(size.width * fraction, size.height * 0.79f),
strokeWidth = stroke,
cap = StrokeCap.Round,
)
}
}
}
}
}
@Composable
private fun PrivateDnsWarning(privateDnsHost: String?, prefs: Prefs) {
val context = LocalContext.current
val shownHost = rememberLast(privateDnsHost).orEmpty()
var dismissedHost by remember { mutableStateOf(prefs.dismissedPrivateDns) }
AnimatedVisibility(
visible = privateDnsHost != null && privateDnsHost != dismissedHost,
enter = Motion.expandIn,
exit = Motion.collapseOut,
) {
HintCard(
text = stringResource(R.string.hint, shownHost),
icon = R.drawable.ic_alert,
tint = WarningColor,
action = {
TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) }
},
onDismiss = {
dismissedHost = shownHost
prefs.dismissedPrivateDns = shownHost
},
)
}
}
@Composable
fun StatBlock(value: String, label: String, modifier: Modifier = Modifier, valueColor: Color = Palette.Fg) {
Column(modifier, verticalArrangement = Arrangement.spacedBy(3.dp)) {
Text(value, color = valueColor, fontSize = 21.sp, fontWeight = FontWeight.ExtraBold, maxLines = 1)
Text(label, color = Palette.Fg2, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
}
}
@Composable
private fun ChartSection(chart: Chart, period: StatsPeriod, height: Dp, onPeriod: (StatsPeriod) -> Unit) {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
PeriodChip(period, onPeriod)
Spacer(Modifier.weight(1f))
LegendItem(stringResource(R.string.stat_requests), Palette.Accent)
Spacer(Modifier.width(14.dp))
LegendItem(stringResource(R.string.mon_blocked), Palette.Blocked)
}
Box(
Modifier
.fillMaxWidth()
.height(height),
contentAlignment = Alignment.Center,
) {
if (chart.bars.all { it.total == 0L }) {
Text(
stringResource(R.string.chart_empty),
color = Palette.Fg3,
fontSize = 13.sp,
lineHeight = 18.sp,
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 24.dp),
)
} else {
TrafficChart(chart.bars, Modifier.fillMaxWidth().height(height))
}
}
// Hours: first hour on the left, now on the right. Days: a label under every bar.
Row(Modifier.fillMaxWidth()) {
if (chart.period == StatsPeriod.DAY) {
Text(chart.labels.firstOrNull().orEmpty(), color = Palette.Fg3, fontSize = 11.sp, modifier = Modifier.weight(1f))
Text(stringResource(R.string.chart_now), color = Palette.Fg3, fontSize = 11.sp)
} else {
chart.labels.forEachIndexed { index, label ->
Text(
label,
color = if (index == chart.labels.lastIndex) Palette.Fg else Palette.Fg3,
fontSize = 11.sp,
maxLines = 1,
textAlign = TextAlign.Center,
modifier = Modifier.weight(1f),
)
}
}
}
}
}
@Composable
private fun LegendItem(label: String, color: Color) {
Row(verticalAlignment = Alignment.CenterVertically) {
Box(
Modifier
.size(8.dp)
.clip(RoundedCornerShape(2.dp))
.background(color)
)
Spacer(Modifier.width(6.dp))
Text(label, color = Palette.Fg2, fontSize = 11.sp)
}
}
// One bar per hour or day: requests in the accent color with the blocked part at the bottom.
// Empty slots show a short stub, so a mostly empty day reads as empty instead of broken.
@Composable
private fun TrafficChart(bars: List<Bar>, modifier: Modifier = Modifier) {
val measurer = rememberTextMeasurer()
// Scale, grid and grid labels are worked out when the bars or the size change, not every frame
Spacer(
modifier.drawWithCache {
val n = bars.size
if (n == 0) return@drawWithCache onDrawBehind {}
val maxValue = niceCeiling(bars.maxOf { it.total }.coerceAtLeast(1L))
val top = 16.dp.toPx()
val base = size.height - 2.dp.toPx()
val span = base - top
val slot = size.width / n
val barWidth = (slot * if (n > 10) 0.62f else 0.5f).coerceAtLeast(2.dp.toPx())
val radius = CornerRadius((barWidth / 2).coerceAtMost(4.dp.toPx()))
val stub = 2.dp.toPx()
val minBar = 4.dp.toPx()
val minBlocked = 2.dp.toPx()
val gridWidth = 1.dp.toPx()
val dash = PathEffect.dashPathEffect(floatArrayOf(3.dp.toPx(), 4.dp.toPx()))
fun height(value: Long) = value.toFloat() / maxValue * span
val grid = listOf(maxValue / 2, maxValue).filter { it > 0 }.map { value ->
val y = base - height(value)
val labelTop = y - 14.dp.toPx()
// The same constraints drawText() would use for a label at this spot
val label = measurer.measure(
text = formatCompact(value),
style = ChartLabelStyle,
constraints = Constraints(
maxWidth = ceil(size.width).roundToInt().coerceAtLeast(0),
maxHeight = ceil(size.height - labelTop).roundToInt().coerceAtLeast(0),
),
layoutDirection = layoutDirection,
density = this,
)
GridLine(y, labelTop, label)
}
onDrawBehind {
grid.forEach { line ->
drawLine(
color = Palette.Line,
start = Offset(0f, line.y),
end = Offset(size.width, line.y),
strokeWidth = gridWidth,
pathEffect = dash,
)
drawText(line.label, topLeft = Offset(0f, line.labelTop))
}
bars.forEachIndexed { index, bar ->
val x = index * slot + (slot - barWidth) / 2
if (bar.total == 0L) {
drawRoundRect(Palette.Line, Offset(x, base - stub), Size(barWidth, stub), CornerRadius(stub / 2))
return@forEachIndexed
}
val current = index == n - 1
val h = height(bar.total).coerceAtLeast(minBar)
drawRoundRect(
if (current) Palette.Accent else Palette.Accent.copy(alpha = 0.6f),
Offset(x, base - h),
Size(barWidth, h),
radius,
)
if (bar.blocked > 0) {
val hb = height(bar.blocked).coerceIn(minBlocked, h)
if (hb >= h - radius.x) {
drawRoundRect(Palette.Blocked, Offset(x, base - hb), Size(barWidth, hb), radius)
} else {
drawRect(Palette.Blocked, Offset(x, base - hb), Size(barWidth, hb))
}
}
}
}
}
)
}
private class GridLine(val y: Float, val labelTop: Float, val label: TextLayoutResult)
// 1, 2 or 5 times a power of ten, at least [value]: keeps the grid labels round
private fun niceCeiling(value: Long): Long {
var magnitude = 1L
while (magnitude * 10 <= value) magnitude *= 10
for (factor in longArrayOf(1, 2, 5)) {
if (factor * magnitude >= value) return factor * magnitude
}
return 10 * magnitude
}
// Date formats of the chart for the current locale and time zone. The chart is refreshed up to
// once a second, so they are kept rather than built anew each time. Main thread only.
private class ChartFormats(val locale: Locale, val zone: String) {
val hour = SimpleDateFormat("HH:00", locale)
val day = SimpleDateFormat("EEE", locale)
}
private var chartFormats: ChartFormats? = null
private fun chartFormats(): ChartFormats {
val locale = Locale.getDefault()
val zone = TimeZone.getDefault().id
return chartFormats?.takeIf { it.locale == locale && it.zone == zone }
?: ChartFormats(locale, zone).also { chartFormats = it }
}
// 24 hourly bars, or 7 bars for the calendar days of the last week (today last)
private fun buildChart(period: StatsPeriod, now: Long = System.currentTimeMillis()): Chart {
val hours = StatsStore.hourly(period.hours, now)
val firstHour = now / HOUR_MS - (hours.size - 1)
val formats = chartFormats()
if (period == StatsPeriod.DAY) {
// Only the first hour gets a label; the other end of the axis says "now"
val label = formats.hour.format(Date(firstHour * HOUR_MS))
return Chart(period, hours.map { Bar(it.total, it.blocked) }, listOf(label))
}
val calendar = Calendar.getInstance()
fun dayKey(time: Long): Int {
calendar.timeInMillis = time
return calendar.get(Calendar.YEAR) * 1000 + calendar.get(Calendar.DAY_OF_YEAR)
}
val dayStarts = (6 downTo 0).map { back ->
calendar.timeInMillis = now
calendar.add(Calendar.DAY_OF_YEAR, -back)
calendar.timeInMillis
}
val keys = dayStarts.map { dayKey(it) }
val totals = LongArray(7)
val blocked = LongArray(7)
hours.forEachIndexed { index, point ->
val day = keys.indexOf(dayKey((firstHour + index) * HOUR_MS))
if (day >= 0) {
totals[day] += point.total
blocked[day] += point.blocked
}
}
return Chart(period, List(7) { Bar(totals[it], blocked[it]) }, dayStarts.map { formats.day.format(Date(it)) })
}
private enum class BlocklistOffer { NONE, SWITCH_ON, FIRST_LIST }
@Composable
private fun BlocklistCard(
info: String,
offer: BlocklistOffer,
downloading: Boolean,
error: String?,
canAccept: Boolean,
onAccept: () -> Unit,
onClick: () -> Unit,
) {
val subtitle = when {
error != null -> stringResource(R.string.bl_download_failed, error)
offer == BlocklistOffer.SWITCH_ON -> stringResource(R.string.blocklist_cta_master)
offer == BlocklistOffer.FIRST_LIST -> stringResource(R.string.blocklist_cta_lists)
else -> info
}
Row(
modifier = Modifier
.fillMaxWidth()
.appCard()
.clickable(onClick = onClick)
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
) {
val idle = offer != BlocklistOffer.NONE
Box(
modifier = Modifier
.size(40.dp)
.clip(CircleShape)
.background(if (idle) Palette.Track else Palette.Accent),
contentAlignment = Alignment.Center,
) {
Icon(
painterResource(R.drawable.ic_privacy),
contentDescription = null,
tint = if (idle) Palette.Fg2 else Palette.AccentInk,
modifier = Modifier.size(22.dp),
)
}
Spacer(Modifier.width(14.dp))
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
Text(stringResource(R.string.blocklist_title), color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold)
Text(
subtitle,
color = if (error != null) Palette.Blocked else Palette.Fg2,
fontSize = 12.sp,
lineHeight = 16.sp,
maxLines = 3,
overflow = TextOverflow.Ellipsis,
)
}
Spacer(Modifier.width(10.dp))
if (offer == BlocklistOffer.NONE) {
Chevron()
} else {
Button(
onClick = onAccept,
enabled = canAccept && !downloading,
shape = RoundedCornerShape(14.dp),
contentPadding = PaddingValues(horizontal = 14.dp),
modifier = Modifier.heightIn(min = 40.dp),
) {
if (downloading) {
CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp, color = Palette.Fg2)
Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.downloading), fontSize = 13.sp, maxLines = 1)
} else {
Text(stringResource(R.string.turn_on), fontWeight = FontWeight.Bold, fontSize = 13.sp, maxLines = 1)
}
}
}
}
}
@@ -0,0 +1,14 @@
package cc.skysparkle.sparkledns
import okhttp3.OkHttpClient
import java.util.concurrent.TimeUnit
// Base for every OkHttp client in the app. Clients made with newBuilder() share its dispatcher
// and thread pools, and its connection pool unless they bring their own.
internal object Http {
val client: OkHttpClient by lazy {
OkHttpClient.Builder()
.connectTimeout(15, TimeUnit.SECONDS)
.build()
}
}
@@ -1,477 +1,103 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.Manifest
import android.app.Activity
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.LinkProperties
import android.net.Network
import android.net.Uri import android.net.Uri
import android.net.VpnService
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.SystemClock import android.os.SystemClock
import android.provider.Settings import android.provider.Settings
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.togetherWith
import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.rememberInfiniteTransition
import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Switch
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.material3.darkColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.withContext import kotlinx.coroutines.flow.callbackFlow
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flowOf
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
AppLogo.preload(this)
enableEdgeToEdge() enableEdgeToEdge()
setContent { setContent {
MaterialTheme(colorScheme = AppColors) { AppShell() } MaterialTheme(colorScheme = AppColors) {
// There is no Surface at the root, so text and icons without an explicit color
// would fall back to black and disappear on the dark background
CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onSurface) {
AppShell()
}
}
} }
} }
} }
private val AppColors = darkColorScheme( internal class TestResult(val ok: Boolean, val text: String)
primary = Color(0xFF7FB2FF),
onPrimary = Color(0xFF00285C), // How long a tap on Connect, Disconnect or Switch blocks further taps if the VPN state never changes
background = Color(0xFF0F1115), private const val BUSY_TIMEOUT_MS = 5000L
surface = Color(0xFF0F1115),
// Set by a tap until the VPN state changes or the attempt gives up, so a double tap neither
// starts two connections nor switches the VPN back on right after turning it off
@Composable
internal fun rememberVpnBusy(active: DohProvider?): MutableState<Boolean> {
val busy = remember { mutableStateOf(false) }
LaunchedEffect(active) { busy.value = false }
LaunchedEffect(busy.value) {
if (busy.value) {
delay(BUSY_TIMEOUT_MS)
busy.value = false
}
}
return busy
}
// Keeps test results across rotation and process death
internal val TestResultSaver = Saver<TestResult?, String>(
save = { result -> result?.let { (if (it.ok) "1" else "0") + it.text } },
restore = { saved -> TestResult(saved.startsWith("1"), saved.drop(1)) },
) )
private val ProtectedContainer = Color(0xFF16233A)
private class TestResult(val ok: Boolean, val text: String)
@Composable @Composable
fun HomeScreen(modifier: Modifier = Modifier) { internal fun CrashCard(report: String, onCopy: () -> Unit, onDismiss: () -> Unit) {
val context = LocalContext.current
val prefs = remember { Prefs(context) }
val active by DohVpnService.active.collectAsState()
val running = active != null
val scope = rememberCoroutineScope()
val stats = rememberLiveStats()
var selected by remember { mutableStateOf(prefs.providerId) }
var customUrl by remember { mutableStateOf(prefs.customUrl) }
var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) }
var customHttp3 by remember { mutableStateOf(prefs.customHttp3) }
var testResult by remember { mutableStateOf<TestResult?>(null) }
var shownResult by remember { mutableStateOf<TestResult?>(null) } // kept while the card animates out
var testing by remember { mutableStateOf(false) }
val crashReport = remember { CrashLog.read(context) }
// Strict Private DNS makes Android ignore the VPN's DNS server; re-checked while Home is open
val privateDnsHost by produceState<String?>(null) {
while (true) {
value = readPrivateDnsHost(context)
delay(3000)
}
}
var crashVisible by remember { mutableStateOf(crashReport != null) }
val isCustom = selected == Providers.CUSTOM_ID
val customValid = customUrl.trim().toHttpUrlOrNull()?.isHttps == true
val canConnect = !isCustom || customValid
val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3) { prefs.resolve() }
val customName = stringResource(R.string.custom)
fun nameOf(p: DohProvider) = if (p.id == Providers.CUSTOM_ID) customName else p.name
val shownProvider = active ?: selectedProvider
val usesHttp3 = shownProvider.http3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
// Picking a server never touches a live connection; switching is an explicit action
val pendingSwitch = active?.let { it != selectedProvider && canConnect } == true
val vpnPermission = rememberLauncherForActivityResult(
ActivityResultContracts.StartActivityForResult()
) { if (it.resultCode == Activity.RESULT_OK) sendAction(context, DohVpnService.ACTION_START) }
fun connectVpn() {
val permission = VpnService.prepare(context)
if (permission != null) vpnPermission.launch(permission)
else sendAction(context, DohVpnService.ACTION_START)
}
// The status notification is optional: connect whatever the user answers
val notificationPermission = rememberLauncherForActivityResult(
ActivityResultContracts.RequestPermission()
) { connectVpn() }
fun toggle() {
if (running) {
sendAction(context, DohVpnService.ACTION_STOP)
return
}
val needsNotificationPermission = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED
if (needsNotificationPermission) notificationPermission.launch(Manifest.permission.POST_NOTIFICATIONS)
else connectVpn()
}
fun select(id: String) {
selected = id
prefs.providerId = id
testResult = null
}
fun runTest() {
val provider = prefs.resolve()
testing = true
testResult = null
scope.launch {
val result = withContext(Dispatchers.IO) { testProvider(context, provider) }
shownResult = result
testResult = result
testing = false
}
}
Column(
modifier = modifier
.fillMaxSize()
.verticalScroll(rememberScrollState())
.padding(horizontal = 16.dp, vertical = 12.dp),
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
AnimatedVisibility(visible = crashVisible, enter = Motion.expandIn, exit = Motion.collapseOut) {
val report = crashReport.orEmpty()
CrashCard(
report = report,
onCopy = {
context.getSystemService(ClipboardManager::class.java)
.setPrimaryClip(ClipData.newPlainText("SparkleDNS crash", report))
},
onDismiss = { CrashLog.clear(context); crashVisible = false },
)
}
StatusHero(
running = running,
providerName = nameOf(shownProvider),
http3 = usesHttp3,
stats = stats,
canConnect = canConnect,
switchTo = if (pendingSwitch) nameOf(selectedProvider) else null,
onToggle = ::toggle,
onSwitch = { sendAction(context, DohVpnService.ACTION_START) },
)
SectionHeader(stringResource(R.string.servers))
Card(Modifier.fillMaxWidth()) {
Column(Modifier.padding(vertical = 6.dp)) {
Providers.list.forEachIndexed { index, p ->
if (index > 0) RowDivider()
ProviderRow(p.name, hostOf(p.url), p.http3, selected == p.id) { select(p.id) }
}
RowDivider()
ProviderRow(
title = stringResource(R.string.custom),
subtitle = hostOf(customUrl),
http3 = customHttp3,
selected = isCustom,
) { select(Providers.CUSTOM_ID) }
}
}
AnimatedVisibility(visible = isCustom, enter = Motion.expandIn, exit = Motion.collapseOut) {
Card(Modifier.fillMaxWidth()) {
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
OutlinedTextField(
value = customUrl,
onValueChange = { customUrl = it; prefs.customUrl = it },
label = { Text(stringResource(R.string.custom_url)) },
singleLine = true,
isError = !customValid,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),
modifier = Modifier.fillMaxWidth(),
)
if (!customValid) {
Text(
stringResource(R.string.invalid_url),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.error,
)
}
OutlinedTextField(
value = customBootstrap,
onValueChange = { customBootstrap = it; prefs.customBootstrap = it },
label = { Text(stringResource(R.string.custom_bootstrap)) },
singleLine = true,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done),
modifier = Modifier.fillMaxWidth(),
)
Row(
modifier = Modifier
.fillMaxWidth()
.toggleable(
value = customHttp3,
role = Role.Switch,
onValueChange = { customHttp3 = it; prefs.customHttp3 = it },
)
.padding(vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
Text(stringResource(R.string.http3), style = MaterialTheme.typography.bodyLarge)
Text(
stringResource(R.string.http3_note),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
Spacer(Modifier.width(12.dp))
Switch(checked = customHttp3, onCheckedChange = null)
}
}
}
}
OutlinedButton(
onClick = ::runTest,
enabled = !testing && canConnect,
modifier = Modifier
.fillMaxWidth()
.height(48.dp),
) { Text(stringResource(if (testing) R.string.testing else R.string.test)) }
AnimatedVisibility(visible = testResult != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
shownResult?.let { result ->
HintCard(
text = result.text,
icon = if (result.ok) R.drawable.ic_check else R.drawable.ic_alert,
tint = if (result.ok) CachedColor else MaterialTheme.colorScheme.error,
)
}
}
val lastHost = remember { arrayOf("") }
privateDnsHost?.let { lastHost[0] = it }
AnimatedVisibility(visible = privateDnsHost != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
HintCard(
text = stringResource(R.string.hint, lastHost[0]),
icon = R.drawable.ic_alert,
tint = WarningColor,
action = {
TextButton(onClick = { openNetworkSettings(context) }) { Text(stringResource(R.string.open_settings)) }
},
)
}
}
}
@Composable
private fun StatusHero(
running: Boolean,
providerName: String,
http3: Boolean,
stats: QueryStats,
canConnect: Boolean,
switchTo: String?,
onToggle: () -> Unit,
onSwitch: () -> Unit,
) {
val accent by animateColorAsState(
if (running) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline,
animationSpec = Motion.color,
label = "accent",
)
val container by animateColorAsState(
if (running) ProtectedContainer else MaterialTheme.colorScheme.surfaceContainerHighest,
animationSpec = Motion.color,
label = "container",
)
val ringAlpha by animateFloatAsState(if (running) 1f else 0f, Motion.rotation, label = "ring")
Card(
modifier = Modifier.fillMaxWidth(),
colors = CardDefaults.cardColors(containerColor = container),
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(20.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
Box(Modifier.size(124.dp), contentAlignment = Alignment.Center) {
if (ringAlpha > 0f) PulseRing(accent, ringAlpha)
Box(
modifier = Modifier
.size(92.dp)
.clip(CircleShape)
.background(accent.copy(alpha = 0.18f)),
contentAlignment = Alignment.Center,
) {
Icon(
painterResource(R.drawable.ic_privacy),
contentDescription = null,
tint = accent,
modifier = Modifier.size(52.dp),
)
}
}
AnimatedContent(
targetState = running,
transitionSpec = { fadeIn(Motion.enterFade) togetherWith fadeOut(Motion.exitFade) },
label = "status",
) { on ->
Text(
stringResource(if (on) R.string.status_on else R.string.status_off),
style = MaterialTheme.typography.headlineSmall,
)
}
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
stringResource(R.string.via, providerName),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
if (http3) {
Spacer(Modifier.width(8.dp))
Pill("HTTP/3", accent)
}
}
AnimatedVisibility(visible = running, enter = Motion.expandIn, exit = Motion.collapseOut) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
StatColumn(formatCount(stats.total), stringResource(R.string.mon_queries), Modifier.weight(1f))
StatDivider()
StatColumn(formatCount(stats.blocked), stringResource(R.string.mon_blocked), Modifier.weight(1f))
StatDivider()
StatColumn(cachePercent(stats), stringResource(R.string.mon_cached), Modifier.weight(1f))
}
}
Button(
onClick = onToggle,
enabled = running || canConnect,
modifier = Modifier
.fillMaxWidth()
.height(52.dp),
) {
AnimatedContent(
targetState = running,
transitionSpec = { fadeIn(Motion.enterFade) togetherWith fadeOut(Motion.exitFade) },
label = "toggle",
) { on -> Text(stringResource(if (on) R.string.disconnect else R.string.connect)) }
}
// Remembers the last name so the button keeps its label while it animates out
val lastSwitch = remember { arrayOf("") }
if (switchTo != null) lastSwitch[0] = switchTo
AnimatedVisibility(visible = switchTo != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
OutlinedButton(onClick = onSwitch, modifier = Modifier.fillMaxWidth()) {
Icon(painterResource(R.drawable.ic_switch), contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.switch_to, lastSwitch[0]))
}
}
}
}
}
@Composable
private fun PulseRing(color: Color, visibility: Float) {
val transition = rememberInfiniteTransition(label = "pulse")
val progress by transition.animateFloat(
initialValue = 0f,
targetValue = 1f,
animationSpec = infiniteRepeatable(tween(1800, easing = LinearEasing)),
label = "progress",
)
Box(
Modifier
.size(124.dp)
.graphicsLayer {
val scale = 0.74f + 0.26f * progress
scaleX = scale
scaleY = scale
alpha = (1f - progress) * visibility
}
.clip(CircleShape)
.background(color.copy(alpha = 0.28f))
)
}
@Composable
private fun CrashCard(report: String, onCopy: () -> Unit, onDismiss: () -> Unit) {
Card( Card(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(20.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer), colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer),
) { ) {
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -495,62 +121,33 @@ private fun CrashCard(report: String, onCopy: () -> Unit, onDismiss: () -> Unit)
} }
} }
@Composable // Hostname of strict Private DNS (DNS-over-TLS) on the current network, null when it is Automatic or Off.
private fun ProviderRow(title: String, subtitle: String, http3: Boolean, selected: Boolean, onClick: () -> Unit) { // Android reports the current state on registration and every change after it.
val highlight by animateColorAsState( internal fun privateDnsHosts(context: Context): Flow<String?> {
if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.08f) else Color.Transparent, if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return flowOf(null)
animationSpec = Motion.color, val cm = context.applicationContext.getSystemService(ConnectivityManager::class.java) ?: return flowOf(null)
label = "highlight", return callbackFlow {
) val callback = object : ConnectivityManager.NetworkCallback() {
Row( override fun onLinkPropertiesChanged(network: Network, linkProperties: LinkProperties) {
modifier = Modifier trySend(linkProperties.privateDnsServerName)
.fillMaxWidth() }
.background(highlight)
.selectable(selected = selected, onClick = onClick, role = Role.RadioButton) override fun onLost(network: Network) {
.padding(horizontal = 12.dp, vertical = 10.dp), trySend(null)
verticalAlignment = Alignment.CenterVertically, }
) {
RadioButton(selected = selected, onClick = null)
Spacer(Modifier.width(12.dp))
Column(Modifier.weight(1f)) {
Text(title, style = MaterialTheme.typography.bodyLarge)
Text(
subtitle,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
} }
if (http3) { val registered = runCatching { cm.registerDefaultNetworkCallback(callback) }.isSuccess
Spacer(Modifier.width(8.dp)) awaitClose { if (registered) runCatching { cm.unregisterNetworkCallback(callback) } }
Pill("HTTP/3", MaterialTheme.colorScheme.primary) }.distinctUntilChanged()
}
}
} }
@Composable internal fun openNetworkSettings(context: Context) {
private fun RowDivider() {
HorizontalDivider(
modifier = Modifier.padding(start = 60.dp),
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f),
)
}
// Hostname of strict Private DNS (DNS-over-TLS) on the current network, null when it is Automatic or Off
private fun readPrivateDnsHost(context: Context): String? {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return null
val cm = context.getSystemService(ConnectivityManager::class.java) ?: return null
return runCatching { cm.getLinkProperties(cm.activeNetwork)?.privateDnsServerName }.getOrNull()
}
private fun openNetworkSettings(context: Context) {
runCatching { runCatching {
context.startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) context.startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
} }
} }
private fun hostOf(url: String): String = internal fun hostOf(url: String): String =
runCatching { Uri.parse(url.trim()).host }.getOrNull()?.takeIf { it.isNotEmpty() } ?: url runCatching { Uri.parse(url.trim()).host }.getOrNull()?.takeIf { it.isNotEmpty() } ?: url
internal fun sendAction(context: Context, action: String) { internal fun sendAction(context: Context, action: String) {
@@ -558,7 +155,7 @@ internal fun sendAction(context: Context, action: String) {
} }
// Runs from the app process, which is excluded from the VPN, so it tests the server directly // Runs from the app process, which is excluded from the VPN, so it tests the server directly
private fun testProvider(context: Context, provider: DohProvider): TestResult { internal fun testProvider(context: Context, provider: DohProvider): TestResult {
val client = DohClient(context, provider) val client = DohClient(context, provider)
return try { return try {
val t0 = SystemClock.elapsedRealtime() val t0 = SystemClock.elapsedRealtime()
@@ -1,301 +0,0 @@
package cc.skysparkle.sparkledns
import android.widget.Toast
import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
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.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card
import androidx.compose.material3.FilterChip
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
private enum class MonitorFilter { ALL, BLOCKED, ERRORS }
private val TimeFormat = SimpleDateFormat("HH:mm:ss", Locale.ROOT)
@Composable
fun MonitorScreen(modifier: Modifier = Modifier) {
val context = LocalContext.current
val scope = rememberCoroutineScope()
val custom by Blocklist.custom.collectAsState()
var entries by remember { mutableStateOf(QueryLog.snapshot()) }
var stats by remember { mutableStateOf(QueryLog.stats()) }
var filter by rememberSaveable { mutableStateOf(MonitorFilter.ALL) }
var search by rememberSaveable { mutableStateOf("") }
LaunchedEffect(Unit) {
while (true) {
entries = QueryLog.snapshot()
stats = QueryLog.stats()
delay(1000)
}
}
val visible = remember(entries, filter, search) {
val term = search.trim()
entries.filter { e ->
val matchesFilter = when (filter) {
MonitorFilter.ALL -> true
MonitorFilter.BLOCKED -> e.status == QueryStatus.BLOCKED
MonitorFilter.ERRORS -> e.status == QueryStatus.FAILED
}
matchesFilter && (term.isEmpty() || e.domain.contains(term, ignoreCase = true))
}
}
fun toggleBlock(domain: String, unblock: Boolean) {
scope.launch {
val ok = withContext(Dispatchers.IO) {
if (unblock) {
Blocklist.removeCustom(context, domain)
true
} else {
Blocklist.addCustom(context, domain)
}
}
val message = when {
!ok -> context.getString(R.string.bl_invalid)
unblock -> context.getString(R.string.mon_unblocked, domain)
else -> context.getString(R.string.mon_blocked_added, domain)
}
Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
}
}
LazyColumn(
modifier = modifier.fillMaxSize(),
contentPadding = PaddingValues(16.dp),
) {
item {
Card(Modifier.fillMaxWidth()) {
Row(
modifier = Modifier.padding(vertical = 16.dp),
verticalAlignment = Alignment.CenterVertically,
) {
StatColumn(formatCount(stats.total), stringResource(R.string.mon_queries), Modifier.weight(1f))
StatDivider()
StatColumn(cachePercent(stats), stringResource(R.string.mon_cached), Modifier.weight(1f))
StatDivider()
StatColumn(formatCount(stats.blocked), stringResource(R.string.mon_blocked), Modifier.weight(1f))
StatDivider()
StatColumn(
stringResource(R.string.mon_ms, stats.avgLatencyMs),
stringResource(R.string.mon_latency),
Modifier.weight(1f),
)
}
}
}
item {
Row(
modifier = Modifier.padding(top = 12.dp),
verticalAlignment = Alignment.CenterVertically,
) {
// Chips scroll sideways on narrow screens instead of squeezing the clear button
Row(
modifier = Modifier
.weight(1f)
.horizontalScroll(rememberScrollState()),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
FilterChip(
selected = filter == MonitorFilter.ALL,
onClick = { filter = MonitorFilter.ALL },
label = { Text(stringResource(R.string.mon_all)) },
)
FilterChip(
selected = filter == MonitorFilter.BLOCKED,
onClick = { filter = MonitorFilter.BLOCKED },
label = { Text(stringResource(R.string.status_blocked)) },
leadingIcon = { ChipIcon(R.drawable.ic_tab_block) },
)
FilterChip(
selected = filter == MonitorFilter.ERRORS,
onClick = { filter = MonitorFilter.ERRORS },
label = { Text(stringResource(R.string.mon_errors)) },
leadingIcon = { ChipIcon(R.drawable.ic_alert) },
)
}
IconButton(
onClick = {
QueryLog.clear()
entries = emptyList()
stats = QueryLog.stats()
},
enabled = entries.isNotEmpty() || stats.total > 0,
) {
Icon(painterResource(R.drawable.ic_clear), stringResource(R.string.mon_clear), Modifier.size(22.dp))
}
}
}
item {
OutlinedTextField(
value = search,
onValueChange = { search = it },
placeholder = { Text(stringResource(R.string.mon_search)) },
leadingIcon = { Icon(painterResource(R.drawable.ic_search), contentDescription = null) },
singleLine = true,
shape = RoundedCornerShape(50),
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 12.dp),
)
}
if (visible.isEmpty()) {
item(key = "empty") {
val text = stringResource(if (entries.isEmpty()) R.string.mon_empty else R.string.mon_no_match)
Box(Modifier.animateItem()) { EmptyState(R.drawable.ic_tab_monitor, text) }
}
}
itemsIndexed(visible, key = { _, e -> e.id }) { index, entry ->
val inCustom = entry.domain in custom
QueryRow(
modifier = Modifier.animateItem(),
entry = entry,
first = index == 0,
last = index == visible.lastIndex,
showBlock = !inCustom && entry.status != QueryStatus.BLOCKED,
showUnblock = inCustom,
onBlock = { toggleBlock(entry.domain, unblock = false) },
onUnblock = { toggleBlock(entry.domain, unblock = true) },
)
}
}
}
@Composable
private fun ChipIcon(icon: Int) {
Icon(painterResource(icon), contentDescription = null, modifier = Modifier.size(18.dp))
}
@Composable
fun EmptyState(icon: Int, text: String) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 40.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
IconBadge(icon, MaterialTheme.colorScheme.onSurfaceVariant, size = 64.dp)
Spacer(Modifier.height(12.dp))
Text(
text,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
)
}
}
@Composable
private fun QueryRow(
modifier: Modifier,
entry: QueryEntry,
first: Boolean,
last: Boolean,
showBlock: Boolean,
showUnblock: Boolean,
onBlock: () -> Unit,
onUnblock: () -> Unit,
) {
val (icon, color: Color) = when (entry.status) {
QueryStatus.OK -> R.drawable.ic_check to MaterialTheme.colorScheme.primary
QueryStatus.CACHED -> R.drawable.ic_check to CachedColor
QueryStatus.BLOCKED -> R.drawable.ic_tab_block to MaterialTheme.colorScheme.error
QueryStatus.FAILED -> R.drawable.ic_alert to WarningColor
}
val label = when (entry.status) {
QueryStatus.OK -> stringResource(R.string.mon_ms, entry.latencyMs)
QueryStatus.CACHED -> stringResource(R.string.status_cached)
QueryStatus.BLOCKED -> stringResource(R.string.status_blocked)
QueryStatus.FAILED -> stringResource(R.string.status_failed)
}
Column(
modifier
.fillMaxWidth()
.background(groupedBackground, groupedShape(first, last))
) {
if (!first) {
HorizontalDivider(
modifier = Modifier.padding(start = 60.dp),
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f),
)
}
Row(
modifier = Modifier.padding(start = 12.dp, end = 4.dp, top = 8.dp, bottom = 8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
IconBadge(icon, color, size = 36.dp)
Spacer(Modifier.width(12.dp))
Column(Modifier.weight(1f)) {
Text(entry.domain, style = MaterialTheme.typography.bodyMedium, maxLines = 1, overflow = TextOverflow.Ellipsis)
Text(
"${TimeFormat.format(Date(entry.time))} · ${DnsMessage.typeName(entry.type)}",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
Spacer(Modifier.width(8.dp))
Pill(label, color)
when {
showBlock -> IconButton(onClick = onBlock) {
Icon(painterResource(R.drawable.ic_tab_block), stringResource(R.string.mon_block), Modifier.size(20.dp))
}
showUnblock -> IconButton(onClick = onUnblock) {
Icon(painterResource(R.drawable.ic_check), stringResource(R.string.mon_unblock), Modifier.size(20.dp))
}
else -> Spacer(Modifier.width(48.dp))
}
}
}
}
@@ -1,6 +1,5 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import androidx.compose.animation.SizeTransform
import androidx.compose.animation.core.CubicBezierEasing import androidx.compose.animation.core.CubicBezierEasing
import androidx.compose.animation.core.FiniteAnimationSpec import androidx.compose.animation.core.FiniteAnimationSpec
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
@@ -25,6 +24,4 @@ object Motion {
val expandIn = fadeIn(enterFade) + expandVertically(size) val expandIn = fadeIn(enterFade) + expandVertically(size)
val collapseOut = fadeOut(exitFade) + shrinkVertically(size) val collapseOut = fadeOut(exitFade) + shrinkVertically(size)
fun sizeTransform() = SizeTransform(clip = false) { _, _ -> size }
} }
@@ -3,9 +3,10 @@ package cc.skysparkle.sparkledns
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import kotlin.random.Random import kotlin.random.Random
// IPv4 addresses are kept as plain numbers, so parsing a query allocates only its payload
class UdpPacket( class UdpPacket(
val srcIp: ByteArray, val srcIp: Int,
val dstIp: ByteArray, val dstIp: Int,
val srcPort: Int, val srcPort: Int,
val dstPort: Int, val dstPort: Int,
val payload: ByteArray, val payload: ByteArray,
@@ -29,8 +30,8 @@ object Packet {
if (end <= ihl + 8) return null if (end <= ihl + 8) return null
return UdpPacket( return UdpPacket(
srcIp = buf.copyOfRange(12, 16), srcIp = i32(buf, 12),
dstIp = buf.copyOfRange(16, 20), dstIp = i32(buf, 16),
srcPort = u16(buf, ihl), srcPort = u16(buf, ihl),
dstPort = dstPort, dstPort = dstPort,
payload = buf.copyOfRange(ihl + 8, end), payload = buf.copyOfRange(ihl + 8, end),
@@ -47,8 +48,8 @@ object Packet {
p[6] = 0x40 // don't fragment p[6] = 0x40 // don't fragment
p[8] = 64 p[8] = 64
p[9] = 17 p[9] = 17
query.dstIp.copyInto(p, 12) put32(p, 12, query.dstIp)
query.srcIp.copyInto(p, 16) put32(p, 16, query.srcIp)
put16(p, 10, checksum(p, 0, 20, 0)) put16(p, 10, checksum(p, 0, 20, 0))
put16(p, 20, query.dstPort) put16(p, 20, query.dstPort)
@@ -123,7 +124,9 @@ object DnsMessage {
fun question(msg: ByteArray): Question? { fun question(msg: ByteArray): Question? {
if (msg.size < 12 || u16(msg, 4) < 1) return null if (msg.size < 12 || u16(msg, 4) < 1) return null
val name = StringBuilder() // Sized up front, so the builder does not grow: a valid name has at most 253 characters,
// and never more than the message has bytes after the header
val name = StringBuilder(minOf(msg.size - 12, 253))
var p = 12 var p = 12
while (true) { while (true) {
if (p >= msg.size) return null if (p >= msg.size) return null
@@ -180,6 +183,8 @@ internal fun put32(b: ByteArray, off: Int, value: Int) {
internal fun u32(b: ByteArray, off: Int): Long = internal fun u32(b: ByteArray, off: Int): Long =
((u16(b, off).toLong()) shl 16) or u16(b, off + 2).toLong() ((u16(b, off).toLong()) shl 16) or u16(b, off + 2).toLong()
internal fun i32(b: ByteArray, off: Int): Int = (u16(b, off) shl 16) or u16(b, off + 2)
// Returns the offset right after a (possibly compressed) DNS name // Returns the offset right after a (possibly compressed) DNS name
internal fun skipName(b: ByteArray, start: Int): Int? { internal fun skipName(b: ByteArray, start: Int): Int? {
var p = start var p = start
@@ -25,6 +25,29 @@ class Prefs(context: Context) {
get() = sp.getStringSet(KEY_EXCLUDED, null)?.toSet() ?: emptySet() get() = sp.getStringSet(KEY_EXCLUDED, null)?.toSet() ?: emptySet()
set(value) = sp.edit().putStringSet(KEY_EXCLUDED, value).apply() set(value) = sp.edit().putStringSet(KEY_EXCLUDED, value).apply()
var updateInterval: UpdateInterval
get() = UpdateInterval.entries.getOrNull(sp.getInt(KEY_UPDATE_INTERVAL, UpdateInterval.DAILY.ordinal))
?: UpdateInterval.DAILY
set(value) = sp.edit().putInt(KEY_UPDATE_INTERVAL, value.ordinal).apply()
var updateWifiOnly: Boolean
get() = sp.getBoolean(KEY_UPDATE_WIFI_ONLY, true)
set(value) = sp.edit().putBoolean(KEY_UPDATE_WIFI_ONLY, value).apply()
// Hint cards the user closed with the X
fun isHintDismissed(key: String): Boolean =
sp.getStringSet(KEY_HINTS, null)?.contains(key) == true
fun dismissHint(key: String) {
val current = sp.getStringSet(KEY_HINTS, null)?.toSet() ?: emptySet()
sp.edit().putStringSet(KEY_HINTS, current + key).apply()
}
// The Private DNS warning stays closed until the hostname changes
var dismissedPrivateDns: String
get() = sp.getString(KEY_PRIVATE_DNS, null) ?: ""
set(value) = sp.edit().putString(KEY_PRIVATE_DNS, value).apply()
fun resolve(): DohProvider = fun resolve(): DohProvider =
if (providerId == Providers.CUSTOM_ID) { if (providerId == Providers.CUSTOM_ID) {
DohProvider(Providers.CUSTOM_ID, "Custom", customUrl.trim(), parseIps(customBootstrap), customHttp3) DohProvider(Providers.CUSTOM_ID, "Custom", customUrl.trim(), parseIps(customBootstrap), customHttp3)
@@ -38,5 +61,9 @@ class Prefs(context: Context) {
const val KEY_BOOTSTRAP = "custom_bootstrap" const val KEY_BOOTSTRAP = "custom_bootstrap"
const val KEY_HTTP3 = "custom_http3" const val KEY_HTTP3 = "custom_http3"
const val KEY_EXCLUDED = "excluded_apps" const val KEY_EXCLUDED = "excluded_apps"
const val KEY_HINTS = "dismissed_hints"
const val KEY_PRIVATE_DNS = "dismissed_private_dns"
const val KEY_UPDATE_INTERVAL = "update_interval"
const val KEY_UPDATE_WIFI_ONLY = "update_wifi_only"
} }
} }
@@ -8,23 +8,48 @@ data class DohProvider(
val url: String, val url: String,
val bootstrap: List<String> = emptyList(), val bootstrap: List<String> = emptyList(),
val http3: Boolean = false, val http3: Boolean = false,
val policy: String? = null,
val donate: String? = null,
) )
object Providers { object Providers {
const val CUSTOM_ID = "custom" const val CUSTOM_ID = "custom"
const val DEFAULT_ID = "skysparkle"
val list = listOf( // Servers ship with the app; new ones arrive with app updates
DohProvider("skysparkle", "SkySparkle", "https://blog.skysparkle.cc/dns-query", http3 = true), val builtIn = listOf(
DohProvider("cloudflare", "Cloudflare", "https://cloudflare-dns.com/dns-query", listOf("1.1.1.1", "1.0.0.1")), DohProvider(
DohProvider("google", "Google", "https://dns.google/dns-query", listOf("8.8.8.8", "8.8.4.4")), "skysparkle", "SkySparkle", "https://blog.skysparkle.cc/dns-query",
DohProvider("quad9", "Quad9", "https://dns.quad9.net/dns-query", listOf("9.9.9.9", "149.112.112.112")), http3 = true, policy = "https://skysparkle.cc/privacy?lang=en",
DohProvider("adguard", "AdGuard", "https://dns.adguard-dns.com/dns-query", listOf("94.140.14.14", "94.140.15.15")), ),
DohProvider("mullvad", "Mullvad", "https://dns.mullvad.net/dns-query", listOf("194.242.2.2")), DohProvider(
"quad9", "Quad9", "https://dns.quad9.net/dns-query", listOf("9.9.9.9", "149.112.112.112"),
http3 = true,
policy = "https://quad9.net/service/privacy/",
donate = "https://quad9.net/donate/",
),
DohProvider(
"digitale-gesellschaft", "Digitale Gesellschaft", "https://dns.digitale-gesellschaft.ch/dns-query",
listOf("185.95.218.42", "185.95.218.43"), http3 = true,
policy = "https://www.digitale-gesellschaft.ch/dns/",
donate = "https://www.digitale-gesellschaft.ch/uber-uns/unterstuetzer-werden/",
),
DohProvider(
"uncensoreddns", "UncensoredDNS", "https://anycast.uncensoreddns.org/dns-query", listOf("91.239.100.100"),
policy = "https://blog.uncensoreddns.org/faq/",
),
DohProvider(
"ffmuc", "Freifunk München", "https://doh.ffmuc.net/dns-query",
listOf("5.1.66.255", "185.150.99.255"), http3 = true,
policy = "https://ffmuc.net/dns-privacy/",
donate = "https://spende.ffmuc.net/",
),
) )
val default: DohProvider get() = list.first() // The project's own server stays the default whatever order the list uses
val default: DohProvider = builtIn.firstOrNull { it.id == DEFAULT_ID } ?: builtIn.first()
fun byId(id: String): DohProvider = list.firstOrNull { it.id == id } ?: default fun byId(id: String): DohProvider = builtIn.firstOrNull { it.id == id } ?: default
} }
fun parseIps(raw: String): List<String> = fun parseIps(raw: String): List<String> =
@@ -1,5 +1,10 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.transform
enum class QueryStatus { OK, CACHED, BLOCKED, FAILED } enum class QueryStatus { OK, CACHED, BLOCKED, FAILED }
class QueryEntry( class QueryEntry(
@@ -11,61 +16,54 @@ class QueryEntry(
val latencyMs: Int, val latencyMs: Int,
) )
data class QueryStats( // In-memory only: nothing is written to disk or sent anywhere. StatsStore keeps hourly
val total: Long, // numbers without domains for the charts.
val cached: Long,
val blocked: Long,
val failed: Long,
val avgLatencyMs: Int,
)
// In-memory only: nothing is written to disk or sent anywhere
object QueryLog { object QueryLog {
private const val MAX_ENTRIES = 500 private const val MAX_ENTRIES = 500
private val entries = ArrayDeque<QueryEntry>() private val entries = ArrayDeque<QueryEntry>()
private var nextId = 0L private var nextId = 0L
private var total = 0L private val version = MutableStateFlow(0L)
private var cached = 0L
private var blocked = 0L // The last snapshot, handed out again while the log has not changed
private var failed = 0L private var lastSnapshot: List<QueryEntry> = emptyList()
private var latencySum = 0L private var snapshotVersion = 0L
private var latencyCount = 0L
// Fires right away, then at most once a second while queries keep coming: a busy log refreshes
// the screen no more often than the old one-second polling did, and an idle one not at all
fun changes(): Flow<Long> = version.transform {
emit(it)
delay(1000)
}
fun add(question: DnsMessage.Question?, status: QueryStatus, latencyMs: Int) { fun add(question: DnsMessage.Question?, status: QueryStatus, latencyMs: Int) {
if (question == null) return if (question == null) return
val time = System.currentTimeMillis()
synchronized(this) { synchronized(this) {
if (entries.size >= MAX_ENTRIES) entries.removeFirst() if (entries.size >= MAX_ENTRIES) entries.removeFirst()
entries.addLast( entries.addLast(QueryEntry(nextId++, time, question.name.ifEmpty { "." }, question.type, status, latencyMs))
QueryEntry(nextId++, System.currentTimeMillis(), question.name.ifEmpty { "." }, question.type, status, latencyMs) version.value++
)
total++
when (status) {
QueryStatus.OK -> { latencySum += latencyMs; latencyCount++ }
QueryStatus.CACHED -> cached++
QueryStatus.BLOCKED -> blocked++
QueryStatus.FAILED -> failed++
}
} }
// Hourly numbers for the charts; outside the lock above, as it takes a lock of its own
StatsStore.record(status, latencyMs, Companies.of(question.name), time)
} }
// Newest first. Builds a real copy: on API 35+ List.reversed() resolves to a live JDK view, // Newest first. Builds a real copy: on API 35+ List.reversed() resolves to a live JDK view,
// and on older devices that method does not exist at all // and on older devices that method does not exist at all. While the log does not change the
// same list comes back, so a screen refreshed with it has nothing to update.
@Synchronized @Synchronized
fun snapshot(): List<QueryEntry> = List(entries.size) { entries[entries.size - 1 - it] } fun snapshot(): List<QueryEntry> {
val current = version.value
@Synchronized if (snapshotVersion != current) {
fun stats() = QueryStats( lastSnapshot = List(entries.size) { entries[entries.size - 1 - it] }
total = total, snapshotVersion = current
cached = cached, }
blocked = blocked, return lastSnapshot
failed = failed, }
avgLatencyMs = if (latencyCount == 0L) 0 else (latencySum / latencyCount).toInt(),
)
@Synchronized @Synchronized
fun clear() { fun clear() {
entries.clear() entries.clear()
total = 0; cached = 0; blocked = 0; failed = 0; latencySum = 0; latencyCount = 0 version.value++
} }
} }
@@ -0,0 +1,333 @@
package cc.skysparkle.sparkledns
import androidx.annotation.DrawableRes
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.clickable
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.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
@Composable
fun SettingsScreen(
bottomPadding: Dp,
onOpenApps: () -> Unit,
onOpenAbout: () -> Unit,
modifier: Modifier = Modifier,
) {
val context = LocalContext.current
val prefs = remember { Prefs(context) }
val scope = rememberCoroutineScope()
val side = sidePadding(windowWidth())
val active by DohVpnService.active.collectAsStateWithLifecycle()
var selected by remember { mutableStateOf(prefs.providerId) }
var customUrl by remember { mutableStateOf(prefs.customUrl) }
var customBootstrap by remember { mutableStateOf(prefs.customBootstrap) }
var customHttp3 by remember { mutableStateOf(prefs.customHttp3) }
var testResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf<TestResult?>(null) }
var shownResult by rememberSaveable(stateSaver = TestResultSaver) { mutableStateOf<TestResult?>(null) } // kept while the card animates out
var testing by remember { mutableStateOf(false) }
val excludedCount = remember { prefs.excludedApps.size }
val isCustom = selected == Providers.CUSTOM_ID
val customValid = remember(customUrl) { customUrl.trim().toHttpUrlOrNull()?.isHttps == true }
val canConnect = !isCustom || customValid
val selectedProvider = remember(selected, customUrl, customBootstrap, customHttp3) { prefs.resolve() }
// Picking a server never touches a live connection; switching is an explicit action
val pendingSwitch = active?.let { it != selectedProvider && canConnect } == true
var busy by rememberVpnBusy(active)
fun select(id: String) {
selected = id
prefs.providerId = id
testResult = null
}
fun runTest() {
val provider = prefs.resolve()
testing = true
testResult = null
scope.launch {
val result = withContext(Dispatchers.IO) { testProvider(context, provider) }
shownResult = result
testResult = result
testing = false
}
}
Column(
modifier = modifier
.verticalScroll(rememberScrollState())
.padding(start = side, end = side, top = 16.dp, bottom = bottomPadding),
verticalArrangement = Arrangement.spacedBy(10.dp),
) {
ScreenTitle(stringResource(R.string.tab_settings), Modifier.heightIn(min = 44.dp))
SectionLabel(stringResource(R.string.servers), Modifier.padding(top = 8.dp))
Column(Modifier.fillMaxWidth().appCard()) {
Providers.builtIn.forEachIndexed { index, provider ->
if (index > 0) ListDivider()
ServerRow(
title = provider.name,
subtitle = hostOf(provider.url) + if (provider.http3) " · HTTP/3" else "",
selected = selected == provider.id,
onPolicy = provider.policy?.let { url -> { openUrl(context, url) } },
onDonate = provider.donate?.let { url -> { openUrl(context, url) } },
onClick = { select(provider.id) },
)
}
ListDivider()
ServerRow(
title = stringResource(R.string.custom),
subtitle = if (customUrl.trim() == "https://" || customUrl.isBlank()) "DNS-over-HTTPS (RFC 8484)" else hostOf(customUrl),
selected = isCustom,
onClick = { select(Providers.CUSTOM_ID) },
)
AnimatedVisibility(visible = isCustom, enter = Motion.expandIn, exit = Motion.collapseOut) {
Column(
Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
) {
OutlinedTextField(
value = customUrl,
onValueChange = { customUrl = it; prefs.customUrl = it },
label = { Text(stringResource(R.string.custom_url)) },
singleLine = true,
isError = !customValid,
shape = RoundedCornerShape(14.dp),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),
modifier = Modifier.fillMaxWidth(),
)
if (!customValid) {
Text(stringResource(R.string.invalid_url), color = Palette.Blocked, fontSize = 12.sp)
}
OutlinedTextField(
value = customBootstrap,
onValueChange = { customBootstrap = it; prefs.customBootstrap = it },
label = { Text(stringResource(R.string.custom_bootstrap)) },
singleLine = true,
shape = RoundedCornerShape(14.dp),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done),
modifier = Modifier.fillMaxWidth(),
)
Row(
modifier = Modifier
.fillMaxWidth()
.toggleable(
value = customHttp3,
role = Role.Switch,
onValueChange = { customHttp3 = it; prefs.customHttp3 = it },
)
.padding(vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
Text(stringResource(R.string.http3), color = Palette.Fg, fontSize = 15.sp)
Text(stringResource(R.string.http3_note), color = Palette.Fg3, fontSize = 12.sp)
}
Spacer(Modifier.width(12.dp))
AppSwitch(checked = customHttp3, onCheckedChange = null)
}
}
}
}
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
OutlinedButton(
onClick = ::runTest,
enabled = !testing && canConnect,
shape = RoundedCornerShape(16.dp),
modifier = Modifier
.weight(1f)
.height(48.dp),
) {
Icon(painterResource(R.drawable.ic_speed), contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(8.dp))
Text(stringResource(if (testing) R.string.testing else R.string.test), maxLines = 1)
}
// The button keeps its label while it animates out
val switchName = rememberLast(if (pendingSwitch) selectedProvider.displayName(context) else null).orEmpty()
AnimatedVisibility(visible = pendingSwitch, modifier = Modifier.weight(1f)) {
Button(
onClick = {
if (!busy) {
busy = true
sendAction(context, DohVpnService.ACTION_START)
}
},
enabled = !busy,
shape = RoundedCornerShape(16.dp),
modifier = Modifier
.fillMaxWidth()
.height(48.dp),
) {
Icon(painterResource(R.drawable.ic_swap), contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(8.dp))
Text(
stringResource(R.string.switch_to, switchName),
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
}
}
AnimatedVisibility(visible = testResult != null, enter = Motion.expandIn, exit = Motion.collapseOut) {
shownResult?.let { result ->
HintCard(
text = result.text,
icon = if (result.ok) R.drawable.ic_check else R.drawable.ic_alert,
tint = if (result.ok) CachedColor else Palette.Blocked,
onDismiss = { testResult = null },
)
}
}
SectionLabel(stringResource(R.string.settings_general), Modifier.padding(top = 8.dp))
Column(Modifier.fillMaxWidth().appCard()) {
NavRow(
icon = R.drawable.ic_tab_apps,
title = stringResource(R.string.settings_apps),
subtitle = if (excludedCount > 0) stringResource(R.string.apps_count, excludedCount)
else stringResource(R.string.settings_apps_desc),
onClick = onOpenApps,
)
ListDivider()
NavRow(
icon = R.drawable.ic_tab_info,
title = stringResource(R.string.tab_about),
subtitle = "${stringResource(R.string.about_version)} ${BuildConfig.VERSION_NAME}",
onClick = onOpenAbout,
)
}
}
}
@Composable
private fun ServerRow(
title: String,
subtitle: String,
selected: Boolean,
onPolicy: (() -> Unit)? = null,
onDonate: (() -> Unit)? = null,
onClick: () -> Unit,
) {
val highlight by animateColorAsState(
if (selected) Palette.Accent.copy(alpha = 0.06f) else Color.Transparent,
animationSpec = Motion.color,
label = "highlight",
)
Row(
modifier = Modifier
.fillMaxWidth()
// Read when drawing, so the fade does not recompose the row every frame
.drawBehind { drawRect(highlight) }
.selectable(selected = selected, onClick = onClick, role = Role.RadioButton)
.heightIn(min = 60.dp)
.padding(start = 16.dp, end = 8.dp, top = 8.dp, bottom = 8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
Text(
title,
color = Palette.Fg,
fontSize = 15.sp,
fontWeight = FontWeight.Bold,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(subtitle, color = Palette.Fg3, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
}
if (onDonate != null) LinkButton(R.drawable.ic_donate, stringResource(R.string.donate), onDonate)
if (onPolicy != null) LinkButton(R.drawable.ic_policy, stringResource(R.string.about_privacy_policy), onPolicy)
Spacer(Modifier.width(4.dp))
if (selected) {
Icon(
painterResource(R.drawable.ic_check),
contentDescription = null,
tint = Palette.Accent,
modifier = Modifier.size(22.dp),
)
} else {
Spacer(Modifier.size(22.dp))
}
Spacer(Modifier.width(6.dp))
}
}
// Small button next to a server that opens one of its pages
@Composable
private fun LinkButton(@DrawableRes icon: Int, description: String, onClick: () -> Unit) {
IconButton(onClick = onClick, modifier = Modifier.size(40.dp)) {
Icon(painterResource(icon), contentDescription = description, tint = Palette.Fg3, modifier = Modifier.size(18.dp))
}
}
@Composable
private fun NavRow(@DrawableRes icon: Int, title: String, subtitle: String, onClick: () -> Unit) {
Row(
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = onClick)
.heightIn(min = 60.dp)
.padding(start = 16.dp, end = 12.dp, top = 10.dp, bottom = 10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(painterResource(icon), contentDescription = null, tint = Palette.Accent, modifier = Modifier.size(24.dp))
Spacer(Modifier.width(14.dp))
Column(Modifier.weight(1f)) {
Text(title, color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold)
Text(subtitle, color = Palette.Fg3, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
}
Chevron()
}
}
@@ -0,0 +1,259 @@
package cc.skysparkle.sparkledns
import android.content.Context
import android.util.Log
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.DataInputStream
import java.io.DataOutputStream
import java.io.File
import java.util.concurrent.Executors
class StatsSummary(
val total: Long,
val blocked: Long,
val cached: Long,
val avgLatencyMs: Int,
// Requests per company, indexed by Company.ordinal
val companies: LongArray,
)
class HourPoint(val total: Long, val blocked: Long)
// Hourly counters of the last 7 days for the charts. Only numbers are kept, never domains,
// and they never leave the device.
object StatsStore {
private const val HOUR_MS = 3_600_000L
private const val FILE = "stats.bin"
private const val SAVE_INTERVAL_MS = 60_000L
private val counters = HourlyCounters()
private var file: File? = null
// Bumped when the numbers change without a new query: loaded from disk
private val _version = MutableStateFlow(0)
val version: StateFlow<Int> = _version
private var lastSave = 0L
private var dirty = false
// Counts every change, so summary() can hand out its last result while nothing changed
private var changes = 0L
private var lastSummary: StatsSummary? = null
private var summaryChanges = 0L
private var summaryHours = 0
private var summaryHour = 0L
// Saves happen off the VPN threads, one at a time
private val writer = Executors.newSingleThreadExecutor { Thread(it, "stats-writer").apply { isDaemon = true } }
// The file is read outside the lock, so neither the DNS threads nor the screens wait for
// storage. Queries counted before it was read are added to the saved numbers.
fun init(context: Context) {
val target = File(context.filesDir, FILE)
val saved = read(target)
synchronized(this) {
file = target
if (saved != null) counters.merge(saved)
changes++
}
_version.value++
}
fun record(status: QueryStatus, latencyMs: Int, company: Company?, now: Long = System.currentTimeMillis()) {
val save = synchronized(this) {
counters.record(status, latencyMs, company, now / HOUR_MS)
changes++
dirty = true
if (file != null && now - lastSave >= SAVE_INTERVAL_MS) {
lastSave = now
true
} else {
false
}
}
// The writer thread encodes the numbers itself, so this DNS thread only hands the job over
if (save) writer.execute(::save)
}
// Totals of the last [hours] hours, the current one included. While nothing changed the same
// object comes back, so a screen refreshed with it has nothing to recompose.
fun summary(hours: Int, now: Long = System.currentTimeMillis()): StatsSummary = synchronized(this) {
val current = now / HOUR_MS
lastSummary?.takeIf { summaryChanges == changes && summaryHours == hours && summaryHour == current }
?: counters.summary(hours, current).also {
lastSummary = it
summaryChanges = changes
summaryHours = hours
summaryHour = current
}
}
// One point per hour, oldest first, ending with the current hour
fun hourly(hours: Int, now: Long = System.currentTimeMillis()): List<HourPoint> =
synchronized(this) { counters.hourly(hours, now / HOUR_MS) }
// Saves what is not on disk yet; called when the VPN stops
fun flush() {
val save = synchronized(this) {
if (file != null && dirty) {
lastSave = System.currentTimeMillis()
true
} else {
false
}
}
if (save) writer.execute(::save)
}
// Runs on the writer thread
private fun save() {
val (target, bytes) = synchronized(this) {
val current = file ?: return
dirty = false
current to counters.encode()
}
try {
val tmp = File(target.parentFile, "$FILE.tmp")
tmp.writeBytes(bytes)
if (!tmp.renameTo(target)) tmp.delete()
} catch (e: Exception) {
Log.w("SparkleDNS", "Cannot save statistics", e)
}
}
private fun read(source: File): HourlyCounters? {
if (!source.exists()) return null
return try {
HourlyCounters.decode(source.readBytes())
} catch (e: Exception) {
Log.w("SparkleDNS", "Cannot read statistics", e)
null
}
}
}
// The numbers behind StatsStore: a ring of hourly rows, each remembering which hour (since the
// epoch) it holds. Plain data without locks or Android; StatsStore takes care of both.
internal class HourlyCounters {
val hourIds = LongArray(HOURS) { -1L }
val rows = Array(HOURS) { LongArray(FIELDS) }
fun record(status: QueryStatus, latencyMs: Int, company: Company?, hour: Long) {
val row = row(hour)
row[TOTAL]++
when (status) {
QueryStatus.BLOCKED -> row[BLOCKED]++
QueryStatus.CACHED -> row[CACHED]++
QueryStatus.OK -> {
row[LATENCY_SUM] += latencyMs.toLong()
row[LATENCY_COUNT]++
}
QueryStatus.FAILED -> Unit
}
if (company != null) row[FIRST_COMPANY + company.ordinal]++
}
// Totals of the last [hours] hours up to [currentHour]
fun summary(hours: Int, currentHour: Long): StatsSummary {
val sums = LongArray(FIELDS)
for (back in 0 until hours.coerceIn(1, HOURS)) {
val id = currentHour - back
val index = slot(id)
if (hourIds[index] != id) continue
val row = rows[index]
for (field in 0 until FIELDS) sums[field] += row[field]
}
return StatsSummary(
total = sums[TOTAL],
blocked = sums[BLOCKED],
cached = sums[CACHED],
avgLatencyMs = if (sums[LATENCY_COUNT] == 0L) 0 else (sums[LATENCY_SUM] / sums[LATENCY_COUNT]).toInt(),
companies = sums.copyOfRange(FIRST_COMPANY, FIELDS),
)
}
// One point per hour, oldest first, ending with [currentHour]
fun hourly(hours: Int, currentHour: Long): List<HourPoint> {
val count = hours.coerceIn(1, HOURS)
return List(count) { position ->
val id = currentHour - (count - 1 - position)
val index = slot(id)
if (hourIds[index] == id) HourPoint(rows[index][TOTAL], rows[index][BLOCKED]) else HourPoint(0, 0)
}
}
// Saved hours are added to the ones counted since the start; a slot keeps the newer hour
fun merge(saved: HourlyCounters) {
for (index in 0 until HOURS) {
val id = saved.hourIds[index]
when {
id < 0 || id < hourIds[index] -> Unit
id == hourIds[index] -> for (field in 0 until FIELDS) rows[index][field] += saved.rows[index][field]
else -> {
hourIds[index] = id
saved.rows[index].copyInto(rows[index])
}
}
}
}
fun encode(): ByteArray {
val bytes = ByteArrayOutputStream(12 + HOURS * (FIELDS + 1) * 8)
DataOutputStream(bytes).use { out ->
out.writeInt(FORMAT)
out.writeInt(FIELDS)
out.writeInt(HOURS)
for (index in 0 until HOURS) {
out.writeLong(hourIds[index])
rows[index].forEach { out.writeLong(it) }
}
}
return bytes.toByteArray()
}
private fun slot(id: Long): Int = (((id % HOURS) + HOURS) % HOURS).toInt()
private fun row(id: Long): LongArray {
val index = slot(id)
if (hourIds[index] != id) {
hourIds[index] = id
rows[index].fill(0L)
}
return rows[index]
}
companion object {
const val HOURS = 24 * 7
private const val FORMAT = 1
// Per hour: total, blocked, cached, latency sum and count, then one counter per company
private const val TOTAL = 0
private const val BLOCKED = 1
private const val CACHED = 2
private const val LATENCY_SUM = 3
private const val LATENCY_COUNT = 4
const val FIRST_COMPANY = 5
val FIELDS = FIRST_COMPANY + Company.entries.size
// Files from a version with fewer companies load fine: the new counters start at zero.
// Null for a file of another format.
fun decode(bytes: ByteArray): HourlyCounters? {
DataInputStream(ByteArrayInputStream(bytes)).use { input ->
if (input.readInt() != FORMAT) return null
val fields = input.readInt()
if (input.readInt() != HOURS || fields < FIRST_COMPANY) return null
val result = HourlyCounters()
for (index in 0 until HOURS) {
result.hourIds[index] = input.readLong()
for (field in 0 until fields) {
val value = input.readLong()
if (field < FIELDS) result.rows[index][field] = value
}
}
return result
}
}
}
}
@@ -0,0 +1,275 @@
package cc.skysparkle.sparkledns
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Switch
import androidx.compose.material3.SwitchDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.darkColorScheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
// One dark palette for the whole app
object Palette {
val Bg = Color(0xFF08090B)
val Card = Color(0xFF17181C)
val CardHigh = Color(0xFF1E2026)
val Line = Color(0xFF24262C)
val Track = Color(0xFF3A3C44)
val Fg = Color(0xFFF2F3F5)
val Fg2 = Color(0xFF9A9DA6)
val Fg3 = Color(0xFF7E828C)
val Accent = Color(0xFF7FB2FF)
val AccentSoft = Color(0x297FB2FF)
val AccentInk = Color(0xFF0A0B0D)
val Blocked = Color(0xFFFF6B7D)
val Nav = Color(0xEB1E2026)
val NavIcon = Color(0xFF8A8E98)
}
internal val AppColors = darkColorScheme(
primary = Palette.Accent,
onPrimary = Palette.AccentInk,
primaryContainer = Color(0xFF22324A),
onPrimaryContainer = Palette.Accent,
secondary = Palette.Accent,
onSecondary = Palette.AccentInk,
secondaryContainer = Color(0xFF22324A),
onSecondaryContainer = Palette.Accent,
background = Palette.Bg,
onBackground = Palette.Fg,
surface = Palette.Bg,
onSurface = Palette.Fg,
surfaceVariant = Palette.Card,
onSurfaceVariant = Palette.Fg2,
surfaceContainerLowest = Palette.Bg,
surfaceContainerLow = Palette.Card,
surfaceContainer = Palette.Card,
surfaceContainerHigh = Palette.CardHigh,
surfaceContainerHighest = Palette.Card,
outline = Palette.Track,
outlineVariant = Palette.Line,
error = Palette.Blocked,
onError = Palette.AccentInk,
errorContainer = Color(0xFF3A1C22),
onErrorContainer = Color(0xFFFFD9DE),
)
val CardShape = RoundedCornerShape(20.dp)
// On tablets content stays this wide and sits in the middle, so rows do not stretch across the screen
val MaxContentWidth = 560.dp
// From this width Home and Activity show two columns side by side
val WideLayoutWidth = 840.dp
val MaxWideContentWidth = 1040.dp
// Size of the app window in dp
@Composable
fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp
@Composable
fun windowHeight(): Dp = LocalConfiguration.current.screenHeightDp.dp
// Side padding that keeps content at most [max] wide and at least [min] away from the edges
fun sidePadding(available: Dp, max: Dp = MaxContentWidth, min: Dp = 20.dp): Dp =
maxOf(min, (available - max) / 2)
fun Modifier.appCard(): Modifier = clip(CardShape).background(Palette.Card)
@Composable
fun AppSwitch(
checked: Boolean,
onCheckedChange: ((Boolean) -> Unit)?,
modifier: Modifier = Modifier,
enabled: Boolean = true,
) {
Switch(
checked = checked,
onCheckedChange = onCheckedChange,
modifier = modifier,
enabled = enabled,
colors = appSwitchColors(),
)
}
@Composable
private fun appSwitchColors() = SwitchDefaults.colors(
checkedThumbColor = Color.White,
checkedTrackColor = Palette.Accent,
checkedBorderColor = Palette.Accent,
uncheckedThumbColor = Palette.Fg2,
uncheckedTrackColor = Palette.Track,
uncheckedBorderColor = Palette.Track,
)
// Big bold title of a main tab
@Composable
fun ScreenTitle(text: String, modifier: Modifier = Modifier) {
Text(
text,
modifier = modifier,
color = Palette.Fg,
fontSize = 24.sp,
fontWeight = FontWeight.ExtraBold,
letterSpacing = (-0.3).sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
@Composable
fun SectionLabel(text: String, modifier: Modifier = Modifier) {
Text(
text,
modifier = modifier.padding(start = 4.dp, top = 8.dp, bottom = 2.dp),
color = Palette.Fg2,
fontSize = 13.sp,
fontWeight = FontWeight.Bold,
)
}
// Back arrow and title of a page opened from a tab
@Composable
fun PageHeader(
title: String,
onBack: () -> Unit,
modifier: Modifier = Modifier,
action: (@Composable () -> Unit)? = null,
) {
Row(
modifier = modifier
.fillMaxWidth()
.heightIn(min = 56.dp)
.padding(start = 4.dp, end = 12.dp),
verticalAlignment = Alignment.CenterVertically,
) {
IconButton(onClick = onBack) {
Icon(painterResource(R.drawable.ic_back), contentDescription = stringResource(R.string.back), tint = Palette.Fg)
}
Text(
title,
modifier = Modifier.weight(1f),
color = Palette.Fg,
fontSize = 20.sp,
fontWeight = FontWeight.ExtraBold,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
action?.invoke()
}
}
// A page with a back header around content that is not built for one
@Composable
fun SubPage(title: String, onBack: () -> Unit, modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) {
Box(modifier, contentAlignment = Alignment.TopCenter) {
Column(
Modifier
.fillMaxHeight()
.widthIn(max = MaxContentWidth + 32.dp)
.fillMaxWidth()
) {
PageHeader(title, onBack)
Box(
Modifier
.weight(1f)
.fillMaxSize()
.navigationBarsPadding(),
content = content,
)
}
}
}
private val SearchTextStyle = TextStyle(color = Palette.Fg, fontSize = 14.sp)
@Composable
fun SearchField(
value: String,
onValueChange: (String) -> Unit,
placeholder: String,
modifier: Modifier = Modifier,
trailing: (@Composable () -> Unit)? = null,
) {
Row(
modifier = modifier
.fillMaxWidth()
.height(48.dp)
.clip(RoundedCornerShape(16.dp))
.background(Palette.Card)
.padding(start = 14.dp, end = if (trailing != null) 2.dp else 14.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
painterResource(R.drawable.ic_search),
contentDescription = null,
tint = Palette.Fg3,
modifier = Modifier.size(18.dp),
)
Spacer(Modifier.width(10.dp))
Box(Modifier.weight(1f), contentAlignment = Alignment.CenterStart) {
if (value.isEmpty()) {
Text(placeholder, color = Palette.Fg3, fontSize = 14.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
}
BasicTextField(
value = value,
onValueChange = onValueChange,
modifier = Modifier.fillMaxWidth(),
singleLine = true,
textStyle = SearchTextStyle,
cursorBrush = SolidColor(Palette.Accent),
)
}
trailing?.invoke()
}
}
// Thin line between the rows of a card
@Composable
fun ListDivider(modifier: Modifier = Modifier) {
HorizontalDivider(modifier = modifier.padding(horizontal = 16.dp), color = Palette.Line)
}
// The arrow at the end of a row that opens something
@Composable
fun Chevron(modifier: Modifier = Modifier) {
Icon(
painterResource(R.drawable.ic_chevron),
contentDescription = null,
tint = Palette.Fg3,
modifier = modifier.size(20.dp),
)
}
+136 -100
View File
@@ -1,18 +1,17 @@
package cc.skysparkle.sparkledns package cc.skysparkle.sparkledns
import android.content.Context
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.compose.animation.AnimatedContent import androidx.annotation.StringRes
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
@@ -22,30 +21,58 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.res.imageResource
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlinx.coroutines.delay import androidx.compose.ui.unit.sp
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.repeatOnLifecycle
import java.text.NumberFormat import java.text.NumberFormat
import java.util.Locale
val CachedColor = Color(0xFF7FD1AE) val CachedColor = Color(0xFF7FD1AE)
val WarningColor = Color(0xFFFFB86B) val WarningColor = Color(0xFFFFB86B)
// The 512 px logo, decoded once while the screens are in use. Home shows it each time the tab
// opens, and decoding it there would cost the main thread a frame.
object AppLogo {
@Volatile
private var bitmap: ImageBitmap? = null
// Started with the activity, so the first frame of Home usually finds the logo decoded
fun preload(context: Context) {
if (bitmap != null) return
val appContext = context.applicationContext
Thread({ runCatching { get(appContext) } }, "logo-load").start()
}
@Synchronized
fun get(context: Context): ImageBitmap =
bitmap ?: ImageBitmap.imageResource(context.resources, R.drawable.app_logo).also { bitmap = it }
fun clear() {
bitmap = null
}
}
// Icon on a soft circle of its own color // Icon on a soft circle of its own color
@Composable @Composable
fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.primary, size: Dp = 40.dp) { fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.primary, size: Dp = 40.dp) {
@@ -60,65 +87,29 @@ fun IconBadge(@DrawableRes icon: Int, tint: Color = MaterialTheme.colorScheme.pr
} }
} }
@Composable
fun SectionHeader(
title: String,
@DrawableRes icon: Int? = null,
modifier: Modifier = Modifier,
action: (@Composable () -> Unit)? = null,
) {
Row(
modifier = modifier
.fillMaxWidth()
.heightIn(min = 40.dp)
.padding(top = 8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
if (icon != null) {
Icon(
painterResource(icon),
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.size(18.dp),
)
Spacer(Modifier.width(8.dp))
}
Text(
title,
style = MaterialTheme.typography.titleSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.weight(1f),
)
action?.invoke()
}
}
@Composable
fun Pill(text: String, color: Color) {
Text(
text,
style = MaterialTheme.typography.labelMedium,
color = color,
modifier = Modifier
.clip(RoundedCornerShape(50))
.background(color.copy(alpha = 0.14f))
.padding(horizontal = 10.dp, vertical = 3.dp),
)
}
@Composable @Composable
fun HintCard( fun HintCard(
text: String, text: String,
@DrawableRes icon: Int = R.drawable.ic_tab_info, @DrawableRes icon: Int = R.drawable.ic_tab_info,
tint: Color = MaterialTheme.colorScheme.onSurfaceVariant, tint: Color = MaterialTheme.colorScheme.onSurfaceVariant,
action: (@Composable () -> Unit)? = null, action: (@Composable () -> Unit)? = null,
onDismiss: (() -> Unit)? = null,
) { ) {
Card( Card(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
colors = CardDefaults.cardColors(containerColor = tint.copy(alpha = 0.10f)), colors = CardDefaults.cardColors(containerColor = tint.copy(alpha = 0.10f)),
) { ) {
Row( Row(
modifier = Modifier.padding(start = 14.dp, end = if (action != null) 6.dp else 14.dp, top = 12.dp, bottom = 12.dp), modifier = Modifier.padding(
start = 14.dp,
end = when {
onDismiss != null -> 4.dp
action != null -> 6.dp
else -> 14.dp
},
top = if (onDismiss != null) 6.dp else 12.dp,
bottom = if (onDismiss != null) 6.dp else 12.dp,
),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
Icon(painterResource(icon), contentDescription = null, tint = tint, modifier = Modifier.size(20.dp)) Icon(painterResource(icon), contentDescription = null, tint = tint, modifier = Modifier.size(20.dp))
@@ -130,62 +121,52 @@ fun HintCard(
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
action?.invoke() action?.invoke()
if (onDismiss != null) {
IconButton(onClick = onDismiss, modifier = Modifier.size(40.dp)) {
Icon(
painterResource(R.drawable.ic_close),
contentDescription = stringResource(R.string.dismiss),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.size(18.dp),
)
}
}
} }
} }
} }
private class Last<T>(var value: T?)
// The last non-null value, so a card can keep showing its text while it animates out
@Composable @Composable
fun StatColumn(value: String, label: String, modifier: Modifier = Modifier) { fun <T : Any> rememberLast(value: T?): T? {
Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) { val last = remember { Last<T>(null) }
// Numbers roll up when they change if (value != null) last.value = value
AnimatedContent( return last.value
targetState = value,
transitionSpec = {
(slideInVertically(Motion.slide) { it / 2 } + fadeIn(Motion.enterFade)) togetherWith
(slideOutVertically(Motion.slide) { -it / 2 } + fadeOut(Motion.exitFade)) using
Motion.sizeTransform()
},
label = "stat",
) { shown ->
Text(shown, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.SemiBold, maxLines = 1)
}
Text(
label,
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
}
} }
// Runs [onChange] when the query log changes, at most once a second and only while the screen
// is started: nothing runs while the app sits in the background
@Composable @Composable
fun StatDivider() { fun OnQueryLogChange(onChange: () -> Unit) {
Box( val lifecycle = LocalLifecycleOwner.current.lifecycle
Modifier val current by rememberUpdatedState(onChange)
.size(width = 1.dp, height = 32.dp) LaunchedEffect(lifecycle) {
.background(MaterialTheme.colorScheme.outlineVariant) lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
) QueryLog.changes().collect { current() }
}
// Polls the in-memory query log once a second while the screen is visible
@Composable
fun rememberLiveStats(): QueryStats {
var stats by remember { mutableStateOf(QueryLog.stats()) }
LaunchedEffect(Unit) {
while (true) {
stats = QueryLog.stats()
delay(1000)
} }
} }
return stats
} }
fun formatCount(value: Long): String = NumberFormat.getIntegerInstance().format(value) // Called from composition only, i.e. on the main thread; rebuilt when the locale changes
private var countFormat: Pair<Locale, NumberFormat>? = null
fun cachePercent(stats: QueryStats): String = fun formatCount(value: Long): String {
"${if (stats.total == 0L) 0 else stats.cached * 100 / stats.total}%" val locale = Locale.getDefault()
val format = countFormat?.takeIf { it.first == locale }?.second
?: NumberFormat.getIntegerInstance(locale).also { countFormat = locale to it }
return format.format(value)
}
// Rows of one visual group share a background; only the outer corners are rounded // Rows of one visual group share a background; only the outer corners are rounded
fun groupedShape(first: Boolean, last: Boolean, radius: Dp = 16.dp) = RoundedCornerShape( fun groupedShape(first: Boolean, last: Boolean, radius: Dp = 16.dp) = RoundedCornerShape(
@@ -197,3 +178,58 @@ fun groupedShape(first: Boolean, last: Boolean, radius: Dp = 16.dp) = RoundedCor
val groupedBackground: Color val groupedBackground: Color
@Composable get() = MaterialTheme.colorScheme.surfaceContainerHighest @Composable get() = MaterialTheme.colorScheme.surfaceContainerHighest
// Short numbers for stat tiles: 812, 7.27k, 48.1k, 312k, 1.2M (decimal separator of the locale)
fun formatCompact(value: Long): String {
val locale = Locale.getDefault()
return when {
value < 1_000 -> formatCount(value)
value < 10_000 -> String.format(locale, "%.2fk", value / 1_000.0)
value < 100_000 -> String.format(locale, "%.1fk", value / 1_000.0)
value < 1_000_000 -> String.format(locale, "%.0fk", value / 1_000.0)
else -> String.format(locale, "%.1fM", value / 1_000_000.0)
}
}
@Composable
fun EmptyState(icon: Int, text: String) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 40.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
IconBadge(icon, MaterialTheme.colorScheme.onSurfaceVariant, size = 64.dp)
Spacer(Modifier.height(12.dp))
Text(
text,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
)
}
}
enum class StatsPeriod(val hours: Int, @StringRes val label: Int) {
DAY(24, R.string.period_24h),
WEEK(24 * 7, R.string.period_7d),
}
// Switches between the last 24 hours and the last 7 days
@Composable
fun PeriodChip(period: StatsPeriod, onChange: (StatsPeriod) -> Unit) {
val shape = RoundedCornerShape(18.dp)
Row(
modifier = Modifier
.clip(shape)
.border(1.dp, Palette.Track, shape)
.clickable { onChange(if (period == StatsPeriod.DAY) StatsPeriod.WEEK else StatsPeriod.DAY) }
.heightIn(min = 36.dp)
.padding(start = 14.dp, end = 10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(stringResource(period.label), color = Palette.Fg, fontSize = 12.sp, fontWeight = FontWeight.Bold)
Spacer(Modifier.width(4.dp))
Icon(painterResource(R.drawable.ic_expand), contentDescription = null, tint = Palette.Fg2, modifier = Modifier.size(16.dp))
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "add" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 11.5 12.5 H 6 v -1 h 5.5 V 6 h 1 v 5.5 H 18 v 1 h -5.5 V 18 h -1 z" />
android:pathData="M132.0,191.5L123.0,191.5L122.3,191.0L122.0,133.0L64.0,132.7L63.5,132.0L63.5,123.0L64.0,122.3L122.0,122.0L122.3,64.0L123.0,63.5L132.0,63.5L132.7,64.0L133.0,122.0L191.0,122.3L191.5,123.0L191.5,132.0L191.0,132.7L133.0,133.0L132.7,191.0Z" />
</vector> </vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:fillColor="#FFFFFFFF"
android:fillType="evenOdd"
android:pathData="M175.0,214.5L29.0,214.5L28.5,214.0L28.5,34.0L29.0,33.3L124.0,33.3L124.5,34.0L124.5,75.0L125.0,75.7L226.3,76.0L226.5,164.0L226.0,164.5L217.0,164.5L215.7,164.0L215.7,87.0L215.0,86.5L172.0,86.5L125.0,86.5L124.5,87.0L124.5,118.0L125.0,118.5L149.0,118.5L150.0,119.0L150.0,129.0L126.0,129.3L124.7,130.0L125.0,161.0L149.0,161.3L150.0,162.0L150.0,171.0L149.0,171.7L125.0,172.0L124.7,203.0L126.0,203.7L175.0,203.7L175.5,205.0L175.5,214.0ZM71.3,75.0L71.0,44.0L39.5,44.0L39.3,75.0L40.0,75.7L70.0,75.7ZM114.0,75.0L114.0,45.0L113.5,44.0L82.0,44.0L82.0,75.0L83.0,75.7L113.0,75.7ZM71.3,118.0L71.0,86.7L40.0,86.5L39.3,87.0L39.3,118.0L40.0,118.5L70.0,118.5ZM114.0,118.0L114.0,87.0L113.0,86.5L83.0,86.5L82.0,87.0L82.0,118.0L83.0,118.5L113.0,118.5ZM186.0,129.0L175.7,129.0L175.5,119.0L176.0,118.5L185.0,118.5L186.3,119.0ZM71.0,161.0L71.0,129.5L40.0,129.3L39.3,130.0L39.5,161.0ZM114.0,161.0L114.0,130.0L113.0,129.3L83.0,129.3L82.0,130.0L82.0,160.0L82.5,161.0ZM186.0,171.5L176.0,171.7L175.5,171.0L175.5,162.0L176.0,161.3L186.0,161.5ZM71.3,203.0L71.0,172.0L39.5,172.0L39.3,203.0L40.0,203.7L70.0,203.7ZM114.0,203.0L114.0,173.0L113.5,172.0L82.0,172.0L82.0,203.0L83.0,203.7L113.0,203.7ZM226.0,235.7L217.0,235.7L215.7,235.0L215.7,215.0L215.0,214.5L195.0,214.5L194.5,214.0L194.5,205.0L195.0,203.7L215.0,203.7L215.7,203.0L216.0,182.7L226.0,182.5L226.5,183.0L226.5,203.0L227.0,203.7L247.5,204.0L247.7,214.0L247.0,214.5L227.0,214.5L226.5,215.0L226.5,235.0Z" />
</vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "error" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 12 16.462 q .262 0 .439 -.177 q .176 -.177 .176 -.439 q 0 -.261 -.177 -.438 T 12 15.23 t -.438 .177 t -.177 .438 t .177 .439 t .438 .177 m -.5 -3.308 h 1 v -6 h -1 z M 12.003 21 q -1.866 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" />
android:pathData="M137.0,223.0L130.0,223.5L117.0,223.0L105.0,221.0L98.0,219.0L90.0,216.0L80.0,211.0L68.0,203.0L60.0,196.0L53.7,189.0L47.7,181.0L43.5,174.0L37.7,162.0L34.7,153.0L31.7,135.0L31.5,125.0L32.0,117.0L34.0,105.0L36.0,98.0L39.0,90.0L44.0,80.0L52.0,68.0L59.0,60.0L66.0,53.7L74.0,47.7L81.0,43.5L93.0,37.7L102.0,34.7L120.0,31.7L130.0,31.5L138.0,32.0L150.0,34.0L157.0,36.0L165.0,39.0L175.0,44.0L187.0,52.0L195.0,59.0L201.3,66.0L207.3,74.0L211.5,81.0L217.3,93.0L220.3,102.0L223.3,120.0L223.5,130.0L223.0,138.0L221.0,150.0L219.0,157.0L216.0,165.0L211.0,175.0L203.0,187.0L196.0,195.0L189.0,201.3L181.0,207.3L174.0,211.5L162.0,217.3L153.0,220.3ZM139.0,212.0L145.0,211.3L159.0,207.3L167.0,203.7L174.0,199.5L185.0,191.0L193.7,182.0L199.0,175.0L207.0,160.0L209.3,153.0L211.5,144.0L212.5,136.0L212.7,123.0L211.3,110.0L207.3,96.0L203.7,88.0L199.5,81.0L191.0,70.0L182.0,61.3L175.0,56.0L160.0,48.0L153.0,45.7L144.0,43.5L136.0,42.5L123.0,42.3L110.0,43.7L96.0,47.7L88.0,51.3L81.0,55.5L70.0,64.0L61.3,73.0L56.0,80.0L48.0,95.0L45.7,102.0L43.5,111.0L42.5,119.0L42.3,132.0L43.7,145.0L47.7,159.0L51.3,167.0L55.5,174.0L64.0,185.0L73.0,193.7L80.0,199.0L95.0,207.0L102.0,209.3L111.0,211.5L123.0,212.7L132.0,212.7ZM132.0,139.7L123.0,139.7L122.3,139.0L122.3,77.0L123.0,75.7L132.0,75.7L132.7,77.0L132.7,139.0ZM128.0,175.0L126.0,175.0L123.0,173.3L121.3,171.0L121.0,169.0L122.0,165.0L124.0,163.0L128.0,162.0L131.0,163.0L132.0,164.0L133.0,165.0L134.0,168.0L133.5,171.0L132.3,173.0L130.0,174.7Z" />
</vector> </vector>
-10
View File
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:fillColor="#FFFFFFFF"
android:fillType="evenOdd"
android:pathData="M226.0,181.0L29.0,181.0L28.5,180.0L28.7,177.0L32.0,161.0L36.0,150.0L44.0,135.0L49.0,128.0L59.0,117.3L67.0,110.7L76.0,105.0L76.7,104.0L59.7,74.0L60.0,70.0L62.0,68.0L65.0,67.0L66.0,67.0L69.3,69.0L87.0,98.7L99.0,94.7L102.0,94.3L107.0,92.7L113.0,91.7L126.0,90.7L140.0,91.5L148.0,92.7L159.0,95.5L165.0,98.0L168.0,98.7L173.0,91.0L173.0,90.0L177.0,84.0L184.0,71.0L186.0,68.7L188.0,67.3L191.0,67.0L193.0,68.0L195.3,71.0L195.0,75.0L186.0,90.0L186.0,91.0L182.0,97.0L179.0,103.0L178.0,104.0L187.0,110.0L196.7,118.0L205.0,127.0L212.3,137.0L217.7,147.0L223.3,162.0L223.7,165.0L225.3,170.0L225.7,175.0L226.3,177.0L226.7,180.0ZM83.5,156.0L87.0,155.3L90.3,153.0L93.0,149.0L93.5,146.0L93.3,142.0L92.5,140.0L90.0,136.7L86.0,134.3L81.0,133.7L76.0,135.7L74.3,137.0L72.3,140.0L71.3,144.0L71.7,149.0L74.3,153.0L77.0,155.0L83.0,156.3ZM174.0,156.0L177.0,155.3L180.0,153.3L182.0,151.0L183.3,148.0L183.7,144.0L183.3,141.0L180.7,137.0L177.0,134.5L172.0,133.7L168.0,134.7L164.7,137.0L162.0,141.0L161.3,145.0L161.7,148.0L162.7,150.0L166.0,154.0L169.0,155.5L173.0,156.3Z" />
</vector>
+4 -5
View File
@@ -1,11 +1,10 @@
<!-- Material Symbols Light "arrow-back" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:autoMirrored="true" android:viewportWidth="24"
android:viewportWidth="256" android:viewportHeight="24">
android:viewportHeight="256">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="m 6.921 12.5 l 5.793 5.792 L 12 19 l -7 -7 l 7 -7 l .714 .708 L 6.92 11.5 H 19 v 1 z" />
android:pathData="M128.0,201.7L127.0,201.7L53.3,128.0L53.3,127.0L127.0,53.3L128.0,53.3L134.7,60.0L134.3,61.0L74.3,121.0L73.7,122.0L74.0,122.3L201.0,122.3L202.3,123.0L202.3,132.0L201.0,132.7L73.5,133.0L134.3,194.0L134.7,195.0Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "check-circle" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="m 10.562 15.908 l 6.396 -6.396 l -.708 -.708 l -5.688 5.688 l -2.85 -2.85 l -.708 .708 z M 12.003 21 q -1.866 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" />
android:pathData="M101.0,184.0L49.0,132.0L48.5,131.0L49.0,130.3L56.0,123.7L101.0,168.7L102.0,168.3L199.0,71.3L200.0,72.0L206.0,78.0L206.3,79.0Z" />
</vector> </vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "chevron-right" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="m 13.292 12 l -4.6 -4.6 l .708 -.708 L 14.708 12 L 9.4 17.308 l -.708 -.708 z" />
</vector>
-10
View File
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:fillColor="#FFFFFFFF"
android:fillType="evenOdd"
android:pathData="M127.0,202.3L49.0,202.3L48.0,202.0L32.0,186.0L30.0,183.0L28.3,179.0L27.7,176.0L28.0,171.0L30.0,166.0L35.0,160.0L142.0,49.0L147.0,45.7L152.0,44.7L157.0,45.0L160.0,46.0L165.0,49.7L209.3,94.0L213.3,100.0L214.0,104.0L214.0,109.0L211.0,116.0ZM227.0,202.3L167.7,202.0L178.0,191.5L227.0,191.5L227.5,192.0L227.5,201.0Z" />
</vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "close" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="m 6.4 18.308 l -.708 -.708 l 5.6 -5.6 l -5.6 -5.6 l .708 -.708 l 5.6 5.6 l 5.6 -5.6 l .708 .708 l -5.6 5.6 l 5.6 5.6 l -.708 .708 l -5.6 -5.6 z" />
</vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "code" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 8 17.308 L 2.692 12 L 8 6.692 l .714 .714 l -4.6 4.6 L 8.708 16.6 z m 8 0 l -.713 -.714 l 4.6 -4.6 L 15.292 7.4 L 16 6.692 L 21.308 12 z" />
</vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "content-copy" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 9.116 17 q -.691 0 -1.153 -.462 T 7.5 15.385 V 4.615 q 0 -.69 .463 -1.153 T 9.116 3 h 7.769 q .69 0 1.153 .462 t .462 1.153 v 10.77 q 0 .69 -.462 1.152 T 16.884 17 z m -3 3 q -.691 0 -1.153 -.462 T 4.5 18.385 V 6.615 h 1 v 11.77 q 0 .23 .192 .423 t .423 .192 h 8.77 v 1 z" />
</vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "copyright" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 10 15.5 h 4 q .213 0 .356 -.144 T 14.5 15 v -1.5 h -1 v 1 h -3 v -5 h 3 v 1 h 1 V 9 q 0 -.214 -.144 -.357 T 14 8.5 h -4 q -.213 0 -.356 .144 T 9.5 9 v 6 q 0 .213 .144 .356 T 10 15.5 m 2.003 5.5 q -1.867 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" />
android:pathData="M137.0,223.0L130.0,223.5L117.0,223.0L105.0,221.0L98.0,219.0L90.0,216.0L80.0,211.0L68.0,203.0L60.0,196.0L53.7,189.0L47.7,181.0L43.5,174.0L37.7,162.0L34.7,153.0L31.7,135.0L31.5,125.0L32.0,117.0L34.0,105.0L36.0,98.0L39.0,90.0L44.0,80.0L52.0,68.0L59.0,60.0L66.0,53.7L74.0,47.7L81.0,43.5L93.0,37.7L102.0,34.7L120.0,31.7L130.0,31.5L138.0,32.0L150.0,34.0L157.0,36.0L165.0,39.0L175.0,44.0L187.0,52.0L195.0,59.0L201.3,66.0L207.3,74.0L211.5,81.0L217.3,93.0L220.3,102.0L223.3,120.0L223.5,130.0L223.0,138.0L221.0,150.0L219.0,157.0L216.0,165.0L211.0,175.0L203.0,187.0L196.0,195.0L189.0,201.3L181.0,207.3L174.0,211.5L162.0,217.3L153.0,220.3ZM139.0,212.0L145.0,211.3L159.0,207.3L167.0,203.7L174.0,199.5L185.0,191.0L193.7,182.0L199.0,175.0L207.0,160.0L209.3,153.0L211.5,144.0L212.5,136.0L212.7,123.0L211.3,110.0L207.3,96.0L203.7,88.0L199.5,81.0L191.0,70.0L182.0,61.3L175.0,56.0L160.0,48.0L153.0,45.7L144.0,43.5L136.0,42.5L123.0,42.3L110.0,43.7L96.0,47.7L88.0,51.3L81.0,55.5L70.0,64.0L61.3,73.0L56.0,80.0L48.0,95.0L45.7,102.0L43.5,111.0L42.5,119.0L42.3,132.0L43.7,145.0L47.7,159.0L51.3,167.0L55.5,174.0L64.0,185.0L73.0,193.7L80.0,199.0L95.0,207.0L102.0,209.3L111.0,211.5L123.0,212.7L132.0,212.7ZM151.0,164.3L106.0,164.7L103.0,164.0L101.5,162.0L100.7,160.0L100.7,96.0L102.0,92.0L104.0,90.7L149.0,90.3L152.0,91.0L153.5,93.0L154.3,95.0L154.0,111.3L144.0,111.5L143.5,111.0L143.5,102.0L143.0,100.7L112.0,100.7L111.5,102.0L111.7,154.0L143.0,154.3L143.5,153.0L143.5,144.0L144.0,143.5L154.0,143.7L154.3,159.0L153.0,163.0Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "delete" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 7.616 20 q -.691 0 -1.153 -.462 T 6 18.384 V 6 H 5 V 5 h 4 v -.77 h 6 V 5 h 4 v 1 h -1 v 12.385 q 0 .69 -.462 1.153 T 16.384 20 z m 2.192 -3 h 1 V 8 h -1 z m 3.384 0 h 1 V 8 h -1 z" />
android:pathData="M179.0,212.3L79.0,212.7L75.0,212.0L71.0,210.0L67.7,207.0L65.0,203.0L63.7,199.0L63.5,196.0L63.5,64.0L63.0,63.5L54.0,63.5L52.7,63.0L53.0,53.0L95.0,52.7L95.5,52.0L95.5,45.0L96.0,44.5L159.0,44.5L159.5,45.0L159.5,52.0L160.0,52.7L202.0,53.0L202.3,63.0L201.0,63.5L192.0,63.5L191.5,64.0L191.5,197.0L190.5,202.0L189.0,205.0L185.0,209.3L182.0,211.3ZM114.7,180.0L114.7,86.0L114.0,84.7L105.0,84.7L104.0,85.0L104.0,180.0L105.0,180.7L114.0,180.7ZM151.0,180.0L151.0,86.0L150.0,84.7L141.0,84.7L140.3,86.0L140.3,180.0L141.0,180.7L150.0,180.7Z" />
</vector> </vector>
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "delete-sweep" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 14.885 17.5 v -1 h 3 v 1 z m 0 -8 v -1 h 6 v 1 z m 0 4 v -1 h 5 v 1 z M 4.115 8 h -1 V 7 h 3.731 v -.885 h 2.538 V 7 h 3.732 v 1 h -1 v 8.385 q 0 .69 -.463 1.153 T 10.5 18 H 5.73 q -.69 0 -1.152 -.462 t -.462 -1.153 z" />
</vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "volunteer-activism" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 6.385 19.583 v -6.737 h 2.08 q .137 0 .283 .028 t .283 .078 l 6.021 2.21 q .446 .163 .736 .536 q .289 .373 .289 .839 q 0 .275 -.18 .446 t -.443 .17 h -1.202 q -.51 0 -.995 -.06 t -.951 -.226 l -1.792 -.644 l -.287 .744 l 1.964 .675 q .472 .16 .976 .22 q .504 .061 1.021 .061 h 5.158 q .685 0 1.17 .45 T 21 19.5 l -6.994 2.308 z m -4 1.417 v -8.154 h 3 V 21 z m 13.307 -8.615 l -3.765 -3.608 q -.66 -.635 -1.101 -1.422 q -.442 -.788 -.442 -1.709 q 0 -1.106 .77 -1.876 T 13.032 3 q .819 0 1.49 .443 t 1.171 1.076 q .5 -.633 1.172 -1.076 q .67 -.443 1.49 -.443 q 1.106 0 1.876 .77 T 21 5.646 q 0 .921 -.438 1.709 t -1.099 1.422 z" />
</vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "keyboard-arrow-down" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 12 14.708 L 6.692 9.4 l .708 -.708 l 4.6 4.6 l 4.6 -4.6 l .708 .708 z" />
android:pathData="M128.0,201.7L127.0,201.7L53.3,128.0L53.3,127.0L60.0,120.3L61.0,120.7L121.0,180.7L122.0,181.3L122.3,181.0L122.3,54.0L123.0,52.7L132.0,52.7L132.7,54.0L133.0,181.5L194.0,120.7L195.0,120.3L201.7,127.0L201.7,128.0Z" />
</vector> </vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "filter-alt" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 11.77 19 q -.33 0 -.55 -.22 t -.22 -.55 v -5.576 L 5.604 5.83 q -.202 -.27 -.055 -.55 t .47 -.28 h 11.962 q .323 0 .47 .28 q .147 .282 -.055 .55 L 13 12.655 v 5.577 q 0 .328 -.22 .549 t -.55 .22 z" />
</vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "headphones" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 8.077 20 H 5.616 q -.691 0 -1.153 -.462 T 4 18.384 V 12 q 0 -1.664 .626 -3.118 T 6.34 6.34 t 2.542 -1.714 T 12 4 t 3.118 .626 T 17.66 6.34 t 1.714 2.542 T 20 12 v 6.385 q 0 .69 -.462 1.152 T 18.384 20 h -2.461 v -6.154 H 19 V 12 q 0 -2.925 -2.037 -4.962 T 12 5 T 7.038 7.038 T 5 12 v 1.846 h 3.077 z" />
android:pathData="M206.0,180.3L84.0,180.7L80.0,180.0L76.0,178.0L73.0,175.0L69.7,170.0L68.7,164.0L68.7,49.0L70.0,42.0L71.7,39.0L75.0,35.3L79.0,32.7L82.0,31.7L85.0,31.5L202.0,31.5L207.0,32.5L213.0,36.0L215.3,39.0L217.3,43.0L218.3,48.0L218.3,163.0L218.0,167.0L215.0,174.0L212.0,177.0ZM131.0,156.0L138.0,154.7L142.0,152.3L148.0,146.0L150.3,140.0L151.0,135.0L151.0,74.0L172.0,73.7L175.0,73.0L177.0,71.7L178.0,71.0L180.0,66.0L179.0,62.0L177.7,60.0L175.0,58.0L171.0,57.3L151.0,57.3L148.0,57.7L145.0,60.0L143.0,63.0L142.7,65.0L142.7,118.0L142.0,118.7L139.0,116.0L138.0,116.0L137.0,115.0L132.0,113.7L126.0,113.7L122.0,114.7L118.0,116.7L114.0,120.0L111.0,124.0L109.5,127.0L108.5,131.0L108.5,139.0L109.7,143.0L112.7,148.0L118.0,153.0L122.0,155.0L129.0,156.3ZM177.0,212.0L175.0,212.7L52.0,212.7L48.0,212.0L44.0,210.0L41.0,207.0L37.7,202.0L36.7,196.0L36.7,76.0L38.0,72.0L40.0,70.5L44.0,70.5L46.3,72.0L47.5,75.0L47.5,196.0L49.3,200.0L52.0,201.7L55.0,202.3L175.0,202.3L178.0,203.7L179.3,206.0L179.0,210.0Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "sports-esports" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 4.512 18 q -.762 0 -1.18 -.551 t -.32 -1.23 L 4.1 8.604 q .167 -1.132 .991 -1.868 Q 5.916 6 7.05 6 h 9.9 q 1.135 0 1.959 .736 t .991 1.868 l 1.089 7.615 q .098 .679 -.32 1.23 t -1.18 .551 q -.333 0 -.6 -.101 t -.508 -.341 L 15.823 15 H 8.177 l -2.558 2.558 q -.24 .24 -.507 .341 t -.6 .101 M 17 12.808 q .329 0 .568 -.24 t .24 -.568 t -.24 -.568 t -.568 -.24 t -.568 .24 t -.24 .568 t .24 .568 t .568 .24 m -2 -3 q .329 0 .568 -.24 t .24 -.568 t -.24 -.568 t -.568 -.24 t -.568 .24 t -.24 .568 t .24 .568 t .568 .24 m -6.942 2.884 h .884 v -1.75 h 1.75 v -.884 h -1.75 v -1.75 h -.884 v 1.75 h -1.75 v .884 h 1.75 z" />
android:pathData="M131.0,222.0L128.0,222.5L123.0,222.0L113.0,217.0L100.0,209.0L99.0,209.0L93.0,205.0L80.0,198.0L74.0,194.0L73.0,194.0L67.0,190.0L54.0,183.0L48.0,179.0L44.7,175.0L42.7,170.0L42.3,167.0L42.7,149.0L44.0,145.0L47.0,141.0L53.0,136.7L122.0,97.0L122.0,84.0L119.0,83.5L112.0,80.0L106.7,75.0L102.7,68.0L100.7,59.0L101.5,52.0L103.0,47.0L107.0,41.0L112.0,36.3L117.0,33.5L123.0,31.7L127.0,31.5L131.0,31.7L137.0,33.0L144.0,37.0L150.3,44.0L152.3,48.0L153.3,51.0L154.3,58.0L154.0,62.0L152.5,68.0L149.0,74.0L145.0,78.3L142.0,80.7L137.0,83.3L134.0,83.7L132.7,85.0L133.0,97.0L148.0,106.0L149.0,106.0L155.0,110.0L161.0,113.0L162.0,114.0L168.0,117.0L169.0,118.0L175.0,121.0L181.0,125.0L182.0,125.0L188.0,129.0L201.0,136.0L207.0,140.0L210.3,144.0L211.3,146.0L212.7,152.0L212.3,170.0L211.0,174.0L208.0,178.0L202.0,182.3L173.0,198.7L164.0,204.3L136.0,220.3ZM129.5,182.0L193.7,145.0L190.0,142.0L177.0,135.0L171.0,131.0L170.0,131.0L164.0,127.0L151.0,120.0L138.0,112.0L133.0,109.7L132.7,143.0L132.0,143.5L123.0,143.5L122.3,143.0L122.0,109.5L62.0,143.7L61.0,145.0L84.0,158.0L90.0,162.0L91.0,162.0L104.0,170.0L110.0,173.0L116.0,177.0L117.0,177.0L123.0,181.0L127.0,182.5Z" />
</vector> </vector>
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "image" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 5.616 20 q -.691 0 -1.153 -.462 T 4 18.384 V 5.616 q 0 -.691 .463 -1.153 T 5.616 4 h 12.769 q .69 0 1.153 .463 T 20 5.616 v 12.769 q 0 .69 -.462 1.153 T 18.384 20 z M 7.5 16.5 h 9.154 l -2.827 -3.77 l -2.615 3.308 l -1.75 -2.115 z" />
android:pathData="M206.0,180.3L84.0,180.7L80.0,180.0L76.0,178.0L73.0,175.0L69.7,170.0L68.7,164.0L68.7,49.0L70.0,42.0L71.7,39.0L75.0,35.3L79.0,32.7L82.0,31.7L85.0,31.5L202.0,31.5L207.0,32.5L213.0,36.0L215.3,39.0L217.3,43.0L218.3,48.0L218.3,163.0L218.0,167.0L215.0,174.0L212.0,177.0ZM179.0,212.7L52.0,212.7L48.0,212.0L44.0,210.0L41.0,207.0L37.7,202.0L36.7,196.0L37.0,70.5L38.0,70.0L47.0,70.0L47.5,71.0L47.5,196.0L49.3,200.0L52.0,201.7L55.0,202.3L179.0,202.3L179.5,203.0L179.5,212.0ZM189.3,145.0L164.7,112.0L161.0,107.3L160.0,107.0L135.0,138.5L134.0,139.0L133.0,138.0L118.0,120.0L117.0,120.0L97.5,145.0L98.0,145.5L188.0,145.5Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "map" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="m 15 19.923 l -6 -2.1 l -3.958 1.53 q -.384 .143 -.713 -.083 T 4 18.634 V 6.404 q 0 -.268 .13 -.489 t .378 -.307 L 9 4.077 l 6 2.1 l 3.958 -1.53 q .384 -.143 .713 .054 t .329 .588 v 12.384 q 0 .287 -.159 .498 q -.158 .212 -.426 .298 z m -.5 -1.22 v -11.7 l -5 -1.745 v 11.7 z" />
android:pathData="M159.0,212.0L103.0,192.0L95.0,189.7L89.0,192.3L87.0,192.7L84.0,194.3L82.0,194.7L76.0,197.3L74.0,197.7L71.0,199.3L69.0,199.7L52.0,206.3L49.0,206.5L44.3,204.0L42.3,200.0L42.3,67.0L42.5,65.0L45.0,61.0L49.0,58.7L96.0,43.0L152.0,63.0L160.0,65.3L166.0,62.7L168.0,62.3L171.0,60.7L173.0,60.3L179.0,57.7L181.0,57.3L184.0,55.7L186.0,55.3L203.0,48.7L206.0,48.5L208.0,49.0L211.0,51.0L212.7,54.0L212.5,191.0L209.0,195.3L205.0,197.3L199.0,199.3L196.0,199.7ZM154.3,198.0L154.0,74.0L150.0,73.0L140.0,69.0L130.0,66.0L101.0,55.7L100.7,180.0L102.0,181.0L109.0,183.0L142.0,195.0L153.0,198.5L154.0,198.5Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "news" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 5.616 20 q -.691 0 -1.153 -.462 T 4 18.384 V 5.616 q 0 -.691 .463 -1.153 T 5.616 4 h 9.961 L 20 8.423 v 9.962 q 0 .69 -.462 1.153 T 18.384 20 z M 7.5 16 h 9 v -1 h -9 z m 0 -3.5 h 9 v -1 h -9 z M 15 9 h 4 l -4 -4 z M 7.5 9 H 12 V 8 H 7.5 z" />
android:pathData="M201.0,212.0L198.0,212.7L58.0,212.7L55.0,212.3L51.0,211.0L47.0,208.0L43.7,203.0L42.3,198.0L42.3,58.0L42.7,55.0L44.0,51.0L48.0,46.3L52.0,43.7L57.0,42.3L165.0,42.3L166.0,42.7L212.3,89.0L212.5,199.0L211.0,204.0L208.0,208.0L205.0,210.3ZM201.7,95.0L160.0,53.3L159.5,54.0L159.5,95.0L160.0,95.5L201.0,95.5ZM127.5,95.0L127.5,86.0L127.0,84.7L79.7,85.0L79.5,95.0L80.0,95.5L127.0,95.5ZM175.5,132.0L175.5,123.0L175.0,122.3L80.0,122.3L79.5,123.0L79.5,132.0L80.0,132.7L175.0,132.7ZM175.3,170.0L175.5,160.0L175.0,159.5L80.0,159.5L79.5,160.0L79.5,169.0L80.0,170.3Z" />
</vector> </vector>
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "business-center" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 4.616 20 q -.691 0 -1.153 -.462 T 3 18.384 V 14.5 h 7 V 16 h 4 v -1.5 h 7 v 3.885 q 0 .69 -.462 1.152 T 19.385 20 z M 11 15 v -2 h 2 v 2 z m -8 -1.5 V 8.616 q 0 -.691 .463 -1.153 T 4.615 7 H 9 V 5.615 q 0 -.69 .463 -1.153 T 10.616 4 h 2.769 q .69 0 1.153 .462 T 15 5.615 V 7 h 4.385 q .69 0 1.152 .463 T 21 8.616 V 13.5 h -7 V 12 h -4 v 1.5 z M 10 7 h 4 V 5.615 q 0 -.23 -.192 -.423 T 13.385 5 h -2.77 q -.23 0 -.423 .192 T 10 5.615 z" />
android:pathData="M211.0,212.3L47.0,212.7L43.0,212.0L39.0,210.0L35.7,207.0L33.0,203.0L31.7,199.0L31.5,196.0L31.5,90.0L32.5,85.0L34.0,82.0L39.0,77.0L41.0,75.7L45.0,74.5L95.0,74.3L95.5,73.0L95.5,58.0L97.0,52.0L99.7,48.0L103.0,45.0L106.0,43.3L111.0,42.3L144.0,42.3L148.0,43.0L152.0,45.0L156.0,49.0L158.3,53.0L159.3,56.0L159.5,73.0L160.0,74.3L208.0,74.3L212.0,75.0L216.0,77.0L220.0,81.0L222.3,85.0L223.3,88.0L223.5,197.0L222.5,202.0L221.0,205.0L216.0,210.0L214.0,211.3ZM148.5,74.0L148.3,57.0L147.0,55.0L145.0,53.7L142.0,52.7L113.0,52.7L110.0,53.7L108.0,55.0L106.5,58.0L106.3,73.0L107.0,74.3Z" />
</vector> </vector>
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "forum" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 7.23 16.23 q -.326 0 -.547 -.22 q -.221 -.222 -.221 -.549 v -1 h 11.75 l .634 .635 V 6 h 1 q .327 0 .548 .221 t .222 .548 v 12.539 l -3.078 -3.077 z m -3.845 -.691 V 3.769 q 0 -.327 .22 -.548 Q 3.828 3 4.155 3 h 11.923 q .327 0 .548 .221 t .221 .548 v 7.923 q 0 .327 -.221 .549 q -.221 .22 -.548 .22 H 6.462 z" />
android:pathData="M219.0,228.0L218.0,228.7L40.0,228.7L39.0,228.0L39.0,187.0L38.0,186.3L32.0,186.3L31.0,186.0L30.7,185.0L31.0,146.0L32.0,144.0L34.0,142.7L36.0,142.3L61.0,142.3L64.0,143.5L65.3,145.0L66.0,148.0L66.0,186.0L59.0,186.3L57.7,187.0L58.0,218.0L155.0,218.0L155.0,154.0L154.0,153.0L130.0,153.0L125.0,152.5L119.0,151.0L111.0,147.0L106.3,143.0L102.0,138.0L98.7,132.0L96.7,125.0L96.7,114.0L99.0,106.0L103.0,99.0L112.0,90.0L122.0,84.0L123.5,75.0L125.5,69.0L129.0,63.0L135.0,56.3L143.0,50.7L147.0,48.7L153.0,47.3L154.0,46.7L166.0,46.7L173.0,48.5L180.0,52.0L186.0,56.7L191.0,62.0L196.3,72.0L198.3,84.0L206.0,88.0L210.0,91.0L216.7,98.0L220.0,103.0L222.7,109.0L224.3,117.0L224.3,121.0L223.0,129.0L222.0,132.0L220.0,135.0L220.0,136.0L214.3,143.0L209.0,147.3L203.0,150.5L197.0,152.3L190.0,153.0L167.0,153.0L165.7,154.0L165.7,217.0L166.0,218.0L167.0,218.3L218.0,218.3L219.0,219.0ZM52.0,131.0L49.0,131.5L44.0,131.0L40.0,128.3L37.7,125.0L36.5,120.0L37.0,116.0L39.0,112.0L44.0,108.5L48.0,107.7L54.0,109.3L57.0,111.5L59.3,115.0L59.7,118.0L60.3,119.0L59.5,124.0L57.0,128.0Z" />
</vector> </vector>
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "android" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 2.692 17.02 q .206 -2.272 1.398 -4.173 q 1.192 -1.9 3.176 -3.02 l -1.562 -2.7 q -.131 -.206 -.066 -.408 q .066 -.202 .277 -.327 q .2 -.106 .393 -.04 q .192 .065 .319 .256 l 1.565 2.715 q 1.82 -.764 3.808 -.764 t 3.808 .764 l 1.565 -2.715 q .127 -.19 .32 -.256 q .192 -.066 .391 .04 q .212 .125 .278 .327 q .065 .202 -.066 .408 l -1.561 2.7 q 1.983 1.12 3.175 3.02 q 1.192 1.901 1.398 4.172 z m 5.08 -2.328 q .445 0 .75 -.307 q .305 -.308 .305 -.753 t -.308 -.75 t -.752 -.305 t -.75 .308 t -.306 .752 q 0 .446 .308 .75 t .753 .305 m 8.462 0 q .445 0 .75 -.307 q .304 -.308 .304 -.753 t -.307 -.75 t -.753 -.305 t -.75 .308 t -.305 .752 t .307 .75 t .753 .305" />
android:pathData="M147.0,223.5L108.0,223.5L107.5,223.0L106.7,218.0L106.3,212.0L105.7,210.0L105.3,204.0L104.7,202.0L103.7,193.0L91.0,187.0L83.0,181.0L75.0,183.7L70.0,186.3L68.0,186.7L56.0,192.3L54.0,192.3L34.7,159.0L34.7,158.0L37.0,156.0L58.0,140.3L58.7,139.0L57.7,130.0L58.7,116.0L56.0,113.0L54.0,112.0L52.0,110.0L34.5,97.0L38.0,90.0L42.0,84.0L42.0,83.0L54.0,63.0L58.0,64.0L82.0,74.5L92.0,67.7L103.0,62.5L104.0,60.0L107.0,35.0L108.0,31.5L147.0,31.5L147.5,32.0L148.3,38.0L150.7,59.0L152.0,63.0L153.0,63.0L163.0,68.0L172.0,74.3L178.0,71.7L180.0,71.3L183.0,69.7L185.0,69.3L195.0,64.7L201.0,62.7L220.3,96.0L220.3,97.0L218.0,99.0L195.5,116.0L196.3,121.0L196.5,128.0L196.3,133.0L195.3,139.0L196.0,140.0L220.0,158.0L220.0,159.0L219.0,160.0L204.0,187.0L201.0,192.0L200.0,192.5L172.0,180.5L161.0,188.3L153.0,191.7L151.3,193.0L151.0,194.0L148.0,220.0ZM129.0,154.0L134.0,153.3L138.0,152.0L143.0,149.0L146.5,146.0L149.0,143.0L152.0,138.0L153.5,133.0L153.7,125.0L153.3,121.0L150.3,114.0L145.0,107.7L142.0,105.0L137.0,102.5L127.0,100.7L120.0,101.7L117.0,102.7L113.0,104.7L107.0,110.0L104.0,114.0L102.5,117.0L101.0,122.0L100.5,128.0L101.7,136.0L105.3,143.0L110.0,148.0L116.0,152.0L119.0,153.0L124.0,154.0Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "movie" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="m 4.616 5 l 1.5 3 h 3 l -1.5 -3 h 2 l 1.5 3 h 3 l -1.5 -3 h 2 l 1.5 3 h 3 l -1.5 -3 h 1.769 q .69 0 1.153 .463 T 21 6.616 v 10.769 q 0 .69 -.462 1.153 T 19.385 19 H 4.615 q -.69 0 -1.152 -.462 T 3 17.384 V 6.616 q 0 -.691 .463 -1.153 T 4.615 5" />
android:pathData="M206.0,180.3L84.0,180.7L80.0,180.0L76.0,178.0L73.0,175.0L69.7,170.0L68.7,164.0L68.7,49.0L70.0,42.0L71.7,39.0L75.0,35.3L79.0,32.7L82.0,31.7L85.0,31.5L202.0,31.5L207.0,32.5L213.0,36.0L215.3,39.0L217.3,43.0L218.3,48.0L218.3,163.0L218.0,167.0L215.0,174.0L212.0,177.0ZM177.0,212.0L175.0,212.7L52.0,212.7L48.0,212.0L44.0,210.0L41.0,207.0L37.7,202.0L36.7,196.0L36.7,76.0L38.0,72.0L40.0,70.5L44.0,70.5L46.3,72.0L47.5,75.0L47.5,196.0L49.3,200.0L52.0,201.7L55.0,202.3L175.0,202.3L178.0,203.7L179.3,206.0L179.0,210.0ZM129.5,139.0L131.0,138.7L135.0,136.3L173.0,111.7L175.5,109.0L176.3,106.0L175.3,103.0L173.0,100.7L160.0,92.0L156.0,90.0L132.0,74.0L127.0,73.3L124.0,75.0L122.3,79.0L122.3,134.0L125.0,138.0L127.0,139.0Z" />
</vector> </vector>
-10
View File
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:fillColor="#FFFFFFFF"
android:fillType="evenOdd"
android:pathData="M122.0,212.5L56.0,212.5L54.0,212.0L49.0,209.3L47.3,208.0L43.7,203.0L42.3,198.0L42.3,58.0L43.0,54.0L47.0,47.3L52.0,43.7L57.0,42.3L197.0,42.3L201.0,43.0L207.7,47.0L211.3,52.0L212.7,57.0L212.7,122.0L212.0,122.5L201.0,120.0L191.0,119.3L182.0,120.0L171.0,122.5L80.0,122.3L79.5,123.0L79.5,132.0L80.0,132.7L149.0,133.0L148.0,134.3L142.0,139.0L136.0,145.3L131.0,152.0L128.0,157.0L128.0,158.0L127.0,159.0L127.0,160.0L125.0,162.3L80.0,162.3L79.5,163.0L79.5,172.0L80.0,173.0L121.0,173.0L121.5,174.0L119.7,184.0L119.3,194.0L119.7,202.0L120.7,208.0L122.3,212.0ZM175.5,92.0L175.5,83.0L175.0,82.0L80.0,82.0L79.5,83.0L79.5,92.0L80.0,92.7L175.0,92.7ZM196.0,235.0L189.0,235.3L182.0,234.5L174.0,232.0L173.0,231.0L167.0,228.0L160.3,222.0L155.0,215.0L151.7,209.0L149.5,201.0L149.3,196.0L148.7,193.0L149.5,184.0L152.0,176.0L155.0,171.0L155.0,170.0L159.0,165.0L167.0,157.7L176.0,152.7L182.0,151.3L183.0,150.7L192.0,150.0L201.0,151.0L208.0,153.0L209.0,154.0L210.0,154.0L215.0,157.0L219.0,160.0L226.3,168.0L231.3,177.0L233.3,183.0L234.3,192.0L233.5,201.0L231.5,208.0L227.5,216.0L221.0,223.7L212.0,230.3L208.0,232.3L202.0,234.3ZM171.5,199.0L174.0,197.0L175.3,194.0L175.3,191.0L174.3,189.0L171.0,186.0L167.0,185.7L165.0,186.3L163.0,188.0L161.5,191.0L161.3,194.0L162.0,196.0L163.5,198.0L166.0,199.5L168.0,200.0ZM195.0,199.0L198.0,196.0L198.5,194.0L198.3,190.0L196.0,187.0L192.0,185.5L190.0,185.7L186.0,188.0L184.5,191.0L184.7,195.0L185.7,197.0L189.0,199.5L191.0,200.0ZM218.0,199.0L220.0,197.5L221.5,195.0L221.3,190.0L219.0,187.0L216.0,185.7L213.0,185.7L210.0,187.3L208.0,190.0L207.5,192.0L207.7,195.0L209.0,197.0L212.0,199.5L216.0,199.7Z" />
</vector>
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "encrypted" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 10.98 14.5 h 2.04 l -.556 -3.09 q .442 -.154 .73 -.543 T 13.48 10 q 0 -.613 -.434 -1.047 q -.433 -.434 -1.047 -.434 t -1.047 .434 T 10.519 10 q 0 .479 .288 .867 t .73 .542 z M 12 20.962 q -3.014 -.895 -5.007 -3.651 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 3.454 -1.993 6.21 T 12 20.963" />
android:pathData="M128.0,242.3L124.0,241.5L112.0,236.0L111.0,236.0L110.0,235.0L109.0,235.0L108.0,234.0L107.0,234.0L102.0,231.0L99.0,230.0L86.0,222.0L79.0,217.0L68.0,208.0L58.3,198.0L49.7,187.0L42.7,176.0L37.7,166.0L34.7,159.0L30.7,147.0L28.3,136.0L27.7,135.0L27.3,131.0L26.7,130.0L25.3,118.0L24.7,116.0L23.5,95.0L23.7,79.0L25.0,62.0L26.0,58.0L28.0,54.0L30.7,50.0L35.0,45.7L41.0,41.7L43.0,41.3L46.0,39.7L105.0,20.3L108.0,18.7L114.0,16.7L122.0,14.7L127.0,14.3L133.0,14.7L140.0,16.5L164.0,25.0L211.0,40.5L218.0,44.0L224.3,50.0L227.0,54.0L229.3,59.0L229.7,62.0L230.3,63.0L231.5,83.0L231.3,102.0L230.5,114.0L228.5,129.0L226.0,141.0L221.0,157.0L219.0,161.0L217.0,167.0L216.0,168.0L216.0,169.0L215.0,170.0L210.0,180.0L204.0,189.0L196.0,198.7L188.0,207.0L178.0,215.3L167.0,223.3L155.0,230.3L141.0,237.3L139.0,237.7L134.0,240.3ZM128.5,225.0L139.0,220.5L151.0,214.3L161.0,208.0L170.0,201.3L185.0,187.0L191.3,179.0L198.0,169.0L199.0,166.0L200.0,165.0L203.0,159.0L203.0,158.0L207.0,149.0L209.0,141.0L210.0,139.0L212.0,130.0L214.5,113.0L215.5,98.0L215.5,83.0L214.3,65.0L213.7,63.0L211.0,59.0L209.0,57.5L204.0,55.0L185.0,49.0L133.0,31.0L127.0,30.3L123.0,30.7L87.0,42.7L84.0,44.3L49.0,55.7L46.0,57.3L43.0,60.0L40.5,66.0L39.5,83.0L39.5,98.0L40.7,115.0L41.3,117.0L41.7,122.0L43.7,133.0L44.3,134.0L44.7,138.0L47.3,145.0L47.7,148.0L51.7,158.0L57.7,170.0L64.3,180.0L70.0,187.0L81.0,198.0L91.0,206.0L105.0,215.0L106.0,215.0L110.0,217.5L127.0,225.5Z" />
</vector> </vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "policy" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 12 20.962 q -3.014 -.895 -5.007 -3.651 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 1.498 -.422 2.88 t -1.14 2.674 l -2.95 -2.95 q .237 -.379 .375 -.814 Q 15 12.454 15 12 q 0 -1.246 -.877 -2.123 T 12 9 t -2.123 .877 T 9 12 t .877 2.123 T 12 15 q .487 0 .941 -.147 q .455 -.147 .828 -.441 l 3.071 3.065 q -1.011 1.167 -2.18 2.11 T 12 20.962 M 12 14 q -.825 0 -1.412 -.587 T 10 12 t .588 -1.412 T 12 10 t 1.413 .588 T 14 12 t -.587 1.413 T 12 14" />
</vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "verified-user" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 10.95 14.858 L 15.908 9.9 l -.714 -.713 l -4.244 4.244 l -2.138 -2.139 l -.714 .714 z M 12 20.96 q -3.013 -.894 -5.007 -3.65 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 3.454 -1.993 6.21 T 12 20.963" />
android:pathData="M196.0,182.0L186.0,182.0L174.0,180.0L157.0,174.0L152.0,171.0L145.3,165.0L140.7,159.0L133.7,147.0L130.0,143.0L128.0,142.7L125.0,143.3L122.0,146.0L113.0,161.0L106.7,168.0L101.0,172.3L87.0,178.3L84.0,178.7L80.0,180.3L76.0,180.7L75.0,181.3L65.0,182.3L58.0,182.0L46.0,180.0L29.0,174.0L27.5,172.0L24.7,164.0L24.3,161.0L22.7,157.0L20.7,147.0L19.5,137.0L19.7,118.0L19.0,117.0L14.0,117.0L13.7,116.0L21.3,86.0L22.0,85.3L27.0,85.0L28.0,82.0L30.0,80.7L56.0,77.3L57.0,76.7L58.0,77.0L76.0,75.3L78.0,74.7L89.0,74.3L94.0,73.7L123.0,72.7L153.0,73.3L176.0,74.7L206.0,78.0L227.0,81.5L227.7,84.0L228.5,85.0L233.0,85.3L233.7,86.0L241.3,116.0L241.0,117.0L234.0,117.0L233.5,118.0L234.0,131.0L233.3,142.0L231.0,157.0L228.0,171.0L227.0,173.3L220.0,176.3L218.0,176.7L215.0,178.3L212.0,178.7L208.0,180.3L204.0,180.7L203.0,181.3ZM198.0,173.0L207.0,171.3L216.0,168.3L219.0,166.7L220.3,164.0L224.0,144.0L225.0,126.0L223.3,106.0L220.0,90.0L219.0,89.0L198.0,86.0L173.0,83.5L131.0,81.7L109.0,82.0L107.0,85.0L103.0,95.0L97.0,113.0L96.0,118.0L94.0,124.0L89.5,147.0L87.7,168.0L88.0,168.3L91.0,166.7L93.0,166.3L98.0,163.3L104.0,158.0L113.0,143.0L115.0,141.0L116.0,139.0L118.3,137.0L122.0,134.7L128.0,133.7L134.0,135.0L138.0,138.0L144.3,147.0L149.7,156.0L155.0,162.0L158.0,164.0L169.0,169.0L179.0,172.0L190.0,173.5ZM56.3,172.0L59.0,151.0L63.0,131.0L63.0,129.0L69.0,105.0L75.3,86.0L75.5,85.0L75.0,84.3L64.0,85.3L63.0,86.0L58.5,96.0L54.5,107.0L49.0,127.0L45.5,148.0L44.0,169.0L45.0,170.3L51.0,172.0L55.0,172.7ZM35.3,164.0L36.7,146.0L40.0,126.0L45.0,107.0L50.0,93.0L52.0,89.0L52.0,86.7L50.0,87.3L38.0,88.7L35.0,90.0L31.0,104.0L28.5,120.0L28.5,137.0L29.7,146.0L32.7,159.0L35.0,165.0Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "refresh" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 12.077 19 q -2.931 0 -4.966 -2.033 q -2.034 -2.034 -2.034 -4.964 t 2.034 -4.966 T 12.077 5 q 1.783 0 3.339 .847 q 1.555 .847 2.507 2.365 V 5 h 1 v 5.23 h -5.23 v -1 h 3.7 q -.782 -1.495 -2.198 -2.363 T 12.077 6 q -2.5 0 -4.25 1.75 T 6.077 12 t 1.75 4.25 t 4.25 1.75 q 1.925 0 3.475 -1.1 t 2.175 -2.9 h 1.062 q -.662 2.246 -2.514 3.623 T 12.077 19" />
android:pathData="M139.0,212.3L138.3,211.0L138.3,202.0L139.0,201.3L149.0,198.3L161.0,192.3L169.0,186.3L176.3,179.0L183.0,170.0L188.5,158.0L190.5,150.0L191.5,141.0L191.3,131.0L189.3,120.0L187.3,114.0L184.3,108.0L181.3,103.0L175.0,95.0L170.0,90.0L165.0,86.0L159.0,82.0L155.0,80.0L154.0,80.0L153.0,79.0L146.0,76.7L135.0,74.5L122.0,74.5L121.7,75.0L137.7,91.0L130.0,98.5L100.3,69.0L130.0,39.3L131.0,39.7L137.3,46.0L137.0,47.0L121.0,63.0L122.0,63.5L135.0,63.7L148.0,66.0L157.0,69.0L158.0,70.0L159.0,70.0L163.0,72.0L171.0,77.0L176.0,81.0L185.0,90.0L187.3,93.0L190.3,97.0L196.3,108.0L200.3,120.0L202.3,137.0L201.5,149.0L198.5,162.0L192.0,176.0L184.0,187.0L173.0,197.3L164.0,203.3L151.0,209.3L148.0,209.7L144.0,211.3L140.0,211.7ZM116.0,211.7L107.0,210.0L98.0,207.0L88.0,202.0L81.0,197.0L71.7,188.0L64.7,179.0L58.7,168.0L58.3,166.0L55.7,160.0L53.7,151.0L52.7,139.0L53.5,128.0L55.7,118.0L58.0,111.0L63.0,101.0L69.0,92.0L75.0,85.5L82.5,93.0L76.0,100.0L72.0,106.0L68.0,114.0L66.0,120.0L64.5,126.0L63.5,136.0L63.7,145.0L65.7,156.0L68.7,164.0L74.3,174.0L79.0,180.0L87.0,188.0L94.0,193.0L102.0,197.0L109.0,199.5L116.0,201.0L116.7,202.0L116.7,211.0Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "search" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="m 19.485 20.154 l -6.262 -6.262 q -.75 .639 -1.725 .989 t -1.96 .35 q -2.402 0 -4.066 -1.663 T 3.808 9.503 T 5.47 5.436 t 4.064 -1.667 t 4.068 1.664 T 15.268 9.5 q 0 1.042 -.369 2.017 t -.97 1.668 l 6.262 6.261 z M 9.539 14.23 q 1.99 0 3.36 -1.37 t 1.37 -3.361 t -1.37 -3.36 t -3.36 -1.37 t -3.361 1.37 t -1.37 3.36 t 1.37 3.36 t 3.36 1.37" />
android:pathData="M208.0,214.0L207.0,214.0L141.0,148.0L140.0,148.0L131.0,154.3L122.0,158.3L116.0,159.7L115.0,160.3L112.0,160.7L111.0,161.3L99.0,162.0L89.0,161.0L76.0,157.0L67.0,152.0L63.0,149.0L56.7,143.0L52.3,138.0L47.7,131.0L42.7,120.0L40.7,111.0L40.3,96.0L41.0,89.0L44.5,77.0L48.0,70.0L52.0,64.0L59.0,56.3L64.0,52.0L70.0,48.0L78.0,43.7L89.0,40.7L97.0,39.7L104.0,39.7L115.0,41.0L125.0,44.0L136.0,50.0L141.0,54.0L148.0,61.0L154.3,70.0L158.3,78.0L161.3,88.0L162.3,96.0L162.3,105.0L160.0,118.0L154.0,132.0L148.3,140.0L214.0,206.0L214.7,207.0L214.0,208.0ZM106.0,151.0L116.0,149.3L124.0,146.3L130.0,142.7L135.0,138.7L142.0,131.0L146.5,124.0L150.0,115.0L151.5,106.0L151.3,93.0L149.3,84.0L144.3,74.0L140.0,68.0L134.0,62.0L130.0,59.0L121.0,54.0L113.0,51.5L106.0,50.5L94.0,50.7L85.0,52.7L76.0,56.7L66.0,64.3L60.0,71.0L54.0,82.0L52.0,89.0L50.7,100.0L51.7,112.0L52.3,113.0L53.7,119.0L59.7,130.0L69.0,140.0L73.0,143.0L80.0,147.0L85.0,149.0L91.0,150.5L99.0,151.3Z" />
</vector> </vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:fillColor="#FFFFFFFF"
android:fillType="evenOdd"
android:pathData="M127.0,223.0L116.0,219.0L108.0,215.0L107.0,214.0L106.0,214.0L92.0,204.0L82.0,194.0L74.7,185.0L68.7,176.0L63.7,167.0L57.7,152.0L57.3,149.0L55.7,145.0L53.7,133.0L52.7,119.0L52.7,61.0L54.0,59.7L56.0,59.3L59.0,57.7L64.0,56.3L67.0,54.7L72.0,53.3L75.0,51.7L80.0,50.3L83.0,48.7L88.0,47.3L91.0,45.7L96.0,44.3L99.0,42.7L104.0,41.3L107.0,39.7L112.0,38.3L126.0,32.7L128.0,32.5L202.0,60.0L202.3,118.0L201.0,135.0L199.0,145.0L195.0,158.0L191.0,167.0L188.0,172.0L188.0,173.0L181.0,184.0L179.0,186.0L146.0,153.5L137.0,158.3L132.0,159.3L121.0,159.0L116.0,157.5L111.0,155.0L107.0,152.0L103.0,148.0L100.7,145.0L98.0,140.0L95.7,131.0L95.7,124.0L97.5,116.0L100.0,111.0L103.0,107.0L107.0,103.0L110.0,100.7L115.0,98.0L124.0,95.7L131.0,95.7L139.0,97.5L144.0,100.0L148.0,103.0L154.3,110.0L157.0,115.0L158.3,119.0L159.3,124.0L159.3,132.0L157.0,140.0L154.3,146.0L177.0,168.7L178.0,169.0L182.0,161.0L182.0,160.0L183.0,159.0L187.0,148.0L189.0,141.0L190.5,133.0L191.5,121.0L191.5,68.0L191.0,67.3L127.0,43.7L124.0,45.3L108.0,50.7L105.0,52.3L100.0,53.7L97.0,55.3L92.0,56.7L89.0,58.3L84.0,59.7L78.0,62.3L73.0,63.7L70.0,65.3L65.0,66.7L63.5,68.0L63.5,121.0L64.7,135.0L65.3,136.0L65.7,140.0L67.3,145.0L67.7,148.0L69.7,154.0L71.3,157.0L71.7,159.0L76.7,169.0L83.3,179.0L90.7,188.0L100.0,197.0L110.0,204.0L122.0,210.0L128.0,211.7L132.0,210.3L141.0,206.3L153.0,198.5L159.5,206.0L159.0,207.0L146.0,215.3L136.0,220.3ZM133.5,148.0L136.0,147.3L139.7,145.0L145.5,139.0L148.5,132.0L148.3,122.0L147.3,119.0L145.5,116.0L144.0,114.0L139.0,109.5L132.0,106.5L122.0,106.7L119.0,107.7L116.0,109.5L114.0,111.0L109.5,116.0L106.5,123.0L106.7,133.0L107.7,136.0L109.5,139.0L111.0,141.0L116.0,145.5L123.0,148.5L129.0,148.7Z" />
</vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "speed" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 10.758 15.192 q .452 .452 1.18 .415 q .73 -.038 1.078 -.515 l 5.253 -7.323 l -7.361 5.216 q -.496 .334 -.559 1.035 t .409 1.172 M 5.1 19 q -.28 0 -.512 -.141 q -.232 -.142 -.392 -.386 q -.592 -1.021 -.894 -2.158 T 3 14 q 0 -1.864 .71 -3.506 q .711 -1.642 1.927 -2.857 Q 6.852 6.42 8.494 5.71 T 12 5 q 1.858 0 3.485 .698 t 2.852 1.901 t 1.938 2.817 t .72 3.472 q .005 1.24 -.294 2.409 t -.903 2.253 q -.14 .244 -.382 .347 q -.241 .103 -.522 .103 z" />
</vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "swap-horizontal-circle" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="m 9.692 17.308 l .708 -.708 l -2.089 -2.1 H 13 v -1 H 8.312 l 2.088 -2.1 l -.708 -.708 L 6.385 14 z m 4.616 -4 L 17.616 10 l -3.308 -3.308 l -.708 .708 l 2.089 2.1 H 11 v 1 h 4.689 L 13.6 12.6 z M 12.003 21 q -1.866 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" />
</vector>
-10
View File
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:fillColor="#FFFFFFFF"
android:fillType="evenOdd"
android:pathData="M178.0,144.3L177.0,144.0L170.3,137.0L202.0,105.0L201.0,104.0L125.0,104.0L124.3,103.0L124.3,94.0L125.0,93.5L202.0,93.5L202.7,93.0L170.7,61.0L170.3,60.0L177.0,53.3L178.0,53.3L223.3,99.0ZM78.0,201.3L77.0,201.7L31.7,156.0L77.0,110.7L78.0,110.7L84.3,117.0L84.7,118.0L52.7,150.0L53.0,150.5L130.0,150.7L130.7,152.0L130.7,160.0L130.0,161.3L53.0,161.5L52.7,162.0L84.7,194.0L84.3,195.0Z" />
</vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "apps" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 6 19.23 q -.508 0 -.87 -.36 T 4.77 18 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m -12 -6 q -.508 0 -.87 -.36 T 4.77 12 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m -12 -6 q -.508 0 -.87 -.36 T 4.77 6 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 T 10.77 6 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 T 16.77 6 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36" />
android:pathData="M67.0,76.3L61.0,76.5L57.0,75.0L52.7,71.0L50.7,67.0L50.5,61.0L52.0,57.0L56.0,52.7L60.0,50.7L66.0,50.5L70.0,52.0L74.3,56.0L76.3,60.0L76.5,66.0L75.0,70.0L71.0,74.3ZM131.0,76.3L125.0,76.5L121.0,75.0L116.7,71.0L114.7,67.0L114.5,61.0L116.0,57.0L120.0,52.7L124.0,50.7L130.0,50.5L134.0,52.0L138.3,56.0L140.3,60.0L140.5,66.0L139.0,70.0L135.0,74.3ZM195.0,76.3L189.0,76.5L185.0,75.0L180.7,71.0L178.7,67.0L178.5,61.0L180.0,57.0L184.0,52.7L188.0,50.7L194.0,50.5L198.0,52.0L202.3,56.0L204.3,60.0L204.5,66.0L203.0,70.0L199.0,74.3ZM67.0,140.3L61.0,140.5L57.0,139.0L52.7,135.0L50.7,131.0L50.5,125.0L52.0,121.0L56.0,116.7L60.0,114.7L66.0,114.5L70.0,116.0L74.3,120.0L76.3,124.0L76.5,130.0L75.0,134.0L71.0,138.3ZM131.0,140.3L125.0,140.5L121.0,139.0L116.7,135.0L114.7,131.0L114.5,125.0L116.0,121.0L120.0,116.7L124.0,114.7L130.0,114.5L134.0,116.0L138.3,120.0L140.3,124.0L140.5,130.0L139.0,134.0L135.0,138.3ZM195.0,140.3L189.0,140.5L185.0,139.0L180.7,135.0L178.7,131.0L178.5,125.0L180.0,121.0L184.0,116.7L188.0,114.7L194.0,114.5L198.0,116.0L202.3,120.0L204.3,124.0L204.5,130.0L203.0,134.0L199.0,138.3ZM67.0,204.3L61.0,204.5L57.0,203.0L52.7,199.0L50.7,195.0L50.5,189.0L52.0,185.0L56.0,180.7L60.0,178.7L66.0,178.5L70.0,180.0L74.3,184.0L76.3,188.0L76.5,194.0L75.0,198.0L71.0,202.3ZM131.0,204.3L125.0,204.5L121.0,203.0L116.7,199.0L114.7,195.0L114.5,189.0L116.0,185.0L120.0,180.7L124.0,178.7L130.0,178.5L134.0,180.0L138.3,184.0L140.3,188.0L140.5,194.0L139.0,198.0L135.0,202.3ZM195.0,204.3L189.0,204.5L185.0,203.0L180.7,199.0L178.7,195.0L178.5,189.0L180.0,185.0L184.0,180.7L188.0,178.7L194.0,178.5L198.0,180.0L202.3,184.0L204.3,188.0L204.5,194.0L203.0,198.0L199.0,202.3Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "do-not-disturb-on" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 7.5 12.5 h 9 v -1 h -9 z m 4.503 8.5 q -1.866 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" />
android:pathData="M137.0,223.0L130.0,223.5L117.0,223.0L105.0,221.0L98.0,219.0L90.0,216.0L80.0,211.0L68.0,203.0L60.0,196.0L53.7,189.0L47.7,181.0L43.5,174.0L37.7,162.0L34.7,153.0L31.7,135.0L31.5,125.0L32.0,117.0L34.0,105.0L36.0,98.0L39.0,90.0L44.0,80.0L52.0,68.0L59.0,60.0L66.0,53.7L74.0,47.7L81.0,43.5L93.0,37.7L102.0,34.7L120.0,31.7L130.0,31.5L138.0,32.0L150.0,34.0L157.0,36.0L165.0,39.0L175.0,44.0L187.0,52.0L195.0,59.0L201.3,66.0L207.3,74.0L211.5,81.0L217.3,93.0L220.3,102.0L223.3,120.0L223.5,130.0L223.0,138.0L221.0,150.0L219.0,157.0L216.0,165.0L211.0,175.0L203.0,187.0L196.0,195.0L189.0,201.3L181.0,207.3L174.0,211.5L162.0,217.3L153.0,220.3ZM192.0,183.0L194.0,181.0L201.0,171.0L207.0,159.0L210.0,150.0L212.0,140.0L212.7,132.0L212.7,123.0L211.3,110.0L207.3,96.0L203.7,88.0L199.5,81.0L191.0,70.0L182.0,61.3L175.0,56.0L169.0,52.5L160.0,48.0L153.0,45.7L144.0,43.5L136.0,42.5L119.0,42.5L106.0,44.7L94.0,48.7L86.0,52.7L77.0,58.7L73.0,62.0L71.7,64.0L191.0,183.3ZM139.0,212.0L149.0,210.3L158.0,207.3L165.0,204.3L175.0,198.3L182.0,193.0L183.3,191.0L64.0,71.7L63.0,72.0L58.0,78.0L54.0,84.0L54.0,85.0L53.0,86.0L49.0,94.0L44.7,107.0L42.5,119.0L42.5,136.0L43.7,145.0L47.7,159.0L51.3,167.0L59.0,179.0L64.0,185.0L73.0,193.7L80.0,199.0L85.0,202.0L95.0,207.0L102.0,209.3L111.0,211.5L123.0,212.7L132.0,212.7Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "shield" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 12 20.962 q -3.014 -.895 -5.007 -3.651 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 3.454 -1.993 6.21 T 12 20.963" />
android:pathData="M128.0,242.3L124.0,241.5L112.0,236.0L111.0,236.0L110.0,235.0L109.0,235.0L108.0,234.0L107.0,234.0L102.0,231.0L99.0,230.0L86.0,222.0L79.0,217.0L68.0,208.0L58.3,198.0L49.7,187.0L42.7,176.0L37.7,166.0L34.7,159.0L30.7,147.0L28.3,136.0L27.7,135.0L27.3,131.0L26.7,130.0L25.3,118.0L24.7,116.0L23.5,95.0L23.7,79.0L25.0,62.0L26.0,58.0L28.0,54.0L30.7,50.0L35.0,45.7L41.0,41.7L43.0,41.3L46.0,39.7L105.0,20.3L108.0,18.7L114.0,16.7L122.0,14.7L127.0,14.3L133.0,14.7L140.0,16.5L164.0,25.0L211.0,40.5L218.0,44.0L224.3,50.0L227.0,54.0L229.3,59.0L229.7,62.0L230.3,63.0L231.5,83.0L231.3,102.0L230.5,114.0L228.5,129.0L226.0,141.0L221.0,157.0L219.0,161.0L217.0,167.0L216.0,168.0L216.0,169.0L215.0,170.0L210.0,180.0L204.0,189.0L196.0,198.7L188.0,207.0L178.0,215.3L167.0,223.3L155.0,230.3L141.0,237.3L139.0,237.7L134.0,240.3ZM128.5,225.0L139.0,220.5L151.0,214.3L161.0,208.0L170.0,201.3L185.0,187.0L191.3,179.0L198.0,169.0L199.0,166.0L200.0,165.0L203.0,159.0L203.0,158.0L207.0,149.0L209.0,141.0L210.0,139.0L212.0,130.0L214.5,113.0L215.5,98.0L215.5,83.0L214.3,65.0L213.7,63.0L211.0,59.0L209.0,57.5L204.0,55.0L185.0,49.0L133.0,31.0L127.0,30.3L123.0,30.7L87.0,42.7L84.0,44.3L49.0,55.7L46.0,57.3L43.0,60.0L40.5,66.0L39.5,83.0L39.5,98.0L40.7,115.0L41.3,117.0L41.7,122.0L43.7,133.0L44.3,134.0L44.7,138.0L47.3,145.0L47.7,148.0L51.7,158.0L57.7,170.0L64.3,180.0L70.0,187.0L81.0,198.0L91.0,206.0L105.0,215.0L106.0,215.0L110.0,217.5L127.0,225.5Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "info" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 11.5 16.5 h 1 V 11 h -1 z m .5 -6.923 q .262 0 .439 -.177 t .176 -.439 t -.177 -.438 T 12 8.346 t -.438 .177 t -.177 .439 t .177 .438 t .438 .177 M 12.003 21 q -1.867 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" />
android:pathData="M131.0,74.0L127.0,74.3L122.0,73.3L120.0,72.3L115.7,69.0L112.5,64.0L111.7,61.0L111.5,57.0L112.7,52.0L115.0,48.0L118.0,45.0L122.0,43.0L129.0,42.3L132.0,42.7L134.0,43.5L138.0,46.0L140.0,48.0L142.5,52.0L143.5,57.0L143.3,62.0L141.0,67.0L136.0,72.0ZM138.0,212.5L118.0,212.7L116.7,212.0L116.7,105.0L117.0,104.0L118.0,103.7L137.0,103.7L138.0,104.0L138.3,105.0Z" />
</vector> </vector>
+4 -4
View File
@@ -1,10 +1,10 @@
<!-- Material Symbols Light "analytics" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="256" android:viewportWidth="24"
android:viewportHeight="256"> android:viewportHeight="24">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FFFFFFFF"
android:fillType="evenOdd" android:pathData="M 7.73 16.5 h 1 V 12 h -1 z m 7.54 0 h 1 V 7 h -1 z m -3.77 0 h 1 V 14 h -1 z m 0 -4.5 h 1 v -2 h -1 z m -5.884 8 q -.691 0 -1.153 -.462 T 4 18.384 V 5.616 q 0 -.691 .463 -1.153 T 5.616 4 h 12.769 q .69 0 1.153 .463 T 20 5.616 v 12.769 q 0 .69 -.462 1.153 T 18.384 20 z" />
android:pathData="M223.0,128.7L214.0,128.7L212.7,128.0L212.7,69.0L211.0,66.0L209.0,64.0L206.0,63.5L47.0,63.7L45.0,65.0L42.5,68.0L42.3,96.0L41.0,96.7L32.0,96.7L31.5,96.0L31.5,69.0L32.5,64.0L36.0,58.0L39.0,55.7L43.0,53.7L48.0,52.7L206.0,52.7L213.0,54.0L216.0,55.7L219.7,59.0L222.3,63.0L223.3,66.0L223.5,128.0ZM76.0,175.3L74.0,175.5L71.0,174.7L68.7,172.0L49.3,133.0L32.0,132.7L31.5,132.0L31.5,123.0L32.0,122.3L53.0,122.3L56.0,123.3L59.5,129.0L74.0,157.7L75.0,157.0L76.0,154.0L77.0,153.0L77.0,152.0L79.0,149.0L79.0,148.0L80.0,147.0L80.0,146.0L81.0,145.0L81.0,144.0L82.0,143.0L82.0,142.0L83.0,141.0L83.0,140.0L84.0,139.0L84.0,138.0L85.0,137.0L85.0,136.0L86.0,135.0L86.0,134.0L87.0,133.0L88.0,130.0L89.0,129.0L89.0,128.0L90.0,127.0L90.0,126.0L91.0,125.0L91.0,124.0L92.0,123.0L92.0,122.0L93.0,121.0L93.0,120.0L94.0,119.0L94.0,118.0L95.0,117.0L96.0,114.0L97.0,113.0L97.0,112.0L98.0,111.0L99.0,108.0L100.0,107.0L100.0,106.0L101.0,105.0L102.0,102.0L103.0,101.0L103.0,100.0L104.0,99.0L104.0,98.0L105.0,97.0L106.0,94.0L107.0,93.0L107.0,92.0L109.0,89.0L109.0,88.0L110.0,87.0L110.0,86.0L111.0,85.0L111.0,84.0L114.0,80.7L117.0,80.0L119.0,80.5L121.0,82.0L122.3,84.0L142.3,124.0L142.0,125.0L135.0,130.7L134.0,131.3L133.7,131.0L117.3,98.0L117.0,97.5L116.0,98.0L78.5,173.0ZM187.0,223.0L180.0,223.5L171.0,222.5L166.0,221.0L155.0,215.0L149.7,210.0L144.7,204.0L140.7,196.0L139.3,190.0L138.7,189.0L138.3,179.0L139.0,172.0L141.0,165.0L145.0,157.0L148.0,154.0L150.0,151.0L158.0,144.7L166.0,140.7L173.0,138.7L183.0,138.3L190.0,139.0L197.0,141.0L205.0,145.5L212.3,152.0L217.0,158.0L220.3,164.0L222.7,172.0L223.5,180.0L223.0,188.0L221.0,196.0L217.0,204.0L209.0,213.0L203.0,217.3L195.0,221.3ZM116.0,202.0L49.0,202.3L42.0,201.0L40.0,200.0L35.3,196.0L32.7,192.0L31.7,189.0L31.5,159.0L32.0,158.3L41.0,158.3L42.3,159.0L42.3,186.0L44.0,189.0L46.0,191.0L49.0,191.5L113.0,191.5L113.7,192.0L114.3,194.0ZM183.3,184.0L203.3,164.0L198.0,158.5L177.3,179.0L182.0,183.7L183.0,184.3Z" />
</vector> </vector>
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "settings" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="m 10.135 21 l -.362 -2.892 q -.479 -.145 -1.035 -.454 q -.557 -.31 -.947 -.664 l -2.668 1.135 l -1.865 -3.25 l 2.306 -1.739 q -.045 -.27 -.073 -.558 q -.03 -.288 -.03 -.559 q 0 -.252 .03 -.53 q .028 -.278 .073 -.626 L 3.258 9.126 l 1.865 -3.212 L 7.771 7.03 q .448 -.373 .97 -.673 q .52 -.3 1.013 -.464 L 10.134 3 h 3.732 l .361 2.912 q .575 .202 1.016 .463 t .909 .654 l 2.725 -1.115 l 1.865 3.211 l -2.382 1.796 q .082 .31 .092 .569 t .01 .51 q 0 .233 -.02 .491 q -.019 .259 -.088 .626 l 2.344 1.758 l -1.865 3.25 l -2.681 -1.154 q -.467 .393 -.94 .673 t -.985 .445 L 13.866 21 z m 1.838 -6.5 q 1.046 0 1.773 -.727 T 14.473 12 t -.727 -1.773 t -1.773 -.727 q -1.052 0 -1.776 .727 T 9.473 12 t .724 1.773 t 1.776 .727" />
</vector>
+10
View File
@@ -0,0 +1,10 @@
<!-- Material Symbols Light "update" by Google, Apache License 2.0 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 12.02 20 q -1.664 0 -3.119 -.626 T 6.359 17.66 t -1.714 -2.542 T 4.02 12 t .626 -3.118 T 6.36 6.34 T 8.9 4.626 T 12.019 4 q 1.723 0 3.282 .712 q 1.559 .711 2.718 1.984 V 4.308 h 1 v 4.154 h -4.153 v -1 h 2.48 q -1.044 -1.15 -2.41 -1.806 Q 13.572 5 12.02 5 Q 9.094 5 7.057 7.038 T 5.019 12 t 2.038 4.963 T 12.019 19 q 2.625 0 4.569 -1.71 t 2.35 -4.29 h 1.012 q -.356 3.021 -2.62 5.01 Q 15.066 20 12.02 20 m 3.146 -4.146 l -3.647 -3.646 V 7 h 1 v 4.792 l 3.354 3.354 z" />
</vector>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

+134
View File
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="connect">Verbinden</string>
<string name="disconnect">Trennen</string>
<string name="servers">DNS-over-HTTPS-Server</string>
<string name="custom">Eigener Server</string>
<string name="custom_url">DoH-URL</string>
<string name="custom_bootstrap">Bootstrap-IP (optional, durch Kommas getrennt)</string>
<string name="invalid_url">Die URL muss mit https:// beginnen</string>
<string name="switch_to">Zu %1$s wechseln</string>
<string name="test">Server testen</string>
<string name="testing">Wird getestet…</string>
<string name="test_ok">Funktioniert über %1$s – erste Anfrage %2$d ms, Wiederholung %3$d ms</string>
<string name="http3">HTTP/3 (QUIC)</string>
<string name="http3_note">Android 14+. Mit HTTP/3 werden keine Bootstrap-IPs verwendet</string>
<string name="test_rcode">Server antwortete mit Fehlercode %1$d</string>
<string name="test_fail">Fehler: %1$s</string>
<string name="crash_title">Die App ist beim letzten Mal abgestürzt</string>
<string name="copy">Kopieren</string>
<string name="dismiss">Schließen</string>
<string name="hint">„Privates DNS“ ist in den Android-Einstellungen auf %1$s gesetzt. DNS geht deshalb dorthin und umgeht SparkleDNS. Stelle es auf „Automatisch“ oder „Aus“.</string>
<string name="notif_channel">VPN-Status</string>
<string name="notif_title">Geschützt über %1$s</string>
<string name="notif_text">DNS über HTTPS ist aktiv</string>
<string name="tab_home">Start</string>
<string name="tab_blocklist">Sperrliste</string>
<string name="tab_about">Info</string>
<string name="mon_cached">Aus dem Cache</string>
<string name="mon_blocked">Blockiert</string>
<string name="mon_ms">%1$d ms</string>
<string name="mon_all">Alle</string>
<string name="mon_errors">Fehler</string>
<string name="mon_search">Domain suchen</string>
<string name="mon_clear">Leeren</string>
<string name="mon_empty">Noch keine Anfragen. Verbinde dich und öffne eine beliebige Website.</string>
<string name="status_cached">Cache</string>
<string name="status_blocked">Blockiert</string>
<string name="status_failed">Fehler</string>
<string name="mon_block">Blockieren</string>
<string name="mon_unblock">Freigeben</string>
<string name="mon_blocked_added">%1$s zur Sperrliste hinzugefügt</string>
<string name="mon_unblocked">%1$s von der Sperrliste entfernt</string>
<string name="apps_hint">Ausgeschaltete Apps umgehen SparkleDNS und nutzen das normale DNS des Netzwerks.</string>
<string name="apps_search">Apps suchen</string>
<string name="apps_pending">Änderungen gelten nach dem erneuten Verbinden</string>
<string name="reconnect">Neu verbinden</string>
<string name="apps_loading">Wird geladen…</string>
<string name="apps_count">DNS umgehen: %1$d</string>
<string name="bl_note">Subdomains werden ebenfalls blockiert. Hosts-, reine Domain-, AdBlock- und dnsmasq-Listen werden unterstützt. Änderungen gelten sofort.</string>
<string name="bl_my">Meine Domains</string>
<string name="bl_domain_hint">example.com</string>
<string name="add">Hinzufügen</string>
<string name="bl_invalid">Ungültige Domain</string>
<string name="bl_empty_custom">Noch keine Domains</string>
<string name="delete">Löschen</string>
<string name="bl_updating">Wird aktualisiert…</string>
<string name="bl_list_url">Listen-URL</string>
<string name="bl_list_info">%1$s Domains · %2$s</string>
<string name="bl_download_failed">Download fehlgeschlagen: %1$s</string>
<string name="about_desc">DNS-Anfragen verschlüsseln, ohne den gesamten Verkehr über ein VPN zu leiten.</string>
<string name="about_version">Version</string>
<string name="about_protocol">Protokoll</string>
<string name="about_http3_yes">Auf diesem Gerät unterstützt</string>
<string name="about_http3_no">Benötigt Android 14+, HTTP/2 wird verwendet</string>
<string name="group_social">Soziale Netzwerke &amp; Messenger</string>
<string name="group_video">Video</string>
<string name="group_audio">Musik &amp; Audio</string>
<string name="group_games">Spiele</string>
<string name="group_images">Fotos &amp; Bilder</string>
<string name="group_news">Nachrichten</string>
<string name="group_maps">Karten &amp; Navigation</string>
<string name="group_productivity">Produktivität</string>
<string name="group_other">Sonstiges</string>
<string name="group_system">System</string>
<string name="group_count">%1$d von %2$d über DNS</string>
<string name="about_privacy_policy">Datenschutzerklärung</string>
<string name="donate">Spenden</string>
<string name="licenses_title">Open-Source-Lizenzen</string>
<string name="licenses_hint">SparkleDNS basiert auf diesen Open-Source-Projekten. Tippe auf ein Projekt, um seine Seite zu öffnen.</string>
<string name="licenses_data">Sperrlisten-Daten (bei Bedarf geladen, nicht enthalten)</string>
<string name="license_view">Lizenz ansehen</string>
<string name="back">Zurück</string>
<string name="about_source">Quellcode</string>
<string name="open_settings">Einstellungen</string>
<string name="mon_no_match">Nichts passt zum Filter</string>
<string name="no_browser">Keine App zum Öffnen dieses Links gefunden</string>
<string name="toggle_on">AN</string>
<string name="toggle_off">AUS</string>
<string name="home_protected">Du bist geschützt</string>
<string name="home_unprotected">Du bist nicht geschützt</string>
<string name="home_via">Verschlüsselt über %1$s</string>
<string name="home_off_desc">DNS läuft wie gewohnt über dein Netzwerk</string>
<string name="stat_requests">Anfragen</string>
<string name="stat_avg">Ø Zeit</string>
<string name="chart_now">Jetzt</string>
<string name="period_24h">24 Stunden</string>
<string name="period_7d">7 Tage</string>
<string name="home_lists_info">Aktive Listen: %1$d · Regeln: %2$s</string>
<string name="blocklist_title">DNS-Blocklisten</string>
<string name="tab_activity">Aktivität</string>
<string name="tab_settings">Einstellungen</string>
<string name="companies_title">Anteil der Konzerne</string>
<string name="companies_desc">Welcher Anteil deiner Anfragen an die größten Konzerne und andere Websites geht.</string>
<string name="companies_other">Andere</string>
<string name="recent_title">Letzte Anfragen</string>
<string name="filter">Filter</string>
<string name="bl_search">Listen suchen</string>
<string name="auto_update">Automatisch aktualisieren</string>
<string name="auto_off">Aus</string>
<string name="auto_daily">Täglich</string>
<string name="auto_weekly">Wöchentlich</string>
<string name="auto_wifi">Nur über WLAN</string>
<string name="auto_wifi_desc">Keine Updates über mobile Daten</string>
<string name="auto_update_now">Jetzt aktualisieren</string>
<string name="done">Fertig</string>
<string name="cancel">Abbrechen</string>
<string name="preset_pro_desc">Ausgewogener Schutz vor Werbung, Tracking und Malware. Die beste Wahl für jeden Tag.</string>
<string name="preset_proplus_desc">Maximaler Schutz. Kann Anmeldungen in manchen Apps und Links stören.</string>
<string name="preset_tif_desc">Bedrohungsdaten: Domains für Malware, Phishing, Betrug und Cryptojacking.</string>
<string name="list_added_by_you">Von dir per URL hinzugefügt.</string>
<string name="list_not_downloaded">Noch nicht heruntergeladen</string>
<string name="my_domains_desc">Domains, die du selbst blockiert hast. Subdomains werden ebenfalls blockiert.</string>
<string name="bl_add_list">Neue Blockliste hinzufügen</string>
<string name="settings_general">Allgemein</string>
<string name="settings_apps">Apps ohne SparkleDNS</string>
<string name="settings_apps_desc">Ausgewählte Apps nutzen das normale DNS des Netzwerks</string>
<string name="chart_empty">Noch keine Daten. Nach dem Verbinden füllt sich das Diagramm Stunde für Stunde.</string>
<string name="companies_wait">Daten werden gesammelt: %1$d von %2$d Anfragen</string>
<string name="blocklist_cta_lists">Keine Liste ist aktiv. Schalte HaGeZi Pro ein, um Werbung und Tracker zu blockieren.</string>
<string name="blocklist_cta_master">Blockieren ist aus. Schalte es ein, um Werbung und Tracker zu filtern.</string>
<string name="turn_on">Einschalten</string>
<string name="downloading">Wird geladen…</string>
<string name="change_server">Server wechseln</string>
</resources>

Some files were not shown because too many files have changed in this diff Show More