Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
09b3a00207 | ||
|
|
2f1ddd0ff0 | ||
|
|
612c017c2b | ||
|
|
a332ca9c23 | ||
|
|
830e653690 | ||
|
|
0f709aaff8 | ||
|
|
43030575c4 | ||
|
|
5027fbcd85 | ||
|
|
7ef64324fb | ||
|
|
021f7106cc | ||
|
|
f25e10d217 | ||
|
|
7812f62c0f | ||
|
|
08633f918c | ||
|
|
62867fcd07 | ||
|
|
b87683a0b0 | ||
|
|
bc4cd8daf1 | ||
|
|
887299a3a7 | ||
|
|
c163a6d578 | ||
|
|
3c9535e1d5 | ||
|
|
64d664fbe9 | ||
|
|
4b5c9bdf85 | ||
|
|
d1d8d01dd0 |
@@ -8,6 +8,10 @@
|
||||
|
||||
| App | Replaces | Status | Install |
|
||||
| --- | --- | --- | --- |
|
||||
| **Messages** (`messages/`) | Google Messages (SMS) | alpha, not yet tested with real SMS | [Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.messages%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Messages%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.messages%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EMessages%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Emessages-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D) · F-Droid: not yet |
|
||||
| **Telefon** (`telefon/`) | Google Phone | alpha, not yet tested with real calls | [Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.telefon%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Telefon%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.telefon%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5ETelefon%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Etelefon-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D) · F-Droid: not yet |
|
||||
| **Rechner** (`rechner/`) | Google Calculator | alpha | [Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.rechner%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Rechner%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.rechner%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5ERechner%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Erechner-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D) · F-Droid: not yet |
|
||||
| **Uhr** (`uhr/`) | Google Clock / Pixel Clock | alpha, in daily testing | [Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.uhr%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Uhr%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.uhr%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EUhr%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Euhr-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D) · F-Droid: not yet |
|
||||
| **Wetter** (`wetter/`) | Google Weather / Pixel Weather | alpha, in daily testing | [Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.wetter%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Wetter%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.wetter%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EWetter%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Ewetter-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D) · F-Droid: not yet |
|
||||
|
||||
More apps will follow, one folder each. Each one goes through the same pipeline (see [How these apps are made](#how-these-apps-are-made)).
|
||||
@@ -20,11 +24,118 @@ A weather app with the look and feel of Pixel Weather: an animated sky that chan
|
||||
- **No account, no tracking, no analytics.** Everything stays on the device. Coordinates are rounded to two decimals (about 1 km) before they reach the weather service.
|
||||
- **Open data sources only:** [Open-Meteo](https://open-meteo.com) for forecasts, 15-minute precipitation, air quality, pollen and place search (CC BY 4.0), and [Nominatim / OpenStreetMap](https://nominatim.org) for naming your current location.
|
||||
- **Features today:** current location and saved cities (swipe between them), search with a full preview before saving, precipitation-in-the-next-hours card, a rule-based daily summary, day detail view, units and theme settings, light and dark mode.
|
||||
- **Five home-screen widgets:** a weather card that grows from 3×2 to 4×5 (hourly panel, then a daily list), a pill, a tilted pill, a one-line bar with a cookie badge, and a classic card. Each one can be customised when added or later: location, system/light/dark, colours (wallpaper Material You, current weather, or five fixed palettes, all WCAG AA checked) and background opacity from 100 % down to fully transparent.
|
||||
- **Six home-screen widgets:** a minimal clock with date and current weather (transparent by default), a weather card that grows from 3×2 to 4×5 (hourly panel, then a daily list), a pill, a tilted pill, a one-line bar with a cookie badge, and a classic card. The widget picker shows real previews. Each one can be customised when added or later: location, system/light/dark, colours (wallpaper Material You, current weather, or five fixed palettes, all WCAG AA checked) and background opacity from 100 % down to fully transparent.
|
||||
- **Coming next:** severe weather alerts (DWD / MeteoAlarm), precipitation radar map, card reordering, notifications.
|
||||
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/S01-clear-day.png" width="200" alt="Home, sunny">
|
||||
<img src="docs/screenshots/S01-clear-night-dark.png" width="200" alt="Home, clear night, dark mode">
|
||||
<img src="docs/screenshots/S01-rain-nowcast.png" width="200" alt="Rain with the next-hours precipitation card">
|
||||
</p>
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/S01-full-light.png" width="200" alt="Full forecast with detail tiles">
|
||||
<img src="docs/screenshots/S04-day-dark.png" width="200" alt="Day detail">
|
||||
<img src="docs/screenshots/S08-settings.png" width="200" alt="Settings">
|
||||
</p>
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/widgets.png" width="380" alt="Home-screen widgets: clock, weather card, pill, bar, classic, tilted pill">
|
||||
</p>
|
||||
|
||||
<sub>Screenshots are rendered from a real Open-Meteo response (Berlin) by the app's screenshot tests; widgets are rendered on a Pixel with the wallpaper colours of that phone.</sub>
|
||||
|
||||
Requires Android 10 (API 29) or newer.
|
||||
|
||||
### Messages
|
||||
|
||||
An SMS app with the look of Google Messages, made to replace the system messaging app.
|
||||
|
||||
- **Becomes your default SMS app** (Android's SMS role): receives and stores texts, sends long messages in parts, shows sending / delivered / failed (tap to retry), and handles "decline with message" from the phone app.
|
||||
- **Conversations** with unread markers and contact names, **chat** with grouped bubbles and day separators, **new chat** from contacts or a number, **search**, **archive** and **delete**, call from the chat.
|
||||
- **Notifications** with direct reply and "mark as read".
|
||||
- **No network permission**; messages stay in Android's own SMS database.
|
||||
- Not included: RCS (Google/carrier backend), spam protection, Gemini features. MMS (pictures, group MMS) comes later.
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/messages/S01-list-light.png" width="200" alt="Conversations">
|
||||
<img src="docs/screenshots/messages/S02-chat-light.png" width="200" alt="Chat">
|
||||
<img src="docs/screenshots/messages/S02-chat-dark.png" width="200" alt="Chat, dark">
|
||||
</p>
|
||||
|
||||
### Telefon
|
||||
|
||||
A phone app in the style of the Pixel dialer, made to replace the system phone app.
|
||||
|
||||
- **Becomes your default phone app** (Android's dialer role): shows incoming calls full screen over the lock screen with slide to answer or decline, the in-call screen with mute, speaker, Bluetooth, hold and keypad, and call notifications. The ringtone is played by Android itself.
|
||||
- **Start:** search, filters (all, missed, contacts), favourites from your starred contacts, call history grouped by day with missed calls in red; repeated calls fold into one row.
|
||||
- **Keypad** with T9 contact suggestions, **voicemail** dials your SIM's mailbox number, **details** per contact or number with history, SMS, favourite toggle and "add contact".
|
||||
- **Your data stays in the system.** Call history and contacts are read from Android's own databases, nothing is copied, and there is no network permission. Declining with a quick reply hands the text to your SMS app.
|
||||
- Not included: spam detection, call screening, recording and live translation (Google services).
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/telefon/S01-home-light.png" width="200" alt="Start with favourites and call history">
|
||||
<img src="docs/screenshots/telefon/S06-incoming-light.png" width="200" alt="Incoming call">
|
||||
<img src="docs/screenshots/telefon/S07-incall-dark.png" width="200" alt="In call">
|
||||
</p>
|
||||
|
||||
<sub>Screenshots use made-up contacts.</sub>
|
||||
|
||||
### Rechner
|
||||
|
||||
A calculator with the flow of the Pixel calculator: live result while typing, a scientific row that expands into a full panel, and the history in a sheet you pull down from the display.
|
||||
|
||||
- **Exact arithmetic.** Numbers are decimal, not floating point: 0,1 + 0,2 is 0,3, 1 ÷ 3 × 3 is 1, 100! is exact. Trigonometry snaps exact angles (sin 30° = 0,5, cos π = −1). The engine is covered by unit tests.
|
||||
- **Smart input:** one key for parentheses that opens or closes as needed, operators replace each other, implicit multiplication (2π, 3(4)), percent the way people expect (50 + 10 % = 55), unfinished input still shows a preview.
|
||||
- **Scientific:** √ π ^ ! · Deg/Rad · sin cos tan and their inverses (Inv) · e ln log · eˣ 10ˣ x².
|
||||
- **History** grouped by day, tap to reuse; copy, paste and a memory (MS/MR) from a long press on the display; wallpaper colours, light and dark.
|
||||
- **No permissions** except vibration for key feedback. No network.
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/rechner/S01-typing-light.png" width="200" alt="Typing with live result">
|
||||
<img src="docs/screenshots/rechner/S02-scientific-dark.png" width="200" alt="Scientific panel">
|
||||
<img src="docs/screenshots/rechner/S03-history-dark.png" width="200" alt="History">
|
||||
</p>
|
||||
|
||||
Requires Android 10 (API 29) or newer.
|
||||
|
||||
### Uhr
|
||||
|
||||
A clock and alarm app with the look and flow of the Pixel clock: alarms in expandable cards, world clock, several timers at once, stopwatch with laps, and a bedtime schedule.
|
||||
|
||||
- **Reliable alarms without Google.** Exact alarms via `AlarmManager.setAlarmClock` (exempt from Doze, shown in the status bar), rescheduled after reboot, time or time zone changes and app updates. Wall-clock based: 7:00 stays 7:00 across daylight saving and travel; the scheduling logic is unit-tested for DST gaps and zone changes.
|
||||
- **Ringing done right:** a full-screen screen over the lock screen with slide to snooze or stop, alarm-stream audio that gets louder gradually, vibration, automatic silence after a set time, and notifications for upcoming, snoozed and missed alarms. Volume keys can snooze or stop.
|
||||
- **No network permission at all.** World clock cities come from the system time zone database (names localised offline), sounds from the device, the app's own tone, or your own audio files.
|
||||
- **Also:** days and labels per alarm, pause until a date, skip the next ring, timers with ring progress and +1:00 that keep running in the background with a live countdown notification, stopwatch with fastest/slowest laps, analog or digital clock, wallpaper colours (Material You), three home-screen widgets (live digital clock, analog clock, next alarm).
|
||||
- **Bedtime extras:** own sleep sounds (rain, waves, deep noise) with a sleep timer that fades out, and a sunrise option that slowly brightens the screen 15 minutes before the wake-up alarm.
|
||||
- **Coming next:** widget style options like Wetter, screensaver/night clock.
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/uhr/S01-alarms-dark.png" width="200" alt="Alarm list">
|
||||
<img src="docs/screenshots/uhr/S02-expanded-dark.png" width="200" alt="Alarm expanded">
|
||||
<img src="docs/screenshots/uhr/S11-ringing.png" width="200" alt="Ringing screen with slide to snooze or stop">
|
||||
</p>
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/uhr/S06-clock-dark.png" width="200" alt="World clock">
|
||||
<img src="docs/screenshots/uhr/S08-timers-dark.png" width="200" alt="Timers">
|
||||
<img src="docs/screenshots/uhr/S09-stopwatch-dark.png" width="200" alt="Stopwatch with laps">
|
||||
</p>
|
||||
|
||||
<sub>Screenshots rendered by the app's screenshot tests with the fallback palette; on Android 12+ the app uses your wallpaper colours.</sub>
|
||||
|
||||
Requires Android 10 (API 29) or newer.
|
||||
|
||||
## Replacing the system apps
|
||||
|
||||
Each app plugs into the places Android uses to pick an app, so you can uninstall or disable the Google version (on GrapheneOS most are not installed anyway):
|
||||
|
||||
| App | How it takes over |
|
||||
| --- | --- |
|
||||
| Messages | Android's default SMS app role (Settings → Apps → Default apps → SMS app), plus `sms:`/`smsto:` links and sharing text |
|
||||
| Telefon | Android's default phone app role (Settings → Apps → Default apps → Phone app), plus `tel:` links and the dial intent |
|
||||
| Uhr | the public alarm clock intents: set alarm, set timer, show alarms/timers, dismiss and snooze, used by voice assistants, calendars and other apps; exact alarms shown in the status bar and lock screen |
|
||||
| Rechner | the system calculator category, so the calculator key of keyboards and launchers opens it |
|
||||
| Wetter | no system role exists for weather; its widgets and the "at a glance"-style clock widget replace the Google ones |
|
||||
|
||||
## Install with Obtainium
|
||||
|
||||
[Obtainium](https://github.com/ImranR98/Obtainium) installs and updates apps straight from this repository's releases, with no store in between.
|
||||
@@ -48,6 +159,46 @@ If the button does not open Obtainium (some browsers block links to apps; the pa
|
||||
obtainium://app/%7B%22id%22%3A%22app.wetter%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Wetter%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.wetter%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EWetter%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Ewetter-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D
|
||||
```
|
||||
|
||||
### Uhr
|
||||
|
||||
[<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="54">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.uhr%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Uhr%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.uhr%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EUhr%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Euhr-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D)
|
||||
|
||||
Same setup as Wetter, with the filters `^Uhr ` (release titles) and `^uhr-.*\.apk$` (APKs). Raw link:
|
||||
|
||||
```
|
||||
obtainium://app/%7B%22id%22%3A%22app.uhr%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Uhr%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.uhr%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EUhr%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Euhr-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D
|
||||
```
|
||||
|
||||
### Rechner
|
||||
|
||||
[<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="54">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.rechner%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Rechner%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.rechner%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5ERechner%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Erechner-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D)
|
||||
|
||||
Filters: `^Rechner ` (release titles) and `^rechner-.*\.apk$` (APKs). Raw link:
|
||||
|
||||
```
|
||||
obtainium://app/%7B%22id%22%3A%22app.rechner%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Rechner%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.rechner%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5ERechner%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Erechner-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D
|
||||
```
|
||||
|
||||
### Telefon
|
||||
|
||||
[<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="54">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.telefon%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Telefon%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.telefon%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5ETelefon%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Etelefon-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D)
|
||||
|
||||
Filters: `^Telefon ` and `^telefon-.*\.apk$`. Raw link:
|
||||
|
||||
```
|
||||
obtainium://app/%7B%22id%22%3A%22app.telefon%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Telefon%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.telefon%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5ETelefon%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Etelefon-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D
|
||||
```
|
||||
|
||||
### Messages
|
||||
|
||||
[<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="54">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22app.messages%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Messages%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.messages%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EMessages%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Emessages-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D)
|
||||
|
||||
Filters: `^Messages ` and `^messages-.*\.apk$`. Raw link:
|
||||
|
||||
```
|
||||
obtainium://app/%7B%22id%22%3A%22app.messages%22%2C%22url%22%3A%22https%3A%2F%2Fgit.mrblake.cc%2FMrBlake%2FNoGooleApps%22%2C%22author%22%3A%22MrBlake%22%2C%22name%22%3A%22Messages%22%2C%22overrideSource%22%3A%22Codeberg%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22appId%5C%22%3A%5C%22app.messages%5C%22%2C%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5EMessages%20%5C%22%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Emessages-.%2A%5C%5C%5C%5C.apk%24%5C%22%2C%5C%22autoApkFilterByArch%5C%22%3Afalse%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%7D%22%7D
|
||||
```
|
||||
|
||||
**Releases.** Every app is published as a release titled `<App> <version>` (for example `Wetter 0.1.0`, tag `wetter-v0.1.0`) with one asset named `<app>-<version>.apk`. Obtainium shows *"no matching version"* until the first release of an app exists.
|
||||
|
||||
**F-Droid:** not available yet. The apps contain no proprietary libraries, so an F-Droid build is planned (either the main repository or a self-hosted F-Droid repo).
|
||||
@@ -56,20 +207,26 @@ obtainium://app/%7B%22id%22%3A%22app.wetter%22%2C%22url%22%3A%22https%3A%2F%2Fgi
|
||||
|
||||
### The Replica pipeline
|
||||
|
||||
Every app is rebuilt with **[Replica](https://github.com/Jakeschincariol/replica-skill)**, an open set of eleven Claude Code skills by Jake Schincariol for cloning an app's *functionality and UX patterns* clean-room style. Each skill writes files the next one reads, and everything is kept in [`replica/`](replica/):
|
||||
Every app is rebuilt with **[Replica](https://github.com/Jakeschincariol/replica-skill)**, an open set of eleven Claude Code skills by Jake Schincariol for cloning an app's *functionality and UX patterns* clean-room style. Each skill writes files the next one reads, and everything is kept in [`replica/<app>/`](replica/wetter/):
|
||||
|
||||
| Step | Skill | What it produced for Wetter |
|
||||
| --- | --- | --- |
|
||||
| 1 | `replica-recon` | [Recon map](replica/recon.md) built from public sources (help center, reviews, store listing): 15 screens, 9 user flows, components, inferred data model, [feature matrix](replica/features.csv) |
|
||||
| 2 | `replica-architect` | [Architecture](replica/architecture.md) and [schema](replica/schema.sql): native Kotlin, offline-first, no server, public APIs only |
|
||||
| 3 | `replica-design` | [Design tokens](replica/design/tokens.json) and [component specs](replica/design/components.md), WCAG AA contrast checked (70 colour pairs), generated into Compose code |
|
||||
| 4 | `replica-build` | The app itself, screen by screen, with a [build log](replica/build-log.md) and [screenshots](replica/clone-screens/) rendered from a real API response |
|
||||
| 1 | `replica-recon` | [Recon map](replica/wetter/recon.md) built from public sources (help center, reviews, store listing): 15 screens, 9 user flows, components, inferred data model, [feature matrix](replica/wetter/features.csv) |
|
||||
| 2 | `replica-architect` | [Architecture](replica/wetter/architecture.md) and [schema](replica/wetter/schema.sql): native Kotlin, offline-first, no server, public APIs only |
|
||||
| 3 | `replica-design` | [Design tokens](replica/wetter/design/tokens.json) and [component specs](replica/wetter/design/components.md), WCAG AA contrast checked (70 colour pairs), generated into Compose code |
|
||||
| 4 | `replica-build` | The app itself, screen by screen, with a [build log](replica/wetter/build-log.md) and [screenshots](replica/wetter/clone-screens/) rendered from a real API response |
|
||||
| next | `replica-test`, `replica-diff`, `replica-entrepreneur`, `replica-brand`, `replica-launch`, `replica-deploy`, `replica-backend` | QA, parity scoring against the original, reading real user reviews for improvements, naming and branding, store listing, release |
|
||||
|
||||
**Telefon** as well: [recon](replica/telefon/recon.md), [architecture](replica/telefon/architecture.md), [tokens](replica/telefon/design/tokens.json) (20 pairs AA), [build log](replica/telefon/build-log.md).
|
||||
|
||||
**Rechner** too: [recon](replica/rechner/recon.md), [architecture](replica/rechner/architecture.md), [tokens](replica/rechner/design/tokens.json) (24 pairs AA), [build log](replica/rechner/build-log.md), [screenshots](replica/rechner/clone-screens/).
|
||||
|
||||
**Uhr** went through the same steps from scratch: [recon](replica/uhr/recon.md) (17 screens, 9 flows), [architecture](replica/uhr/architecture.md), [design tokens](replica/uhr/design/tokens.json) (39 pairs AA), [build log](replica/uhr/build-log.md) and [screenshots](replica/uhr/clone-screens/).
|
||||
|
||||
The rules Replica enforces, and that this project follows:
|
||||
|
||||
- **Public sources and our own devices only.** No decompiling, no private APIs, no reading the original's code or network traffic.
|
||||
- **Everything written fresh.** Code, icons, weather glyphs, the animated sky and every label are made from scratch. Reference screenshots of the originals live in `replica/screens/` for layout comparison only and never ship.
|
||||
- **Everything written fresh.** Code, icons, weather glyphs, the animated sky and every label are made from scratch. Reference screenshots of the originals live in `replica/<app>/screens/` for layout comparison only and never ship.
|
||||
- **What cannot be cloned is left out on purpose:** Google's own forecast models, Gemini summaries, Calendar/Gmail-based insights and account sync. Open alternatives replace them where it makes sense.
|
||||
|
||||
### Built with AI, steered by a human
|
||||
@@ -87,19 +244,23 @@ Each commit says what changed and carries a `Co-Authored-By` line for the AI.
|
||||
Requirements: JDK 17 or newer and the Android SDK (platform 36).
|
||||
|
||||
```bash
|
||||
cd wetter
|
||||
cd wetter # or: cd uhr, cd rechner
|
||||
./gradlew :app:assembleRelease # APK in app/build/outputs/apk/release/
|
||||
./gradlew :app:testDebugUnitTest # unit + screenshot tests
|
||||
./gradlew :app:recordRoborazziDebug # re-render replica/clone-screens/
|
||||
./gradlew :app:recordRoborazziDebug # re-render replica/wetter/clone-screens/
|
||||
```
|
||||
|
||||
Local release builds are signed with the debug key so they install over each other. Published releases will use a dedicated signing key.
|
||||
Release builds are signed with the project key from `~/.android/nogoogleapps-release.properties` (kept outside the repository); without it they fall back to the debug key for local testing. `scripts/release.sh <app>` builds, signs and publishes a release in the format Obtainium expects.
|
||||
|
||||
## Repository layout
|
||||
|
||||
```
|
||||
replica/ recon, architecture, design system, build log, screenshots
|
||||
replica/<app>/ recon, architecture, design system, build log, screenshots (one folder per app)
|
||||
wetter/ the weather app (Kotlin, Jetpack Compose, Glance widgets, Room, WorkManager)
|
||||
messages/ the SMS app (Kotlin, Jetpack Compose, system SMS provider)
|
||||
telefon/ the phone app (Kotlin, Jetpack Compose, InCallService, system call log and contacts)
|
||||
rechner/ the calculator (Kotlin, Jetpack Compose, own exact expression engine)
|
||||
uhr/ the clock and alarm app (Kotlin, Jetpack Compose, AlarmManager, Glance, Room)
|
||||
```
|
||||
|
||||
## Credits
|
||||
|
||||
|
After Width: | Height: | Size: 124 KiB |
|
After Width: | Height: | Size: 127 KiB |
|
After Width: | Height: | Size: 261 KiB |
|
After Width: | Height: | Size: 157 KiB |
|
After Width: | Height: | Size: 127 KiB |
|
After Width: | Height: | Size: 76 KiB |
|
After Width: | Height: | Size: 126 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 57 KiB |
|
After Width: | Height: | Size: 58 KiB |
|
After Width: | Height: | Size: 57 KiB |
|
After Width: | Height: | Size: 78 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 60 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 63 KiB |
|
After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 60 KiB |
|
After Width: | Height: | Size: 72 KiB |
|
After Width: | Height: | Size: 61 KiB |
|
After Width: | Height: | Size: 21 KiB |
|
After Width: | Height: | Size: 87 KiB |
@@ -0,0 +1,6 @@
|
||||
.gradle/
|
||||
build/
|
||||
local.properties
|
||||
.idea/
|
||||
*.iml
|
||||
.kotlin/
|
||||
@@ -0,0 +1,93 @@
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
id("org.jetbrains.kotlin.android")
|
||||
id("org.jetbrains.kotlin.plugin.compose")
|
||||
id("com.google.devtools.ksp")
|
||||
id("io.github.takahirom.roborazzi")
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "app.messages"
|
||||
compileSdk = 36
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "app.messages"
|
||||
minSdk = 29
|
||||
targetSdk = 36
|
||||
versionCode = 1
|
||||
versionName = "0.1.0"
|
||||
}
|
||||
|
||||
// Release key lives outside the repo; without it, release builds fall back to the debug key (local only).
|
||||
val keyProps = Properties().apply {
|
||||
val f = file(System.getProperty("user.home") + "/.android/nogoogleapps-release.properties")
|
||||
if (f.exists()) f.inputStream().use { load(it) }
|
||||
}
|
||||
signingConfigs {
|
||||
if (keyProps.isNotEmpty()) create("release") {
|
||||
storeFile = file(keyProps.getProperty("storeFile"))
|
||||
storePassword = keyProps.getProperty("storePassword")
|
||||
keyAlias = keyProps.getProperty("keyAlias")
|
||||
keyPassword = keyProps.getProperty("keyPassword")
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
debug {
|
||||
// installs next to the release app from Obtainium
|
||||
applicationIdSuffix = ".debug"
|
||||
resValue("string", "app_name", "Messages (Debug)")
|
||||
}
|
||||
release {
|
||||
resValue("string", "app_name", "Messages")
|
||||
isMinifyEnabled = true
|
||||
isShrinkResources = true
|
||||
signingConfig = signingConfigs.findByName("release") ?: signingConfigs.getByName("debug")
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
buildFeatures { compose = true }
|
||||
testOptions { unitTests { isIncludeAndroidResources = true } }
|
||||
}
|
||||
|
||||
kotlin { compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) } }
|
||||
|
||||
ksp { arg("room.schemaLocation", "$projectDir/schemas") }
|
||||
|
||||
dependencies {
|
||||
val composeBom = platform("androidx.compose:compose-bom:2025.10.01")
|
||||
implementation(composeBom)
|
||||
implementation("androidx.compose.ui:ui")
|
||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||
implementation("androidx.compose.foundation:foundation")
|
||||
implementation("androidx.compose.material3:material3")
|
||||
implementation("androidx.compose.material:material-icons-extended")
|
||||
debugImplementation("androidx.compose.ui:ui-tooling")
|
||||
|
||||
implementation("androidx.activity:activity-compose:1.11.0")
|
||||
implementation("androidx.core:core-ktx:1.17.0")
|
||||
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.9.4")
|
||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4")
|
||||
|
||||
implementation("androidx.room:room-runtime:2.7.0")
|
||||
implementation("androidx.room:room-ktx:2.7.0")
|
||||
ksp("androidx.room:room-compiler:2.7.0")
|
||||
implementation("androidx.datastore:datastore-preferences:1.1.7")
|
||||
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
|
||||
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("org.robolectric:robolectric:4.15.1")
|
||||
testImplementation("androidx.compose.ui:ui-test-junit4")
|
||||
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||
testImplementation("io.github.takahirom.roborazzi:roborazzi:1.46.1")
|
||||
testImplementation("io.github.takahirom.roborazzi:roborazzi-compose:1.46.1")
|
||||
}
|
||||
|
||||
roborazzi { outputDir.set(rootProject.file("../replica/messages/clone-screens")) }
|
||||
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- no INTERNET: SMS travel over the mobile network through the system, not through this app -->
|
||||
<uses-permission android:name="android.permission.READ_SMS" />
|
||||
<uses-permission android:name="android.permission.SEND_SMS" />
|
||||
<uses-permission android:name="android.permission.RECEIVE_SMS" />
|
||||
<uses-permission android:name="android.permission.RECEIVE_MMS" />
|
||||
<uses-permission android:name="android.permission.RECEIVE_WAP_PUSH" />
|
||||
<uses-permission android:name="android.permission.READ_CONTACTS" />
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||
<uses-feature android:name="android.hardware.telephony" android:required="false" />
|
||||
|
||||
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name" android:supportsRtl="true" android:theme="@android:style/Theme.Material.NoActionBar">
|
||||
|
||||
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
<category android:name="android.intent.category.APP_MESSAGING" />
|
||||
</intent-filter>
|
||||
<!-- required for the default SMS app role -->
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.SENDTO" />
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="sms" /><data android:scheme="smsto" /><data android:scheme="mms" /><data android:scheme="mmsto" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.SEND" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<data android:mimeType="text/plain" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<receiver android:name=".sms.SmsDeliverReceiver" android:exported="true" android:permission="android.permission.BROADCAST_SMS">
|
||||
<intent-filter><action android:name="android.provider.Telephony.SMS_DELIVER" /></intent-filter>
|
||||
</receiver>
|
||||
<receiver android:name=".sms.MmsDeliverReceiver" android:exported="true" android:permission="android.permission.BROADCAST_WAP_PUSH">
|
||||
<intent-filter>
|
||||
<action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
|
||||
<data android:mimeType="application/vnd.wap.mms-message" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:name=".sms.RespondViaMessageService" android:exported="true" android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<data android:scheme="sms" /><data android:scheme="smsto" /><data android:scheme="mms" /><data android:scheme="mmsto" />
|
||||
</intent-filter>
|
||||
</service>
|
||||
<receiver android:name=".sms.SmsStatusReceiver" android:exported="false" />
|
||||
<receiver android:name=".sms.NotificationActionReceiver" android:exported="false" />
|
||||
</application>
|
||||
</manifest>
|
||||
@@ -0,0 +1,243 @@
|
||||
package app.messages
|
||||
|
||||
import android.Manifest
|
||||
import android.app.role.RoleManager
|
||||
import android.content.ClipData
|
||||
import android.content.ClipboardManager
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import android.provider.ContactsContract
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
|
||||
import androidx.compose.material.icons.outlined.Archive
|
||||
import androidx.compose.material.icons.outlined.Call
|
||||
import androidx.compose.material.icons.outlined.Chat
|
||||
import androidx.compose.material.icons.outlined.Delete
|
||||
import androidx.compose.material.icons.outlined.Unarchive
|
||||
import androidx.compose.material.icons.rounded.MoreVert
|
||||
import androidx.compose.material.icons.rounded.Search
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.DropdownMenu
|
||||
import androidx.compose.material3.DropdownMenuItem
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.ExtendedFloatingActionButton
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.material3.TopAppBar
|
||||
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.produceState
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.core.content.ContextCompat
|
||||
import app.messages.data.Message
|
||||
import app.messages.data.Sms
|
||||
import app.messages.sms.Notifier
|
||||
import app.messages.sms.Sender
|
||||
import app.messages.ui.Conversation
|
||||
import app.messages.ui.ConversationList
|
||||
import app.messages.ui.NewChat
|
||||
import app.messages.ui.SearchResults
|
||||
import app.messages.ui.components.Avatar
|
||||
import app.messages.ui.theme.MsgTheme
|
||||
import app.messages.ui.theme.WType
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
/** Also the target of sms:/smsto: links (required for the default SMS app role). */
|
||||
class MainActivity : ComponentActivity() {
|
||||
private val open = mutableStateOf<Pair<String, String>?>(null) // address to draft
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
Notifier.channel(this)
|
||||
handle(intent)
|
||||
setContent { MsgTheme { App(open.value) { open.value = null } } }
|
||||
}
|
||||
|
||||
override fun onNewIntent(intent: Intent) { super.onNewIntent(intent); handle(intent) }
|
||||
|
||||
private fun handle(i: Intent?) {
|
||||
i ?: return
|
||||
val address = when (i.action) {
|
||||
Intent.ACTION_SENDTO, Intent.ACTION_VIEW -> i.data?.schemeSpecificPart?.substringBefore('?')?.takeIf { i.data?.scheme in setOf("sms", "smsto", "mms", "mmsto") }
|
||||
Intent.ACTION_SEND -> ""
|
||||
else -> i.getStringExtra(Notifier.EXTRA_ADDRESS)
|
||||
} ?: return
|
||||
val body = i.getStringExtra("sms_body") ?: i.getStringExtra(Intent.EXTRA_TEXT) ?: ""
|
||||
open.value = Uri.decode(address) to body
|
||||
}
|
||||
}
|
||||
|
||||
private sealed interface Route {
|
||||
data class Chat(val address: String, val draft: String = "") : Route
|
||||
data object New : Route
|
||||
data object Search : Route
|
||||
data object Archive : Route
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun App(request: Pair<String, String>?, onHandled: () -> Unit) {
|
||||
val ctx = LocalContext.current
|
||||
val role = ctx.getSystemService(RoleManager::class.java)
|
||||
var isDefault by remember { mutableStateOf(role.isRoleHeld(RoleManager.ROLE_SMS)) }
|
||||
var granted by remember { mutableStateOf(has(ctx, Manifest.permission.READ_SMS)) }
|
||||
val perms = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { granted = has(ctx, Manifest.permission.READ_SMS) }
|
||||
val roleLauncher = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
|
||||
isDefault = role.isRoleHeld(RoleManager.ROLE_SMS); granted = has(ctx, Manifest.permission.READ_SMS)
|
||||
if (!has(ctx, Manifest.permission.READ_CONTACTS)) perms.launch(arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.POST_NOTIFICATIONS))
|
||||
}
|
||||
var asked by rememberSaveable { mutableStateOf(false) }
|
||||
LaunchedEffect(Unit) {
|
||||
if (!isDefault && !asked && role.isRoleAvailable(RoleManager.ROLE_SMS)) { asked = true; roleLauncher.launch(role.createRequestRoleIntent(RoleManager.ROLE_SMS)) }
|
||||
else if (!granted) perms.launch(arrayOf(Manifest.permission.READ_SMS, Manifest.permission.READ_CONTACTS, Manifest.permission.POST_NOTIFICATIONS))
|
||||
}
|
||||
|
||||
var route by remember { mutableStateOf<Route?>(null) }
|
||||
LaunchedEffect(request) { request?.let { (a, b) -> route = if (a.isBlank()) Route.New else Route.Chat(a, b); onHandled() } }
|
||||
val threads by remember(granted, isDefault) { Sms.threads(ctx) }.collectAsState(initial = emptyList())
|
||||
var selected by remember { mutableStateOf(setOf<Long>()) }
|
||||
var confirmDelete by remember { mutableStateOf(false) }
|
||||
|
||||
val back: () -> Unit = { route = if (route is Route.Chat || route is Route.Search) null else null }
|
||||
if (route != null) BackHandler(onBack = back)
|
||||
if (selected.isNotEmpty()) BackHandler { selected = emptySet() }
|
||||
|
||||
when (val r = route) {
|
||||
is Route.Chat -> ChatScreen(r.address, r.draft, isDefault, onBack = back) { roleLauncher.launch(role.createRequestRoleIntent(RoleManager.ROLE_SMS)) }
|
||||
Route.New -> Scaffold(topBar = { TopAppBar({ Text(stringResource(R.string.new_chat)) }, navigationIcon = { BackBtn(back) }) }) { pad ->
|
||||
val contacts by produceState(emptyList<Pair<String, String>>()) { value = withContext(Dispatchers.IO) { contacts(ctx) } }
|
||||
NewChat(pad, contacts) { route = Route.Chat(it) }
|
||||
}
|
||||
Route.Search -> Scaffold(topBar = { TopAppBar({ Text(stringResource(R.string.search)) }, navigationIcon = { BackBtn(back) }) }) { pad ->
|
||||
SearchResults(pad, { Sms.search(ctx, it) }, { Sms.contact(ctx, it)?.first ?: it }) { m -> route = Route.Chat(m.address) }
|
||||
}
|
||||
Route.Archive, null -> {
|
||||
val archive = r == Route.Archive
|
||||
var menu by remember { mutableStateOf(false) }
|
||||
Scaffold(
|
||||
topBar = {
|
||||
if (selected.isNotEmpty()) TopAppBar({ Text("${selected.size}") }, navigationIcon = { IconButton({ selected = emptySet() }) { Icon(Icons.AutoMirrored.Rounded.ArrowBack, null) } },
|
||||
actions = {
|
||||
IconButton({ selected.forEach { Sms.setArchived(ctx, it, !archive) }; selected = emptySet() }) { Icon(if (archive) Icons.Outlined.Unarchive else Icons.Outlined.Archive, stringResource(R.string.archive)) }
|
||||
IconButton({ confirmDelete = true }) { Icon(Icons.Outlined.Delete, stringResource(R.string.delete)) }
|
||||
})
|
||||
else TopAppBar({ Text(stringResource(if (archive) R.string.archived else R.string.app_title)) },
|
||||
navigationIcon = { if (archive) BackBtn { route = null } },
|
||||
actions = {
|
||||
IconButton({ route = Route.Search }) { Icon(Icons.Rounded.Search, stringResource(R.string.search)) }
|
||||
IconButton({ menu = true }) { Icon(Icons.Rounded.MoreVert, null) }
|
||||
DropdownMenu(menu, { menu = false }) {
|
||||
DropdownMenuItem(text = { Text(stringResource(R.string.archived)) }, onClick = { menu = false; route = Route.Archive })
|
||||
}
|
||||
})
|
||||
},
|
||||
floatingActionButton = {
|
||||
if (!archive) ExtendedFloatingActionButton(onClick = { route = Route.New }, icon = { Icon(Icons.Outlined.Chat, null) }, text = { Text(stringResource(R.string.start_chat)) },
|
||||
containerColor = MaterialTheme.colorScheme.primaryContainer)
|
||||
},
|
||||
) { pad ->
|
||||
Column {
|
||||
if (!isDefault && !archive) Column(
|
||||
Modifier.padding(start = 16.dp, end = 16.dp, top = pad.calculateTopPadding() + 8.dp).clip(RoundedCornerShape(24.dp)).background(MaterialTheme.colorScheme.primaryContainer)
|
||||
.clickable { roleLauncher.launch(role.createRequestRoleIntent(RoleManager.ROLE_SMS)) }.padding(16.dp),
|
||||
) {
|
||||
Text(stringResource(R.string.default_title), style = WType.body, color = MaterialTheme.colorScheme.onPrimaryContainer)
|
||||
Text(stringResource(R.string.default_text), style = WType.bodySm, color = MaterialTheme.colorScheme.onPrimaryContainer)
|
||||
}
|
||||
ConversationList(threads.filter { it.archived == archive }, if (!isDefault && !archive) PaddingValues(bottom = pad.calculateBottomPadding()) else pad,
|
||||
onOpen = { t -> if (selected.isNotEmpty()) selected = selected.toggle(t.id) else route = Route.Chat(t.address) },
|
||||
onLongPress = { selected = selected.toggle(it.id) }, selected = selected)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (confirmDelete) AlertDialog({ confirmDelete = false }, title = { Text(stringResource(R.string.delete_confirm, selected.size)) },
|
||||
confirmButton = { TextButton({ selected.forEach { Sms.deleteThread(ctx, it) }; selected = emptySet(); confirmDelete = false }) { Text(stringResource(R.string.delete)) } },
|
||||
dismissButton = { TextButton({ confirmDelete = false }) { Text(stringResource(android.R.string.cancel)) } })
|
||||
}
|
||||
|
||||
private fun Set<Long>.toggle(id: Long) = if (id in this) this - id else this + id
|
||||
|
||||
@Composable private fun BackBtn(onClick: () -> Unit) = IconButton(onClick) { Icon(Icons.AutoMirrored.Rounded.ArrowBack, stringResource(R.string.back)) }
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun ChatScreen(address: String, draft: String, isDefault: Boolean, onBack: () -> Unit, onMakeDefault: () -> Unit) {
|
||||
val ctx = LocalContext.current
|
||||
val threadId = remember(address) { runCatching { Sms.threadIdFor(ctx, address) }.getOrDefault(-1L) }
|
||||
val messages by remember(threadId) { Sms.messages(ctx, threadId) }.collectAsState(initial = emptyList())
|
||||
LaunchedEffect(threadId, messages.size) { if (isDefault) { Sms.markRead(ctx, threadId); Notifier.cancel(ctx, threadId) } }
|
||||
val who = remember(address) { Sms.contact(ctx, address) }
|
||||
var menuFor by remember { mutableStateOf<Message?>(null) }
|
||||
var needRole by remember { mutableStateOf(false) }
|
||||
Scaffold(topBar = {
|
||||
TopAppBar(title = {
|
||||
androidx.compose.foundation.layout.Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically) {
|
||||
Avatar(who?.first ?: address, who?.second, 36.dp)
|
||||
Text(" " + (who?.first ?: address), style = WType.title.copy(fontSize = WType.body.fontSize * 1.15f))
|
||||
}
|
||||
}, navigationIcon = { BackBtn(onBack) }, actions = {
|
||||
if (address.any(Char::isDigit)) IconButton({ ctx.startActivity(Intent(Intent.ACTION_DIAL, Uri.fromParts("tel", address, null))) }) { Icon(Icons.Outlined.Call, stringResource(R.string.call)) }
|
||||
})
|
||||
}) { pad ->
|
||||
Conversation(messages, pad, onSend = { text -> if (isDefault) Sender.send(ctx, address, text) else needRole = true },
|
||||
onRetry = { m -> if (isDefault) { Sms.deleteMessage(ctx, m.id); Sender.send(ctx, address, m.body) } }, onLong = { menuFor = it }, draft = draft)
|
||||
}
|
||||
menuFor?.let { m ->
|
||||
AlertDialog({ menuFor = null }, text = {
|
||||
Column {
|
||||
TextButton({ ctx.getSystemService(ClipboardManager::class.java).setPrimaryClip(ClipData.newPlainText("SMS", m.body)); menuFor = null }) { Text(stringResource(R.string.copy)) }
|
||||
TextButton({ Sms.deleteMessage(ctx, m.id); menuFor = null }) { Text(stringResource(R.string.delete)) }
|
||||
}
|
||||
}, confirmButton = {})
|
||||
}
|
||||
if (needRole) AlertDialog({ needRole = false }, title = { Text(stringResource(R.string.default_title)) }, text = { Text(stringResource(R.string.need_role_send)) },
|
||||
confirmButton = { TextButton({ needRole = false; onMakeDefault() }) { Text(stringResource(R.string.make_default)) } },
|
||||
dismissButton = { TextButton({ needRole = false }) { Text(stringResource(android.R.string.cancel)) } })
|
||||
}
|
||||
|
||||
private fun has(ctx: Context, p: String) = ContextCompat.checkSelfPermission(ctx, p) == PackageManager.PERMISSION_GRANTED
|
||||
|
||||
private fun contacts(ctx: Context): List<Pair<String, String>> {
|
||||
if (!has(ctx, Manifest.permission.READ_CONTACTS)) return emptyList()
|
||||
val out = mutableListOf<Pair<String, String>>()
|
||||
runCatching {
|
||||
ctx.contentResolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
|
||||
arrayOf(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME, ContactsContract.CommonDataKinds.Phone.NUMBER), null, null,
|
||||
"${ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME} COLLATE LOCALIZED ASC")?.use { c -> while (c.moveToNext()) out += c.getString(0).orEmpty() to c.getString(1).orEmpty() }
|
||||
}
|
||||
return out.distinctBy { it.second.filter(Char::isDigit) }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,152 @@
|
||||
package app.messages.data
|
||||
|
||||
import android.Manifest
|
||||
import android.content.ContentValues
|
||||
import android.content.Context
|
||||
import android.content.pm.PackageManager
|
||||
import android.database.ContentObserver
|
||||
import android.net.Uri
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.provider.ContactsContract
|
||||
import android.provider.Telephony
|
||||
import androidx.core.content.ContextCompat
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.channels.awaitClose
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.callbackFlow
|
||||
import kotlinx.coroutines.flow.flowOn
|
||||
|
||||
enum class Box { INBOX, SENT, OUTBOX, FAILED, QUEUED, DRAFT }
|
||||
|
||||
data class Message(val id: Long, val threadId: Long, val address: String, val body: String, val date: Long, val box: Box, val read: Boolean, val status: Int)
|
||||
|
||||
data class Thread(val id: Long, val address: String, val name: String?, val photo: Uri?, val snippet: String, val date: Long, val unread: Int, val lastFromMe: Boolean, val archived: Boolean)
|
||||
|
||||
private fun Context.has(p: String) = ContextCompat.checkSelfPermission(this, p) == PackageManager.PERMISSION_GRANTED
|
||||
|
||||
private fun <T> Context.observe(uri: Uri, load: () -> T): Flow<T> = callbackFlow {
|
||||
val obs = object : ContentObserver(Handler(Looper.getMainLooper())) { override fun onChange(selfChange: Boolean) { trySend(load()) } }
|
||||
contentResolver.registerContentObserver(uri, true, obs)
|
||||
trySend(load())
|
||||
awaitClose { contentResolver.unregisterContentObserver(obs) }
|
||||
}.flowOn(Dispatchers.IO)
|
||||
|
||||
/** All SMS data lives in Android's own provider; this app only reads and (as default SMS app) writes it. */
|
||||
object Sms {
|
||||
private val nameCache = mutableMapOf<String, Pair<String, Uri?>?>()
|
||||
|
||||
fun contact(context: Context, number: String): Pair<String, Uri?>? = nameCache.getOrPut(number) {
|
||||
if (number.isBlank() || !context.has(Manifest.permission.READ_CONTACTS)) return@getOrPut null
|
||||
runCatching {
|
||||
context.contentResolver.query(Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number)),
|
||||
arrayOf(ContactsContract.PhoneLookup.DISPLAY_NAME, ContactsContract.PhoneLookup.PHOTO_URI), null, null, null)?.use { c ->
|
||||
if (c.moveToFirst()) c.getString(0) to c.getString(1)?.let(Uri::parse) else null
|
||||
}
|
||||
}.getOrNull()
|
||||
}
|
||||
|
||||
private fun box(t: Int) = when (t) {
|
||||
Telephony.Sms.MESSAGE_TYPE_SENT -> Box.SENT; Telephony.Sms.MESSAGE_TYPE_OUTBOX -> Box.OUTBOX; Telephony.Sms.MESSAGE_TYPE_FAILED -> Box.FAILED
|
||||
Telephony.Sms.MESSAGE_TYPE_QUEUED -> Box.QUEUED; Telephony.Sms.MESSAGE_TYPE_DRAFT -> Box.DRAFT; else -> Box.INBOX
|
||||
}
|
||||
|
||||
/** One row per thread, newest first: built from the SMS table (works on every Android build). */
|
||||
fun threads(context: Context): Flow<List<Thread>> = context.observe(Telephony.Sms.CONTENT_URI) { loadThreads(context) }
|
||||
|
||||
private fun loadThreads(context: Context): List<Thread> {
|
||||
if (!context.has(Manifest.permission.READ_SMS)) return emptyList()
|
||||
val archived = archivedIds(context)
|
||||
val latest = linkedMapOf<Long, Thread>()
|
||||
val unread = mutableMapOf<Long, Int>()
|
||||
runCatching {
|
||||
context.contentResolver.query(Telephony.Sms.CONTENT_URI,
|
||||
arrayOf(Telephony.Sms.THREAD_ID, Telephony.Sms.ADDRESS, Telephony.Sms.BODY, Telephony.Sms.DATE, Telephony.Sms.TYPE, Telephony.Sms.READ),
|
||||
null, null, "${Telephony.Sms.DATE} DESC")?.use { c ->
|
||||
while (c.moveToNext()) {
|
||||
val tid = c.getLong(0)
|
||||
if (c.getInt(5) == 0 && box(c.getInt(4)) == Box.INBOX) unread[tid] = (unread[tid] ?: 0) + 1
|
||||
if (tid in latest) continue
|
||||
val address = c.getString(1).orEmpty()
|
||||
val who = contact(context, address)
|
||||
latest[tid] = Thread(tid, address, who?.first, who?.second, c.getString(2).orEmpty(), c.getLong(3), 0, box(c.getInt(4)) != Box.INBOX, tid in archived)
|
||||
}
|
||||
}
|
||||
}
|
||||
return latest.values.map { it.copy(unread = unread[it.id] ?: 0) }
|
||||
}
|
||||
|
||||
fun messages(context: Context, threadId: Long): Flow<List<Message>> = context.observe(Telephony.Sms.CONTENT_URI) {
|
||||
val out = mutableListOf<Message>()
|
||||
runCatching {
|
||||
context.contentResolver.query(Telephony.Sms.CONTENT_URI,
|
||||
arrayOf(Telephony.Sms._ID, Telephony.Sms.THREAD_ID, Telephony.Sms.ADDRESS, Telephony.Sms.BODY, Telephony.Sms.DATE, Telephony.Sms.TYPE, Telephony.Sms.READ, Telephony.Sms.STATUS),
|
||||
"${Telephony.Sms.THREAD_ID} = ?", arrayOf(threadId.toString()), "${Telephony.Sms.DATE} ASC")?.use { c ->
|
||||
while (c.moveToNext()) out += Message(c.getLong(0), c.getLong(1), c.getString(2).orEmpty(), c.getString(3).orEmpty(), c.getLong(4), box(c.getInt(5)), c.getInt(6) == 1, c.getInt(7))
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fun search(context: Context, q: String): List<Message> {
|
||||
if (q.length < 2) return emptyList()
|
||||
val out = mutableListOf<Message>()
|
||||
runCatching {
|
||||
context.contentResolver.query(Telephony.Sms.CONTENT_URI,
|
||||
arrayOf(Telephony.Sms._ID, Telephony.Sms.THREAD_ID, Telephony.Sms.ADDRESS, Telephony.Sms.BODY, Telephony.Sms.DATE, Telephony.Sms.TYPE, Telephony.Sms.READ, Telephony.Sms.STATUS),
|
||||
"${Telephony.Sms.BODY} LIKE ?", arrayOf("%$q%"), "${Telephony.Sms.DATE} DESC LIMIT 100")?.use { c ->
|
||||
while (c.moveToNext()) out += Message(c.getLong(0), c.getLong(1), c.getString(2).orEmpty(), c.getString(3).orEmpty(), c.getLong(4), box(c.getInt(5)), c.getInt(6) == 1, c.getInt(7))
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
fun threadIdFor(context: Context, address: String): Long = Telephony.Threads.getOrCreateThreadId(context, address)
|
||||
|
||||
fun insertIncoming(context: Context, address: String, body: String, sentAt: Long, subId: Int): Uri? = context.contentResolver.insert(
|
||||
Telephony.Sms.Inbox.CONTENT_URI,
|
||||
ContentValues().apply {
|
||||
put(Telephony.Sms.ADDRESS, address); put(Telephony.Sms.BODY, body); put(Telephony.Sms.DATE, System.currentTimeMillis())
|
||||
put(Telephony.Sms.DATE_SENT, sentAt); put(Telephony.Sms.READ, 0); put(Telephony.Sms.SEEN, 0); put(Telephony.Sms.SUBSCRIPTION_ID, subId)
|
||||
},
|
||||
)
|
||||
|
||||
fun insertOutgoing(context: Context, address: String, body: String, subId: Int): Uri? = context.contentResolver.insert(
|
||||
Telephony.Sms.Outbox.CONTENT_URI,
|
||||
ContentValues().apply {
|
||||
put(Telephony.Sms.ADDRESS, address); put(Telephony.Sms.BODY, body); put(Telephony.Sms.DATE, System.currentTimeMillis())
|
||||
put(Telephony.Sms.READ, 1); put(Telephony.Sms.SUBSCRIPTION_ID, subId)
|
||||
},
|
||||
)
|
||||
|
||||
fun setBox(context: Context, uri: Uri, type: Int) = runCatching {
|
||||
context.contentResolver.update(uri, ContentValues().apply { put(Telephony.Sms.TYPE, type) }, null, null)
|
||||
}
|
||||
|
||||
fun setDelivered(context: Context, uri: Uri, ok: Boolean) = runCatching {
|
||||
context.contentResolver.update(uri, ContentValues().apply { put(Telephony.Sms.STATUS, if (ok) Telephony.Sms.STATUS_COMPLETE else Telephony.Sms.STATUS_FAILED) }, null, null)
|
||||
}
|
||||
|
||||
fun markRead(context: Context, threadId: Long) = runCatching {
|
||||
context.contentResolver.update(Telephony.Sms.CONTENT_URI, ContentValues().apply { put(Telephony.Sms.READ, 1); put(Telephony.Sms.SEEN, 1) },
|
||||
"${Telephony.Sms.THREAD_ID} = ? AND ${Telephony.Sms.READ} = 0", arrayOf(threadId.toString()))
|
||||
}
|
||||
|
||||
fun deleteThread(context: Context, threadId: Long) = runCatching {
|
||||
context.contentResolver.delete(Telephony.Sms.CONTENT_URI, "${Telephony.Sms.THREAD_ID} = ?", arrayOf(threadId.toString()))
|
||||
}
|
||||
|
||||
fun deleteMessage(context: Context, id: Long) = runCatching {
|
||||
context.contentResolver.delete(Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()), null, null)
|
||||
}
|
||||
|
||||
// Archive: kept in our own preferences (the provider column is not writable on every build)
|
||||
private fun prefs(context: Context) = context.getSharedPreferences("archive", Context.MODE_PRIVATE)
|
||||
fun archivedIds(context: Context): Set<Long> = prefs(context).getStringSet("ids", emptySet())!!.mapNotNull { it.toLongOrNull() }.toSet()
|
||||
fun setArchived(context: Context, threadId: Long, on: Boolean) {
|
||||
val s = archivedIds(context).map { it.toString() }.toMutableSet()
|
||||
if (on) s += threadId.toString() else s -= threadId.toString()
|
||||
prefs(context).edit().putStringSet("ids", s).apply()
|
||||
context.contentResolver.notifyChange(Telephony.Sms.CONTENT_URI, null)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package app.messages.sms
|
||||
|
||||
import android.Manifest
|
||||
import android.app.NotificationChannel
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.Person
|
||||
import androidx.core.app.RemoteInput
|
||||
import androidx.core.content.ContextCompat
|
||||
import app.messages.MainActivity
|
||||
import app.messages.R
|
||||
import app.messages.data.Sms
|
||||
|
||||
object Notifier {
|
||||
const val CH = "messages"
|
||||
const val ACTION_REPLY = "app.messages.REPLY"
|
||||
const val ACTION_READ = "app.messages.READ"
|
||||
const val KEY_REPLY = "reply"
|
||||
const val EXTRA_THREAD = "thread"
|
||||
const val EXTRA_ADDRESS = "address"
|
||||
|
||||
fun channel(context: Context) = context.getSystemService(NotificationManager::class.java)
|
||||
.createNotificationChannel(NotificationChannel(CH, context.getString(R.string.ch_messages), NotificationManager.IMPORTANCE_HIGH))
|
||||
|
||||
fun incoming(context: Context, threadId: Long, address: String, body: String) {
|
||||
if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) return
|
||||
channel(context)
|
||||
val name = Sms.contact(context, address)?.first ?: address
|
||||
val sender = Person.Builder().setName(name).setKey(address).build()
|
||||
val me = Person.Builder().setName(context.getString(R.string.me)).build()
|
||||
val open = PendingIntent.getActivity(context, threadId.toInt(),
|
||||
Intent(context, MainActivity::class.java).putExtra(EXTRA_THREAD, threadId).putExtra(EXTRA_ADDRESS, address).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP),
|
||||
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
fun action(a: String, mutable: Boolean) = PendingIntent.getBroadcast(context, (a + threadId).hashCode(),
|
||||
Intent(context, NotificationActionReceiver::class.java).setAction(a).putExtra(EXTRA_THREAD, threadId).putExtra(EXTRA_ADDRESS, address),
|
||||
if (mutable) PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT else PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
val reply = NotificationCompat.Action.Builder(0, context.getString(R.string.reply), action(ACTION_REPLY, true))
|
||||
.addRemoteInput(RemoteInput.Builder(KEY_REPLY).setLabel(context.getString(R.string.reply_hint)).build())
|
||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY).setShowsUserInterface(false).build()
|
||||
val read = NotificationCompat.Action.Builder(0, context.getString(R.string.mark_read), action(ACTION_READ, false))
|
||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).setShowsUserInterface(false).build()
|
||||
val n = NotificationCompat.Builder(context, CH).setSmallIcon(R.drawable.ic_stat_message)
|
||||
.setStyle(NotificationCompat.MessagingStyle(me).addMessage(body, System.currentTimeMillis(), sender))
|
||||
.setContentIntent(open).setAutoCancel(true).setCategory(NotificationCompat.CATEGORY_MESSAGE)
|
||||
.addAction(reply).addAction(read).setShortcutId(null).build()
|
||||
context.getSystemService(NotificationManager::class.java).notify(threadId.toInt(), n)
|
||||
}
|
||||
|
||||
fun cancel(context: Context, threadId: Long) = context.getSystemService(NotificationManager::class.java).cancel(threadId.toInt())
|
||||
|
||||
fun mmsUnsupported(context: Context) {
|
||||
if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) return
|
||||
channel(context)
|
||||
context.getSystemService(NotificationManager::class.java).notify(1,
|
||||
NotificationCompat.Builder(context, CH).setSmallIcon(R.drawable.ic_stat_message)
|
||||
.setContentTitle(context.getString(R.string.mms_title)).setContentText(context.getString(R.string.mms_text)).setAutoCancel(true).build())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
package app.messages.sms
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.Service
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.IBinder
|
||||
import android.provider.Telephony
|
||||
import android.telephony.SmsManager
|
||||
import android.telephony.SubscriptionManager
|
||||
import androidx.core.app.RemoteInput
|
||||
import app.messages.data.Sms
|
||||
|
||||
/** SMS_DELIVER: only the default SMS app gets this, and must store the message itself. */
|
||||
class SmsDeliverReceiver : BroadcastReceiver() {
|
||||
override fun onReceive(context: Context, intent: Intent) {
|
||||
val parts = Telephony.Sms.Intents.getMessagesFromIntent(intent) ?: return
|
||||
if (parts.isEmpty()) return
|
||||
val address = parts[0].displayOriginatingAddress.orEmpty()
|
||||
val body = parts.joinToString("") { it.displayMessageBody.orEmpty() }
|
||||
val subId = intent.getIntExtra("subscription", SubscriptionManager.getDefaultSmsSubscriptionId())
|
||||
val uri = Sms.insertIncoming(context, address, body, parts[0].timestampMillis, subId)
|
||||
val threadId = Sms.threadIdFor(context, address)
|
||||
Notifier.incoming(context, threadId, address, body)
|
||||
android.util.Log.i("Messages", "stored incoming sms $uri")
|
||||
}
|
||||
}
|
||||
|
||||
/** MMS push: accepted so the role is valid; MMS download is not supported yet. */
|
||||
class MmsDeliverReceiver : BroadcastReceiver() {
|
||||
override fun onReceive(context: Context, intent: Intent) = Notifier.mmsUnsupported(context)
|
||||
}
|
||||
|
||||
object Sender {
|
||||
const val ACTION_SENT = "app.messages.SENT"
|
||||
const val ACTION_DELIVERED = "app.messages.DELIVERED"
|
||||
|
||||
/** Writes to the outbox first, so a message never disappears; the receivers move it to sent or failed. */
|
||||
fun send(context: Context, address: String, text: String, subId: Int = SubscriptionManager.getDefaultSmsSubscriptionId()) {
|
||||
if (text.isBlank() || address.isBlank()) return
|
||||
val uri = Sms.insertOutgoing(context, address, text, subId) ?: return
|
||||
val sm = (if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) context.getSystemService(SmsManager::class.java).createForSubscriptionId(subId)
|
||||
else context.getSystemService(SmsManager::class.java))
|
||||
val parts = sm.divideMessage(text)
|
||||
fun pi(action: String, i: Int) = android.app.PendingIntent.getBroadcast(
|
||||
context, (uri.toString() + action + i).hashCode(),
|
||||
Intent(context, SmsStatusReceiver::class.java).setAction(action).setData(uri).putExtra("last", i == parts.lastIndex),
|
||||
android.app.PendingIntent.FLAG_IMMUTABLE,
|
||||
)
|
||||
val sent = ArrayList(parts.indices.map { pi(ACTION_SENT, it) })
|
||||
val delivered = ArrayList(parts.indices.map { pi(ACTION_DELIVERED, it) })
|
||||
runCatching { sm.sendMultipartTextMessage(address, null, parts, sent, delivered) }
|
||||
.onFailure { Sms.setBox(context, uri, Telephony.Sms.MESSAGE_TYPE_FAILED) }
|
||||
}
|
||||
}
|
||||
|
||||
class SmsStatusReceiver : BroadcastReceiver() {
|
||||
override fun onReceive(context: Context, intent: Intent) {
|
||||
val uri: Uri = intent.data ?: return
|
||||
when (intent.action) {
|
||||
Sender.ACTION_SENT -> {
|
||||
val ok = resultCode == Activity.RESULT_OK
|
||||
// any failed part fails the message; the last part's success marks it sent
|
||||
if (!ok) Sms.setBox(context, uri, Telephony.Sms.MESSAGE_TYPE_FAILED)
|
||||
else if (intent.getBooleanExtra("last", true)) Sms.setBox(context, uri, Telephony.Sms.MESSAGE_TYPE_SENT)
|
||||
}
|
||||
Sender.ACTION_DELIVERED -> if (intent.getBooleanExtra("last", true)) Sms.setDelivered(context, uri, resultCode == Activity.RESULT_OK)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Direct reply and "mark as read" from the notification. */
|
||||
class NotificationActionReceiver : BroadcastReceiver() {
|
||||
override fun onReceive(context: Context, intent: Intent) {
|
||||
val threadId = intent.getLongExtra(Notifier.EXTRA_THREAD, -1)
|
||||
val address = intent.getStringExtra(Notifier.EXTRA_ADDRESS).orEmpty()
|
||||
when (intent.action) {
|
||||
Notifier.ACTION_REPLY -> {
|
||||
val text = RemoteInput.getResultsFromIntent(intent)?.getCharSequence(Notifier.KEY_REPLY)?.toString().orEmpty()
|
||||
Sender.send(context, address, text)
|
||||
Sms.markRead(context, threadId)
|
||||
Notifier.cancel(context, threadId)
|
||||
}
|
||||
Notifier.ACTION_READ -> { Sms.markRead(context, threadId); Notifier.cancel(context, threadId) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** "Decline with message" from the phone app; required for the SMS role. */
|
||||
class RespondViaMessageService : Service() {
|
||||
override fun onBind(intent: Intent?): IBinder? = null
|
||||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
||||
val to = intent?.data?.schemeSpecificPart?.substringBefore('?').orEmpty()
|
||||
val text = intent?.getStringExtra(Intent.EXTRA_TEXT).orEmpty()
|
||||
if (to.isNotBlank() && text.isNotBlank()) Sender.send(this, to, text)
|
||||
stopSelf(startId)
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,230 @@
|
||||
package app.messages.ui
|
||||
|
||||
import android.text.format.DateUtils
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.combinedClickable
|
||||
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.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.imePadding
|
||||
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.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.rounded.Send
|
||||
import androidx.compose.material.icons.rounded.ErrorOutline
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
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.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.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.SpanStyle
|
||||
import androidx.compose.ui.text.buildAnnotatedString
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.text.withStyle
|
||||
import androidx.compose.ui.unit.dp
|
||||
import app.messages.R
|
||||
import app.messages.data.Box as MBox
|
||||
import app.messages.data.Message
|
||||
import app.messages.data.Thread
|
||||
import app.messages.ui.components.Avatar
|
||||
import app.messages.ui.theme.WType
|
||||
import java.time.Instant
|
||||
import java.time.LocalDate
|
||||
import java.time.ZoneId
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.time.format.FormatStyle
|
||||
|
||||
fun shortTime(at: Long): String {
|
||||
val d = Instant.ofEpochMilli(at).atZone(ZoneId.systemDefault())
|
||||
return when {
|
||||
d.toLocalDate() == LocalDate.now() -> d.toLocalTime().format(DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT))
|
||||
d.toLocalDate().isAfter(LocalDate.now().minusDays(7)) -> d.format(DateTimeFormatter.ofPattern("EEE"))
|
||||
else -> d.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
|
||||
}
|
||||
}
|
||||
|
||||
/** S01 */
|
||||
@Composable
|
||||
fun ConversationList(threads: List<Thread>, pad: PaddingValues, onOpen: (Thread) -> Unit, onLongPress: (Thread) -> Unit, selected: Set<Long>) {
|
||||
if (threads.isEmpty()) {
|
||||
Box(Modifier.fillMaxSize().padding(pad), contentAlignment = Alignment.Center) {
|
||||
Text(stringResource(R.string.no_threads), style = WType.body, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
return
|
||||
}
|
||||
LazyColumn(Modifier.fillMaxSize(), contentPadding = PaddingValues(top = pad.calculateTopPadding(), bottom = pad.calculateBottomPadding() + 96.dp)) {
|
||||
items(threads, key = { it.id }) { t ->
|
||||
val unread = t.unread > 0
|
||||
val sel = t.id in selected
|
||||
Row(
|
||||
Modifier.fillMaxWidth().background(if (sel) MaterialTheme.colorScheme.secondaryContainer else Color.Transparent)
|
||||
.combinedClickable(onClick = { onOpen(t) }, onLongClick = { onLongPress(t) }).padding(horizontal = 16.dp, vertical = 12.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Avatar(t.name ?: t.address, t.photo, 48.dp)
|
||||
Spacer(Modifier.width(16.dp))
|
||||
Column(Modifier.weight(1f)) {
|
||||
Text(t.name ?: t.address, style = WType.body.copy(fontWeight = if (unread) FontWeight.Bold else FontWeight.Normal), maxLines = 1, overflow = TextOverflow.Ellipsis)
|
||||
Text(
|
||||
(if (t.lastFromMe) stringResource(R.string.you_prefix) else "") + t.snippet.replace('\n', ' '),
|
||||
style = WType.bodySm.copy(fontWeight = if (unread) FontWeight.SemiBold else FontWeight.Normal),
|
||||
color = if (unread) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
}
|
||||
Column(horizontalAlignment = Alignment.End) {
|
||||
Text(shortTime(t.date), style = WType.label, color = if (unread) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
if (unread) Box(Modifier.padding(top = 6.dp).size(10.dp).clip(CircleShape).background(MaterialTheme.colorScheme.primary))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** S02 */
|
||||
@Composable
|
||||
fun Conversation(messages: List<Message>, pad: PaddingValues, onSend: (String) -> Unit, onRetry: (Message) -> Unit, onLong: (Message) -> Unit, draft: String = "") {
|
||||
var text by rememberSaveable { mutableStateOf(draft) }
|
||||
val list = rememberLazyListState()
|
||||
LaunchedEffect(messages.size) { if (messages.isNotEmpty()) list.scrollToItem(messages.size * 2) }
|
||||
Column(Modifier.fillMaxSize().padding(top = pad.calculateTopPadding()).imePadding().navigationBarsPadding()) {
|
||||
LazyColumn(Modifier.weight(1f).fillMaxWidth(), state = list, contentPadding = PaddingValues(12.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {
|
||||
var lastDay: LocalDate? = null
|
||||
messages.forEachIndexed { i, m ->
|
||||
val day = Instant.ofEpochMilli(m.date).atZone(ZoneId.systemDefault()).toLocalDate()
|
||||
if (day != lastDay) {
|
||||
lastDay = day
|
||||
item(key = "d${m.id}") {
|
||||
Text(DateUtils.getRelativeTimeSpanString(m.date, System.currentTimeMillis(), DateUtils.DAY_IN_MILLIS).toString(),
|
||||
style = WType.label, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
|
||||
textAlign = androidx.compose.ui.text.style.TextAlign.Center)
|
||||
}
|
||||
}
|
||||
val mine = m.box != MBox.INBOX
|
||||
val prevSame = messages.getOrNull(i - 1)?.let { (it.box != MBox.INBOX) == mine } == true
|
||||
val nextSame = messages.getOrNull(i + 1)?.let { (it.box != MBox.INBOX) == mine } == true
|
||||
item(key = m.id) { Bubble(m, mine, prevSame, nextSame, isLast = !nextSame, onRetry, onLong) }
|
||||
}
|
||||
}
|
||||
Row(Modifier.padding(8.dp), verticalAlignment = Alignment.Bottom) {
|
||||
TextField(
|
||||
text, { text = it }, Modifier.weight(1f).heightIn(min = 52.dp).clip(RoundedCornerShape(26.dp)),
|
||||
placeholder = { Text(stringResource(R.string.compose_hint)) }, maxLines = 6,
|
||||
colors = TextFieldDefaults.colors(focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent,
|
||||
focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer, unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer),
|
||||
)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
val can = text.isNotBlank()
|
||||
Box(Modifier.size(52.dp).clip(CircleShape).background(if (can) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surfaceContainer)
|
||||
.clickable(enabled = can) { onSend(text.trim()); text = "" }, contentAlignment = Alignment.Center) {
|
||||
Icon(Icons.AutoMirrored.Rounded.Send, stringResource(R.string.send), tint = if (can) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun Bubble(m: Message, mine: Boolean, prevSame: Boolean, nextSame: Boolean, isLast: Boolean, onRetry: (Message) -> Unit, onLong: (Message) -> Unit) {
|
||||
val s = MaterialTheme.colorScheme
|
||||
val big = 20.dp; val small = 6.dp
|
||||
val shape = if (mine) RoundedCornerShape(big, if (prevSame) small else big, if (nextSame) small else big, big)
|
||||
else RoundedCornerShape(if (prevSame) small else big, big, big, if (nextSame) small else big)
|
||||
val failed = m.box == MBox.FAILED
|
||||
Column(Modifier.fillMaxWidth().padding(top = if (prevSame) 0.dp else 6.dp), horizontalAlignment = if (mine) Alignment.End else Alignment.Start) {
|
||||
Box(
|
||||
Modifier.widthIn(max = 300.dp).clip(shape).background(if (mine) s.primary else s.surfaceContainerHigh)
|
||||
.combinedClickable(onClick = { if (failed) onRetry(m) }, onLongClick = { onLong(m) }).padding(horizontal = 14.dp, vertical = 10.dp),
|
||||
) { Text(m.body, style = WType.body, color = if (mine) s.onPrimary else s.onSurface) }
|
||||
if (isLast || failed) {
|
||||
val status = when {
|
||||
failed -> stringResource(R.string.failed_retry)
|
||||
m.box == MBox.OUTBOX || m.box == MBox.QUEUED -> stringResource(R.string.sending)
|
||||
mine && m.status == android.provider.Telephony.Sms.STATUS_COMPLETE -> stringResource(R.string.delivered) + " · " + shortTime(m.date)
|
||||
else -> shortTime(m.date)
|
||||
}
|
||||
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp)) {
|
||||
if (failed) Icon(Icons.Rounded.ErrorOutline, null, Modifier.size(14.dp), tint = s.error)
|
||||
Text(" $status", style = WType.label, color = if (failed) s.error else s.onSurfaceVariant)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** S03 */
|
||||
@Composable
|
||||
fun NewChat(pad: PaddingValues, contacts: List<Pair<String, String>>, onPick: (String) -> Unit) {
|
||||
var q by rememberSaveable { mutableStateOf("") }
|
||||
val hits = remember(q, contacts) { contacts.filter { (n, num) -> q.isBlank() || n.contains(q, true) || num.filter(Char::isDigit).contains(q.filter(Char::isDigit).ifEmpty { "§" }) }.take(60) }
|
||||
Column(Modifier.fillMaxSize().padding(pad)) {
|
||||
TextField(q, { q = it }, Modifier.fillMaxWidth().padding(16.dp).clip(RoundedCornerShape(28.dp)), singleLine = true,
|
||||
prefix = { Text(stringResource(R.string.to) + " ") }, placeholder = { Text(stringResource(R.string.to_hint)) },
|
||||
colors = TextFieldDefaults.colors(focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent))
|
||||
LazyColumn {
|
||||
if (q.count(Char::isDigit) >= 3) item {
|
||||
Text(stringResource(R.string.send_to, q), style = WType.body, modifier = Modifier.fillMaxWidth().clickable { onPick(q) }.padding(horizontal = 24.dp, vertical = 14.dp))
|
||||
}
|
||||
items(hits) { (name, number) ->
|
||||
Row(Modifier.fillMaxWidth().clickable { onPick(number) }.padding(horizontal = 16.dp, vertical = 10.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Avatar(name, null, 40.dp); Spacer(Modifier.width(16.dp))
|
||||
Column { Text(name, style = WType.body); Text(number, style = WType.bodySm, color = MaterialTheme.colorScheme.onSurfaceVariant) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** S04 */
|
||||
@Composable
|
||||
fun SearchResults(pad: PaddingValues, search: (String) -> List<Message>, nameOf: (String) -> String, onOpen: (Message) -> Unit) {
|
||||
var q by rememberSaveable { mutableStateOf("") }
|
||||
val hits = remember(q) { search(q) }
|
||||
Column(Modifier.fillMaxSize().padding(pad)) {
|
||||
TextField(q, { q = it }, Modifier.fillMaxWidth().padding(16.dp).clip(RoundedCornerShape(28.dp)), singleLine = true, placeholder = { Text(stringResource(R.string.search_hint)) },
|
||||
colors = TextFieldDefaults.colors(focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent))
|
||||
LazyColumn {
|
||||
itemsIndexed(hits) { _, m ->
|
||||
Column(Modifier.fillMaxWidth().clickable { onOpen(m) }.padding(horizontal = 24.dp, vertical = 10.dp)) {
|
||||
Row { Text(nameOf(m.address), style = WType.body, modifier = Modifier.weight(1f)); Text(shortTime(m.date), style = WType.label) }
|
||||
val i = m.body.indexOf(q, ignoreCase = true)
|
||||
Text(buildAnnotatedString {
|
||||
if (i < 0) append(m.body) else {
|
||||
append(m.body.substring(0, i))
|
||||
withStyle(SpanStyle(fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.primary)) { append(m.body.substring(i, i + q.length)) }
|
||||
append(m.body.substring(i + q.length))
|
||||
}
|
||||
}, style = WType.bodySm, maxLines = 2, overflow = TextOverflow.Ellipsis)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
package app.messages.ui.components
|
||||
|
||||
import android.graphics.BitmapFactory
|
||||
import android.net.Uri
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.Person
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.produceState
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.geometry.Offset
|
||||
import androidx.compose.ui.geometry.Size
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.ImageBitmap
|
||||
import androidx.compose.ui.graphics.Outline
|
||||
import androidx.compose.ui.graphics.Path
|
||||
import androidx.compose.ui.graphics.Shape
|
||||
import androidx.compose.ui.graphics.asImageBitmap
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.Density
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.LayoutDirection
|
||||
import androidx.compose.ui.unit.sp
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import kotlin.math.PI
|
||||
import kotlin.math.abs
|
||||
import kotlin.math.cos
|
||||
import kotlin.math.sin
|
||||
|
||||
/** 12-wave scalloped circle for the call screens. */
|
||||
object CookieShape : Shape {
|
||||
override fun createOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline {
|
||||
val c = Offset(size.width / 2, size.height / 2); val r = size.minDimension / 2 * .94f
|
||||
val p = Path()
|
||||
for (i in 0..180) {
|
||||
val a = 2 * PI * i / 180
|
||||
val rr = r * (1 + .05f * cos(12 * a).toFloat())
|
||||
val x = c.x + rr * cos(a).toFloat(); val y = c.y + rr * sin(a).toFloat()
|
||||
if (i == 0) p.moveTo(x, y) else p.lineTo(x, y)
|
||||
}
|
||||
p.close()
|
||||
return Outline.Generic(p)
|
||||
}
|
||||
}
|
||||
|
||||
private val palette = listOf(0xFFD3E3FD, 0xFFC4EED0, 0xFFFFDAD6, 0xFFE9DDFF, 0xFFFFE08B, 0xFFC2E7FF).map { Color(it) }
|
||||
private val onPalette = listOf(0xFF041E49, 0xFF072711, 0xFF410002, 0xFF21005D, 0xFF241A00, 0xFF001E2F).map { Color(it) }
|
||||
|
||||
@Composable
|
||||
fun Avatar(name: String?, photo: Uri?, size: Dp, cookie: Boolean = false, modifier: Modifier = Modifier) {
|
||||
val ctx = LocalContext.current
|
||||
val bmp = produceState<ImageBitmap?>(null, photo) {
|
||||
value = photo?.let { u -> withContext(Dispatchers.IO) { runCatching { ctx.contentResolver.openInputStream(u)?.use { BitmapFactory.decodeStream(it)?.asImageBitmap() } }.getOrNull() } }
|
||||
}.value
|
||||
val shape = if (cookie) CookieShape else CircleShape
|
||||
val i = abs((name ?: "").hashCode()) % palette.size
|
||||
Box(modifier.size(size).clip(shape).background(palette[i]), contentAlignment = Alignment.Center) {
|
||||
when {
|
||||
bmp != null -> Image(bmp, null, Modifier.size(size), contentScale = ContentScale.Crop)
|
||||
!name.isNullOrBlank() && name.first().isLetter() -> Text(name.first().uppercase(), color = onPalette[i], fontSize = (size.value * .42f).sp)
|
||||
else -> Icon(Icons.Rounded.Person, null, tint = onPalette[i], modifier = Modifier.size(size * .55f))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.messages.ui.theme
|
||||
|
||||
import android.os.Build
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.darkColorScheme
|
||||
import androidx.compose.material3.dynamicDarkColorScheme
|
||||
import androidx.compose.material3.dynamicLightColorScheme
|
||||
import androidx.compose.material3.lightColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
|
||||
@Composable
|
||||
fun MsgTheme(dynamic: Boolean = true, forceDark: Boolean? = null, content: @Composable () -> Unit) {
|
||||
val dark = forceDark ?: isSystemInDarkTheme()
|
||||
val ctx = LocalContext.current
|
||||
val scheme = when {
|
||||
dynamic && Build.VERSION.SDK_INT >= 31 -> if (dark) dynamicDarkColorScheme(ctx) else dynamicLightColorScheme(ctx)
|
||||
dark -> darkColorScheme(primary = WColor.darkBubbleOut, onPrimary = WColor.darkOnBubbleOut, background = WColor.darkBg, surface = WColor.darkBg,
|
||||
surfaceContainerLowest = WColor.darkRow, surfaceContainerHigh = WColor.darkBubbleIn, surfaceContainer = WColor.darkComposer,
|
||||
primaryContainer = WColor.darkFab, onPrimaryContainer = WColor.darkOnFab, onSurface = WColor.darkText, onSurfaceVariant = WColor.darkTextMuted, error = WColor.darkError)
|
||||
else -> lightColorScheme(primary = WColor.bubbleOut, onPrimary = WColor.onBubbleOut, background = WColor.bg, surface = WColor.bg,
|
||||
surfaceContainerLowest = WColor.row, surfaceContainerHigh = WColor.bubbleIn, surfaceContainer = WColor.composer,
|
||||
primaryContainer = WColor.fab, onPrimaryContainer = WColor.onFab, onSurface = WColor.text, onSurfaceVariant = WColor.textMuted, error = WColor.error)
|
||||
}
|
||||
MaterialTheme(colorScheme = scheme, content = content)
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
// Generated from tokens.json by gen_theme.py. Do not edit by hand.
|
||||
package app.messages.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
object WColor {
|
||||
val bg = Color(0xFFF8F9FF)
|
||||
val row = Color(0xFFFFFFFF)
|
||||
val text = Color(0xFF191C20)
|
||||
val textMuted = Color(0xFF44474E)
|
||||
val bubbleIn = Color(0xFFE8EAF1)
|
||||
val onBubbleIn = Color(0xFF191C20)
|
||||
val bubbleOut = Color(0xFF2B5EA7)
|
||||
val onBubbleOut = Color(0xFFFFFFFF)
|
||||
val unread = Color(0xFF2B5EA7)
|
||||
val error = Color(0xFFBA1A1A)
|
||||
val fab = Color(0xFFD6E3FF)
|
||||
val onFab = Color(0xFF001B3E)
|
||||
val composer = Color(0xFFECEEF4)
|
||||
val onComposer = Color(0xFF191C20)
|
||||
val darkBg = Color(0xFF111318)
|
||||
val darkRow = Color(0xFF1D2024)
|
||||
val darkText = Color(0xFFE2E2E9)
|
||||
val darkTextMuted = Color(0xFFC4C6D0)
|
||||
val darkBubbleIn = Color(0xFF2B2F36)
|
||||
val darkOnBubbleIn = Color(0xFFE2E2E9)
|
||||
val darkBubbleOut = Color(0xFFA8C7FA)
|
||||
val darkOnBubbleOut = Color(0xFF062E6F)
|
||||
val darkUnread = Color(0xFFA8C7FA)
|
||||
val darkError = Color(0xFFFFB4AB)
|
||||
val darkFab = Color(0xFF284777)
|
||||
val darkOnFab = Color(0xFFD6E3FF)
|
||||
val darkComposer = Color(0xFF2B2F36)
|
||||
val darkOnComposer = Color(0xFFE2E2E9)
|
||||
}
|
||||
|
||||
object WType {
|
||||
val label = TextStyle(fontSize = 12.sp, lineHeight = 16.sp, fontWeight = FontWeight.W500)
|
||||
val bodySm = TextStyle(fontSize = 14.sp, lineHeight = 20.sp, fontWeight = FontWeight.W400)
|
||||
val body = TextStyle(fontSize = 16.sp, lineHeight = 22.sp, fontWeight = FontWeight.W400)
|
||||
val title = TextStyle(fontSize = 22.sp, lineHeight = 28.sp, fontWeight = FontWeight.W400)
|
||||
}
|
||||
|
||||
object WSpace {
|
||||
val s0 = 0.dp
|
||||
val s2 = 2.dp
|
||||
val s4 = 4.dp
|
||||
val s8 = 8.dp
|
||||
val s12 = 12.dp
|
||||
val s16 = 16.dp
|
||||
val s24 = 24.dp
|
||||
}
|
||||
|
||||
object WRadius {
|
||||
val bubble = 20.dp
|
||||
val bubbleTight = 6.dp
|
||||
val pill = 999.dp
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"><path android:fillColor="#FF0E4F8A" android:pathData="M0,0h108v108h-108z"/></vector>
|
||||
@@ -0,0 +1 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"><path android:fillColor="#FFCFE5FF" android:pathData="M36,32h36a8,8 0 0 1 8,8v22a8,8 0 0 1 -8,8h-20l-12,10v-10h-4a8,8 0 0 1 -8,-8v-22a8,8 0 0 1 8,-8z"/><path android:fillColor="#FF0E4F8A" android:pathData="M44,51m-3.2,0a3.2,3.2 0 1,0 6.4,0a3.2,3.2 0 1,0 -6.4,0"/><path android:fillColor="#FF0E4F8A" android:pathData="M54,51m-3.2,0a3.2,3.2 0 1,0 6.4,0a3.2,3.2 0 1,0 -6.4,0"/><path android:fillColor="#FF0E4F8A" android:pathData="M64,51m-3.2,0a3.2,3.2 0 1,0 6.4,0a3.2,3.2 0 1,0 -6.4,0"/></vector>
|
||||
@@ -0,0 +1 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"><path android:fillColor="#FF000000" android:pathData="M36,32h36a8,8 0 0 1 8,8v22a8,8 0 0 1 -8,8h-20l-12,10v-10h-4a8,8 0 0 1 -8,-8v-22a8,8 0 0 1 8,-8z"/><path android:fillColor="#FFFFFFFF" android:pathData="M44,51m-3.2,0a3.2,3.2 0 1,0 6.4,0a3.2,3.2 0 1,0 -6.4,0"/><path android:fillColor="#FFFFFFFF" android:pathData="M54,51m-3.2,0a3.2,3.2 0 1,0 6.4,0a3.2,3.2 0 1,0 -6.4,0"/><path android:fillColor="#FFFFFFFF" android:pathData="M64,51m-3.2,0a3.2,3.2 0 1,0 6.4,0a3.2,3.2 0 1,0 -6.4,0"/></vector>
|
||||
@@ -0,0 +1 @@
|
||||
<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="M4,4h16a2,2 0 0 1 2,2v10a2,2 0 0 1 -2,2H8l-4,4V6a2,2 0 0 1 2,-2z"/></vector>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
|
||||
</adaptive-icon>
|
||||
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_title">Nachrichten</string>
|
||||
<string name="search">Suchen</string>
|
||||
<string name="search_hint">Nachrichten durchsuchen</string>
|
||||
<string name="back">Zurück</string>
|
||||
<string name="archived">Archiviert</string>
|
||||
<string name="archive">Archivieren</string>
|
||||
<string name="delete">Löschen</string>
|
||||
<string name="delete_confirm">%1$d Unterhaltungen löschen?</string>
|
||||
<string name="copy">Text kopieren</string>
|
||||
<string name="call">Anrufen</string>
|
||||
<string name="start_chat">Chat starten</string>
|
||||
<string name="new_chat">Neuer Chat</string>
|
||||
<string name="to">An:</string>
|
||||
<string name="to_hint">Name oder Nummer</string>
|
||||
<string name="send_to">An %1$s senden</string>
|
||||
<string name="no_threads">Noch keine Unterhaltungen</string>
|
||||
<string name="you_prefix">"Du: "</string>
|
||||
<string name="compose_hint">SMS schreiben</string>
|
||||
<string name="send">Senden</string>
|
||||
<string name="sending">Wird gesendet …</string>
|
||||
<string name="delivered">Zugestellt</string>
|
||||
<string name="failed_retry">Nicht gesendet, tippen zum Wiederholen</string>
|
||||
<string name="default_title">Als Standard-SMS-App festlegen</string>
|
||||
<string name="default_text">Nur die Standard-SMS-App darf Nachrichten empfangen und senden. Du kannst das jederzeit in den Android-Einstellungen ändern.</string>
|
||||
<string name="need_role_send">Zum Senden muss diese App deine Standard-SMS-App sein.</string>
|
||||
<string name="make_default">Als Standard festlegen</string>
|
||||
<string name="ch_messages">Nachrichten</string>
|
||||
<string name="me">Ich</string>
|
||||
<string name="reply">Antworten</string>
|
||||
<string name="reply_hint">Nachricht</string>
|
||||
<string name="mark_read">Als gelesen markieren</string>
|
||||
<string name="mms_title">MMS empfangen</string>
|
||||
<string name="mms_text">Bilder und Gruppennachrichten (MMS) werden noch nicht unterstützt.</string>
|
||||
</resources>
|
||||
@@ -0,0 +1,49 @@
|
||||
package app.messages
|
||||
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.test.junit4.createComposeRule
|
||||
import androidx.compose.ui.test.onRoot
|
||||
import app.messages.data.Box
|
||||
import app.messages.data.Message
|
||||
import app.messages.data.Thread
|
||||
import app.messages.ui.Conversation
|
||||
import app.messages.ui.ConversationList
|
||||
import app.messages.ui.theme.MsgTheme
|
||||
import com.github.takahirom.roborazzi.captureRoboImage
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.annotation.GraphicsMode
|
||||
|
||||
/** Made-up people and texts. */
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@GraphicsMode(GraphicsMode.Mode.NATIVE)
|
||||
@Config(sdk = [35], qualifiers = "de-rDE-w412dp-h915dp-xxhdpi", application = android.app.Application::class)
|
||||
class ScreenshotTest {
|
||||
@get:Rule val compose = createComposeRule()
|
||||
private val now = System.currentTimeMillis()
|
||||
private val threads = listOf(
|
||||
Thread(1, "+4930555012", "Clara Wu", null, "Sehen wir uns morgen am Bahnhof?", now - 120_000, 2, false, false),
|
||||
Thread(2, "+4930555013", "Ben Okafor", null, "Alles klar, bis später!", now - 3_600_000, 0, true, false),
|
||||
Thread(3, "+4930555077", "Fahrradladen", null, "Ihr Rad ist abholbereit.", now - 90_000_000, 0, false, false),
|
||||
Thread(4, "88888", null, null, "Ihr Bestätigungscode lautet 482913", now - 200_000_000, 0, false, false),
|
||||
)
|
||||
private val msgs = listOf(
|
||||
Message(1, 1, "+4930555012", "Hey! Hast du am Wochenende Zeit?", now - 7_200_000, Box.INBOX, true, -1),
|
||||
Message(2, 1, "+4930555012", "Wir wollten wandern gehen 🥾", now - 7_100_000, Box.INBOX, true, -1),
|
||||
Message(3, 1, "", "Klingt super, ich bin dabei!", now - 7_000_000, Box.SENT, true, 0),
|
||||
Message(4, 1, "", "Wann geht es los?", now - 6_900_000, Box.SENT, true, 0),
|
||||
Message(5, 1, "+4930555012", "Sehen wir uns morgen am Bahnhof?", now - 120_000, Box.INBOX, false, -1),
|
||||
Message(6, 1, "", "Ja, um 9 Uhr am Gleis 3", now - 60_000, Box.FAILED, true, -1),
|
||||
)
|
||||
private fun shot(name: String, dark: Boolean, c: @Composable () -> Unit) {
|
||||
compose.setContent { MsgTheme(dynamic = false, forceDark = dark) { c() } }
|
||||
compose.onRoot().captureRoboImage("../../replica/messages/clone-screens/$name.png")
|
||||
}
|
||||
@Test fun s01_list() = shot("S01-list-light", false) { ConversationList(threads, PaddingValues(), {}, {}, emptySet()) }
|
||||
@Test fun s02_chat_dark() = shot("S02-chat-dark", true) { Conversation(msgs, PaddingValues(), {}, {}, {}) }
|
||||
@Test fun s02_chat_light() = shot("S02-chat-light", false) { Conversation(msgs, PaddingValues(), {}, {}, {}) }
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
plugins {
|
||||
id("com.android.application") version "8.13.0" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
|
||||
id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
|
||||
id("com.google.devtools.ksp") version "2.2.20-2.0.3" apply false
|
||||
id("io.github.takahirom.roborazzi") version "1.46.1" apply false
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
|
||||
android.useAndroidX=true
|
||||
kotlin.code.style=official
|
||||
android.nonTransitiveRClass=true
|
||||
@@ -0,0 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
@@ -0,0 +1,251 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
@@ -0,0 +1,94 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@@ -0,0 +1,16 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
dependencyResolutionManagement {
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
rootProject.name = "Messages"
|
||||
include(":app")
|
||||
@@ -0,0 +1,6 @@
|
||||
.gradle/
|
||||
build/
|
||||
local.properties
|
||||
.idea/
|
||||
*.iml
|
||||
.kotlin/
|
||||
@@ -0,0 +1,93 @@
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
id("org.jetbrains.kotlin.android")
|
||||
id("org.jetbrains.kotlin.plugin.compose")
|
||||
id("com.google.devtools.ksp")
|
||||
id("io.github.takahirom.roborazzi")
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "app.rechner"
|
||||
compileSdk = 36
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "app.rechner"
|
||||
minSdk = 29
|
||||
targetSdk = 36
|
||||
versionCode = 1
|
||||
versionName = "0.1.0"
|
||||
}
|
||||
|
||||
// Release key lives outside the repo; without it, release builds fall back to the debug key (local only).
|
||||
val keyProps = Properties().apply {
|
||||
val f = file(System.getProperty("user.home") + "/.android/nogoogleapps-release.properties")
|
||||
if (f.exists()) f.inputStream().use { load(it) }
|
||||
}
|
||||
signingConfigs {
|
||||
if (keyProps.isNotEmpty()) create("release") {
|
||||
storeFile = file(keyProps.getProperty("storeFile"))
|
||||
storePassword = keyProps.getProperty("storePassword")
|
||||
keyAlias = keyProps.getProperty("keyAlias")
|
||||
keyPassword = keyProps.getProperty("keyPassword")
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
debug {
|
||||
// installs next to the release app from Obtainium
|
||||
applicationIdSuffix = ".debug"
|
||||
resValue("string", "app_name", "Rechner (Debug)")
|
||||
}
|
||||
release {
|
||||
resValue("string", "app_name", "Rechner")
|
||||
isMinifyEnabled = true
|
||||
isShrinkResources = true
|
||||
signingConfig = signingConfigs.findByName("release") ?: signingConfigs.getByName("debug")
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
buildFeatures { compose = true }
|
||||
testOptions { unitTests { isIncludeAndroidResources = true } }
|
||||
}
|
||||
|
||||
kotlin { compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) } }
|
||||
|
||||
ksp { arg("room.schemaLocation", "$projectDir/schemas") }
|
||||
|
||||
dependencies {
|
||||
val composeBom = platform("androidx.compose:compose-bom:2025.10.01")
|
||||
implementation(composeBom)
|
||||
implementation("androidx.compose.ui:ui")
|
||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||
implementation("androidx.compose.foundation:foundation")
|
||||
implementation("androidx.compose.material3:material3")
|
||||
implementation("androidx.compose.material:material-icons-extended")
|
||||
debugImplementation("androidx.compose.ui:ui-tooling")
|
||||
|
||||
implementation("androidx.activity:activity-compose:1.11.0")
|
||||
implementation("androidx.core:core-ktx:1.17.0")
|
||||
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.9.4")
|
||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4")
|
||||
|
||||
implementation("androidx.room:room-runtime:2.7.0")
|
||||
implementation("androidx.room:room-ktx:2.7.0")
|
||||
ksp("androidx.room:room-compiler:2.7.0")
|
||||
implementation("androidx.datastore:datastore-preferences:1.1.7")
|
||||
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
|
||||
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("org.robolectric:robolectric:4.15.1")
|
||||
testImplementation("androidx.compose.ui:ui-test-junit4")
|
||||
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||
testImplementation("io.github.takahirom.roborazzi:roborazzi:1.46.1")
|
||||
testImplementation("io.github.takahirom.roborazzi:roborazzi-compose:1.46.1")
|
||||
}
|
||||
|
||||
roborazzi { outputDir.set(rootProject.file("../replica/rechner/clone-screens")) }
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
"formatVersion": 1,
|
||||
"database": {
|
||||
"version": 1,
|
||||
"identityHash": "68577f81880de5c04e4721ad8ba32e4e",
|
||||
"entities": [
|
||||
{
|
||||
"tableName": "history",
|
||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `expression` TEXT NOT NULL, `result` TEXT NOT NULL, `created_at` INTEGER NOT NULL)",
|
||||
"fields": [
|
||||
{
|
||||
"fieldPath": "id",
|
||||
"columnName": "id",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "expression",
|
||||
"columnName": "expression",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "result",
|
||||
"columnName": "result",
|
||||
"affinity": "TEXT",
|
||||
"notNull": true
|
||||
},
|
||||
{
|
||||
"fieldPath": "createdAt",
|
||||
"columnName": "created_at",
|
||||
"affinity": "INTEGER",
|
||||
"notNull": true
|
||||
}
|
||||
],
|
||||
"primaryKey": {
|
||||
"autoGenerate": true,
|
||||
"columnNames": [
|
||||
"id"
|
||||
]
|
||||
},
|
||||
"indices": [
|
||||
{
|
||||
"name": "index_history_created_at",
|
||||
"unique": false,
|
||||
"columnNames": [
|
||||
"created_at"
|
||||
],
|
||||
"orders": [],
|
||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_history_created_at` ON `${TABLE_NAME}` (`created_at`)"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"setupQueries": [
|
||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '68577f81880de5c04e4721ad8ba32e4e')"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- no INTERNET: a calculator has nothing to send anywhere -->
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:roundIcon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@android:style/Theme.Material.NoActionBar">
|
||||
<activity android:name=".MainActivity" android:exported="true" android:windowSoftInputMode="stateAlwaysHidden">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
<category android:name="android.intent.category.APP_CALCULATOR" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
</manifest>
|
||||
@@ -0,0 +1,26 @@
|
||||
package app.rechner
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import app.rechner.data.Graph
|
||||
import app.rechner.data.Prefs
|
||||
import app.rechner.ui.CalculatorScreen
|
||||
import app.rechner.ui.CalculatorViewModel
|
||||
import app.rechner.ui.theme.CalcTheme
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
Graph.init(this)
|
||||
val vm = CalculatorViewModel.get(this)
|
||||
setContent {
|
||||
val prefs by Graph.store.prefs.collectAsState(initial = Prefs())
|
||||
CalcTheme(prefs.theme) { CalculatorScreen(vm, prefs) }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
package app.rechner.data
|
||||
|
||||
import android.content.Context
|
||||
import androidx.datastore.preferences.core.edit
|
||||
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||
import androidx.datastore.preferences.preferencesDataStore
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Database
|
||||
import androidx.room.Entity
|
||||
import androidx.room.Index
|
||||
import androidx.room.Insert
|
||||
import androidx.room.PrimaryKey
|
||||
import androidx.room.Query
|
||||
import androidx.room.Room
|
||||
import androidx.room.RoomDatabase
|
||||
import app.rechner.engine.Angle
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.map
|
||||
|
||||
@Entity(tableName = "history", indices = [Index("created_at")])
|
||||
data class HistoryEntry(
|
||||
@PrimaryKey(autoGenerate = true) val id: Long = 0,
|
||||
val expression: String,
|
||||
val result: String,
|
||||
@ColumnInfo(name = "created_at") val createdAt: Long = System.currentTimeMillis(),
|
||||
)
|
||||
|
||||
@Dao
|
||||
interface HistoryDao {
|
||||
@Query("SELECT * FROM history ORDER BY created_at") fun all(): Flow<List<HistoryEntry>>
|
||||
@Insert suspend fun insert(e: HistoryEntry)
|
||||
@Query("DELETE FROM history") suspend fun clear()
|
||||
/** keep the list bounded */
|
||||
@Query("DELETE FROM history WHERE id NOT IN (SELECT id FROM history ORDER BY created_at DESC LIMIT 500)") suspend fun trim()
|
||||
}
|
||||
|
||||
@Database(entities = [HistoryEntry::class], version = 1, exportSchema = true)
|
||||
abstract class CalcDb : RoomDatabase() {
|
||||
abstract fun history(): HistoryDao
|
||||
}
|
||||
|
||||
enum class ThemeMode { SYSTEM, LIGHT, DARK }
|
||||
|
||||
data class Prefs(val angle: Angle = Angle.DEG, val memory: String? = null, val expression: String = "", val theme: ThemeMode = ThemeMode.SYSTEM)
|
||||
|
||||
private val Context.store by preferencesDataStore("calc")
|
||||
|
||||
class Store(private val context: Context) {
|
||||
private val kAngle = stringPreferencesKey("angle")
|
||||
private val kMemory = stringPreferencesKey("memory")
|
||||
private val kExpr = stringPreferencesKey("expression")
|
||||
private val kTheme = stringPreferencesKey("theme")
|
||||
|
||||
val prefs: Flow<Prefs> = context.store.data.map { p ->
|
||||
Prefs(
|
||||
angle = p[kAngle]?.let { runCatching { Angle.valueOf(it) }.getOrNull() } ?: Angle.DEG,
|
||||
memory = p[kMemory],
|
||||
expression = p[kExpr] ?: "",
|
||||
theme = p[kTheme]?.let { runCatching { ThemeMode.valueOf(it) }.getOrNull() } ?: ThemeMode.SYSTEM,
|
||||
)
|
||||
}
|
||||
|
||||
suspend fun setAngle(a: Angle) = context.store.edit { it[kAngle] = a.name }
|
||||
suspend fun setMemory(v: String?) = context.store.edit { if (v == null) it.remove(kMemory) else it[kMemory] = v }
|
||||
suspend fun setExpression(v: String) = context.store.edit { it[kExpr] = v }
|
||||
suspend fun setTheme(t: ThemeMode) = context.store.edit { it[kTheme] = t.name }
|
||||
}
|
||||
|
||||
object Graph {
|
||||
lateinit var history: HistoryDao private set
|
||||
lateinit var store: Store private set
|
||||
fun init(context: Context) {
|
||||
if (::store.isInitialized) return
|
||||
val app = context.applicationContext
|
||||
history = Room.databaseBuilder(app, CalcDb::class.java, "calc.db").build().history()
|
||||
store = Store(app)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package app.rechner.engine
|
||||
|
||||
/**
|
||||
* Keypad editing on the expression text. Operators replace a trailing operator, the
|
||||
* parenthesis key opens or closes depending on context, backspace removes whole tokens.
|
||||
*/
|
||||
object Editor {
|
||||
private val binary = setOf('+', '−', '×', '÷', '^')
|
||||
private val functionTokens = listOf("sin⁻¹(", "cos⁻¹(", "tan⁻¹(", "sin(", "cos(", "tan(", "ln(", "log(")
|
||||
|
||||
fun input(expr: String, key: String, decimal: Char): String {
|
||||
val last = expr.lastOrNull()
|
||||
return when {
|
||||
key.length == 1 && key[0].isDigit() -> expr + key
|
||||
key == decimal.toString() -> {
|
||||
val number = expr.takeLastWhile { it.isDigit() || it == decimal || it == '.' }
|
||||
when {
|
||||
decimal in number -> expr
|
||||
number.isEmpty() -> expr + "0" + decimal
|
||||
else -> expr + decimal
|
||||
}
|
||||
}
|
||||
key.length == 1 && key[0] in binary -> {
|
||||
val op = key[0]
|
||||
when {
|
||||
expr.isEmpty() -> if (op == '−') "−" else expr
|
||||
last != null && last in binary -> {
|
||||
// "×−" is allowed for a negative factor, otherwise replace the operator
|
||||
if (op == '−' && last != '−' && last != '+') expr + op else expr.dropLast(1) + op
|
||||
}
|
||||
last == '(' -> if (op == '−') expr + op else expr
|
||||
else -> expr + op
|
||||
}
|
||||
}
|
||||
key == "()" -> {
|
||||
val open = expr.count { it == '(' } - expr.count { it == ')' }
|
||||
val closeable = open > 0 && last != null && last != '(' && last !in binary
|
||||
if (closeable) "$expr)" else "$expr("
|
||||
}
|
||||
key == "%" || key == "!" -> if (last != null && (last.isDigit() || last == ')' || last == 'π' || last == 'e' || last == '!' || last == '%')) expr + key else expr
|
||||
key == "√" || key == "π" || key == "e" -> expr + key
|
||||
key.endsWith("(") -> expr + key
|
||||
else -> expr + key
|
||||
}
|
||||
}
|
||||
|
||||
fun backspace(expr: String): String {
|
||||
functionTokens.firstOrNull { expr.endsWith(it) }?.let { return expr.dropLast(it.length) }
|
||||
return expr.dropLast(1)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,297 @@
|
||||
package app.rechner.engine
|
||||
|
||||
import java.math.BigDecimal
|
||||
import java.math.BigInteger
|
||||
import java.math.MathContext
|
||||
import java.math.RoundingMode
|
||||
import kotlin.math.PI
|
||||
|
||||
enum class Angle { DEG, RAD }
|
||||
|
||||
sealed interface Outcome {
|
||||
data class Value(val value: BigDecimal) : Outcome
|
||||
data class Error(val kind: ErrorKind) : Outcome
|
||||
/** Nothing to show yet (empty or only an operator). */
|
||||
data object Empty : Outcome
|
||||
}
|
||||
|
||||
enum class ErrorKind { DIV_ZERO, DOMAIN, TOO_BIG, SYNTAX }
|
||||
|
||||
class CalcException(val kind: ErrorKind) : Exception(kind.name)
|
||||
|
||||
/**
|
||||
* Parser and evaluator for the expressions the keypad produces.
|
||||
* Display symbols: digits, decimal separator, + − × ÷ ^ ! % √ π e ( ), and the functions
|
||||
* sin cos tan sin⁻¹ cos⁻¹ tan⁻¹ ln log. Unfinished input is tolerated: open parentheses are
|
||||
* closed and a trailing operator is ignored, so the live preview always has something to show.
|
||||
*/
|
||||
class Engine(private val decimalSeparator: Char = ',') {
|
||||
private val mc = MathContext(50, RoundingMode.HALF_EVEN)
|
||||
|
||||
fun evaluate(expression: String, angle: Angle = Angle.DEG, lenient: Boolean = true): Outcome {
|
||||
var tokens = runCatching { tokenize(expression) }.getOrElse { return Outcome.Error(ErrorKind.SYNTAX) }
|
||||
if (lenient) while (tokens.isNotEmpty() && tokens.last().let { it is Tok.Op || it is Tok.Func || it == Tok.Sqrt || it == Tok.Open }) tokens = tokens.dropLast(1)
|
||||
if (tokens.isEmpty()) return Outcome.Empty
|
||||
val open = tokens.count { it == Tok.Open } - tokens.count { it == Tok.Close }
|
||||
if (open > 0) tokens = tokens + List(open) { Tok.Close }
|
||||
return try {
|
||||
val p = Parser(tokens, angle)
|
||||
val v = p.parseExpression()
|
||||
if (!p.atEnd()) throw CalcException(ErrorKind.SYNTAX)
|
||||
if (v.abs() > LIMIT) throw CalcException(ErrorKind.TOO_BIG)
|
||||
Outcome.Value(v)
|
||||
} catch (e: CalcException) {
|
||||
Outcome.Error(e.kind)
|
||||
} catch (e: ArithmeticException) {
|
||||
Outcome.Error(ErrorKind.DOMAIN)
|
||||
}
|
||||
}
|
||||
|
||||
// --- tokens --------------------------------------------------------------------------------
|
||||
|
||||
sealed interface Tok {
|
||||
data class Num(val v: BigDecimal) : Tok
|
||||
data class Op(val c: Char) : Tok
|
||||
data class Func(val name: String) : Tok
|
||||
data object Open : Tok
|
||||
data object Close : Tok
|
||||
data object Fact : Tok
|
||||
data object Percent : Tok
|
||||
data object Sqrt : Tok
|
||||
data object Pi : Tok
|
||||
data object E : Tok
|
||||
}
|
||||
|
||||
private val functions = listOf("sin⁻¹", "cos⁻¹", "tan⁻¹", "sin", "cos", "tan", "ln", "log")
|
||||
|
||||
fun tokenize(s: String): List<Tok> {
|
||||
val out = mutableListOf<Tok>()
|
||||
var i = 0
|
||||
while (i < s.length) {
|
||||
val c = s[i]
|
||||
when {
|
||||
c.isWhitespace() || c == '.' && decimalSeparator == ',' -> i++ // grouping dots are cosmetic
|
||||
c.isDigit() || c == decimalSeparator -> {
|
||||
val start = i
|
||||
while (i < s.length && (s[i].isDigit() || s[i] == decimalSeparator || (s[i] == '.' && decimalSeparator == ','))) i++
|
||||
val raw = s.substring(start, i).filter { it != '.' || decimalSeparator == '.' }.replace(decimalSeparator, '.')
|
||||
if (raw.count { it == '.' } > 1) throw CalcException(ErrorKind.SYNTAX)
|
||||
// "E" exponent from pasted scientific results
|
||||
var text = if (raw == ".") "0" else raw
|
||||
if (i < s.length && s[i] == 'E' && i + 1 < s.length && (s[i + 1].isDigit() || s[i + 1] == '−' || s[i + 1] == '-')) {
|
||||
val e0 = i + 1
|
||||
i += 2
|
||||
while (i < s.length && s[i].isDigit()) i++
|
||||
text += "E" + s.substring(e0, i).replace('−', '-')
|
||||
}
|
||||
out += Tok.Num(BigDecimal(text))
|
||||
}
|
||||
c == '+' -> { out += Tok.Op('+'); i++ }
|
||||
c == '−' || c == '-' -> { out += Tok.Op('−'); i++ }
|
||||
c == '×' || c == '*' -> { out += Tok.Op('×'); i++ }
|
||||
c == '÷' || c == '/' -> { out += Tok.Op('÷'); i++ }
|
||||
c == '^' -> { out += Tok.Op('^'); i++ }
|
||||
c == '(' -> { out += Tok.Open; i++ }
|
||||
c == ')' -> { out += Tok.Close; i++ }
|
||||
c == '!' -> { out += Tok.Fact; i++ }
|
||||
c == '%' -> { out += Tok.Percent; i++ }
|
||||
c == '√' -> { out += Tok.Sqrt; i++ }
|
||||
c == 'π' -> { out += Tok.Pi; i++ }
|
||||
c == 'e' -> { out += Tok.E; i++ }
|
||||
else -> {
|
||||
val f = functions.firstOrNull { s.startsWith(it, i) } ?: throw CalcException(ErrorKind.SYNTAX)
|
||||
out += Tok.Func(f); i += f.length
|
||||
if (i < s.length && s[i] == '(') { out += Tok.Open; i++ } else out += Tok.Open
|
||||
}
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// --- parser --------------------------------------------------------------------------------
|
||||
|
||||
private inner class Parser(private val t: List<Tok>, private val angle: Angle) {
|
||||
private var p = 0
|
||||
fun atEnd() = p >= t.size
|
||||
private fun peek() = t.getOrNull(p)
|
||||
private fun next() = t[p++]
|
||||
|
||||
/** additive: a + b% means a + a·b/100 */
|
||||
fun parseExpression(): BigDecimal {
|
||||
var v = parseTerm()
|
||||
while (true) {
|
||||
val op = (peek() as? Tok.Op)?.c ?: break
|
||||
if (op != '+' && op != '−') break
|
||||
next()
|
||||
val (rhs, wasPercent) = parseTermWithPercent()
|
||||
val r = if (wasPercent) v.multiply(rhs, mc) else rhs
|
||||
v = if (op == '+') v.add(r, mc) else v.subtract(r, mc)
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
private fun parseTermWithPercent(): Pair<BigDecimal, Boolean> {
|
||||
val start = p
|
||||
val v = parseTerm()
|
||||
// a term that is just "x%" counts as a percentage of the left side
|
||||
val plainPercent = p - start >= 2 && t[p - 1] == Tok.Percent && t.subList(start, p - 1).none { it is Tok.Op || it == Tok.Percent }
|
||||
return v to plainPercent
|
||||
}
|
||||
|
||||
private fun startsPrimary(k: Tok?) = k is Tok.Num || k == Tok.Open || k is Tok.Func || k == Tok.Sqrt || k == Tok.Pi || k == Tok.E
|
||||
|
||||
private fun parseTerm(): BigDecimal {
|
||||
var v = parseUnary()
|
||||
while (true) {
|
||||
val k = peek()
|
||||
v = when {
|
||||
k is Tok.Op && k.c == '×' -> { next(); v.multiply(parseUnary(), mc) }
|
||||
k is Tok.Op && k.c == '÷' -> {
|
||||
next()
|
||||
val d = parseUnary()
|
||||
if (d.signum() == 0) throw CalcException(ErrorKind.DIV_ZERO)
|
||||
v.divide(d, mc)
|
||||
}
|
||||
startsPrimary(k) -> v.multiply(parseUnary(), mc) // implicit: 2π, 3(4), 2√9
|
||||
else -> return v
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun parseUnary(): BigDecimal {
|
||||
val k = peek()
|
||||
if (k is Tok.Op && k.c == '−') { next(); return parseUnary().negate() }
|
||||
if (k is Tok.Op && k.c == '+') { next(); return parseUnary() }
|
||||
return parsePower()
|
||||
}
|
||||
|
||||
/** right associative, binds tighter than unary minus on the left: −2^2 = −4 */
|
||||
private fun parsePower(): BigDecimal {
|
||||
val base = parsePostfix()
|
||||
val k = peek()
|
||||
if (k is Tok.Op && k.c == '^') {
|
||||
next()
|
||||
return pow(base, parseUnary())
|
||||
}
|
||||
return base
|
||||
}
|
||||
|
||||
private fun parsePostfix(): BigDecimal {
|
||||
var v = parsePrimary()
|
||||
while (true) {
|
||||
v = when (peek()) {
|
||||
Tok.Fact -> { next(); factorial(v) }
|
||||
Tok.Percent -> { next(); v.divide(BigDecimal(100), mc) }
|
||||
else -> return v
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun parsePrimary(): BigDecimal {
|
||||
return when (val k = next()) {
|
||||
is Tok.Num -> k.v
|
||||
Tok.Pi -> PI_BIG
|
||||
Tok.E -> E_BIG
|
||||
Tok.Open -> {
|
||||
if (peek() == Tok.Close) throw CalcException(ErrorKind.SYNTAX)
|
||||
val v = parseExpression()
|
||||
if (peek() != Tok.Close) throw CalcException(ErrorKind.SYNTAX)
|
||||
next(); v
|
||||
}
|
||||
Tok.Sqrt -> {
|
||||
val x = parsePostfix()
|
||||
if (x.signum() < 0) throw CalcException(ErrorKind.DOMAIN)
|
||||
x.sqrt(mc)
|
||||
}
|
||||
is Tok.Func -> {
|
||||
if (peek() != Tok.Open) throw CalcException(ErrorKind.SYNTAX)
|
||||
next()
|
||||
val x = parseExpression()
|
||||
if (peek() != Tok.Close) throw CalcException(ErrorKind.SYNTAX)
|
||||
next()
|
||||
applyFunction(k.name, x)
|
||||
}
|
||||
else -> throw CalcException(ErrorKind.SYNTAX)
|
||||
}
|
||||
}
|
||||
|
||||
private fun toRad(x: Double) = if (angle == Angle.DEG) x * PI / 180 else x
|
||||
private fun fromRad(x: Double) = if (angle == Angle.DEG) x * 180 / PI else x
|
||||
|
||||
private fun applyFunction(name: String, x: BigDecimal): BigDecimal {
|
||||
val d = x.toDouble()
|
||||
val r = when (name) {
|
||||
"sin" -> exactTrig(x, 0) ?: kotlin.math.sin(toRad(d))
|
||||
"cos" -> exactTrig(x, 1) ?: kotlin.math.cos(toRad(d))
|
||||
"tan" -> {
|
||||
if (angle == Angle.DEG && x.remainder(BigDecimal(180)).abs().compareTo(BigDecimal(90)) == 0) throw CalcException(ErrorKind.DOMAIN)
|
||||
exactTrig(x, 2) ?: kotlin.math.tan(toRad(d))
|
||||
}
|
||||
"sin⁻¹" -> { if (d < -1 || d > 1) throw CalcException(ErrorKind.DOMAIN); fromRad(kotlin.math.asin(d)) }
|
||||
"cos⁻¹" -> { if (d < -1 || d > 1) throw CalcException(ErrorKind.DOMAIN); fromRad(kotlin.math.acos(d)) }
|
||||
"tan⁻¹" -> fromRad(kotlin.math.atan(d))
|
||||
"ln" -> { if (d <= 0) throw CalcException(ErrorKind.DOMAIN); kotlin.math.ln(d) }
|
||||
"log" -> { if (d <= 0) throw CalcException(ErrorKind.DOMAIN); exactLog10(x) ?: kotlin.math.log10(d) }
|
||||
else -> throw CalcException(ErrorKind.SYNTAX)
|
||||
}
|
||||
if (r.isNaN() || r.isInfinite()) throw CalcException(ErrorKind.DOMAIN)
|
||||
return clean(r)
|
||||
}
|
||||
|
||||
/** sin/cos/tan of multiples of 30° and 45° (and π fractions in radians) are exact. */
|
||||
private fun exactTrig(x: BigDecimal, which: Int): Double? {
|
||||
val deg = if (angle == Angle.DEG) x else return null
|
||||
val r = deg.remainder(BigDecimal(360)).let { if (it.signum() < 0) it.add(BigDecimal(360)) else it }
|
||||
if (r.stripTrailingZeros().scale() > 0) return null
|
||||
val a = r.toInt()
|
||||
val table = mapOf(0 to Triple(0.0, 1.0, 0.0), 30 to Triple(.5, Double.NaN, Double.NaN), 90 to Triple(1.0, 0.0, Double.NaN),
|
||||
150 to Triple(.5, Double.NaN, Double.NaN), 180 to Triple(0.0, -1.0, 0.0), 210 to Triple(-.5, Double.NaN, Double.NaN),
|
||||
270 to Triple(-1.0, 0.0, Double.NaN), 330 to Triple(-.5, Double.NaN, Double.NaN),
|
||||
45 to Triple(Double.NaN, Double.NaN, 1.0), 135 to Triple(Double.NaN, Double.NaN, -1.0), 225 to Triple(Double.NaN, Double.NaN, 1.0), 315 to Triple(Double.NaN, Double.NaN, -1.0),
|
||||
60 to Triple(Double.NaN, .5, Double.NaN), 120 to Triple(Double.NaN, -.5, Double.NaN), 240 to Triple(Double.NaN, -.5, Double.NaN), 300 to Triple(Double.NaN, .5, Double.NaN))
|
||||
val e = table[a] ?: return null
|
||||
val v = when (which) { 0 -> e.first; 1 -> e.second; else -> e.third }
|
||||
return v.takeIf { !it.isNaN() }
|
||||
}
|
||||
|
||||
private fun exactLog10(x: BigDecimal): Double? {
|
||||
val s = x.stripTrailingZeros()
|
||||
if (s.unscaledValue() == BigInteger.ONE) return (-s.scale()).toDouble()
|
||||
return null
|
||||
}
|
||||
|
||||
private fun pow(base: BigDecimal, exp: BigDecimal): BigDecimal {
|
||||
val e = exp.stripTrailingZeros()
|
||||
if (e.scale() <= 0 && e.abs() <= BigDecimal(9999)) {
|
||||
val n = e.toInt()
|
||||
if (base.signum() == 0 && n < 0) throw CalcException(ErrorKind.DIV_ZERO)
|
||||
val r = base.pow(kotlin.math.abs(n), mc)
|
||||
return if (n < 0) BigDecimal.ONE.divide(r, mc) else r
|
||||
}
|
||||
if (base.signum() < 0) throw CalcException(ErrorKind.DOMAIN)
|
||||
val r = Math.pow(base.toDouble(), exp.toDouble())
|
||||
if (r.isNaN() || r.isInfinite()) throw CalcException(ErrorKind.TOO_BIG)
|
||||
return clean(r)
|
||||
}
|
||||
|
||||
private fun factorial(x: BigDecimal): BigDecimal {
|
||||
val s = x.stripTrailingZeros()
|
||||
if (s.signum() < 0 || s.scale() > 0) throw CalcException(ErrorKind.DOMAIN)
|
||||
if (s > BigDecimal(1000)) throw CalcException(ErrorKind.TOO_BIG)
|
||||
var r = BigInteger.ONE
|
||||
for (i in 2..s.toInt()) r = r.multiply(BigInteger.valueOf(i.toLong()))
|
||||
return BigDecimal(r)
|
||||
}
|
||||
|
||||
/** Floating results get 15 significant digits, so cos(π) is −1 and not −0.9999999999999999. */
|
||||
private fun clean(d: Double): BigDecimal = BigDecimal(d).round(MathContext(15, RoundingMode.HALF_EVEN)).let {
|
||||
if (it.abs() < BigDecimal("1E-14")) BigDecimal.ZERO else it
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
val PI_BIG = BigDecimal("3.14159265358979323846264338327950288419716939937510")
|
||||
val E_BIG = BigDecimal("2.71828182845904523536028747135266249775724709369995")
|
||||
private val LIMIT = BigDecimal("1E5000")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package app.rechner.engine
|
||||
|
||||
import java.math.BigDecimal
|
||||
import java.math.MathContext
|
||||
import java.math.RoundingMode
|
||||
|
||||
/** Turns exact results into display text: locale separators, no trailing zeros, scientific when huge or tiny. */
|
||||
class NumberFormat(private val decimal: Char = ',', private val grouping: Char = '.') {
|
||||
fun format(v: BigDecimal, maxDigits: Int = 12): String {
|
||||
if (v.signum() == 0) return "0"
|
||||
val abs = v.abs()
|
||||
val sci = abs >= BigDecimal.TEN.pow(maxDigits) || abs < BigDecimal("1E-6")
|
||||
if (sci) {
|
||||
val r = v.round(MathContext(maxDigits - 3, RoundingMode.HALF_EVEN))
|
||||
val exp = r.precision() - r.scale() - 1
|
||||
val mant = r.movePointLeft(exp).stripTrailingZeros()
|
||||
return plain(mant) + "E" + (if (exp < 0) "−" else "") + kotlin.math.abs(exp)
|
||||
}
|
||||
val intDigits = abs.setScale(0, RoundingMode.DOWN).toPlainString().length
|
||||
val r = v.setScale((maxDigits - intDigits).coerceAtLeast(0), RoundingMode.HALF_EVEN).stripTrailingZeros()
|
||||
return plain(r)
|
||||
}
|
||||
|
||||
/** Every digit, for copy, scrolling and the history. */
|
||||
fun full(v: BigDecimal): String = plain(v.round(MathContext(40, RoundingMode.HALF_EVEN)).stripTrailingZeros())
|
||||
|
||||
private fun plain(v: BigDecimal): String {
|
||||
val s = v.toPlainString()
|
||||
val neg = s.startsWith("-")
|
||||
val body = s.removePrefix("-")
|
||||
val int = body.substringBefore('.')
|
||||
val frac = body.substringAfter('.', "")
|
||||
val grouped = int.reversed().chunked(3).joinToString(grouping.toString()).reversed()
|
||||
return (if (neg) "−" else "") + grouped + if (frac.isNotEmpty()) decimal + frac else ""
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,379 @@
|
||||
package app.rechner.ui
|
||||
|
||||
import android.content.ClipData
|
||||
import android.content.ClipboardManager
|
||||
import android.content.Context
|
||||
import android.view.HapticFeedbackConstants
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.core.Animatable
|
||||
import androidx.compose.animation.core.animateDpAsState
|
||||
import androidx.compose.animation.core.spring
|
||||
import androidx.compose.animation.expandVertically
|
||||
import androidx.compose.animation.shrinkVertically
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.combinedClickable
|
||||
import androidx.compose.foundation.gestures.Orientation
|
||||
import androidx.compose.foundation.gestures.draggable
|
||||
import androidx.compose.foundation.gestures.rememberDraggableState
|
||||
import androidx.compose.foundation.horizontalScroll
|
||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||
import androidx.compose.foundation.interaction.collectIsPressedAsState
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.RowScope
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.aspectRatio
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.statusBarsPadding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.rounded.Backspace
|
||||
import androidx.compose.material.icons.rounded.ExpandLess
|
||||
import androidx.compose.material.icons.rounded.ExpandMore
|
||||
import androidx.compose.material.icons.rounded.History
|
||||
import androidx.compose.material.icons.rounded.MoreVert
|
||||
import androidx.compose.material3.DropdownMenu
|
||||
import androidx.compose.material3.DropdownMenuItem
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
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.draw.clip
|
||||
import androidx.compose.ui.layout.onGloballyPositioned
|
||||
import androidx.compose.ui.layout.positionInParent
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.platform.LocalView
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.semantics.contentDescription
|
||||
import androidx.compose.ui.semantics.semantics
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import app.rechner.R
|
||||
import app.rechner.data.Graph
|
||||
import app.rechner.data.HistoryEntry
|
||||
import app.rechner.data.Prefs
|
||||
import app.rechner.data.ThemeMode
|
||||
import app.rechner.engine.Angle
|
||||
import app.rechner.engine.ErrorKind
|
||||
import app.rechner.ui.theme.LocalCalcColors
|
||||
import app.rechner.ui.theme.WType
|
||||
import kotlinx.coroutines.launch
|
||||
import java.time.Instant
|
||||
import java.time.LocalDate
|
||||
import java.time.ZoneId
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.time.format.FormatStyle
|
||||
|
||||
@Composable
|
||||
fun CalculatorScreen(vm: CalculatorViewModel, prefs: Prefs) {
|
||||
val state by vm.state.collectAsState()
|
||||
val history by vm.history.collectAsState()
|
||||
CalculatorContent(
|
||||
state = state, history = history, prefs = prefs, decimal = vm.decimal,
|
||||
onKey = vm::key, onBackspace = vm::backspace, onClear = vm::clear, onEquals = vm::equals,
|
||||
onInsert = vm::insert, onAngle = vm::setAngle, onClearHistory = { vm.clearHistory() },
|
||||
onMemoryStore = { vm.memoryStore(it) }, currentValue = vm::currentValue,
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun CalculatorContent(
|
||||
state: CalcState,
|
||||
history: List<HistoryEntry>,
|
||||
prefs: Prefs,
|
||||
decimal: Char,
|
||||
onKey: (String) -> Unit,
|
||||
onBackspace: () -> Unit,
|
||||
onClear: () -> Unit,
|
||||
onEquals: () -> Unit,
|
||||
onInsert: (String) -> Unit,
|
||||
onAngle: (Angle) -> Unit,
|
||||
onClearHistory: () -> Unit,
|
||||
onMemoryStore: (String) -> Unit,
|
||||
currentValue: () -> String,
|
||||
initialHistoryOpen: Boolean = false,
|
||||
initialScientific: Boolean = false,
|
||||
) {
|
||||
val c = LocalCalcColors.current
|
||||
var scientific by rememberSaveable { mutableStateOf(initialScientific) }
|
||||
var inverse by rememberSaveable { mutableStateOf(false) }
|
||||
val scope = rememberCoroutineScope()
|
||||
val view = LocalView.current
|
||||
val tap: (() -> Unit) -> () -> Unit = { f -> { view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP); f() } }
|
||||
|
||||
BoxWithConstraints(Modifier.fillMaxSize().background(c.bg)) {
|
||||
val density = LocalDensity.current
|
||||
val fullPx = with(density) { maxHeight.toPx() }
|
||||
// the display is a sheet: collapsed above the keypad, pulled down it shows the history
|
||||
val sheet = remember { Animatable(if (initialHistoryOpen) 1f else 0f) }
|
||||
var keypadTop by remember { mutableStateOf(maxHeight * .4f) }
|
||||
Column(Modifier.fillMaxSize()) {
|
||||
Spacer(Modifier.weight(1f))
|
||||
Column(Modifier.onGloballyPositioned { keypadTop = with(density) { it.positionInParent().y.toDp() } - 8.dp }) {
|
||||
FunctionArea(scientific, inverse, prefs.angle, { scientific = !scientific }, { inverse = !inverse }, onAngle, onKey, tap)
|
||||
Keypad(decimal, onKey, onBackspace, onClear, onEquals, tap, Modifier.navigationBarsPadding())
|
||||
}
|
||||
}
|
||||
// the display reaches down to the function row; pulled down it covers the keypad
|
||||
val collapsed by animateDpAsState(keypadTop, spring(.9f, 500f), label = "top")
|
||||
val height = collapsed + (maxHeight - collapsed - 24.dp) * sheet.value
|
||||
Column(
|
||||
Modifier.fillMaxWidth().height(height).clip(RoundedCornerShape(bottomStart = 32.dp, bottomEnd = 32.dp)).background(c.display)
|
||||
.draggable(
|
||||
rememberDraggableState { d -> scope.launch { sheet.snapTo((sheet.value + d / (fullPx * .6f)).coerceIn(0f, 1f)) } },
|
||||
Orientation.Vertical,
|
||||
onDragStopped = { v -> scope.launch { sheet.animateTo(if (v > 300 || (v > -300 && sheet.value > .4f)) 1f else 0f, spring(.9f, 400f)) } },
|
||||
)
|
||||
.statusBarsPadding(),
|
||||
) {
|
||||
TopBar(
|
||||
historyOpen = sheet.value > .5f,
|
||||
onHistory = { scope.launch { sheet.animateTo(if (sheet.value > .5f) 0f else 1f, spring(.9f, 400f)) } },
|
||||
onClearHistory = onClearHistory, theme = prefs.theme,
|
||||
)
|
||||
if (sheet.value > 0.01f) {
|
||||
HistoryList(history, Modifier.weight(1f)) { onInsert(it); scope.launch { sheet.animateTo(0f, spring(.9f, 400f)) } }
|
||||
Text(stringResource(R.string.current_expression), style = WType.label, color = c.muted, modifier = Modifier.padding(horizontal = 24.dp))
|
||||
} else Spacer(Modifier.weight(1f))
|
||||
Display(state, prefs, onInsert, onMemoryStore, currentValue)
|
||||
// drag handle
|
||||
Box(Modifier.fillMaxWidth().padding(vertical = 10.dp), contentAlignment = Alignment.Center) {
|
||||
Box(Modifier.size(32.dp, 4.dp).clip(RoundedCornerShape(2.dp)).background(c.muted.copy(alpha = .6f)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun TopBar(historyOpen: Boolean, onHistory: () -> Unit, onClearHistory: () -> Unit, theme: ThemeMode) {
|
||||
val c = LocalCalcColors.current
|
||||
var menu by remember { mutableStateOf(false) }
|
||||
val scope = rememberCoroutineScope()
|
||||
Row(Modifier.fillMaxWidth().padding(horizontal = 8.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
IconButton(onClick = onHistory) {
|
||||
Box(Modifier.size(36.dp).clip(CircleShape).background(if (historyOpen) c.op else Color.Transparent), contentAlignment = Alignment.Center) {
|
||||
Icon(Icons.Rounded.History, stringResource(R.string.history), tint = if (historyOpen) c.onOp else c.muted)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.weight(1f))
|
||||
IconButton(onClick = { menu = true }) { Icon(Icons.Rounded.MoreVert, stringResource(R.string.more), tint = c.muted) }
|
||||
DropdownMenu(menu, { menu = false }) {
|
||||
DropdownMenuItem(text = { Text(stringResource(R.string.clear_history)) }, onClick = { menu = false; onClearHistory() })
|
||||
val next = when (theme) { ThemeMode.SYSTEM -> ThemeMode.DARK; ThemeMode.DARK -> ThemeMode.LIGHT; ThemeMode.LIGHT -> ThemeMode.SYSTEM }
|
||||
val label = mapOf(ThemeMode.SYSTEM to R.string.theme_system, ThemeMode.DARK to R.string.theme_dark, ThemeMode.LIGHT to R.string.theme_light)
|
||||
DropdownMenuItem(
|
||||
text = { Text(stringResource(R.string.theme) + ": " + stringResource(label.getValue(theme))) },
|
||||
onClick = { scope.launch { Graph.store.setTheme(next) } },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun HistoryList(history: List<HistoryEntry>, modifier: Modifier, onPick: (String) -> Unit) {
|
||||
val c = LocalCalcColors.current
|
||||
val state = rememberLazyListState()
|
||||
LaunchedEffect(history.size) { if (history.isNotEmpty()) state.scrollToItem(history.size + countDays(history)) }
|
||||
if (history.isEmpty()) {
|
||||
Box(modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { Text(stringResource(R.string.no_history), style = WType.body, color = c.muted) }
|
||||
return
|
||||
}
|
||||
val res = LocalContext.current.resources
|
||||
LazyColumn(modifier.fillMaxWidth(), state = state, verticalArrangement = Arrangement.Bottom) {
|
||||
var lastDay: LocalDate? = null
|
||||
history.forEach { h ->
|
||||
val day = Instant.ofEpochMilli(h.createdAt).atZone(ZoneId.systemDefault()).toLocalDate()
|
||||
if (day != lastDay) {
|
||||
val d = day
|
||||
item(key = "d$d") {
|
||||
val label = when (d) {
|
||||
LocalDate.now() -> res.getString(R.string.today)
|
||||
LocalDate.now().minusDays(1) -> res.getString(R.string.yesterday)
|
||||
else -> d.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM))
|
||||
}
|
||||
Text(label, style = WType.label, color = c.muted, modifier = Modifier.padding(start = 24.dp, top = 16.dp, bottom = 4.dp))
|
||||
}
|
||||
lastDay = day
|
||||
}
|
||||
item(key = h.id) {
|
||||
Column(
|
||||
Modifier.fillMaxWidth().clickable { onPick(h.result) }.padding(horizontal = 24.dp, vertical = 8.dp),
|
||||
horizontalAlignment = Alignment.End,
|
||||
) {
|
||||
Text(h.expression, style = WType.historyExpr, color = c.muted, maxLines = 1)
|
||||
Text(h.result, style = WType.historyResult, color = c.text, maxLines = 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun countDays(h: List<HistoryEntry>) = h.map { Instant.ofEpochMilli(it.createdAt).atZone(ZoneId.systemDefault()).toLocalDate() }.distinct().size
|
||||
|
||||
@Composable
|
||||
private fun Display(state: CalcState, prefs: Prefs, onInsert: (String) -> Unit, onMemoryStore: (String) -> Unit, currentValue: () -> String) {
|
||||
val c = LocalCalcColors.current
|
||||
val context = LocalContext.current
|
||||
var menu by remember { mutableStateOf(false) }
|
||||
val clipboard = context.getSystemService(ClipboardManager::class.java)
|
||||
val scroll = rememberScrollState()
|
||||
LaunchedEffect(state.expression) { scroll.scrollTo(scroll.maxValue) }
|
||||
Column(Modifier.fillMaxWidth().padding(horizontal = 24.dp), horizontalAlignment = Alignment.End) {
|
||||
Box {
|
||||
val text = state.expression.ifEmpty { " " }
|
||||
// shrink with length, then scroll
|
||||
val size = when { text.length <= 7 -> 72.sp; text.length <= 10 -> 56.sp; text.length <= 14 -> 44.sp; else -> 36.sp }
|
||||
Row(Modifier.horizontalScroll(scroll)) {
|
||||
Text(
|
||||
text, style = WType.expr.copy(fontSize = size, lineHeight = size * 1.1f, fontFeatureSettings = "tnum"), color = c.text, maxLines = 1,
|
||||
modifier = Modifier.combinedClickable(onClick = {}, onLongClick = { menu = true }).semantics { contentDescription = speak(state.expression) },
|
||||
)
|
||||
}
|
||||
DropdownMenu(menu, { menu = false }, shape = RoundedCornerShape(24.dp)) {
|
||||
DropdownMenuItem(text = { Text(stringResource(R.string.copy)) }, onClick = {
|
||||
menu = false; clipboard.setPrimaryClip(ClipData.newPlainText("Ergebnis", currentValue()))
|
||||
})
|
||||
DropdownMenuItem(text = { Text(stringResource(R.string.paste)) }, onClick = {
|
||||
menu = false; clipboard.primaryClip?.getItemAt(0)?.coerceToText(context)?.toString()?.let(onInsert)
|
||||
})
|
||||
DropdownMenuItem(text = { Text("MS") }, onClick = { menu = false; onMemoryStore(currentValue()) })
|
||||
if (prefs.memory != null) DropdownMenuItem(text = { Text("MR " + prefs.memory) }, onClick = { menu = false; onInsert(prefs.memory) })
|
||||
}
|
||||
}
|
||||
val second = when {
|
||||
state.error != null -> errorText(state.error)
|
||||
state.showingResult -> ""
|
||||
else -> state.preview
|
||||
}
|
||||
Text(
|
||||
second.ifEmpty { " " }, style = if (state.error != null) WType.fn else WType.result.copy(fontFeatureSettings = "tnum"),
|
||||
color = if (state.error != null) c.error else c.result, maxLines = 1, textAlign = TextAlign.End,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun errorText(e: ErrorKind) = stringResource(
|
||||
when (e) { ErrorKind.DIV_ZERO -> R.string.err_div_zero; ErrorKind.DOMAIN -> R.string.err_domain; ErrorKind.TOO_BIG -> R.string.err_too_big; ErrorKind.SYNTAX -> R.string.err_syntax },
|
||||
)
|
||||
|
||||
private fun speak(e: String) = e.replace("×", " mal ").replace("÷", " geteilt durch ").replace("−", " minus ").replace("+", " plus ").replace("√", " Wurzel ").replace("π", " Pi ")
|
||||
|
||||
@Composable
|
||||
private fun FunctionArea(
|
||||
expanded: Boolean, inverse: Boolean, angle: Angle,
|
||||
onToggle: () -> Unit, onInverse: () -> Unit, onAngle: (Angle) -> Unit, onKey: (String) -> Unit, tap: (() -> Unit) -> () -> Unit,
|
||||
) {
|
||||
val c = LocalCalcColors.current
|
||||
Column(Modifier.fillMaxWidth().padding(horizontal = 12.dp)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
listOf("√" to "√", "π" to "π", "^" to "^", "!" to "!").forEach { (label, key) ->
|
||||
FnKey(label, expanded, tap { onKey(key) })
|
||||
}
|
||||
Box(Modifier.padding(start = 6.dp).size(40.dp).clip(CircleShape).background(c.fn).clickable(onClick = onToggle), contentAlignment = Alignment.Center) {
|
||||
Icon(if (expanded) Icons.Rounded.ExpandLess else Icons.Rounded.ExpandMore, stringResource(R.string.more_functions), tint = c.onFn)
|
||||
}
|
||||
}
|
||||
AnimatedVisibility(expanded, enter = expandVertically(spring(.9f, 500f)), exit = shrinkVertically(spring(.9f, 500f))) {
|
||||
Column {
|
||||
Row {
|
||||
FnKey(if (angle == Angle.DEG) "Deg" else "Rad", true, tap { onAngle(if (angle == Angle.DEG) Angle.RAD else Angle.DEG) })
|
||||
if (inverse) { FnKey("sin⁻¹", true, tap { onKey("sin⁻¹(") }); FnKey("cos⁻¹", true, tap { onKey("cos⁻¹(") }); FnKey("tan⁻¹", true, tap { onKey("tan⁻¹(") }) }
|
||||
else { FnKey("sin", true, tap { onKey("sin(") }); FnKey("cos", true, tap { onKey("cos(") }); FnKey("tan", true, tap { onKey("tan(") }) }
|
||||
Spacer(Modifier.width(46.dp))
|
||||
}
|
||||
Row {
|
||||
FnKey("Inv", true, onInverse, selected = inverse)
|
||||
if (inverse) { FnKey("eˣ", true, tap { onKey("e^") }); FnKey("10ˣ", true, tap { onKey("10^") }); FnKey("x²", true, tap { onKey("^2") }) }
|
||||
else { FnKey("e", true, tap { onKey("e") }); FnKey("ln", true, tap { onKey("ln(") }); FnKey("log", true, tap { onKey("log(") }) }
|
||||
Spacer(Modifier.width(46.dp))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun RowScope.FnKey(label: String, tonal: Boolean, onClick: () -> Unit, selected: Boolean = false) {
|
||||
val c = LocalCalcColors.current
|
||||
Box(
|
||||
Modifier.weight(1f).padding(4.dp).height(44.dp).clip(RoundedCornerShape(22.dp))
|
||||
.background(if (selected) c.op else if (tonal) c.fn else Color.Transparent).clickable(onClick = onClick),
|
||||
contentAlignment = Alignment.Center,
|
||||
) { Text(label, style = WType.fn, color = if (selected) c.onOp else c.onFn) }
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun Keypad(
|
||||
decimal: Char, onKey: (String) -> Unit, onBackspace: () -> Unit, onClear: () -> Unit, onEquals: () -> Unit,
|
||||
tap: (() -> Unit) -> () -> Unit, modifier: Modifier,
|
||||
) {
|
||||
val c = LocalCalcColors.current
|
||||
data class K(val label: String, val bg: Color, val fg: Color, val action: () -> Unit, val icon: ImageVector? = null, val long: (() -> Unit)? = null, val desc: String = label)
|
||||
val d = K("", c.digit, c.onDigit, {})
|
||||
fun digit(s: String) = d.copy(label = s, action = tap { onKey(s) })
|
||||
fun op(s: String, desc: String) = K(s, c.op, c.onOp, tap { onKey(s) }, desc = desc)
|
||||
val rows = listOf(
|
||||
listOf(K("AC", c.ac, c.onAc, tap(onClear), desc = "Alles löschen"), op("()", "Klammer"), op("%", "Prozent"), op("÷", "geteilt durch")),
|
||||
listOf(digit("7"), digit("8"), digit("9"), op("×", "mal")),
|
||||
listOf(digit("4"), digit("5"), digit("6"), op("−", "minus")),
|
||||
listOf(digit("1"), digit("2"), digit("3"), op("+", "plus")),
|
||||
listOf(digit("0"), digit(decimal.toString()), K("", c.digit, c.onDigit, tap(onBackspace), Icons.AutoMirrored.Rounded.Backspace, long = onClear, desc = "Löschen"),
|
||||
K("=", c.eq, c.onEq, tap(onEquals), desc = "gleich")),
|
||||
)
|
||||
Column(modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
rows.forEach { row ->
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
row.forEach { k -> Key(k.label, k.bg, k.fg, k.icon, k.desc, k.action, k.long, Modifier.weight(1f)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Circle at rest, squircle while pressed: the expressive press. */
|
||||
@Composable
|
||||
private fun Key(label: String, bg: Color, fg: Color, icon: ImageVector?, desc: String, onClick: () -> Unit, onLong: (() -> Unit)?, modifier: Modifier) {
|
||||
val source = remember { MutableInteractionSource() }
|
||||
val pressed by source.collectIsPressedAsState()
|
||||
val radius by animateDpAsState(if (pressed) 22.dp else 100.dp, spring(.6f, 800f), label = "r")
|
||||
Box(
|
||||
modifier.aspectRatio(1.18f).clip(RoundedCornerShape(radius)).background(bg)
|
||||
.combinedClickable(interactionSource = source, indication = null, onClick = onClick, onLongClick = onLong)
|
||||
.semantics { contentDescription = desc },
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
if (icon != null) Icon(icon, null, tint = fg, modifier = Modifier.size(30.dp))
|
||||
else Text(label, style = WType.key, color = fg)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package app.rechner.ui
|
||||
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import app.rechner.data.Graph
|
||||
import app.rechner.data.HistoryEntry
|
||||
import app.rechner.engine.Angle
|
||||
import app.rechner.engine.Editor
|
||||
import app.rechner.engine.Engine
|
||||
import app.rechner.engine.ErrorKind
|
||||
import app.rechner.engine.NumberFormat
|
||||
import app.rechner.engine.Outcome
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.SharingStarted
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.flow.stateIn
|
||||
import kotlinx.coroutines.launch
|
||||
import java.text.DecimalFormatSymbols
|
||||
|
||||
data class CalcState(
|
||||
val expression: String = "",
|
||||
/** live preview, empty when there is nothing new to show */
|
||||
val preview: String = "",
|
||||
val error: ErrorKind? = null,
|
||||
/** after "=": the expression is a result and the next digit starts over */
|
||||
val showingResult: Boolean = false,
|
||||
val previous: String = "",
|
||||
)
|
||||
|
||||
class CalculatorViewModel : ViewModel() {
|
||||
val decimal: Char = DecimalFormatSymbols.getInstance().decimalSeparator
|
||||
private val grouping: Char = DecimalFormatSymbols.getInstance().groupingSeparator.let { if (it == decimal) ' ' else it }
|
||||
private val engine = Engine(decimal)
|
||||
val format = NumberFormat(decimal, grouping)
|
||||
private var angle = Angle.DEG
|
||||
|
||||
private val _state = MutableStateFlow(CalcState())
|
||||
val state: StateFlow<CalcState> = _state
|
||||
val history: StateFlow<List<HistoryEntry>> = Graph.history.all().stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
|
||||
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
val p = Graph.store.prefs.first()
|
||||
angle = p.angle
|
||||
update(p.expression)
|
||||
}
|
||||
}
|
||||
|
||||
fun setAngle(a: Angle) {
|
||||
angle = a
|
||||
viewModelScope.launch { Graph.store.setAngle(a) }
|
||||
update(_state.value.expression, keepResult = _state.value.showingResult)
|
||||
}
|
||||
|
||||
fun key(k: String) {
|
||||
val s = _state.value
|
||||
val base = when {
|
||||
// a digit or function after "=" starts a new calculation; an operator continues with the result
|
||||
s.showingResult && (k.first().isDigit() || k == decimal.toString() || k.endsWith("(") || k in setOf("√", "π", "e", "()")) -> ""
|
||||
s.error != null && s.showingResult -> ""
|
||||
else -> s.expression
|
||||
}
|
||||
update(Editor.input(base, k, decimal))
|
||||
}
|
||||
|
||||
fun backspace() = update(if (_state.value.showingResult) "" else Editor.backspace(_state.value.expression))
|
||||
fun clear() = update("")
|
||||
fun insert(text: String) = update(_state.value.let { if (it.showingResult) "" else it.expression } + sanitize(text))
|
||||
|
||||
fun equals() {
|
||||
val s = _state.value
|
||||
if (s.expression.isEmpty() || s.showingResult) return
|
||||
when (val r = engine.evaluate(s.expression, angle, lenient = true)) {
|
||||
is Outcome.Value -> {
|
||||
val result = format.format(r.value, 15)
|
||||
viewModelScope.launch { Graph.history.insert(HistoryEntry(expression = s.expression, result = result)); Graph.history.trim() }
|
||||
_state.value = CalcState(expression = result, previous = s.expression, showingResult = true)
|
||||
persist(result)
|
||||
}
|
||||
is Outcome.Error -> _state.value = s.copy(error = r.kind, preview = "")
|
||||
Outcome.Empty -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
fun clearHistory() = viewModelScope.launch { Graph.history.clear() }
|
||||
fun memoryStore(value: String) = viewModelScope.launch { Graph.store.setMemory(value) }
|
||||
|
||||
/** The value currently shown: result after "=", else the live preview, else the expression. */
|
||||
fun currentValue(): String = _state.value.let { if (it.showingResult) it.expression else it.preview.ifEmpty { it.expression } }
|
||||
|
||||
private fun update(expr: String, keepResult: Boolean = false) {
|
||||
val r = engine.evaluate(expr, angle, lenient = true)
|
||||
val preview = when (r) {
|
||||
is Outcome.Value -> format.format(r.value).takeIf { it != expr && hasOperation(expr) } ?: ""
|
||||
else -> ""
|
||||
}
|
||||
_state.value = CalcState(expression = expr, preview = preview, showingResult = keepResult)
|
||||
persist(expr)
|
||||
}
|
||||
|
||||
private fun hasOperation(e: String) = e.any { it in "+−×÷^!%√πe(" } || e.contains("sin") || e.contains("cos") || e.contains("tan") || e.contains("ln") || e.contains("log")
|
||||
|
||||
private fun persist(expr: String) = viewModelScope.launch { Graph.store.setExpression(expr) }
|
||||
|
||||
/** Paste keeps only what the keypad could type. */
|
||||
private fun sanitize(t: String) = t.replace('*', '×').replace('/', '÷').replace('-', '−')
|
||||
.filter { it.isDigit() || it == decimal || it == grouping || it in "+−×÷^!%√πe()E" || it.isLetter() }
|
||||
|
||||
companion object {
|
||||
fun get(activity: ComponentActivity) = ViewModelProvider(activity)[CalculatorViewModel::class.java]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package app.rechner.ui.theme
|
||||
|
||||
import android.os.Build
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.material3.ColorScheme
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.darkColorScheme
|
||||
import androidx.compose.material3.dynamicDarkColorScheme
|
||||
import androidx.compose.material3.dynamicLightColorScheme
|
||||
import androidx.compose.material3.lightColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.CompositionLocalProvider
|
||||
import androidx.compose.runtime.Immutable
|
||||
import androidx.compose.runtime.staticCompositionLocalOf
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import app.rechner.data.ThemeMode
|
||||
|
||||
/** Key and display roles; from the wallpaper on Android 12+, from tokens otherwise. */
|
||||
@Immutable
|
||||
data class CalcColors(
|
||||
val bg: Color, val display: Color, val text: Color, val muted: Color, val result: Color, val error: Color,
|
||||
val digit: Color, val onDigit: Color, val op: Color, val onOp: Color, val ac: Color, val onAc: Color,
|
||||
val eq: Color, val onEq: Color, val fn: Color, val onFn: Color,
|
||||
)
|
||||
|
||||
private val LightCalc = CalcColors(
|
||||
WColor.bg, WColor.display, WColor.text, WColor.textMuted, WColor.result, WColor.error,
|
||||
WColor.keyDigit, WColor.onKeyDigit, WColor.keyOp, WColor.onKeyOp, WColor.keyAc, WColor.onKeyAc,
|
||||
WColor.keyEq, WColor.onKeyEq, WColor.keyFn, WColor.onKeyFn,
|
||||
)
|
||||
private val DarkCalc = CalcColors(
|
||||
WColor.darkBg, WColor.darkDisplay, WColor.darkText, WColor.darkTextMuted, WColor.darkResult, WColor.darkError,
|
||||
WColor.darkKeyDigit, WColor.darkOnKeyDigit, WColor.darkKeyOp, WColor.darkOnKeyOp, WColor.darkKeyAc, WColor.darkOnKeyAc,
|
||||
WColor.darkKeyEq, WColor.darkOnKeyEq, WColor.darkKeyFn, WColor.darkOnKeyFn,
|
||||
)
|
||||
|
||||
private fun fromScheme(s: ColorScheme, dark: Boolean) = CalcColors(
|
||||
bg = s.surface, display = s.surfaceContainerHigh, text = s.onSurface, muted = s.onSurfaceVariant, result = s.onSurfaceVariant, error = s.error,
|
||||
digit = if (dark) s.surfaceContainer else s.surfaceContainerLow, onDigit = s.onSurface,
|
||||
op = s.secondaryContainer, onOp = s.onSecondaryContainer,
|
||||
ac = s.tertiaryContainer, onAc = s.onTertiaryContainer,
|
||||
eq = if (dark) s.primary else s.primaryContainer, onEq = if (dark) s.onPrimary else s.onPrimaryContainer,
|
||||
fn = s.surfaceContainerHighest, onFn = s.onSurface,
|
||||
)
|
||||
|
||||
val LocalCalcColors = staticCompositionLocalOf { LightCalc }
|
||||
|
||||
@Composable
|
||||
fun CalcTheme(mode: ThemeMode = ThemeMode.SYSTEM, dynamic: Boolean = true, content: @Composable () -> Unit) {
|
||||
val dark = when (mode) { ThemeMode.SYSTEM -> isSystemInDarkTheme(); ThemeMode.LIGHT -> false; ThemeMode.DARK -> true }
|
||||
val context = LocalContext.current
|
||||
val useDynamic = dynamic && Build.VERSION.SDK_INT >= 31
|
||||
val scheme = when {
|
||||
useDynamic -> if (dark) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
||||
dark -> darkColorScheme()
|
||||
else -> lightColorScheme()
|
||||
}
|
||||
val calc = if (useDynamic) fromScheme(scheme, dark) else if (dark) DarkCalc else LightCalc
|
||||
CompositionLocalProvider(LocalCalcColors provides calc) { MaterialTheme(colorScheme = scheme, content = content) }
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
// Generated from tokens.json by gen_theme.py. Do not edit by hand.
|
||||
package app.rechner.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
object WColor {
|
||||
val bg = Color(0xFFF9F9FF)
|
||||
val display = Color(0xFFE1E5EE)
|
||||
val sheet = Color(0xFFE8EBF2)
|
||||
val text = Color(0xFF191C20)
|
||||
val textMuted = Color(0xFF43474E)
|
||||
val result = Color(0xFF5A5F68)
|
||||
val keyDigit = Color(0xFFEEF0F5)
|
||||
val onKeyDigit = Color(0xFF191C20)
|
||||
val keyOp = Color(0xFFD6E3F5)
|
||||
val onKeyOp = Color(0xFF0E1D2E)
|
||||
val keyAc = Color(0xFFEAD9FF)
|
||||
val onKeyAc = Color(0xFF25113D)
|
||||
val keyEq = Color(0xFFCDE3FB)
|
||||
val onKeyEq = Color(0xFF06233D)
|
||||
val keyFn = Color(0xFFDDE3EC)
|
||||
val onKeyFn = Color(0xFF191C20)
|
||||
val error = Color(0xFFBA1A1A)
|
||||
val darkBg = Color(0xFF0B1414)
|
||||
val darkDisplay = Color(0xFF283535)
|
||||
val darkSheet = Color(0xFF1E2A2A)
|
||||
val darkText = Color(0xFFE0E6E6)
|
||||
val darkTextMuted = Color(0xFFBEC8C8)
|
||||
val darkResult = Color(0xFF9FB0B0)
|
||||
val darkKeyDigit = Color(0xFF172121)
|
||||
val darkOnKeyDigit = Color(0xFFDDE4E4)
|
||||
val darkKeyOp = Color(0xFFA3D1D3)
|
||||
val darkOnKeyOp = Color(0xFF002F31)
|
||||
val darkKeyAc = Color(0xFF8FD5E8)
|
||||
val darkOnKeyAc = Color(0xFF00303B)
|
||||
val darkKeyEq = Color(0xFF00E0CC)
|
||||
val darkOnKeyEq = Color(0xFF00332E)
|
||||
val darkKeyFn = Color(0xFF253232)
|
||||
val darkOnKeyFn = Color(0xFFDDE4E4)
|
||||
val darkError = Color(0xFFFFB4AB)
|
||||
}
|
||||
|
||||
object WType {
|
||||
val label = TextStyle(fontSize = 14.sp, lineHeight = 20.sp, fontWeight = FontWeight.W500)
|
||||
val body = TextStyle(fontSize = 16.sp, lineHeight = 24.sp, fontWeight = FontWeight.W400)
|
||||
val fn = TextStyle(fontSize = 22.sp, lineHeight = 28.sp, fontWeight = FontWeight.W400)
|
||||
val key = TextStyle(fontSize = 34.sp, lineHeight = 40.sp, fontWeight = FontWeight.W400)
|
||||
val result = TextStyle(fontSize = 36.sp, lineHeight = 44.sp, fontWeight = FontWeight.W400)
|
||||
val expr = TextStyle(fontSize = 72.sp, lineHeight = 80.sp, fontWeight = FontWeight.W400)
|
||||
val exprMin = TextStyle(fontSize = 36.sp, lineHeight = 44.sp, fontWeight = FontWeight.W400)
|
||||
val historyExpr = TextStyle(fontSize = 18.sp, lineHeight = 24.sp, fontWeight = FontWeight.W400)
|
||||
val historyResult = TextStyle(fontSize = 28.sp, lineHeight = 34.sp, fontWeight = FontWeight.W400)
|
||||
}
|
||||
|
||||
object WSpace {
|
||||
val s0 = 0.dp
|
||||
val s4 = 4.dp
|
||||
val s8 = 8.dp
|
||||
val s12 = 12.dp
|
||||
val s16 = 16.dp
|
||||
val s24 = 24.dp
|
||||
val s32 = 32.dp
|
||||
}
|
||||
|
||||
object WRadius {
|
||||
val display = 32.dp
|
||||
val key = 999.dp
|
||||
val keyPressed = 24.dp
|
||||
val menu = 24.dp
|
||||
val pill = 999.dp
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"><path android:fillColor="#FF1E3A5F" android:pathData="M0,0h108v108h-108z"/></vector>
|
||||
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
|
||||
<path android:fillColor="#FFD6E3FF" android:pathData="M37,30h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:fillColor="#FFD6E3FF" android:pathData="M63,30h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:fillColor="#FFD6E3FF" android:pathData="M37,56h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:fillColor="#FFFFB86B" android:pathData="M63,56h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:strokeColor="#FF1E3A5F" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M36,41h10M41,36v10"/>
|
||||
<path android:strokeColor="#FF1E3A5F" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M62,41h10"/>
|
||||
<path android:strokeColor="#FF1E3A5F" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M37.5,63.5l7,7M44.5,63.5l-7,7"/>
|
||||
<path android:strokeColor="#FF5A2E00" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M62,64h10M62,70h10"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
|
||||
<path android:fillColor="#FF000000" android:pathData="M37,30h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="M63,30h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="M37,56h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="M63,56h8a7,7 0 0 1 7,7v8a7,7 0 0 1 -7,7h-8a7,7 0 0 1 -7,-7v-8a7,7 0 0 1 7,-7z"/>
|
||||
<path android:strokeColor="#FFFFFFFF" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M36,41h10M41,36v10"/>
|
||||
<path android:strokeColor="#FFFFFFFF" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M62,41h10"/>
|
||||
<path android:strokeColor="#FFFFFFFF" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M37.5,63.5l7,7M44.5,63.5l-7,7"/>
|
||||
<path android:strokeColor="#FFFFFFFF" android:strokeWidth="2.6" android:strokeLineCap="round" android:pathData="M62,64h10M62,70h10"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
|
||||
</adaptive-icon>
|
||||
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="history">Verlauf</string>
|
||||
<string name="more">Weitere Optionen</string>
|
||||
<string name="more_functions">Weitere Funktionen</string>
|
||||
<string name="clear_history">Verlauf löschen</string>
|
||||
<string name="no_history">Noch keine Rechnungen</string>
|
||||
<string name="current_expression">Aktuelle Eingabe</string>
|
||||
<string name="today">Heute</string>
|
||||
<string name="yesterday">Gestern</string>
|
||||
<string name="copy">Kopieren</string>
|
||||
<string name="paste">Einfügen</string>
|
||||
<string name="theme">Design</string>
|
||||
<string name="theme_system">System</string>
|
||||
<string name="theme_light">Hell</string>
|
||||
<string name="theme_dark">Dunkel</string>
|
||||
<string name="err_div_zero">Division durch null geht nicht</string>
|
||||
<string name="err_domain">Nicht definiert</string>
|
||||
<string name="err_too_big">Zahl zu groß</string>
|
||||
<string name="err_syntax">Ungültige Eingabe</string>
|
||||
</resources>
|
||||
@@ -0,0 +1,52 @@
|
||||
package app.rechner
|
||||
|
||||
import app.rechner.engine.Angle
|
||||
import app.rechner.engine.Engine
|
||||
import app.rechner.engine.ErrorKind
|
||||
import app.rechner.engine.NumberFormat
|
||||
import app.rechner.engine.Outcome
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
class EngineTest {
|
||||
private val e = Engine(',')
|
||||
private val f = NumberFormat(',', '.')
|
||||
private fun calc(s: String, angle: Angle = Angle.DEG): String = when (val r = e.evaluate(s, angle)) {
|
||||
is Outcome.Value -> f.format(r.value)
|
||||
is Outcome.Error -> r.kind.name
|
||||
Outcome.Empty -> ""
|
||||
}
|
||||
|
||||
@Test fun basics() {
|
||||
assertEquals("46", calc("12+34"))
|
||||
assertEquals("14", calc("2+3×4"))
|
||||
assertEquals("20", calc("(2+3)×4"))
|
||||
assertEquals("−625", calc("−5×125"))
|
||||
assertEquals("2,5", calc("5÷2"))
|
||||
assertEquals("118", calc("69+49"))
|
||||
}
|
||||
@Test fun exactDecimals() { assertEquals("0,3", calc("0,1+0,2")); assertEquals("1", calc("1÷3×3")) }
|
||||
@Test fun grouping() { assertEquals("7.720", calc("7.775−55")); assertEquals("2.025", calc("2.024+1")) }
|
||||
@Test fun percent() {
|
||||
assertEquals("55", calc("50+10%")); assertEquals("45", calc("50−10%"))
|
||||
assertEquals("5", calc("50×10%")); assertEquals("0,1", calc("10%"))
|
||||
}
|
||||
@Test fun powersAndRoots() {
|
||||
assertEquals("−4", calc("−2^2")); assertEquals("512", calc("2^3^2")); assertEquals("3", calc("√9"))
|
||||
assertEquals("0,5", calc("2^−1")); assertEquals("1,41421356237", calc("√2"))
|
||||
}
|
||||
@Test fun implicitMultiplication() { assertEquals("6,28318530718", calc("2π")); assertEquals("12", calc("3(4)")); assertEquals("6", calc("2√9")) }
|
||||
@Test fun trig() {
|
||||
assertEquals("0,5", calc("sin(30)")); assertEquals("−1", calc("cos(180)")); assertEquals("1", calc("tan(45)"))
|
||||
assertEquals("−1", calc("cos(π)", Angle.RAD)); assertEquals("30", calc("sin⁻¹(0,5)"))
|
||||
assertEquals("DOMAIN", calc("tan(90)"))
|
||||
}
|
||||
@Test fun logs() { assertEquals("2", calc("log(100)")); assertEquals("1", calc("ln(e)")); assertEquals("DOMAIN", calc("ln(0)")) }
|
||||
@Test fun factorial() { assertEquals("120", calc("5!")); assertEquals("9,33262154E157", calc("100!")); assertEquals("DOMAIN", calc("2,5!")) }
|
||||
@Test fun errors() { assertEquals("DIV_ZERO", calc("1÷0")); assertEquals("DOMAIN", calc("√(−1)")) }
|
||||
@Test fun lenientInput() {
|
||||
assertEquals("5", calc("(2+3")); assertEquals("5", calc("5+")); assertEquals("", calc("")); assertEquals("", calc("×"))
|
||||
assertEquals("7", calc("sin(30)+6,5"))
|
||||
}
|
||||
@Test fun smallNumbers() { assertEquals("1E−7", calc("1÷10000000")) }
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package app.rechner
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.test.junit4.createComposeRule
|
||||
import androidx.compose.ui.test.onRoot
|
||||
import app.rechner.data.HistoryEntry
|
||||
import app.rechner.data.Prefs
|
||||
import app.rechner.data.ThemeMode
|
||||
import app.rechner.engine.Angle
|
||||
import app.rechner.ui.CalcState
|
||||
import app.rechner.ui.CalculatorContent
|
||||
import app.rechner.ui.theme.CalcTheme
|
||||
import com.github.takahirom.roborazzi.captureRoboImage
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.annotation.GraphicsMode
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@GraphicsMode(GraphicsMode.Mode.NATIVE)
|
||||
@Config(sdk = [35], qualifiers = "de-rDE-w412dp-h915dp-xxhdpi", application = android.app.Application::class)
|
||||
class ScreenshotTest {
|
||||
@get:Rule val compose = createComposeRule()
|
||||
private val now = System.currentTimeMillis()
|
||||
private val history = listOf(
|
||||
HistoryEntry(1, "69+49", "118", now - 86_400_000), HistoryEntry(2, "16×0,5", "8", now - 4_000_000),
|
||||
HistoryEntry(3, "−5×125", "−625", now - 3_000_000), HistoryEntry(4, "2.024+1", "2.025", now - 60_000),
|
||||
)
|
||||
|
||||
private fun shot(name: String, dark: Boolean, state: CalcState, history: Boolean = false, sci: Boolean = false, prefs: Prefs = Prefs()) {
|
||||
compose.setContent {
|
||||
CalcTheme(if (dark) ThemeMode.DARK else ThemeMode.LIGHT, dynamic = false) {
|
||||
CalculatorContent(state, this.history, prefs, ',', {}, {}, {}, {}, {}, {}, {}, {}, { "" }, initialHistoryOpen = history, initialScientific = sci)
|
||||
}
|
||||
}
|
||||
compose.onRoot().captureRoboImage("../../replica/rechner/clone-screens/$name.png")
|
||||
}
|
||||
|
||||
@Test fun s01_empty_dark() = shot("S01-empty-dark", true, CalcState())
|
||||
@Test fun s01_typing_light() = shot("S01-typing-light", false, CalcState("7.775−55", "7.720"))
|
||||
@Test fun s01_result_dark() = shot("S01-result-dark", true, CalcState("118", showingResult = true))
|
||||
@Test fun s01_error() = shot("S01-error-light", false, CalcState("1÷0", error = app.rechner.engine.ErrorKind.DIV_ZERO))
|
||||
@Test fun s02_scientific_dark() = shot("S02-scientific-dark", true, CalcState("cos(π)", "−1"), sci = true, prefs = Prefs(angle = Angle.RAD))
|
||||
@Test fun s03_history_dark() = shot("S03-history-dark", true, CalcState("cos(π)", "−1"), history = true)
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
plugins {
|
||||
id("com.android.application") version "8.13.0" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
|
||||
id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
|
||||
id("com.google.devtools.ksp") version "2.2.20-2.0.3" apply false
|
||||
id("io.github.takahirom.roborazzi") version "1.46.1" apply false
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
|
||||
android.useAndroidX=true
|
||||
kotlin.code.style=official
|
||||
android.nonTransitiveRClass=true
|
||||
@@ -0,0 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
@@ -0,0 +1,251 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
@@ -0,0 +1,94 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@@ -0,0 +1,16 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
dependencyResolutionManagement {
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
rootProject.name = "Rechner"
|
||||
include(":app")
|
||||
@@ -0,0 +1,18 @@
|
||||
# Architecture: Messages (Android, ohne Google)
|
||||
|
||||
Same conventions as the others; **no network permission** (SMS goes through the radio, not the internet).
|
||||
|
||||
| Schicht | Wahl | warum |
|
||||
| --- | --- | --- |
|
||||
| UI | Compose, M3 Expressive, dynamic colour | same as the others |
|
||||
| Rolle | `RoleManager.ROLE_SMS` | only the default SMS app may write the SMS provider and receives SMS_DELIVER |
|
||||
| Empfangen | `SMS_DELIVER` receiver (BROADCAST_SMS), joins multipart PDUs, inserts into `Telephony.Sms.Inbox` | default app duty |
|
||||
| MMS-Pflicht | `WAP_PUSH_DELIVER` receiver (accepted, stored later with MMS support) | required for the role |
|
||||
| Senden | `SmsManager.divideMessage` + `sendMultipartTextMessage` with sent/delivered PendingIntents; row in outbox → sent/failed | status updates in the provider |
|
||||
| Antwort ohne UI | `RESPOND_VIA_MESSAGE` service (SEND_RESPOND_VIA_MESSAGE) | phone app "decline with message"; required for the role |
|
||||
| Daten | system provider via ContentResolver + ContentObserver | no copies |
|
||||
| Kontakte | PhoneLookup, same helper as Telefon | |
|
||||
|
||||
Data: no own schema (DataStore for settings).
|
||||
Bites: multipart and encoding, dual SIM (`SubscriptionManager`), status callbacks after process death (receiver updates by message id), notification grouping per thread, short codes and alphanumeric senders (no reply possible).
|
||||
Build order: role + receive + list → conversation + send + status → notifications with reply → new chat, search, archive, delete → MMS.
|
||||
@@ -0,0 +1,13 @@
|
||||
# Build log: Messages
|
||||
|
||||
| ID | date | status | missing | notes |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| S01 Conversations | 2026-10-17 | done | – | threads from the system SMS provider, unread state, multi-select archive/delete |
|
||||
| S02 Conversation | 2026-10-17 | done | attachments | grouped bubbles, day separators, sending/delivered/failed with retry |
|
||||
| S03 New chat | 2026-10-17 | done | – | |
|
||||
| S04 Search | 2026-10-17 | done | – | |
|
||||
| S05 Archived | 2026-10-17 | done | – | archive kept in app preferences |
|
||||
| S06 Settings | – | not started | delivery report toggle | |
|
||||
| S07 Notification | 2026-10-17 | done | – | MessagingStyle, direct reply, mark as read |
|
||||
|
||||
MMS: receiving is acknowledged (needed for the role) but not downloaded yet. **Not tested on a device** (phone disconnected).
|
||||
|
After Width: | Height: | Size: 76 KiB |
|
After Width: | Height: | Size: 105 KiB |
|
After Width: | Height: | Size: 104 KiB |
@@ -0,0 +1,62 @@
|
||||
// Generated from tokens.json by gen_theme.py. Do not edit by hand.
|
||||
package app.messages.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
object WColor {
|
||||
val bg = Color(0xFFF8F9FF)
|
||||
val row = Color(0xFFFFFFFF)
|
||||
val text = Color(0xFF191C20)
|
||||
val textMuted = Color(0xFF44474E)
|
||||
val bubbleIn = Color(0xFFE8EAF1)
|
||||
val onBubbleIn = Color(0xFF191C20)
|
||||
val bubbleOut = Color(0xFF2B5EA7)
|
||||
val onBubbleOut = Color(0xFFFFFFFF)
|
||||
val unread = Color(0xFF2B5EA7)
|
||||
val error = Color(0xFFBA1A1A)
|
||||
val fab = Color(0xFFD6E3FF)
|
||||
val onFab = Color(0xFF001B3E)
|
||||
val composer = Color(0xFFECEEF4)
|
||||
val onComposer = Color(0xFF191C20)
|
||||
val darkBg = Color(0xFF111318)
|
||||
val darkRow = Color(0xFF1D2024)
|
||||
val darkText = Color(0xFFE2E2E9)
|
||||
val darkTextMuted = Color(0xFFC4C6D0)
|
||||
val darkBubbleIn = Color(0xFF2B2F36)
|
||||
val darkOnBubbleIn = Color(0xFFE2E2E9)
|
||||
val darkBubbleOut = Color(0xFFA8C7FA)
|
||||
val darkOnBubbleOut = Color(0xFF062E6F)
|
||||
val darkUnread = Color(0xFFA8C7FA)
|
||||
val darkError = Color(0xFFFFB4AB)
|
||||
val darkFab = Color(0xFF284777)
|
||||
val darkOnFab = Color(0xFFD6E3FF)
|
||||
val darkComposer = Color(0xFF2B2F36)
|
||||
val darkOnComposer = Color(0xFFE2E2E9)
|
||||
}
|
||||
|
||||
object WType {
|
||||
val label = TextStyle(fontSize = 12.sp, lineHeight = 16.sp, fontWeight = FontWeight.W500)
|
||||
val bodySm = TextStyle(fontSize = 14.sp, lineHeight = 20.sp, fontWeight = FontWeight.W400)
|
||||
val body = TextStyle(fontSize = 16.sp, lineHeight = 22.sp, fontWeight = FontWeight.W400)
|
||||
val title = TextStyle(fontSize = 22.sp, lineHeight = 28.sp, fontWeight = FontWeight.W400)
|
||||
}
|
||||
|
||||
object WSpace {
|
||||
val s0 = 0.dp
|
||||
val s2 = 2.dp
|
||||
val s4 = 4.dp
|
||||
val s8 = 8.dp
|
||||
val s12 = 12.dp
|
||||
val s16 = 16.dp
|
||||
val s24 = 24.dp
|
||||
}
|
||||
|
||||
object WRadius {
|
||||
val bubble = 20.dp
|
||||
val bubbleTight = 6.dp
|
||||
val pill = 999.dp
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/env python3
|
||||
"""tokens.json -> Tokens.kt (Compose). Re-run after every token change."""
|
||||
import json, re, sys, pathlib
|
||||
src = pathlib.Path(sys.argv[1] if len(sys.argv) > 1 else "tokens.json")
|
||||
out = pathlib.Path(sys.argv[2] if len(sys.argv) > 2 else src.with_name("Tokens.kt"))
|
||||
t = json.loads(src.read_text())
|
||||
camel = lambda s: re.sub(r"-(\w)", lambda m: m.group(1).upper(), s)
|
||||
L = ["// Generated from tokens.json by gen_theme.py. Do not edit by hand.",
|
||||
"package app.messages.ui.theme", "",
|
||||
"import androidx.compose.ui.graphics.Color",
|
||||
"import androidx.compose.ui.text.TextStyle",
|
||||
"import androidx.compose.ui.text.font.FontWeight",
|
||||
"import androidx.compose.ui.unit.dp",
|
||||
"import androidx.compose.ui.unit.sp", "",
|
||||
"object WColor {"]
|
||||
L += [f" val {camel(k)} = Color(0xFF{v.lstrip('#').upper()})" for k, v in t["color"].items()]
|
||||
L += ["}", "", "object WType {"]
|
||||
for k, v in t["type"].items():
|
||||
L.append(f" val {camel(k)} = TextStyle(fontSize = {v['size']}.sp, lineHeight = {v['line']}.sp, fontWeight = FontWeight.W{v['weight']})")
|
||||
L += ["}", "", "object WSpace {"]
|
||||
L += [f" val s{v} = {v}.dp" for v in t["space"]]
|
||||
L += ["}", "", "object WRadius {"]
|
||||
L += [f" val {camel(k)} = {v}.dp" for k, v in t["radius"].items()]
|
||||
L += ["}", ""]
|
||||
out.write_text("\n".join(L))
|
||||
print("wrote", out)
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"_about": "Messages fallback palette; dynamic colour on Android 12+.",
|
||||
"color": {
|
||||
"bg": "#f8f9ff", "row": "#ffffff", "text": "#191c20", "text-muted": "#44474e",
|
||||
"bubble-in": "#e8eaf1", "on-bubble-in": "#191c20", "bubble-out": "#2b5ea7", "on-bubble-out": "#ffffff",
|
||||
"unread": "#2b5ea7", "error": "#ba1a1a", "fab": "#d6e3ff", "on-fab": "#001b3e", "composer": "#eceef4", "on-composer": "#191c20",
|
||||
"dark-bg": "#111318", "dark-row": "#1d2024", "dark-text": "#e2e2e9", "dark-text-muted": "#c4c6d0",
|
||||
"dark-bubble-in": "#2b2f36", "dark-on-bubble-in": "#e2e2e9", "dark-bubble-out": "#a8c7fa", "dark-on-bubble-out": "#062e6f",
|
||||
"dark-unread": "#a8c7fa", "dark-error": "#ffb4ab", "dark-fab": "#284777", "dark-on-fab": "#d6e3ff", "dark-composer": "#2b2f36", "dark-on-composer": "#e2e2e9"
|
||||
},
|
||||
"pairs": [["text","bg"],["text","row"],["text-muted","row"],["on-bubble-in","bubble-in"],["on-bubble-out","bubble-out"],["unread","row"],["error","bg"],["on-fab","fab"],["on-composer","composer"],
|
||||
["dark-text","dark-bg"],["dark-text","dark-row"],["dark-text-muted","dark-row"],["dark-on-bubble-in","dark-bubble-in"],["dark-on-bubble-out","dark-bubble-out"],["dark-unread","dark-row"],["dark-error","dark-bg"],["dark-on-fab","dark-fab"],["dark-on-composer","dark-composer"]],
|
||||
"type": {"label": {"size": 12, "line": 16, "weight": 500}, "body-sm": {"size": 14, "line": 20, "weight": 400}, "body": {"size": 16, "line": 22, "weight": 400}, "title": {"size": 22, "line": 28, "weight": 400}},
|
||||
"space": [0, 2, 4, 8, 12, 16, 24],
|
||||
"radius": {"bubble": 20, "bubble-tight": 6, "pill": 999}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
feature,area,priority,original,clone,notes
|
||||
Become the default SMS app (role),core,must,yes,yes,
|
||||
Receive SMS and store it in the system provider,core,must,yes,yes,
|
||||
Send SMS incl. long multipart messages,core,must,yes,yes,
|
||||
Sent and delivered status; failed with retry,core,must,yes,yes,
|
||||
Conversation list with unread state,list,must,yes,yes,
|
||||
Contact names and avatars,list,must,yes,yes,
|
||||
Conversation bubbles with day separators,chat,must,yes,yes,
|
||||
Composer with send button,chat,must,yes,yes,
|
||||
Notification with direct reply and mark as read,notifications,must,yes,yes,
|
||||
Start a new chat from contacts or a number,compose,must,yes,yes,
|
||||
Mark as read when opened,core,must,yes,yes,
|
||||
Delete conversations,list,should,yes,yes,
|
||||
Archive conversations,list,should,yes,yes,
|
||||
Search messages,search,should,yes,yes,
|
||||
Copy message text and links clickable,chat,should,yes,yes,
|
||||
Call from the conversation,chat,should,yes,yes,
|
||||
Quick reply from the phone app (respond via message),core,must,yes,yes,needed for the role
|
||||
Dual SIM choice,core,could,yes,partial,
|
||||
Dynamic colour and dark mode,design,must,yes,yes,
|
||||
Delivery reports setting,settings,could,yes,no,
|
||||
MMS pictures and group MMS,mms,should,yes,no,later
|
||||
RCS chat features,rcs,could,yes,skip,Google/carrier backend
|
||||
Spam protection and Gemini features,other,could,yes,skip,Google services
|
||||
Messages for web,other,could,yes,skip,Google service
|
||||
|
@@ -0,0 +1,64 @@
|
||||
# Recon map: Google Messages (Android)
|
||||
|
||||
Scope: conversation list, conversation with bubbles, compose/new chat, SMS send/receive/delivery, notifications with reply, search, archive/delete, contacts integration
|
||||
For: personal use, an SMS app without Google services (project NoGooleApps)
|
||||
Date: 2026-10-17
|
||||
|
||||
## Sources
|
||||
|
||||
| # | source | URL | notes |
|
||||
| --- | --- | --- | --- |
|
||||
| 1 | screenshots | replica/messages/screens/ref-01..05.png | supplied by user: launcher icon, RCS group chat with reactions, list (store art), list on a phone (older), chat with image. Reference only |
|
||||
| 2 | platform docs | https://developer.android.com/reference/android/provider/Telephony | SMS/MMS provider, default SMS app duties |
|
||||
| 3 | platform docs | https://developer.android.com/reference/android/app/role/RoleManager#ROLE_SMS | default SMS app role requirements |
|
||||
|
||||
## Core loop
|
||||
|
||||
See new texts at a glance and answer in two taps, from the list or straight from the notification.
|
||||
|
||||
## Screens
|
||||
|
||||
| ID | screen | how | purpose | components | states |
|
||||
| --- | --- | --- | --- | --- | --- |
|
||||
| S01 | Conversations | launch | all threads | top bar (title, search, menu), rows (avatar, name or number, snippet with "Du: ", time, unread bold + dot), FAB "Chat starten" | empty, no role, filled, unread |
|
||||
| S02 | Conversation | tap a row | read and reply | top bar (back, avatar, name, call, menu), bubbles (incoming left surface, outgoing right primary), day separators, time + delivery status, composer pill (attach, field, send) | sending, sent, delivered, failed (tap to retry), long text, links |
|
||||
| S03 | New chat | FAB | pick a recipient | "An:" field, contact suggestions, type a number | empty, matches |
|
||||
| S04 | Search | search icon | find messages | field, results with highlighted match | |
|
||||
| S05 | Archived | menu | archived threads | list | empty |
|
||||
| S06 | Settings | menu | options | default app, notifications (system), delivery reports, theme | |
|
||||
| S07 | Notification | system | read and reply without opening | MessagingStyle with sender, direct reply, mark as read | |
|
||||
|
||||
## Flows
|
||||
|
||||
```
|
||||
F01 Reply to a new text: notification → reply inline → sent (taps: 2)
|
||||
F02 Read and answer in the app: S01 → S02 → type → send
|
||||
F03 Start a chat: S01 FAB → S03 pick contact → S02 → send
|
||||
F04 Delete / archive a thread: long press in S01 → action
|
||||
F05 Become the default SMS app: first start → system dialog
|
||||
edge: long messages (multipart), no signal (failed, retry), dual SIM, unknown sender, short codes, delivery report
|
||||
```
|
||||
|
||||
## Components
|
||||
|
||||
Avatar (photo, initial, unknown) · ConversationRow · Bubble (in, out; first/middle/last grouping radius) · DaySeparator · Composer pill · Status line (Wird gesendet, Gesendet, Zugestellt, Fehler) · FAB extended "Chat starten" · Selection top bar.
|
||||
|
||||
## Data model
|
||||
|
||||
Messages and threads live in the system provider (`Telephony.Sms`, `Telephony.Threads`); as default SMS app we write incoming messages there ourselves.
|
||||
|
||||
```
|
||||
Thread (system) thread_id, recipients, snippet, date, read, archived (Telephony.Threads.ARCHIVED) confidence: high
|
||||
Sms (system) _id, thread_id, address, body, date, type (inbox|sent|outbox|failed|queued), read, status confidence: high
|
||||
Prefs own: delivery_reports, theme confidence: high
|
||||
```
|
||||
|
||||
## Out of scope
|
||||
|
||||
- RCS (typing indicators, reactions, high-res media, read receipts over data): Google's RCS backend (Jibe) and carrier deals; not open to other apps.
|
||||
- Google account backup, spam protection, Magic Compose/Gemini, "Messages for web": Google services.
|
||||
- MMS (pictures, group MMS): technically possible for a default SMS app but needs carrier MMS settings and PDU handling; planned after SMS works.
|
||||
|
||||
## Size
|
||||
|
||||
Screens 7, flows 5. Hard parts: (1) default-SMS duties (store incoming, mark read, respond-via-message service, sent/delivered intents, multipart), (2) fast thread list with contact names, (3) MMS later. Size: M.
|
||||
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 43 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 154 KiB |
|
After Width: | Height: | Size: 44 KiB |
@@ -0,0 +1,43 @@
|
||||
# Architecture: Rechner (Android, ohne Google)
|
||||
|
||||
Same conventions as `wetter/` and `uhr/`: one native app, no server, **no network permission**.
|
||||
|
||||
## Stack
|
||||
|
||||
| Schicht | Wahl | warum |
|
||||
| --- | --- | --- |
|
||||
| UI | Kotlin + Compose, Material 3 Expressive, dynamic colour | same look and pipeline as the other apps |
|
||||
| Rechenkern | own recursive-descent parser → AST → evaluator on `BigDecimal` (MathContext 50 digits), integers stay exact `BigInteger` | no floating-point surprises (0.1+0.2 = 0.3), 100! exact; pure Kotlin, unit-tested on the JVM |
|
||||
| Funktionen | sin/cos/tan/ln/log/eˣ/√/^ via `Math` on doubles only where unavoidable, results rounded to 15 significant digits, exact values snapped (sin 30° = 0.5, cos π = −1) | readable answers without fake precision |
|
||||
| Persistenz | Room (history) + DataStore (memory, angle unit, current expression) | – |
|
||||
| Build/Verteilung | minSdk 29, `scripts/release.sh rechner` (Obtainium) | – |
|
||||
|
||||
## Schema
|
||||
|
||||
`schema.sql`: 1 table `history`. Single user, app-private storage.
|
||||
|
||||
## Interne API
|
||||
|
||||
| Aufruf | macht | Flow |
|
||||
| --- | --- | --- |
|
||||
| `Engine.evaluate(expr, angle)` | parse + evaluate, tolerant of unfinished input (auto-closes parentheses, ignores a trailing operator) | F01, F02 |
|
||||
| `Editor.input(key)` | cursor-aware editing: digits, operators (replace a trailing operator), smart parentheses, %, functions insert `sin(`, backspace removes whole tokens | F01, F02 |
|
||||
| `Calc.equals()` | evaluate, store history row, result becomes the expression | F01 |
|
||||
| `History.observe()/clear()` | grouped by local day | F03 |
|
||||
| `Memory.store(value)/recall()` | DataStore | F05 |
|
||||
| `Clipboard.copy/paste` | system clipboard; paste is sanitised to calculator tokens | F04 |
|
||||
|
||||
## Was beißt
|
||||
|
||||
- **Precision:** division keeps 50 digits internally; display rounds to fit and strips trailing zeros; repeating decimals shown truncated with an ellipsis rather than rounded up wrongly.
|
||||
- **Percent:** `50+10%` = 55 (percent of the left operand for + and −), `50×10%` = 5; standalone `10%` = 0.1.
|
||||
- **Locale:** German uses comma decimal and dot grouping; the parser accepts the locale separator only.
|
||||
- **Big results:** 100! has 158 digits; display shows them scientifically (1,5E157) and the full value on scroll.
|
||||
- **Domain errors:** √(−1), ln 0, tan 90°, 0÷0, factorial of non-integers → error text, never a crash.
|
||||
|
||||
## Build-Reihenfolge
|
||||
|
||||
1. Vertical slice (S01): engine + keypad + live result + equals; engine unit tests.
|
||||
2. Must: scientific row and panel (S02), Deg/Rad, Inv, errors, auto-shrinking display, history (S03), copy/paste (S04), expressive keys, dynamic colour.
|
||||
3. Should: memory, implicit multiplication, pull-down history, haptics, big numbers, locale separators, clear history.
|
||||
4. Could: landscape layout with all functions.
|
||||
@@ -0,0 +1,13 @@
|
||||
# Build log: Rechner
|
||||
|
||||
App in `rechner/`. Engine unit tests: 12 suites of cases (exact decimals, percent rules, powers, implicit multiplication, trig incl. exact angles, logs, factorial, errors, lenient input). Screenshots via Roborazzi → `replica/rechner/clone-screens/`.
|
||||
|
||||
| ID | date | status | missing | notes |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| S01 Calculator | 2026-10-17 | done | – | verified on device: 12+34 live preview 46, = makes 46 the expression; display grows to meet the keypad |
|
||||
| S02 Scientific | 2026-10-17 | done | – | verified on device: Rad, cos(π) → −1 |
|
||||
| S03 History | 2026-10-17 | done | – | verified on device: pull down shows "Heute" group and the current expression |
|
||||
| S04 Context menu | 2026-10-17 | done | cut | copy, paste, MS, MR |
|
||||
| S05 Settings | 2026-10-17 | done | – | theme and clear history in the overflow menu |
|
||||
|
||||
Not done: landscape layout; scrolling through all digits of very long results.
|
||||
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 122 KiB |
|
After Width: | Height: | Size: 118 KiB |
|
After Width: | Height: | Size: 117 KiB |
|
After Width: | Height: | Size: 151 KiB |