diff --git a/README.md b/README.md index 588f02a..b46dc67 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -# Flock Map App +# DeFlock -A comprehensive Flutter app for viewing and mapping surveillance cameras with OpenStreetMap. Includes offline capabilities, editing ability, and an intuitive interface. +A comprehensive Flutter app for mapping public surveillance infrastructure with OpenStreetMap. Includes offline capabilities, editing ability, and an intuitive interface. -**Stop Flock** is a privacy-focused initiative to document the rapid expansion of ALPRs and AI surveillance cameras. This app aims to be the go-to tool for contributors to map cameras in their communities and upload the data to OpenStreetMap, making surveillance infrastructure visible and searchable. +**DeFlock** is a privacy-focused initiative to document the rapid expansion of ALPRs, AI surveillance cameras, and other public surveillance infrastructure. This app aims to be the go-to tool for contributors to map surveillance devices in their communities and upload the data to OpenStreetMap, making surveillance infrastructure visible and searchable. -**For complete documentation, tutorials, and community info, visit [stopflock.com/app](https://stopflock.com/app)** +**For complete documentation, tutorials, and community info, visit [deflock.me](https://deflock.me)** --- ## What This App Does -- **Map surveillance cameras** with precise location, direction, and manufacturer details +- **Map surveillance infrastructure** including cameras, ALPRs, gunshot detectors, and more with precise location, direction, and manufacturer details - **Upload to OpenStreetMap** with OAuth2 integration (live or sandbox modes) -- **Work completely offline** with downloadable map areas and camera data, plus upload queue +- **Work completely offline** with downloadable map areas and device data, plus upload queue - **Multiple map types** including satellite imagery from Google, Esri, Mapbox, and OpenStreetMap, plus custom map tile provider support -- **Editing Ability** to update existing camera locations and properties -- **Built-in camera profiles** for Flock Safety, Motorola, Genetec, Leonardo, and other major manufacturers, plus custom profiles for more specific tag sets +- **Editing Ability** to update existing device locations and properties +- **Built-in device profiles** for Flock Safety, Motorola, Genetec, Leonardo, and other major manufacturers, plus custom profiles for more specific tag sets --- @@ -25,13 +25,13 @@ A comprehensive Flutter app for viewing and mapping surveillance cameras with Op - **Multi-source tiles**: Switch between OpenStreetMap, Google Satellite, Esri imagery, Mapbox, and any custom providers - **Offline-first design**: Download a region for complete offline operation - **Smooth UX**: Intuitive controls, follow-me mode with GPS rotation, and gesture-friendly interactions -- **Camera visualization**: Color-coded markers showing real cameras (blue), pending uploads (purple), new cameras (white), edited cameras (grey), and cameras being edited (orange) +- **Device visualization**: Color-coded markers showing real devices (blue), pending uploads (purple), new devices (white), edited devices (grey), and devices being edited (orange) -### Camera Management -- **Comprehensive profiles**: Built-in profiles for major manufacturers (Flock, Motorola/Vigilant, Genetec, Leonardo/ELSAG, Neology) plus custom profile creation -- **Editing capabilities**: Update location, direction, and tags of existing cameras +### Device Management +- **Comprehensive profiles**: Built-in profiles for major manufacturers (Flock Safety, Motorola/Vigilant, Genetec, Leonardo/ELSAG, Neology) plus custom profile creation +- **Editing capabilities**: Update location, direction, and tags of existing devices - **Direction visualization**: Interactive field-of-view cones showing camera viewing angles -- **Bulk operations**: Tag multiple cameras efficiently with profile-based workflow +- **Bulk operations**: Tag multiple devices efficiently with profile-based workflow ### Professional Upload & Sync - **OpenStreetMap integration**: Direct upload with full OAuth2 authentication @@ -41,7 +41,7 @@ A comprehensive Flutter app for viewing and mapping surveillance cameras with Op ### Offline Operations - **Smart area downloads**: Automatically calculate tile counts and storage requirements -- **Camera caching**: Offline areas include camera data for complete functionality without network +- **Device caching**: Offline areas include surveillance device data for complete functionality without network - **Global base map**: Permanent worldwide coverage at low zoom levels - **Robust downloads**: Exponential backoff, retry logic, and progress tracking for reliable area downloads @@ -50,18 +50,18 @@ A comprehensive Flutter app for viewing and mapping surveillance cameras with Op ## Quick Start 1. **Install** the app on iOS or Android -2. **Enable location** and grant camera permissions +2. **Enable location** permissions 3. **Log into OpenStreetMap**: Choose upload mode and get OAuth2 credentials -4. **Add your first camera**: Tap the "tag camera" button, position the pin, set direction, select a profile, and tap submit +4. **Add your first device**: Tap the "tag node" button, position the pin, set direction, select a profile, and tap submit -**New to OpenStreetMap?** Visit [stopflock.com/app](https://stopflock.com/app) for complete setup instructions and community guidelines. +**New to OpenStreetMap?** Visit [deflock.me](https://deflock.me) for complete setup instructions and community guidelines. --- ## For Developers ### Architecture Highlights -- **Unified data provider**: All map tiles and camera data route through `MapDataProvider` with pluggable remote/local sources +- **Unified data provider**: All map tiles and surveillance device data route through `MapDataProvider` with pluggable remote/local sources - **Modular settings**: Each settings section is a separate widget for maintainability - **State management**: Provider pattern with clean separation of concerns - **Offline-first**: Network calls are optional; app functions fully offline with downloaded data and queues uploads until online @@ -93,26 +93,26 @@ flutter run - Optional custom icons for camera profiles - Camera deletions - Clean up cache when submitted changesets appear in Overpass results -- Upgrade camera marker design (considering nullplate's svg) +- Upgrade device marker design (considering nullplate's svg) ### Future Features & Wishlist -- Location-based notifications when approaching cameras -- Red/yellow ring for cameras missing specific tag details +- Location-based notifications when approaching surveillance devices +- Red/yellow ring for devices missing specific tag details - iOS/Android native themes and dark mode support - "Cache accumulating" offline areas? - "Offline areas" as tile provider? - Jump to location by coordinates, address, or POI name -- Route planning that avoids surveillance cameras -- Custom camera providers and OSM/Overpass alternatives +- Route planning that avoids surveillance devices +- Custom device providers and OSM/Overpass alternatives --- ## Contributing & Community -This app is part of the larger **Stop Flock** initiative. Join the community: +This app is part of the larger **DeFlock** initiative. Join the community: -- **Documentation & Guides**: [stopflock.com/app](https://stopflock.com/app) -- **Community Discussion**: [stopflock.com](https://stopflock.com) +- **Documentation & Guides**: [deflock.me](https://deflock.me) +- **Community Discussion**: [deflock.me](https://deflock.me) - **Issues & Feature Requests**: GitHub Issues - **Development**: See developer setup above @@ -120,7 +120,7 @@ This app is part of the larger **Stop Flock** initiative. Join the community: ## Privacy & Ethics -This project helps make existing public surveillance infrastructure transparent and searchable. We only document cameras that are already installed and visible in public spaces. +This project helps make existing public surveillance infrastructure transparent and searchable. We only document surveillance devices that are already installed and visible in public spaces. No user information is ever collected, and no data leaves your device except submissions to OSM and whatever data your tile provider can glean from your requests. diff --git a/REBRAND_PROGRESS.md b/REBRAND_PROGRESS.md new file mode 100644 index 0000000..3bd8e58 --- /dev/null +++ b/REBRAND_PROGRESS.md @@ -0,0 +1,26 @@ +# DeFlock Rebrand Progress + +## TODO +- [ ] Test that the app still compiles and runs correctly + +## IN PROGRESS +- [ ] Nothing currently + +## FINISHED +- [x] pubspec.yaml (package name, description) +- [x] lib/main.dart (app title, class names, theme colors) +- [x] lib/screens/home_screen.dart (app bar title) +- [x] lib/services/auth_service.dart (redirect scheme) +- [x] lib/dev_config.dart (client name) +- [x] android/app/src/main/AndroidManifest.xml (app label, redirect scheme) +- [x] ios/Runner/Info.plist (display name, bundle name, redirect scheme) +- [x] android/app/build.gradle.kts (application ID) +- [x] android/app/src/main/kotlin/... (MainActivity package and directory structure) +- [x] assets/info.txt (about content) +- [x] README.md (all branding references) +- [x] Update all import statements (package:flock_map_app -> package:deflockapp) +- [x] lib/widgets/map/tile_layer_manager.dart (user agent package name) +- [x] test/models/pending_upload_test.dart (imports and CameraProfile -> NodeProfile) +- [x] test/widget_test.dart (import statement) +- [x] linux/CMakeLists.txt (binary name and application ID) +- [x] windows/CMakeLists.txt (project name and binary name) \ No newline at end of file diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 8508432..408bae9 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.example.flock_map_app" + namespace = "me.deflock.deflockapp" // Matches current stable Flutter (compileSdk 34 as of July 2025) compileSdk = 35 @@ -24,7 +24,7 @@ android { defaultConfig { // Application ID (package name) - applicationId = "com.example.flock_map_app" + applicationId = "me.deflock.deflockapp" // ──────────────────────────────────────────────────────────── // oauth2_client 4.x & flutter_web_auth_2 5.x require minSdk 23 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 60c4942..a0f101f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ @@ -44,8 +44,8 @@ - - + + diff --git a/android/app/src/main/kotlin/com/example/flock_map_app/MainActivity.kt b/android/app/src/main/kotlin/com/example/flock_map_app/MainActivity.kt deleted file mode 100644 index 6400b53..0000000 --- a/android/app/src/main/kotlin/com/example/flock_map_app/MainActivity.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.flock_map_app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity : FlutterActivity() diff --git a/android/app/src/main/kotlin/me/deflock/deflockapp/MainActivity.kt b/android/app/src/main/kotlin/me/deflock/deflockapp/MainActivity.kt new file mode 100644 index 0000000..4ddd58c --- /dev/null +++ b/android/app/src/main/kotlin/me/deflock/deflockapp/MainActivity.kt @@ -0,0 +1,5 @@ +package me.deflock.deflockapp + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() \ No newline at end of file diff --git a/assets/deflock-logo.svg b/assets/deflock-logo.svg new file mode 100644 index 0000000..b62f613 --- /dev/null +++ b/assets/deflock-logo.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/info.txt b/assets/info.txt index 96fda99..fec130b 100644 --- a/assets/info.txt +++ b/assets/info.txt @@ -1,7 +1,9 @@ -Flock Map App +DeFlock -Built with Flutter. +Map public surveillance infrastructure with OpenStreetMap. -Offline areas, privacy-respecting, designed for OpenStreetMap camera tagging. +Built with Flutter. Offline-capable, privacy-respecting, designed for documenting cameras, ALPRs, and other surveillance devices in your community. + +Part of the DeFlock initiative to make surveillance infrastructure transparent and searchable. This text is loaded from assets/info.txt. diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 50109b3..2a15e16 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Flock Map App + DeFlock CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - flock_map_app + deflockapp CFBundlePackageType APPL CFBundleShortVersionString @@ -55,7 +55,7 @@ None CFBundleURLSchemes - flockmap + deflockapp diff --git a/lib/dev_config.dart b/lib/dev_config.dart index 3803f8c..e770a61 100644 --- a/lib/dev_config.dart +++ b/lib/dev_config.dart @@ -25,7 +25,7 @@ const double kScaleBarBottomOffset = 170.0; const double kAddPinYOffset = 0.0; // Client name and version for OSM uploads ("created_by" tag) -const String kClientName = 'FlockMap'; +const String kClientName = 'DeFlock'; const String kClientVersion = '0.9.7'; // Marker/node interaction diff --git a/lib/main.dart b/lib/main.dart index 131b23e..1a9b061 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -30,22 +30,25 @@ Future main() async { ), ); } - return const FlockMapApp(); + return const DeFlockApp(); }, ), ), ); } -class FlockMapApp extends StatelessWidget { - const FlockMapApp({super.key}); +class DeFlockApp extends StatelessWidget { + const DeFlockApp({super.key}); @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flock Map', + title: 'DeFlock', theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.green), + colorScheme: ColorScheme.fromSeed( + seedColor: const Color(0xFF0080BC), // DeFlock blue + brightness: Brightness.dark, + ), useMaterial3: true, ), routes: { diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 8edde59..4553e01 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -151,7 +151,7 @@ class _HomeScreenState extends State with TickerProviderStateMixin { child: Scaffold( key: _scaffoldKey, appBar: AppBar( - title: const Text('Flock Map'), + title: const Text('DeFlock'), actions: [ IconButton( tooltip: _getFollowMeTooltip(appState.followMeMode), diff --git a/lib/services/auth_service.dart b/lib/services/auth_service.dart index 1ce3953..bd080a8 100644 --- a/lib/services/auth_service.dart +++ b/lib/services/auth_service.dart @@ -13,7 +13,7 @@ import '../app_state.dart' show UploadMode; class AuthService { // Both client IDs from keys.dart - static const _redirect = 'flockmap://auth'; + static const _redirect = 'deflockapp://auth'; late OAuth2Helper _helper; String? _displayName; @@ -46,7 +46,7 @@ class AuthService { authorizeUrl: '$authBase/oauth2/authorize', tokenUrl: '$authBase/oauth2/token', redirectUri: _redirect, - customUriScheme: 'flockmap', + customUriScheme: 'deflockapp', ); _helper = OAuth2Helper( client, diff --git a/lib/services/map_data_submodules/tiles_from_remote.dart b/lib/services/map_data_submodules/tiles_from_remote.dart index 49a52f2..72055ed 100644 --- a/lib/services/map_data_submodules/tiles_from_remote.dart +++ b/lib/services/map_data_submodules/tiles_from_remote.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'dart:async'; import 'package:http/http.dart' as http; import 'package:flutter/foundation.dart'; -import 'package:flock_map_app/dev_config.dart'; +import 'package:deflockapp/dev_config.dart'; import '../network_status.dart'; /// Global semaphore to limit simultaneous tile fetches diff --git a/lib/services/offline_area_service.dart b/lib/services/offline_area_service.dart index 3b52d39..8322a7f 100644 --- a/lib/services/offline_area_service.dart +++ b/lib/services/offline_area_service.dart @@ -11,7 +11,7 @@ import 'offline_areas/world_area_manager.dart'; import '../models/osm_camera_node.dart'; import '../app_state.dart'; import 'map_data_provider.dart'; -import 'package:flock_map_app/dev_config.dart'; +import 'package:deflockapp/dev_config.dart'; /// Service for managing download, storage, and retrieval of offline map areas and cameras. class OfflineAreaService { diff --git a/lib/services/offline_areas/offline_area_downloader.dart b/lib/services/offline_areas/offline_area_downloader.dart index 9ac6076..27bf41b 100644 --- a/lib/services/offline_areas/offline_area_downloader.dart +++ b/lib/services/offline_areas/offline_area_downloader.dart @@ -10,7 +10,7 @@ import '../../models/osm_camera_node.dart'; import '../map_data_provider.dart'; import 'offline_area_models.dart'; import 'offline_tile_utils.dart'; -import 'package:flock_map_app/dev_config.dart'; +import 'package:deflockapp/dev_config.dart'; /// Handles the actual downloading process for offline areas class OfflineAreaDownloader { diff --git a/lib/services/offline_areas/world_area_manager.dart b/lib/services/offline_areas/world_area_manager.dart index 8a4905a..a4c798d 100644 --- a/lib/services/offline_areas/world_area_manager.dart +++ b/lib/services/offline_areas/world_area_manager.dart @@ -5,7 +5,7 @@ import 'package:path_provider/path_provider.dart'; import 'offline_area_models.dart'; import 'offline_tile_utils.dart'; -import 'package:flock_map_app/dev_config.dart'; +import 'package:deflockapp/dev_config.dart'; /// Manages the world area (permanent offline area for base map) class WorldAreaManager { diff --git a/lib/widgets/map/tile_layer_manager.dart b/lib/widgets/map/tile_layer_manager.dart index 155e134..2411c96 100644 --- a/lib/widgets/map/tile_layer_manager.dart +++ b/lib/widgets/map/tile_layer_manager.dart @@ -77,7 +77,7 @@ class TileLayerManager { return TileLayer( urlTemplate: urlTemplate, - userAgentPackageName: 'com.stopflock.flock_map_app', + userAgentPackageName: 'me.deflock.deflockapp', tileProvider: NetworkTileProvider( httpClient: _tileHttpClient, // Enable flutter_map caching - cache busting handled by URL changes and FlutterMap key diff --git a/pubspec.yaml b/pubspec.yaml index 23e3bcd..fabb425 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ -name: flock_map_app -description: Simple OSM camera‑mapping client +name: deflockapp +description: Map public surveillance infrastructure with OpenStreetMap publish_to: "none" version: 0.5.0 diff --git a/test/models/pending_upload_test.dart b/test/models/pending_upload_test.dart index 25cd4e5..16e3a24 100644 --- a/test/models/pending_upload_test.dart +++ b/test/models/pending_upload_test.dart @@ -1,8 +1,8 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:latlong2/latlong.dart'; -import 'package:flock_map_app/models/pending_upload.dart'; -import 'package:flock_map_app/models/camera_profile.dart'; -import 'package:flock_map_app/state/settings_state.dart'; +import 'package:deflockapp/models/pending_upload.dart'; +import 'package:deflockapp/models/node_profile.dart'; +import 'package:deflockapp/state/settings_state.dart'; void main() { group('PendingUpload', () { @@ -18,7 +18,7 @@ void main() { final original = PendingUpload( coord: LatLng(37.7749, -122.4194), direction: 90.0, - profile: CameraProfile.flock(), + profile: NodeProfile.flock(), uploadMode: mode, ); @@ -46,7 +46,7 @@ void main() { 'lat': 37.7749, 'lon': -122.4194, 'dir': 90.0, - 'profile': CameraProfile.flock().toJson(), + 'profile': NodeProfile.flock().toJson(), 'originalNodeId': null, 'attempts': 0, 'error': false, @@ -64,7 +64,7 @@ void main() { final newCamera = PendingUpload( coord: LatLng(37.7749, -122.4194), direction: 90.0, - profile: CameraProfile.flock(), + profile: NodeProfile.flock(), uploadMode: UploadMode.production, ); diff --git a/test/widget_test.dart b/test/widget_test.dart index 8b44e55..d370707 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flock_map_app/main.dart'; +import 'package:deflockapp/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {