Skip to content

RF Sentinel (RFSentinel): free, open-source police detector app for Android. Spots police body cams, Flock ALPR cameras, AirTag trackers, Remote ID drones, smart glasses and fake cell towers from Bluetooth LE and WiFi. No root.

Themes: fsociety (Mr. Robot) theme; DedSec redone with a full-width poster banner

CIS-C0e642e43e8a2b
diff --git a/README.md b/README.md
index 8d3f8bc..dae80d0 100644
--- a/README.md
+++ b/README.md
@@ -27,14 +27,14 @@
</p>
<p align="center">
- <img src="docs/screenshots/list-dedsec.jpg" width="270" alt="List view with demo detections (DedSec theme)" />
+ <img src="docs/screenshots/list-dedsec.jpg" width="270" alt="List view with demo detections (DedSec theme, Watch Dogs 2-inspired)" />
&nbsp;&nbsp;
- <img src="docs/screenshots/radar-dedsec.jpg" width="270" alt="Radar view with demo detections (DedSec theme)" />
+ <img src="docs/screenshots/list-fsociety.jpg" width="270" alt="List view with demo detections (fsociety theme, Mr. Robot-inspired)" />
</p>
<p align="center">
<img src="docs/screenshots/android-auto/navigation.jpg" width="560" alt="Android Auto: live map with nearby devices and OpenStreetMap navigation" />
</p>
-<p align="center"><sub>List and radar views (DedSec theme), and the Android Auto live map with navigation. Demo data. <a href="#themes">See all 12 themes</a> · <a href="#android-auto">Android Auto</a>.</sub></p>
+<p align="center"><sub>The DedSec (Watch Dogs 2) and fsociety (Mr. Robot) themes, and the Android Auto live map with navigation. Demo data. <a href="#themes">See all 13 themes</a> · <a href="#android-auto">Android Auto</a>.</sub></p>
<p align="center">
<a href="https://github.com/CIS-C0/RFSentinel/stargazers"><img src="docs/star-banner.svg" width="560" alt="Like RF Sentinel? Give it a star on GitHub - it's free, takes one click and helps others find it" /></a>
@@ -107,16 +107,16 @@ publicly.
- Decoded Apple Continuity, iBeacon, Eddystone, Fast Pair and ASTM F3411 Remote ID
**Interface**
-- Live list and radar view, with filters and search
+- Live list and radar view, with filter chips showing live counts (flagged, trackers, drones, new, ESP32, favorites, Bluetooth, WiFi) and search
- Device details: evidence, identity, signal graph, **Locate** mode, history and raw advertisement
-- OpenStreetMap map with recorded GPS traces and the devices heard along them
+- OpenStreetMap map with recorded GPS traces and the devices heard along them, the same filter chips, and self-centering that follows you until you pan away
- **History map & timeline:** a heatmap of where flagged equipment showed up, and when (hour of day, day of week)
-- Alerts with sound, vibration patterns and spoken announcements, plus a discreet mode
+- Alerts with sound, vibration patterns and spoken announcements through the phone's own speech engine (prioritised, no stale or repeated phrases, voice and speed pickers), plus a discreet mode
- **Floating threat bubble** over Waze, Google Maps or any other app while scanning
- **Starts by itself in the car** (your car's Bluetooth or Android Auto) and stops when you leave
- Android Auto app with a map of nearby cameras and drones, Quick Settings tile and home-screen widget
- **Report unknown device:** share a privacy-safe signature (no full address, serials, location or times) so new equipment can be added
-- 12 themes, each styled theme with its own animated header
+- 13 themes, each styled theme with its own animated header - including **DedSec** (Watch Dogs 2) and **fsociety** (Mr. Robot) fan themes with full-width poster banners and typing terminals
**Data**
- Export as CSV, JSON, KML, GPX or GeoJSON
@@ -181,7 +181,7 @@ The app never connects to a device. The details screen shows:
### Map and traces
-- The **map** (the floating **Map** button on the main screen) shows your
+- The **map** (the **Map** button next to the list / radar toggle) shows your
position, the trace being recorded, and every device heard around you as a dot
in the same colours as the list and radar, placed where your phone was when its
signal was strongest. That approximates the device's position, not a fix: only
@@ -319,7 +319,8 @@ Pick a theme in the setup wizard or under **Settings → Appearance**.
| Theme | Look |
|---|---|
-| **DedSec** | Watch Dogs 2-style hacktivist zine: black and white with hot pink and violet, halftone print, a hatched pixel skull, a glitching pixel wordmark and a retro-OS terminal that bypasses ctOS |
+| **DedSec** | Watch Dogs 2-style: black and white with electric blue, a full-width DedSec poster banner, a sliced Watch Dogs 2-style wordmark and a `[email protected]` terminal typing hacktivist lines |
+| **fsociety** | Mr. Robot-style: black and blood red, a full-width fsociety poster banner, a red striped wordmark and a `root@fsociety` terminal typing quotes from the show |
| **Night Drive** | Red-only cockpit HUD. Every colour is mapped to red to preserve night vision while driving |
| **Night Vision** | Green phosphor image intensifier with grain and a scope vignette |
| **Amber CRT** | 1980s terminal with a blinking cursor and scanlines |
@@ -330,18 +331,20 @@ Pick a theme in the setup wizard or under **Settings → Appearance**.
| **System / Light / Dark / Material You** | Standard looks. Material You follows your wallpaper colours |
<table>
-<tr><td align="center"><img src="docs/screenshots/themes/dedsec-list.jpg" width="190" alt="DedSec theme, list view" /><br/><sub><b>DedSec</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-drive-list.jpg" width="190" alt="Night Drive theme, list view" /><br/><sub><b>Night Drive</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-vision-list.jpg" width="190" alt="Night Vision theme, list view" /><br/><sub><b>Night Vision</b></sub></td><td align="center"><img src="docs/screenshots/themes/amber-list.jpg" width="190" alt="Amber CRT theme, list view" /><br/><sub><b>Amber CRT</b></sub></td></tr>
-<tr><td align="center"><img src="docs/screenshots/themes/synthwave-list.jpg" width="190" alt="Synthwave theme, list view" /><br/><sub><b>Synthwave</b></sub></td><td align="center"><img src="docs/screenshots/themes/tactical-list.jpg" width="190" alt="Tactical theme, list view" /><br/><sub><b>Tactical</b></sub></td><td align="center"><img src="docs/screenshots/themes/blueprint-list.jpg" width="190" alt="Blueprint theme, list view" /><br/><sub><b>Blueprint</b></sub></td><td align="center"><img src="docs/screenshots/themes/paper-list.jpg" width="190" alt="Paper theme, list view" /><br/><sub><b>Paper</b></sub></td></tr>
-<tr><td align="center"><img src="docs/screenshots/themes/system-list.jpg" width="190" alt="System theme, list view" /><br/><sub><b>System</b></sub></td><td align="center"><img src="docs/screenshots/themes/light-list.jpg" width="190" alt="Light theme, list view" /><br/><sub><b>Light</b></sub></td><td align="center"><img src="docs/screenshots/themes/dark-list.jpg" width="190" alt="Dark theme, list view" /><br/><sub><b>Dark</b></sub></td><td align="center"><img src="docs/screenshots/themes/material-you-list.jpg" width="190" alt="Material You theme, list view" /><br/><sub><b>Material You</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/dedsec-list.jpg" width="190" alt="DedSec theme, list view" /><br/><sub><b>DedSec</b></sub></td><td align="center"><img src="docs/screenshots/themes/fsociety-list.jpg" width="190" alt="fsociety theme, list view" /><br/><sub><b>fsociety</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-drive-list.jpg" width="190" alt="Night Drive theme, list view" /><br/><sub><b>Night Drive</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-vision-list.jpg" width="190" alt="Night Vision theme, list view" /><br/><sub><b>Night Vision</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/amber-list.jpg" width="190" alt="Amber CRT theme, list view" /><br/><sub><b>Amber CRT</b></sub></td><td align="center"><img src="docs/screenshots/themes/synthwave-list.jpg" width="190" alt="Synthwave theme, list view" /><br/><sub><b>Synthwave</b></sub></td><td align="center"><img src="docs/screenshots/themes/tactical-list.jpg" width="190" alt="Tactical theme, list view" /><br/><sub><b>Tactical</b></sub></td><td align="center"><img src="docs/screenshots/themes/blueprint-list.jpg" width="190" alt="Blueprint theme, list view" /><br/><sub><b>Blueprint</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/paper-list.jpg" width="190" alt="Paper theme, list view" /><br/><sub><b>Paper</b></sub></td><td align="center"><img src="docs/screenshots/themes/system-list.jpg" width="190" alt="System theme, list view" /><br/><sub><b>System</b></sub></td><td align="center"><img src="docs/screenshots/themes/light-list.jpg" width="190" alt="Light theme, list view" /><br/><sub><b>Light</b></sub></td><td align="center"><img src="docs/screenshots/themes/dark-list.jpg" width="190" alt="Dark theme, list view" /><br/><sub><b>Dark</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/material-you-list.jpg" width="190" alt="Material You theme, list view" /><br/><sub><b>Material You</b></sub></td></tr>
</table>
<details>
<summary><b>Radar view in every theme</b></summary>
<table>
-<tr><td align="center"><img src="docs/screenshots/themes/dedsec-radar.jpg" width="190" alt="DedSec theme, radar view" /><br/><sub><b>DedSec</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-drive-radar.jpg" width="190" alt="Night Drive theme, radar view" /><br/><sub><b>Night Drive</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-vision-radar.jpg" width="190" alt="Night Vision theme, radar view" /><br/><sub><b>Night Vision</b></sub></td><td align="center"><img src="docs/screenshots/themes/amber-radar.jpg" width="190" alt="Amber CRT theme, radar view" /><br/><sub><b>Amber CRT</b></sub></td></tr>
-<tr><td align="center"><img src="docs/screenshots/themes/synthwave-radar.jpg" width="190" alt="Synthwave theme, radar view" /><br/><sub><b>Synthwave</b></sub></td><td align="center"><img src="docs/screenshots/themes/tactical-radar.jpg" width="190" alt="Tactical theme, radar view" /><br/><sub><b>Tactical</b></sub></td><td align="center"><img src="docs/screenshots/themes/blueprint-radar.jpg" width="190" alt="Blueprint theme, radar view" /><br/><sub><b>Blueprint</b></sub></td><td align="center"><img src="docs/screenshots/themes/paper-radar.jpg" width="190" alt="Paper theme, radar view" /><br/><sub><b>Paper</b></sub></td></tr>
-<tr><td align="center"><img src="docs/screenshots/themes/system-radar.jpg" width="190" alt="System theme, radar view" /><br/><sub><b>System</b></sub></td><td align="center"><img src="docs/screenshots/themes/light-radar.jpg" width="190" alt="Light theme, radar view" /><br/><sub><b>Light</b></sub></td><td align="center"><img src="docs/screenshots/themes/dark-radar.jpg" width="190" alt="Dark theme, radar view" /><br/><sub><b>Dark</b></sub></td><td align="center"><img src="docs/screenshots/themes/material-you-radar.jpg" width="190" alt="Material You theme, radar view" /><br/><sub><b>Material You</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/dedsec-radar.jpg" width="190" alt="DedSec theme, radar view" /><br/><sub><b>DedSec</b></sub></td><td align="center"><img src="docs/screenshots/themes/fsociety-radar.jpg" width="190" alt="fsociety theme, radar view" /><br/><sub><b>fsociety</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-drive-radar.jpg" width="190" alt="Night Drive theme, radar view" /><br/><sub><b>Night Drive</b></sub></td><td align="center"><img src="docs/screenshots/themes/night-vision-radar.jpg" width="190" alt="Night Vision theme, radar view" /><br/><sub><b>Night Vision</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/amber-radar.jpg" width="190" alt="Amber CRT theme, radar view" /><br/><sub><b>Amber CRT</b></sub></td><td align="center"><img src="docs/screenshots/themes/synthwave-radar.jpg" width="190" alt="Synthwave theme, radar view" /><br/><sub><b>Synthwave</b></sub></td><td align="center"><img src="docs/screenshots/themes/tactical-radar.jpg" width="190" alt="Tactical theme, radar view" /><br/><sub><b>Tactical</b></sub></td><td align="center"><img src="docs/screenshots/themes/blueprint-radar.jpg" width="190" alt="Blueprint theme, radar view" /><br/><sub><b>Blueprint</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/paper-radar.jpg" width="190" alt="Paper theme, radar view" /><br/><sub><b>Paper</b></sub></td><td align="center"><img src="docs/screenshots/themes/system-radar.jpg" width="190" alt="System theme, radar view" /><br/><sub><b>System</b></sub></td><td align="center"><img src="docs/screenshots/themes/light-radar.jpg" width="190" alt="Light theme, radar view" /><br/><sub><b>Light</b></sub></td><td align="center"><img src="docs/screenshots/themes/dark-radar.jpg" width="190" alt="Dark theme, radar view" /><br/><sub><b>Dark</b></sub></td></tr>
+<tr><td align="center"><img src="docs/screenshots/themes/material-you-radar.jpg" width="190" alt="Material You theme, radar view" /><br/><sub><b>Material You</b></sub></td></tr>
</table>
</details>
@@ -470,11 +473,13 @@ was re-checked against its IEEE registrant; see
[docs/SIGNATURES.md](docs/SIGNATURES.md#community-lists-compared-2026-10). Known
plate-reader locations come from [DeFlock](https://github.com/FoggedLens/deflock)'s
snapshot of OpenStreetMap, mapped by its volunteers (data © OpenStreetMap
-contributors, ODbL) - thank you. The DedSec theme font is Share Tech Mono (SIL Open
-Font License 1.1). The DedSec theme is an unofficial fan homage to Watch Dogs: all
-its art is original and it contains no Ubisoft artwork or logos. Watch Dogs, DedSec,
-ctOS and Blume are trademarks of Ubisoft; RF Sentinel is not affiliated with or
-endorsed by Ubisoft.
+contributors, ODbL) - thank you. The DedSec and fsociety theme font is Share Tech
+Mono (SIL Open Font License 1.1). The DedSec theme is an unofficial fan homage to
+Watch Dogs; its header poster uses DedSec imagery. Watch Dogs, DedSec, ctOS and Blume
+are trademarks of Ubisoft. The fsociety theme is an unofficial fan homage to Mr. Robot
+and quotes short lines from the show; Mr. Robot is a trademark of Universal Content
+Productions. RF Sentinel is not affiliated with or endorsed by Ubisoft, USA Network
+or NBCUniversal.
## License
diff --git a/app/src/main/java/com/rfsentinel/app/MainActivity.kt b/app/src/main/java/com/rfsentinel/app/MainActivity.kt
index 2e98591..7a66382 100644
--- a/app/src/main/java/com/rfsentinel/app/MainActivity.kt
+++ b/app/src/main/java/com/rfsentinel/app/MainActivity.kt
@@ -102,11 +102,12 @@ class MainActivity : AppCompatActivity() {
binding.mapButton.setOnClickListener {
startActivity(Intent(this, com.rfsentinel.app.ui.MapActivity::class.java))
}
- // Shrink the Map button to its icon while scrolling down the list; full label again at the top.
+ // The disclaimer line at the bottom steps aside once the list is scrolled.
binding.recyclerView.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
override fun onScrolled(rv: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
- if (dy > 8 && binding.mapButton.isExtended) binding.mapButton.shrink()
- else if ((dy < -8 || !rv.canScrollVertically(-1)) && !binding.mapButton.isExtended) binding.mapButton.extend()
+ val atTop = !rv.canScrollVertically(-1)
+ if (dy > 8 && !atTop) binding.disclaimerText.visibility = View.GONE
+ else if (atTop) binding.disclaimerText.visibility = View.VISIBLE
}
})
setupFilterChips()
@@ -150,7 +151,13 @@ class MainActivity : AppCompatActivity() {
if (header == null) return
binding.themeHeader.style = header
val file = com.rfsentinel.app.ui.ThemeManager.bannerFile(this)
- if (com.rfsentinel.app.ui.ThemeManager.hasBanner(this)) {
+ // Bundled poster art sits beside the animated header (a picked banner replaces it).
+ val useArt = theme.headerImage != null && !com.rfsentinel.app.ui.ThemeManager.hasBanner(this)
+ binding.themeHeader.poster = if (useArt) android.graphics.BitmapFactory.decodeResource(resources, theme.headerImage!!,
+ android.graphics.BitmapFactory.Options().apply { inSampleSize = 2 }) else null
+ if (useArt) {
+ binding.themeBanner.visibility = View.GONE
+ } else if (com.rfsentinel.app.ui.ThemeManager.hasBanner(this)) {
val bmp = android.graphics.BitmapFactory.decodeFile(file.absolutePath, android.graphics.BitmapFactory.Options().apply {
// Downsample big images so the header stays light.
val probe = android.graphics.BitmapFactory.Options().apply { inJustDecodeBounds = true }
@@ -168,7 +175,8 @@ class MainActivity : AppCompatActivity() {
val radar = Prefs.radarView(this)
binding.radarView.visibility = if (radar) View.VISIBLE else View.GONE
binding.recyclerView.visibility = if (radar) View.GONE else View.VISIBLE
- if (!binding.mapButton.isExtended) binding.mapButton.extend()
+ binding.disclaimerText.visibility =
+ if (radar || !binding.recyclerView.canScrollVertically(-1)) View.VISIBLE else View.GONE
}
/** Filter chips from [com.rfsentinel.app.ui.DeviceFilter] (same rules as the map), counts filled in by render(). */
@@ -201,6 +209,8 @@ class MainActivity : AppCompatActivity() {
b.iconTint = android.content.res.ColorStateList(arrayOf(checked, none), intArrayOf(onAccent, text))
b.strokeColor = android.content.res.ColorStateList.valueOf(accent)
}
+ binding.mapButton.iconTint = android.content.res.ColorStateList.valueOf(accent)
+ binding.mapButton.strokeColor = android.content.res.ColorStateList.valueOf(accent)
}
private var shownRunning: Boolean? = null
@@ -438,7 +448,6 @@ class MainActivity : AppCompatActivity() {
R.id.action_oui_list -> { startActivity(Intent(this, OuiListActivity::class.java)); true }
R.id.action_export -> { Exporter.showExportMenu(this); true }
R.id.action_export_all -> { Exporter.showExportAll(this); true }
- R.id.action_map -> { startActivity(Intent(this, com.rfsentinel.app.ui.MapActivity::class.java)); true }
R.id.action_traces -> { startActivity(Intent(this, com.rfsentinel.app.ui.TripsActivity::class.java)); true }
R.id.action_history -> { startActivity(Intent(this, com.rfsentinel.app.ui.HistoryActivity::class.java)); true }
R.id.action_about -> { AboutDialog.show(this); true }
diff --git a/app/src/main/java/com/rfsentinel/app/settings/SettingsActivity.kt b/app/src/main/java/com/rfsentinel/app/settings/SettingsActivity.kt
index 4d04215..89cb9d0 100644
--- a/app/src/main/java/com/rfsentinel/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/rfsentinel/app/settings/SettingsActivity.kt
@@ -23,6 +23,14 @@ import com.rfsentinel.app.util.applySystemBarInsets
import kotlinx.coroutines.launch
class SettingsActivity : AppCompatActivity() {
+
+ companion object {
+ /**
+ * Scroll position to restore after a theme change restyles this screen
+ * (possibly twice: ours + AppCompat's night-mode switch).
+ */
+ private var resumeScroll: Int? = null
+ }
private lateinit var binding: ActivitySettingsBinding
private var stopObservingPrefetch: (() -> Unit)? = null
private var stopObservingDeflock: (() -> Unit)? = null
@@ -252,6 +260,7 @@ class SettingsActivity : AppCompatActivity() {
isChecked = t == current
setOnCheckedChangeListener { _, checked ->
if (checked && t != ThemeManager.current(this@SettingsActivity)) {
+ resumeScroll = binding.root.scrollY
ThemeManager.set(this@SettingsActivity, t)
recreate()
}
@@ -259,6 +268,14 @@ class SettingsActivity : AppCompatActivity() {
})
}
+ resumeScroll?.let { y ->
+ binding.root.post {
+ if (isFinishing || isDestroyed) return@post
+ binding.root.scrollTo(0, y)
+ resumeScroll = null
+ }
+ }
+
binding.runSetupButton.setOnClickListener {
startActivity(android.content.Intent(this, com.rfsentinel.app.ui.SetupActivity::class.java))
finish()
diff --git a/app/src/main/java/com/rfsentinel/app/ui/AboutDialog.kt b/app/src/main/java/com/rfsentinel/app/ui/AboutDialog.kt
index 6256a6f..396ebe9 100644
--- a/app/src/main/java/com/rfsentinel/app/ui/AboutDialog.kt
+++ b/app/src/main/java/com/rfsentinel/app/ui/AboutDialog.kt
@@ -37,9 +37,10 @@ object AboutDialog {
&bull; Google Find Hub Network accessory spec; arXiv 2501.17452 (trackers)<br/>
&bull; Research by ryanohoro and GainSec (Flock); Alan Meekins' DEF CON 31 talk (Axon)<br/><br/>
- DedSec and Night Vision theme font: Share Tech Mono &copy; Carrois Type Design, SIL Open Font
- License 1.1 (assets/licenses). "DedSec" is a name from Ubisoft's Watch Dogs; this
- theme is an unofficial, original homage and includes no Ubisoft artwork.<br/><br/>
+ DedSec, fsociety and Night Vision theme font: Share Tech Mono &copy; Carrois Type Design, SIL Open Font
+ License 1.1 (assets/licenses). "DedSec" is a name from Ubisoft's Watch Dogs and "fsociety"
+ from Mr. Robot (Universal Content Productions); these themes are unofficial fan homages,
+ not affiliated with or endorsed by Ubisoft, USA Network or NBCUniversal.<br/><br/>
Feature ideas from SØPHIA, BLE Radar (MetaRadar) and RF Party; no code from
those projects is included.<br/><br/>
diff --git a/app/src/main/java/com/rfsentinel/app/ui/SetupActivity.kt b/app/src/main/java/com/rfsentinel/app/ui/SetupActivity.kt
index c1601d0..8fd9fd5 100644
--- a/app/src/main/java/com/rfsentinel/app/ui/SetupActivity.kt
+++ b/app/src/main/java/com/rfsentinel/app/ui/SetupActivity.kt
@@ -38,6 +38,8 @@ class SetupActivity : AppCompatActivity() {
* the saved-instance state doesn't reliably survive both.
*/
private var resumeStep: Int? = null
+ /** Scroll position of the theme list to restore after the same recreations. */
+ private var resumeScroll: Int? = null
}
private lateinit var binding: ActivitySetupBinding
@@ -69,6 +71,20 @@ class SetupActivity : AppCompatActivity() {
}
})
render()
+ restoreScroll()
+ }
+
+ /**
+ * Puts the theme list back where it was. Kept until an instance actually lays
+ * out, since the first of two back-to-back recreations may never get that far.
+ */
+ private fun restoreScroll() {
+ val y = resumeScroll ?: return
+ binding.pageScroll.post {
+ if (isFinishing || isDestroyed) return@post
+ binding.pageScroll.scrollTo(0, y)
+ resumeScroll = null
+ }
}
override fun onDestroy() {
@@ -90,6 +106,8 @@ class SetupActivity : AppCompatActivity() {
STEPS - 1 -> "Finish"
else -> "Next"
}
+ // No theme is preselected: the user picks one before moving on.
+ binding.nextButton.isEnabled = step != 1 || ThemeManager.isChosen(this)
binding.page.removeAllViews()
stopObservingPrefetch?.invoke(); stopObservingPrefetch = null
when (step) {
@@ -114,16 +132,21 @@ class SetupActivity : AppCompatActivity() {
}
private fun theme() {
- header("Pick a look", "Tap a theme to preview it right away.")
+ header("Pick a look", "Tap a theme to preview it right away. Pick one to continue.")
+ val chosen = ThemeManager.isChosen(this)
val current = ThemeManager.current(this)
ThemeManager.AppTheme.entries.forEach { t ->
val note = if (t == ThemeManager.AppTheme.MATERIAL_YOU && !ThemeManager.isDynamicColorAvailable)
" (this phone: standard Material 3 colours)" else ""
- card(t.title, t.description + note, selected = t == current) {
- if (t != ThemeManager.current(this)) {
- resumeStep = step
+ card(t.title, t.description + note, selected = chosen && t == current) {
+ val restyle = t != ThemeManager.current(this)
+ if (restyle || !ThemeManager.isChosen(this)) {
ThemeManager.set(this, t)
- recreate() // restyles this screen; the step is kept
+ if (restyle) {
+ resumeStep = step
+ resumeScroll = binding.pageScroll.scrollY
+ recreate() // restyles this screen; the step is kept
+ } else render()
}
}
}
diff --git a/app/src/main/java/com/rfsentinel/app/ui/ThemeHeaderView.kt b/app/src/main/java/com/rfsentinel/app/ui/ThemeHeaderView.kt
index eb91826..38c3c0f 100644
--- a/app/src/main/java/com/rfsentinel/app/ui/ThemeHeaderView.kt
+++ b/app/src/main/java/com/rfsentinel/app/ui/ThemeHeaderView.kt
@@ -43,10 +43,14 @@ class ThemeHeaderView @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null
) : View(context, attrs) {
- enum class Style { GLITCH, HUD, NIGHT_VISION, CRT, SUNSET, STENCIL, BLUEPRINT, MASTHEAD }
+ enum class Style { GLITCH, FSOCIETY, HUD, NIGHT_VISION, CRT, SUNSET, STENCIL, BLUEPRINT, MASTHEAD }
var style: Style = Style.GLITCH
- set(value) { field = value; setupPaints(); requestLayout(); invalidate() }
+ set(value) { field = value; wordmark = null; setupPaints(); requestLayout(); invalidate() }
+
+ /** Theme banner art, drawn across the GLITCH / FSOCIETY header behind the text. */
+ var poster: android.graphics.Bitmap? = null
+ set(value) { field = value; requestLayout(); invalidate() }
private val d = resources.displayMetrics.density
private val mono = runCatching { ResourcesCompat.getFont(context, R.font.share_tech_mono) }.getOrNull()
@@ -79,7 +83,7 @@ class ThemeHeaderView @JvmOverloads constructor(
sub.textSize = 12 * d
sub.color = dim
when (style) {
- Style.GLITCH -> { title.typeface = mono; title.isFakeBoldText = true; sub.typeface = mono; sub.color = 0xFF7FB8B0.toInt() }
+ Style.GLITCH, Style.FSOCIETY -> { title.typeface = mono; title.isFakeBoldText = true; sub.typeface = mono; sub.color = 0xFF7FB8B0.toInt() }
Style.HUD -> { title.typeface = face("sans-serif-condensed"); title.letterSpacing = 0.25f; sub.typeface = face("sans-serif-condensed", Typeface.NORMAL); sub.letterSpacing = 0.2f }
Style.NIGHT_VISION -> { title.typeface = mono; title.letterSpacing = 0.1f; sub.typeface = mono }
Style.CRT -> { title.typeface = face("monospace"); sub.typeface = face("monospace", Typeface.NORMAL) }
@@ -92,7 +96,7 @@ class ThemeHeaderView @JvmOverloads constructor(
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
val h = when (style) {
- Style.GLITCH -> 150 * d
+ Style.GLITCH, Style.FSOCIETY -> if (poster != null) 190 * d else 125 * d
Style.SUNSET -> 96 * d
Style.BLUEPRINT, Style.MASTHEAD -> 84 * d
Style.HUD, Style.STENCIL -> 70 * d
@@ -112,7 +116,7 @@ class ThemeHeaderView @JvmOverloads constructor(
super.onDraw(canvas)
val now = System.currentTimeMillis()
val next = when (style) {
- Style.GLITCH -> glitch(canvas, now)
+ Style.GLITCH, Style.FSOCIETY -> glitch(canvas, now)
Style.HUD -> hud(canvas, now)
Style.NIGHT_VISION -> nightVision(canvas, now)
Style.CRT -> crt(canvas, now)
@@ -124,58 +128,103 @@ class ThemeHeaderView @JvmOverloads constructor(
if (next > 0 && isShown) postInvalidateDelayed(next)
}
- // ---- GLITCH (DedSec) --------------------------------------------------------
- // Hacktivist zine / poster look in the spirit of DedSec: black and white with
- // hot pink and violet, a halftone band, an original pixel skull with diagonal
- // hatching, a chunky pixel wordmark, a boxed label and a retro OS popup where
- // a terminal line types itself. All original art - no game artwork or logos.
-
- // Original 17x16 pixel skull: wide cranium, angular sockets, nose gap, two rows of teeth.
- private val skull = listOf(
- "....#########....",
- "..#############..",
- ".###############.",
- "#################",
- "#################",
- "###....###....###",
- "##......#......##",
- "###....###....###",
- "#################",
- "########.########",
- ".######...######.",
- "..#############..",
- "...#.#.#.#.#.#...",
- "...###########...",
- "....#.#.#.#.#....",
- ".....#######....."
- )
- private val pinkC = 0xFFFF2E88.toInt()
+ // ---- GLITCH (DedSec) / FSOCIETY (Mr. Robot) ------------------------------------
+ // Sits beside the theme's bundled poster: a sliced, glitching wordmark, a boxed
+ // label and a retro OS popup where terminal lines type themselves. Each theme
+ // has its own skin (colours, lettering and lines) - unofficial fan homages.
+
private val whiteC = 0xFFF4F4F4.toInt()
private val blackC = 0xFF050505.toInt()
- // Nods to Watch Dogs (ctOS, Blume, DedSec) - an unofficial fan homage.
- private val lines = listOf(
- "> ctOS uplink... bypassed [OK]",
- "> sniff --ble --wifi --passive",
- "> blume_profiler.exe: not on my watch",
- "> rx_only=true tx=0 // listen, never touch",
- "> the city watches you. watch back_",
- "> we are dedsec. join us_"
+
+ /**
+ * @param cuts horizontal bands through the wordmark: (start as fraction of height,
+ * sideways shift in dp); a NaN shift leaves that band empty (a stripe through the letters)
+ */
+ private class Skin(
+ val accent: Int, val ink: Int, val flash: Int, val label: String, val window: String,
+ val font: Typeface, val spacing: Float, val stretch: Float,
+ val cuts: List<Pair<Float, Float>>, val lines: List<String>
+ )
+
+ // Nods to Watch Dogs (ctOS, Blume, DedSec).
+ private val dedsec = Skin(
+ 0xFF0070F0.toInt(), whiteC, 0xFF0070F0.toInt(), "WE ARE DEDSEC", "rf_sentinel.exe",
+ Typeface.create("sans-serif-condensed", Typeface.BOLD), 0.03f, 1.35f,
+ listOf(0.0f to 0f, 0.42f to -4f, 0.50f to 0f, 0.74f to 3f, 0.80f to 0f),
+ listOf(
+ "> ctOS 2.0 uplink... bypassed [OK]",
+ "> sniff --ble --wifi --passive",
+ "> blume_profiler.exe: not on my watch",
+ "> the system is a lie_",
+ "> rx_only=true tx=0 // listen, never touch",
+ "> !nvite.exe: dedsec wants you",
+ "> nudle maps: location leak blocked",
+ "> hacking is our weapon_",
+ "> wrench.exe: (^_^) let's break stuff",
+ "> ctOS profile: [REDACTED]",
+ "> the city watches you. watch back_",
+ "> better a free world_",
+ "> we are dedsec. join us_"
+ )
+ )
+
+ // Nods to Mr. Robot (fsociety, E Corp, the Dark Army) and lines from the show.
+ private val fsociety = Skin(
+ 0xFFC8221A.toInt(), 0xFFC8221A.toInt(), whiteC, "HELLO, FRIEND", "fsociety.dat",
+ Typeface.create("sans-serif", Typeface.BOLD), 0.08f, 1.25f,
+ listOf(0.0f to 0f, 0.45f to Float.NaN, 0.50f to 0f),
+ listOf(
+ "$ whoami -> root",
+ "$ echo \"hello, friend.\"",
+ "$ control is an illusion.",
+ "$ is any of it real?",
+ "$ we are fsociety. we are finally free.",
+ "$ our democracy has been hacked.",
+ "$ bonsoir, elliot.",
+ "$ people always make the best exploits.",
+ "$ give a man a bank, he can rob the world.",
+ "$ a bug is never just a mistake.",
+ "$ hello, friend? that's lame.",
+ "$ we're here to make a change.",
+ "$ dreams don't work unless you do.",
+ "$ the system is a lie.",
+ "$ e corp: our business is life itself",
+ "$ evil corp ledger... encrypted [OK]",
+ "$ ./fuxsocy.py --stage 2",
+ "$ steel mountain hvac: compromised",
+ "$ raspberry_pi: planted. listening.",
+ "$ dark army: five/nine is coming",
+ "$ allsafe ids: 0 alerts. lol.",
+ "$ ecoin wallet: frozen",
+ "$ sniff --ble --wifi --passive",
+ "$ rx_only=true tx=0 // never touch",
+ "$ mr. robot is watching_",
+ "$ the world is a hoax. stay awake.",
+ "$ fsociety: we are legion_"
+ )
)
+
+ private val skin get() = if (style == Style.FSOCIETY) fsociety else dedsec
+
private val sticker = Paint(Paint.ANTI_ALIAS_FLAG)
+ private val posterPaint = Paint(Paint.FILTER_BITMAP_FLAG)
- /** The wordmark drawn tiny and blown up without smoothing: chunky pixel letters. */
+ /** The wordmark in heavy condensed white letters, rendered once and then drawn in slices. */
private var wordmark: android.graphics.Bitmap? = null
- private val pixelPaint = Paint().apply { isFilterBitmap = false; isAntiAlias = false }
+ private val pixelPaint = Paint(Paint.FILTER_BITMAP_FLAG)
private fun wordmarkBitmap(): android.graphics.Bitmap {
wordmark?.let { return it }
- val p = Paint().apply { isAntiAlias = false; typeface = mono; textSize = 13f; color = whiteC; isFakeBoldText = true }
- val fm = p.fontMetrics
- val bmp = android.graphics.Bitmap.createBitmap(
- kotlin.math.ceil(p.measureText("RF_SENTINEL")).toInt() + 2,
- kotlin.math.ceil(fm.descent - fm.ascent).toInt() + 1,
- android.graphics.Bitmap.Config.ARGB_8888
- )
- Canvas(bmp).drawText("RF_SENTINEL", 1f, -fm.ascent, p)
+ val p = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+ typeface = skin.font
+ textSize = 120f; color = skin.ink; letterSpacing = skin.spacing
+ // A light stroke on top of the bold face makes it chunkier, like the game's logo.
+ style = Paint.Style.FILL_AND_STROKE; strokeWidth = 3f
+ }
+ // Crop tightly to the ink so the letters fill the box.
+ val b = android.graphics.Rect()
+ p.getTextBounds("RF_SENTINEL", 0, 11, b)
+ val bmp = android.graphics.Bitmap.createBitmap(b.width() + 8, b.height() + 8, android.graphics.Bitmap.Config.ARGB_8888)
+ Canvas(bmp).drawText("RF_SENTINEL", 4f - b.left, 4f - b.top, p)
return bmp.also { wordmark = it }
}
@@ -188,83 +237,96 @@ class ThemeHeaderView @JvmOverloads constructor(
val w = width.toFloat(); val h = height.toFloat()
canvas.drawColor(blackC)
- // Pixel skull: white body with black diagonal hatching, like a screen-printed poster.
- // Black and white only; pink shows up just as a glitch flash and the eye glints.
val bottomBar = 30 * d
- val cell = min(6.4f * d, (h - bottomBar - 12 * d) / skull.size)
- val sx = 6 * d; val sy = 6 * d
- val jitter = if (glitching) Random.nextInt(-3, 4) * d else 0f
- fun skullCells(dx: Float, dy: Float, color: Int) {
- fill.color = color
- skull.forEachIndexed { r, row ->
- row.forEachIndexed { c, ch ->
- if (ch == '#') canvas.drawRect(sx + dx + c * cell, sy + dy + r * cell, sx + dx + (c + 1) * cell, sy + dy + (r + 1) * cell, fill)
- }
+ // Wide banner art fills the header; the bottom fades to black under the
+ // wordmark, stamp and terminal so they stay readable.
+ val art = poster
+ val ox = 0f
+ if (art != null) {
+ posterPaint.isFilterBitmap = true
+ // Centre-crop to the header's shape so the banner isn't squashed.
+ val crop = if (art.width * h > w * art.height) {
+ val cw = (art.height * w / h).toInt()
+ android.graphics.Rect((art.width - cw) / 2, 0, (art.width + cw) / 2, art.height)
+ } else {
+ val ch = (art.width * h / w).toInt()
+ android.graphics.Rect(0, (art.height - ch) / 2, art.width, (art.height + ch) / 2)
}
+ canvas.drawBitmap(art, crop, RectF(0f, 0f, w, h), posterPaint)
+ if (glitching) repeat(3) {
+ val sy0 = Random.nextFloat() * h; val sh = Random.nextInt(3, 12) * d
+ val srcY = crop.top + (sy0 / h * crop.height()).toInt()
+ val srcH = (sh / h * crop.height()).toInt().coerceAtLeast(1)
+ val off = Random.nextInt(-8, 9) * d
+ canvas.drawBitmap(art, android.graphics.Rect(crop.left, srcY, crop.right, (srcY + srcH).coerceAtMost(crop.bottom)), RectF(off, sy0, w + off, sy0 + sh), posterPaint)
+ }
+ fill.color = blackC // opaque: the paint alpha scales the gradient
+ fill.shader = android.graphics.LinearGradient(0f, h * 0.36f, 0f, h * 0.58f, 0x00050505, 0xF0050505.toInt(), android.graphics.Shader.TileMode.CLAMP)
+ canvas.drawRect(0f, h * 0.36f, w, h, fill)
+ fill.shader = null
}
- if (glitching) skullCells(3 * d + jitter, 0f, pinkC)
- skullCells(0f, 0f, whiteC)
- val skullW = skull[0].length * cell; val skullH = skull.size * cell
- hatch(canvas, sx, sy, sx + skullW, sy + skullH, 3.2f * d)
- // Hollow sockets with a small pink glint that blinks now and then.
- if ((now / 700) % 6 != 0L) {
- fill.color = pinkC
- canvas.drawRect(sx + 4 * cell, sy + 6 * cell, sx + 5 * cell, sy + 7 * cell, fill)
- canvas.drawRect(sx + 12 * cell, sy + 6 * cell, sx + 13 * cell, sy + 7 * cell, fill)
- }
+ val sx = ox + 8 * d; val sy = 6 * d
- // Pixel wordmark with a hard grey drop shadow; sliced sideways while glitching.
- val tx = sx + skullW + 14 * d
+ // Wordmark: at the top on its own, or low over the banner's dark fade.
+ val tx = sx
val bmp = wordmarkBitmap()
- val markW = min(w - tx - 8 * d, 230 * d)
- val markH = markW * bmp.height / bmp.width
- val top = sy + 2 * d
+ val markW = if (art != null) min(w * 0.5f, 190 * d) else min(w - tx - 8 * d, 230 * d)
+ // Stretched taller than the font, like the game's tall condensed logo.
+ val markH = markW * bmp.height / bmp.width * skin.stretch
+ val top = if (art != null) h - bottomBar - 10 * d - markH - 4 * d else sy + 2 * d
val dst = RectF(tx, top, tx + markW, top + markH)
- pixelPaint.colorFilter = android.graphics.PorterDuffColorFilter(if (glitching) pinkC else 0xFF555555.toInt(), android.graphics.PorterDuff.Mode.SRC_IN)
- canvas.drawBitmap(bmp, null, RectF(dst.left + 3 * d, dst.top + 3 * d, dst.right + 3 * d, dst.bottom + 3 * d), pixelPaint)
- pixelPaint.colorFilter = null
- if (glitching) {
- val bands = 4
- for (i in 0 until bands) {
- canvas.save()
- val b0 = dst.top + i * markH / bands
- canvas.clipRect(0f, b0, w, b0 + markH / bands + 1)
- val off = Random.nextInt(-10, 11) * d
- canvas.drawBitmap(bmp, null, RectF(dst.left + off, dst.top, dst.right + off, dst.bottom), pixelPaint)
- canvas.restore()
+ // Sliced like a torn screen: bands shifted sideways with thin gaps between them.
+ val markTop = dst.top + 4 * d
+ val markBox = RectF(dst.left, markTop, dst.right, markTop + markH)
+ val cuts = skin.cuts
+ for (i in cuts.indices) {
+ val (f0, shift) = cuts[i]
+ if (shift.isNaN()) continue
+ val f1 = if (i + 1 < cuts.size) cuts[i + 1].first else 1f
+ val y0 = markBox.top + f0 * markH; val y1 = markBox.top + f1 * markH - 0.8f * d
+ if (y1 <= y0) continue
+ val off = (if (glitching) shift + Random.nextInt(-8, 9) else shift) * d
+ canvas.save()
+ canvas.clipRect(0f, y0, w, y1)
+ if (glitching && i % 2 == 1) {
+ pixelPaint.colorFilter = android.graphics.PorterDuffColorFilter(skin.flash, android.graphics.PorterDuff.Mode.SRC_IN)
+ canvas.drawBitmap(bmp, null, RectF(markBox.left + off + 3 * d, markBox.top, markBox.right + off + 3 * d, markBox.bottom), pixelPaint)
+ pixelPaint.colorFilter = null
}
- } else {
- canvas.drawBitmap(bmp, null, dst, pixelPaint)
+ canvas.drawBitmap(bmp, null, RectF(markBox.left + off, markBox.top, markBox.right + off, markBox.bottom), pixelPaint)
+ canvas.restore()
}
- hatch(canvas, dst.left, dst.top, dst.right, dst.bottom, 4.5f * d, 0.8f * d)
+ dst.bottom = markBox.bottom
// Boxed label: hard white frame, like a stamped sign.
sticker.typeface = mono; sticker.textSize = 13 * d; sticker.isFakeBoldText = true
sticker.textAlign = Paint.Align.LEFT
- val label = "RX ONLY · NO TX"
+ val label = skin.label
val lw = sticker.measureText(label) + 16 * d
- val ly = dst.bottom + 10 * d
val lh = 22 * d
- if (ly + lh < h - bottomBar - 2 * d) {
+ // Under the wordmark, or beside it when it sits over the banner.
+ val lx = if (art != null) dst.right + 12 * d else tx
+ val ly = if (art != null) dst.bottom - lh else dst.bottom + 10 * d
+ if (ly + lh < h - bottomBar - 2 * d + 1 && lx + lw < w - 4 * d) {
fill.color = blackC
- canvas.drawRect(tx, ly, tx + lw, ly + lh, fill)
+ canvas.drawRect(lx, ly, lx + lw, ly + lh, fill)
line.color = whiteC; line.strokeWidth = 2 * d
- canvas.drawRect(tx, ly, tx + lw, ly + lh, line)
+ canvas.drawRect(lx, ly, lx + lw, ly + lh, line)
sticker.color = whiteC
- canvas.drawText(label, tx + 8 * d, ly + lh * 0.7f, sticker)
+ canvas.drawText(label, lx + 8 * d, ly + lh * 0.7f, sticker)
}
- // Retro OS popup along the bottom: pink title bar with _ [] X, the terminal line typing inside.
+ // Retro OS popup along the bottom: accent title bar with _ [] X, the terminal line typing inside.
val wy = h - bottomBar
val barH = 11 * d
fill.color = blackC
- canvas.drawRect(2 * d, wy, w - 2 * d, h - 2 * d, fill)
- fill.color = pinkC
- canvas.drawRect(2 * d, wy, w - 2 * d, wy + barH, fill)
+ canvas.drawRect(ox + 2 * d, wy, w - 2 * d, h - 2 * d, fill)
+ fill.color = skin.accent
+ canvas.drawRect(ox + 2 * d, wy, w - 2 * d, wy + barH, fill)
line.color = whiteC; line.strokeWidth = 1.5f * d
- canvas.drawRect(2 * d, wy, w - 2 * d, h - 2 * d, line)
+ canvas.drawRect(ox + 2 * d, wy, w - 2 * d, h - 2 * d, line)
sub.color = blackC; sub.textSize = 9 * d; sub.typeface = mono; sub.isFakeBoldText = true
- canvas.drawText("rf_sentinel.exe", 7 * d, wy + barH * 0.78f, sub)
+ canvas.drawText(skin.window, ox + 7 * d, wy + barH * 0.78f, sub)
val box = 7 * d
for (i in 0 until 3) {
val bx = w - 8 * d - (3 - i) * (box + 3 * d)
@@ -281,18 +343,21 @@ class ThemeHeaderView @JvmOverloads constructor(
}
}
val cycle = (now - start) / 4500
+ val lines = skin.lines
val lineText = lines[(cycle % lines.size).toInt()]
val typed = (((now - start) % 4500) / 45).toInt().coerceAtMost(lineText.length)
sub.color = whiteC; sub.textSize = 11 * d; sub.isFakeBoldText = false
val cursor = if ((now / 450) % 2 == 0L) "█" else " "
- canvas.drawText(lineText.take(typed) + cursor, 7 * d, h - 7 * d, sub)
+ canvas.save(); canvas.clipRect(ox + 3 * d, wy, w - 3 * d, h)
+ canvas.drawText(lineText.take(typed) + cursor, ox + 7 * d, h - 8 * d, sub)
+ canvas.restore()
sub.textSize = 12 * d
- // Glitch burst: white and pink slabs.
+ // Glitch burst: white and accent slabs.
if (glitching) {
repeat(8) {
- fill.color = if (Random.nextInt(3) == 0) pinkC else whiteC
- val bx = Random.nextFloat() * w; val by = Random.nextFloat() * (h - bottomBar)
+ fill.color = if (Random.nextInt(3) == 0) skin.accent else whiteC
+ val bx = ox + Random.nextFloat() * (w - ox); val by = Random.nextFloat() * (h - bottomBar)
canvas.drawRect(bx, by, bx + Random.nextInt(6, 60) * d, by + Random.nextInt(1, 5) * d, fill)
}
}
@@ -300,19 +365,6 @@ class ThemeHeaderView @JvmOverloads constructor(
return if (glitching) 40 else 90
}
- /** Black diagonal hatch lines over a box: the scanned / screen-printed poster texture. */
- private fun hatch(canvas: Canvas, l: Float, t: Float, r: Float, b: Float, gap: Float, width: Float = 1.1f * d) {
- canvas.save()
- canvas.clipRect(l, t, r, b)
- line.color = blackC; line.strokeWidth = width
- var x = l - (b - t)
- while (x < r) {
- canvas.drawLine(x, b, x + (b - t), t, line)
- x += gap
- }
- canvas.restore()
- }
-
// ---- HUD (Night Drive) ----------------------------------------------------
private fun hud(canvas: Canvas, now: Long): Long {
diff --git a/app/src/main/java/com/rfsentinel/app/ui/ThemeManager.kt b/app/src/main/java/com/rfsentinel/app/ui/ThemeManager.kt
index 078bea8..a795701 100644
--- a/app/src/main/java/com/rfsentinel/app/ui/ThemeManager.kt
+++ b/app/src/main/java/com/rfsentinel/app/ui/ThemeManager.kt
@@ -22,6 +22,7 @@ object ThemeManager {
* @param header animated wordmark drawn above the main screen (null = none)
* @param appTitle action-bar title on the main screen
* @param night true for dark themes, false for light, null to follow the phone
+ * @param headerImage bundled header art shown instead of the animated wordmark
*/
enum class AppTheme(
val title: String,
@@ -29,14 +30,18 @@ object ThemeManager {
val style: Int = R.style.Theme_RFSentinel,
val night: Boolean? = null,
val header: ThemeHeaderView.Style? = null,
- val appTitle: String? = null
+ val appTitle: String? = null,
+ val headerImage: Int? = null
) {
+ // Featured fan themes first in the pickers.
+ DEDSEC("DedSec", "Watch Dogs 2 hacktivist homage: black & electric blue, hooded-skull poster, glitching wordmark, ctOS-busting terminal",
+ R.style.Theme_RFSentinel_DedSec, true, ThemeHeaderView.Style.GLITCH, "[email protected]:~$", R.drawable.dedsec_header),
+ FSOCIETY("fsociety", "Mr. Robot homage: black & blood red, fsociety poster, a terminal full of quotes from the show",
+ R.style.Theme_RFSentinel_Fsociety, true, ThemeHeaderView.Style.FSOCIETY, "root@fsociety:~#", R.drawable.fsociety_header),
SYSTEM("System default", "Teal - follows your phone's light / dark setting"),
LIGHT("Light", "Always light", night = false),
DARK("Dark", "Always dark", night = true),
MATERIAL_YOU("Material You", "Material 3, coloured from your wallpaper (Android 12+)", R.style.Theme_RFSentinel_MaterialYou),
- DEDSEC("DedSec", "Watch Dogs 2 hacktivist homage: black & white zine, hot pink & violet, glitching pixel skull, ctOS-busting terminal",
- R.style.Theme_RFSentinel_DedSec, true, ThemeHeaderView.Style.GLITCH, "> RF_SENTINEL_"),
NIGHT_DRIVE("Night Drive", "Red-only cockpit lighting that keeps your night vision on dark roads",
R.style.Theme_RFSentinel_NightDrive, true, ThemeHeaderView.Style.HUD, "RF SENTINEL"),
NIGHT_VISION("Night Vision", "Green phosphor image intensifier with grain and a scope vignette",
@@ -63,6 +68,10 @@ object ThemeManager {
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null)
?.let { runCatching { AppTheme.valueOf(it) }.getOrNull() } ?: AppTheme.SYSTEM
+ /** True once the user has picked a theme (the setup wizard requires one). */
+ fun isChosen(context: Context): Boolean =
+ context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).contains(KEY)
+
fun set(context: Context, theme: AppTheme) {
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit { putString(KEY, theme.name) }
applyNightMode(theme)
diff --git a/app/src/main/res/drawable-nodpi/dedsec_header.webp b/app/src/main/res/drawable-nodpi/dedsec_header.webp
new file mode 100644
index 0000000..d9ec8a9
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/dedsec_header.webp differ
diff --git a/app/src/main/res/drawable-nodpi/fsociety_header.webp b/app/src/main/res/drawable-nodpi/fsociety_header.webp
new file mode 100644
index 0000000..5216aff
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/fsociety_header.webp differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6be521a..6dd536d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -104,6 +104,19 @@
app:icon="@drawable/ic_radar"
app:iconPadding="0dp" />
</com.google.android.material.button.MaterialButtonToggleGroup>
+
+ <!-- The map (traces, devices, known cameras), right beside the list / radar views. -->
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/mapButton"
+ style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:contentDescription="Open the map: your traces, devices and known cameras"
+ android:minWidth="56dp"
+ android:minHeight="52dp"
+ app:icon="@drawable/ic_map"
+ app:iconPadding="0dp" />
</LinearLayout>
<!-- Device filters (built in code from DeviceFilter, with live counts). -->
@@ -127,13 +140,12 @@
android:layout_height="0dp"
android:layout_weight="1">
- <!-- Bottom padding keeps the last row clear of the floating Map button. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:paddingBottom="80dp" />
+ android:paddingBottom="8dp" />
<com.rfsentinel.app.ui.RadarView
android:id="@+id/radarView"
@@ -151,19 +163,11 @@
android:text="No devices heard yet.\nTap a device for full details.\nLong-press for quick actions (watchlist, whitelist, favorite)."
android:textColor="#888888" />
- <!-- The map (traces, devices, known cameras) was easy to miss as a toolbar icon alone. -->
- <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
- android:id="@+id/mapButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|end"
- android:layout_margin="16dp"
- android:contentDescription="Open the map: your traces, devices and known cameras"
- android:text="Map"
- app:icon="@drawable/ic_map" />
</FrameLayout>
+ <!-- Hidden while the list is scrolled down; back when it returns to the top. -->
<TextView
+ android:id="@+id/disclaimerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index cb3eb8d..1427d2c 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -37,6 +37,7 @@
android:textSize="14sp" />
<ScrollView
+ android:id="@+id/pageScroll"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index f96a6b7..fe9a9b5 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -7,11 +7,6 @@
android:title="Search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" />
- <item
- android:id="@+id/action_map"
- android:icon="@drawable/ic_map"
- android:title="Map"
- app:showAsAction="ifRoom" />
<item
android:id="@+id/action_mute"
android:icon="@drawable/ic_car_volume"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index be09462..3feca9b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,13 +14,21 @@
<color name="scope_text">#AA0B5C63</color>
<color name="trace">#E0622D</color>
- <!-- DedSec-inspired palette: black, white, hot pink, violet -->
+ <!-- DedSec-inspired palette: black, white, electric blue (matches the header poster) -->
<color name="dedsec_black">#050505</color>
- <color name="dedsec_panel">#141016</color>
- <color name="dedsec_magenta">#FF2E88</color>
- <color name="dedsec_violet">#A23CFF</color>
+ <color name="dedsec_panel">#0E1218</color>
+ <color name="dedsec_blue">#0070F0</color>
+ <color name="dedsec_blue_light">#4D9CFF</color>
<color name="dedsec_text">#F4F4F4</color>
- <color name="dedsec_dim">#A99BB8</color>
+ <color name="dedsec_dim">#9AAAC0</color>
+
+ <!-- fsociety (Mr. Robot-inspired): black, ash grey, blood red (matches the header poster) -->
+ <color name="fsoc_black">#050505</color>
+ <color name="fsoc_panel">#151010</color>
+ <color name="fsoc_red">#C8221A</color>
+ <color name="fsoc_red_light">#E5554C</color>
+ <color name="fsoc_text">#EDEDED</color>
+ <color name="fsoc_dim">#A89E9E</color>
<!-- Night Drive: red-only, keeps your night vision while driving -->
<color name="nd_bg">#000000</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4b0e522..166d1e2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,16 +27,16 @@
<item name="actionBarTheme">@style/ThemeOverlay.Material3.ActionBar</item>
</style>
- <!-- DedSec-inspired hacktivist zine: black and white, hot pink and violet, monospace. -->
+ <!-- DedSec-inspired hacktivist poster: black and white with electric blue, monospace. -->
<style name="Theme.RFSentinel.DedSec" parent="Theme.MaterialComponents">
<!-- Selected chips / toggles use this theme's own primary colour. -->
<item name="rfAccent">?attr/colorPrimary</item>
<item name="rfOnAccent">?attr/colorOnPrimary</item>
- <item name="colorPrimary">@color/dedsec_magenta</item>
+ <item name="colorPrimary">@color/dedsec_blue</item>
<item name="colorPrimaryVariant">@color/dedsec_black</item>
- <item name="colorOnPrimary">@color/dedsec_black</item>
- <item name="colorSecondary">@color/dedsec_violet</item>
- <item name="colorOnSecondary">@color/dedsec_text</item>
+ <item name="colorOnPrimary">@color/dedsec_text</item>
+ <item name="colorSecondary">@color/dedsec_blue_light</item>
+ <item name="colorOnSecondary">@color/dedsec_black</item>
<item name="colorSurface">@color/dedsec_panel</item>
<item name="colorOnSurface">@color/dedsec_text</item>
<item name="android:colorBackground">@color/dedsec_black</item>
@@ -51,10 +51,10 @@
<item name="actionBarTheme">@style/DedSec.ActionBarOverlay</item>
<item name="alertDialogTheme">@style/DedSec.Dialog</item>
<item name="materialAlertDialogTheme">@style/DedSec.Dialog</item>
- <item name="rfScopeColor">@color/dedsec_magenta</item>
+ <item name="rfScopeColor">@color/dedsec_blue</item>
<item name="rfScopeTextColor">@color/dedsec_dim</item>
- <item name="rfTraceColor">@color/dedsec_violet</item>
- <item name="colorAccent">@color/dedsec_violet</item>
+ <item name="rfTraceColor">@color/dedsec_blue_light</item>
+ <item name="colorAccent">@color/dedsec_blue</item>
</style>
<style name="DedSec.ActionBar" parent="Widget.MaterialComponents.ActionBar.Solid">
@@ -75,13 +75,68 @@
</style>
<style name="DedSec.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
- <item name="colorPrimary">@color/dedsec_magenta</item>
+ <item name="colorPrimary">@color/dedsec_blue</item>
<item name="colorSurface">@color/dedsec_panel</item>
<item name="android:background">@color/dedsec_panel</item>
<item name="android:textColorPrimary">@color/dedsec_text</item>
<item name="android:fontFamily">@font/share_tech_mono</item>
</style>
+ <!-- fsociety (Mr. Robot-inspired): black and ash grey with blood red, monospace terminal. -->
+ <style name="Theme.RFSentinel.Fsociety" parent="Theme.MaterialComponents">
+ <!-- Selected chips / toggles use this theme's own primary colour. -->
+ <item name="rfAccent">?attr/colorPrimary</item>
+ <item name="rfOnAccent">?attr/colorOnPrimary</item>
+ <item name="colorPrimary">@color/fsoc_red</item>
+ <item name="colorPrimaryVariant">@color/fsoc_black</item>
+ <item name="colorOnPrimary">@color/fsoc_text</item>
+ <item name="colorSecondary">@color/fsoc_red_light</item>
+ <item name="colorOnSecondary">@color/fsoc_black</item>
+ <item name="colorSurface">@color/fsoc_panel</item>
+ <item name="colorOnSurface">@color/fsoc_text</item>
+ <item name="android:colorBackground">@color/fsoc_black</item>
+ <item name="android:windowBackground">@color/fsoc_black</item>
+ <item name="android:textColorPrimary">@color/fsoc_text</item>
+ <item name="android:textColorSecondary">@color/fsoc_dim</item>
+ <item name="android:fontFamily">@font/share_tech_mono</item>
+ <item name="fontFamily">@font/share_tech_mono</item>
+ <item name="android:statusBarColor">@color/fsoc_black</item>
+ <item name="android:navigationBarColor">@color/fsoc_black</item>
+ <item name="actionBarStyle">@style/Fsociety.ActionBar</item>
+ <item name="actionBarTheme">@style/Fsociety.ActionBarOverlay</item>
+ <item name="alertDialogTheme">@style/Fsociety.Dialog</item>
+ <item name="materialAlertDialogTheme">@style/Fsociety.Dialog</item>
+ <item name="rfScopeColor">@color/fsoc_red</item>
+ <item name="rfScopeTextColor">@color/fsoc_dim</item>
+ <item name="rfTraceColor">@color/fsoc_red_light</item>
+ <item name="colorAccent">@color/fsoc_red</item>
+ </style>
+
+ <style name="Fsociety.ActionBar" parent="Widget.MaterialComponents.ActionBar.Solid">
+ <item name="background">@color/fsoc_black</item>
+ <item name="titleTextStyle">@style/Fsociety.ActionBarTitle</item>
+ <item name="elevation">0dp</item>
+ </style>
+
+ <style name="Fsociety.ActionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+ <item name="android:textColor">@color/fsoc_text</item>
+ <item name="android:fontFamily">@font/share_tech_mono</item>
+ <item name="android:textStyle">bold</item>
+ </style>
+
+ <style name="Fsociety.ActionBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+ <item name="colorControlNormal">@color/fsoc_text</item>
+ <item name="android:textColorPrimary">@color/fsoc_text</item>
+ </style>
+
+ <style name="Fsociety.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+ <item name="colorPrimary">@color/fsoc_red_light</item>
+ <item name="colorSurface">@color/fsoc_panel</item>
+ <item name="android:background">@color/fsoc_panel</item>
+ <item name="android:textColorPrimary">@color/fsoc_text</item>
+ <item name="android:fontFamily">@font/share_tech_mono</item>
+ </style>
+
<!-- Shared pieces for the styled themes: colours come from the theme's attrs. -->
<style name="Styled.ActionBar" parent="Widget.MaterialComponents.ActionBar.Solid">
<item name="background">?attr/rfBarColor</item>
diff --git a/docs/screenshots/list-dedsec.jpg b/docs/screenshots/list-dedsec.jpg
index 52eed86..f8faffc 100644
Binary files a/docs/screenshots/list-dedsec.jpg and b/docs/screenshots/list-dedsec.jpg differ
diff --git a/docs/screenshots/list-fsociety.jpg b/docs/screenshots/list-fsociety.jpg
new file mode 100644
index 0000000..f5c61c9
Binary files /dev/null and b/docs/screenshots/list-fsociety.jpg differ
diff --git a/docs/screenshots/radar-dedsec.jpg b/docs/screenshots/radar-dedsec.jpg
deleted file mode 100644
index a4c5729..0000000
Binary files a/docs/screenshots/radar-dedsec.jpg and /dev/null differ
diff --git a/docs/screenshots/themes/dedsec-list.jpg b/docs/screenshots/themes/dedsec-list.jpg
index 70ad47e..f8faffc 100644
Binary files a/docs/screenshots/themes/dedsec-list.jpg and b/docs/screenshots/themes/dedsec-list.jpg differ
diff --git a/docs/screenshots/themes/dedsec-radar.jpg b/docs/screenshots/themes/dedsec-radar.jpg
index b6e66ef..22fa341 100644
Binary files a/docs/screenshots/themes/dedsec-radar.jpg and b/docs/screenshots/themes/dedsec-radar.jpg differ
diff --git a/docs/screenshots/themes/fsociety-list.jpg b/docs/screenshots/themes/fsociety-list.jpg
new file mode 100644
index 0000000..f5c61c9
Binary files /dev/null and b/docs/screenshots/themes/fsociety-list.jpg differ
diff --git a/docs/screenshots/themes/fsociety-radar.jpg b/docs/screenshots/themes/fsociety-radar.jpg
new file mode 100644
index 0000000..467fb28
Binary files /dev/null and b/docs/screenshots/themes/fsociety-radar.jpg differ