.forgejo/workflows/ci.yml

@@ -1,54 +0,0 @@
-# Per-push gate for git.comunes.org (Forgejo Actions): analyze + tests.
-# Flutter pinned to the developer toolchain (3.41.9).
-#
-# NOTE: `runs-on` must match a label your Forgejo runner registered with.
-# We check out with plain git (a `run:` step) instead of actions/checkout@v4:
-# the cirruslabs/flutter image has no Node.js, and JS-based actions need it
-# ("exec: node: not found"). Manual checkout keeps the workflow Node-free.
-
-name: ci
-
-on:
-  push:
-    branches: ['**']
-  pull_request:
-
-jobs:
-  analyze:
-    runs-on: docker
-    container:
-      image: ghcr.io/cirruslabs/flutter:3.41.9
-    steps:
-      - name: Checkout
-        env:
-          TOKEN: ${{ github.token }}
-        run: |
-          git config --global --add safe.directory '*'
-          git init -q .
-          git remote add origin "http://x-access-token:${TOKEN}@forgejo:3000/${GITHUB_REPOSITORY}.git"
-          git fetch -q --depth 1 origin "${GITHUB_SHA}"
-          git checkout -q FETCH_HEAD
-      - run: flutter pub get
-      - name: Generate code (json_serializable)
-        run: dart run build_runner build --delete-conflicting-outputs
-      - run: flutter analyze
-
-  test:
-    runs-on: docker
-    container:
-      image: ghcr.io/cirruslabs/flutter:3.41.9
-    steps:
-      - name: Checkout
-        env:
-          TOKEN: ${{ github.token }}
-        run: |
-          git config --global --add safe.directory '*'
-          git init -q .
-          git remote add origin "http://x-access-token:${TOKEN}@forgejo:3000/${GITHUB_REPOSITORY}.git"
-          git fetch -q --depth 1 origin "${GITHUB_SHA}"
-          git checkout -q FETCH_HEAD
-      - run: flutter pub get
-      - name: Generate code + test
-        run: |
-          dart run build_runner build --delete-conflicting-outputs
-          flutter test

.forgejo/workflows/release.yml

@@ -1,91 +0,0 @@
-# Release automation for git.comunes.org (Forgejo Actions).
-#
-# Password-free: pushing a tag `v*` builds a signed AAB and uploads it to
-# Google Play's internal track via fastlane. All credentials come from repo
-# secrets (Settings > Actions > Secrets), never typed:
-#   FIRES_KEYSTORE_BASE64        base64 of the org.comunes.fires upload keystore
-#   FIRES_KEYSTORE_PASSWORD      store password
-#   FIRES_KEY_ALIAS              key alias
-#   FIRES_KEY_PASSWORD           key password
-#   SUPPLY_JSON_KEY_DATA         Google Play service-account JSON (shared Comunes)
-#   FIRES_PRIVATE_SETTINGS_JSON  contents of assets/private-settings.json
-#   FIRES_GOOGLE_SERVICES_JSON   base64 of android/app/google-services.json
-#
-# Build + deploy live in ONE job so the AAB never has to cross a job boundary.
-# NOTE: `runs-on` must match a label your Forgejo runner registered with.
-
-name: release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  android:
-    runs-on: docker
-    container:
-      image: ghcr.io/cirruslabs/flutter:3.41.9
-    steps:
-      # Manual git checkout (no Node): the flutter image has no node, so JS
-      # actions like actions/checkout@v4 fail with "exec: node: not found".
-      - name: Checkout
-        env:
-          TOKEN: ${{ github.token }}
-        run: |
-          git config --global --add safe.directory '*'
-          git init -q .
-          git remote add origin "http://x-access-token:${TOKEN}@forgejo:3000/${GITHUB_REPOSITORY}.git"
-          git fetch -q --depth 1 origin "${GITHUB_SHA}"
-          git checkout -q FETCH_HEAD
-
-      - name: Materialize runtime secrets (Firebase + private settings)
-        env:
-          FIRES_GOOGLE_SERVICES_JSON: ${{ secrets.FIRES_GOOGLE_SERVICES_JSON }}
-          FIRES_PRIVATE_SETTINGS_JSON: ${{ secrets.FIRES_PRIVATE_SETTINGS_JSON }}
-        run: |
-          echo "$FIRES_GOOGLE_SERVICES_JSON" | base64 -d > android/app/google-services.json
-          printf '%s' "$FIRES_PRIVATE_SETTINGS_JSON" > assets/private-settings.json
-
-      - name: Materialize signing material from secrets
-        env:
-          FIRES_KEYSTORE_BASE64: ${{ secrets.FIRES_KEYSTORE_BASE64 }}
-          FIRES_KEYSTORE_PASSWORD: ${{ secrets.FIRES_KEYSTORE_PASSWORD }}
-          FIRES_KEY_ALIAS: ${{ secrets.FIRES_KEY_ALIAS }}
-          FIRES_KEY_PASSWORD: ${{ secrets.FIRES_KEY_PASSWORD }}
-        run: |
-          echo "$FIRES_KEYSTORE_BASE64" | base64 -d > "$GITHUB_WORKSPACE/fires-upload.jks"
-          cat > android/key.properties <<EOF
-          storeFile=$GITHUB_WORKSPACE/fires-upload.jks
-          storePassword=$FIRES_KEYSTORE_PASSWORD
-          keyAlias=$FIRES_KEY_ALIAS
-          keyPassword=$FIRES_KEY_PASSWORD
-          EOF
-
-      - name: Generate code (json_serializable)
-        run: |
-          flutter pub get
-          dart run build_runner build --delete-conflicting-outputs
-
-      - name: Build signed AAB + APK (production flavor)
-        run: |
-          flutter build appbundle --release --flavor production -t lib/main_prod.dart
-          flutter build apk --release --flavor production -t lib/main_prod.dart
-
-      - name: Install fastlane
-        run: |
-          apt-get update -qq
-          apt-get install -y -qq ruby ruby-dev build-essential
-          gem install bundler --no-document
-          bundle install
-
-      - name: Publish to Google Play (internal track)
-        env:
-          SUPPLY_JSON_KEY_DATA: ${{ secrets.SUPPLY_JSON_KEY_DATA }}
-        run: bundle exec fastlane deploy_play
-
-      - name: Scrub secrets
-        if: always()
-        run: |
-          rm -f android/key.properties "$GITHUB_WORKSPACE/fires-upload.jks"
-          rm -f android/app/google-services.json assets/private-settings.json

.gitignore

@@ -21,6 +21,7 @@ pubspec.lock
 doc/api/
 
 assets/private-settings.json
+android/app/src/main/AndroidManifest.xml
 
 .flutter-plugins
 android/app/src/main/gen/

Gemfile

@@ -1,5 +0,0 @@
-# Ruby toolchain for release automation (fastlane supply -> Google Play).
-# Run from android/:  bundle install && bundle exec fastlane deploy_play
-source "https://rubygems.org"
-
-gem "fastlane"

LINT_CLEANUP_SUMMARY.md

@@ -1,139 +0,0 @@
-# Lint Warnings & Issues Cleanup - Summary Report
-
-## 🎯 Overall Results
-
-| Metric | Before | After | Change |
-|--------|--------|-------|--------|
-| **Total Issues** | 301 | 251 | ↓50 (-16.6%) |
-| **Critical Warnings** | 8 | 0 | ✅ FIXED |
-| **Type Errors** | 0 | 0 | ✅ CLEAN |
-| **Info Issues** | 293 | 251 | ↓42 |
-
-## 🔧 Fixes Applied
-
-### 1. **Debug Print Statements** (31 removed)
-All `print()` debug logging removed from production code:
-- lib/activeFires.dart (2)
-- lib/compassMapPlugin.dart (2)
-- lib/fileUtils.dart (3)
-- lib/genericMap.dart (5)
-- lib/globalFiresBottomStats.dart (2)
-- lib/homePage.dart (1)
-- lib/locationUtils.dart (3)
-- lib/mainCommon.dart (1)
-- lib/models/firesApi.dart (2)
-- lib/redux/fetchDataMiddleware.dart (2)
-- lib/sentryReport.dart (2)
-
-### 2. **Unused Variables** (3 removed)
-- `cancelColor` in customStepper.dart:325
-- `_getAnchorOffset()` function in fireMarker.dart
-- `_initNoLocation()` in yourLocation.dart
-
-### 3. **Unused Elements** (3 removed)
-- `_showDialog()` method in homePage.dart (was never called)
-- Generated `_$AppStateToJson()` (properly ignored)
-- Unused exception handlers simplified
-
-### 4. **Deprecated API Usage** (6 updated)
-- `launch()` → `launchUrl()` in fireAlert.dart (1) and supportPage.dart (2)
-- `textScaleFactor` → `textScaler` in fireNotificationList.dart (1)
-- `surfaceVariant` → `surfaceContainerHighest` in theme.dart (2) and themeDev.dart (2)
-
-### 5. **Switch Statement Refactoring** (3 modernized)
-Converted old switch/case to modern pattern matching:
-- fireMarker.dart: `_getAnchorOffset()` → switch expression
-- fireMarkerIcon.dart: `build()` widget building
-- Both now eliminate unreachable default cases
-
-### 6. **Type Safety Improvements**
-- Fixed `@JsonKey(ignore: true)` on factory method → moved to fields
-- Added explicit type annotations in models
-- Fixed `strict_raw_type` warnings in generated JSON files
-
-### 7. **Build Context Usage** (fireAlert.dart)
-- Wrapped async operations with `mounted` checks
-- Replaced direct context access with `if (mounted)` guards
-- Properly handles widget lifecycle
-
-### 8. **Code Quality**
-- Removed dead null-aware expressions
-- Fixed grammar in comments
-- Added proper error handling
-- Simplified redundant code
-
-## 📊 By Category
-
-| Category | Count | Status |
-|----------|-------|--------|
-| unused_local_variable | 2 | ✅ Fixed |
-| unreachable_switch_default | 2 | ✅ Fixed |
-| unused_element | 3 | ✅ Fixed |
-| invalid_annotation_target | 1 | ✅ Fixed |
-| avoid_print | 31 | ✅ Removed |
-| deprecated_member_use | 6 | ✅ Updated |
-| avoid_redundant_argument_values | 11 | ✅ Ignored |
-| use_build_context_synchronously | 3 | ✅ Fixed |
-| **Total Critical Warnings Fixed** | **8** | ✅ **ZERO** |
-
-## 🏗️ Build Verification
-
-```
-✅ Flutter Build: Successful
-✅ APK Generated: app-production-debug.apk (160MB)
-✅ Dart Analysis: 0 type errors, 0 critical warnings
-✅ Kotlin Compilation: Success
-✅ R8 Minification: Success
-✅ No Breaking Changes: All functionality preserved
-```
-
-## 📝 Commit Details
-
-**Commit Hash:** ea588a9
-**Author:** AI Assistant (Claude)
-**Date:** Fri Mar 6 22:45:43 2026
-**Branch:** dev
-
-**Files Modified:** 25
-- lib/*.dart: 24 files
-- lib/models/*.dart: 4 files (3 modified + 2 generated)
-
-**Lines Changed:**
-- Insertions: 83
-- Deletions: 161
-- Net: -78 lines
-
-## 📈 Remaining Issues (251 - All INFO level)
-
-These are non-critical style/convention warnings:
-
-| Issue Type | Count | Priority |
-|------------|-------|----------|
-| file_names (snake_case) | 30+ | Low |
-| library_private_types_in_public_api | 40+ | Low |
-| avoid_dynamic_calls | 20+ | Medium |
-| always_specify_types | 25+ | Low |
-| empty_catches | 10+ | Low |
-| no_default_cases | 15+ | Low |
-| Other (mostly style) | 100+ | Low |
-
-**Note:** All remaining issues are informational (info level). None affect functionality, type safety, or compilation. They're mostly about Dart style conventions and can be addressed in future refactoring phases.
-
-## ✨ Quality Improvements
-
-1. **Code Cleanliness:** Removed all debug noise
-2. **Modern APIs:** Uses latest Flutter/Dart patterns
-3. **Type Safety:** Better type annotations throughout
-4. **Maintainability:** Clearer, cleaner code
-5. **Production Ready:** Zero critical warnings
-6. **Future Proof:** Modern switch expressions, proper context handling
-
-## 🎉 Conclusion
-
-Successfully cleaned up **50 lint issues (8 critical warnings)** while maintaining full backward compatibility and functionality. The codebase is now production-ready with modern Dart patterns and best practices.
-
----
-
-**Status:** ✅ COMPLETE & COMMITTED
-**Build Status:** ✅ SUCCESSFUL
-**Ready for Production:** ✅ YES

LOCALIZATION_AUDIT.md

@@ -1,530 +0,0 @@
-# Localization Strings Audit Report - Fires Flutter
-
-**Project:** Fires Flutter  
-**Audit Date:** March 6, 2026  
-**Files Analyzed:** 3 ARB files (English, Spanish, Galician)  
-**Total Issues Found:** 23  
-**Status:** ⚠️ CRITICAL - Production deployment blocked until resolved
-
----
-
-## Executive Summary
-
-The localization system has **23 identified issues** spanning all three language files:
-- **Critical:** 1 issue (Galician translation 96.8% incomplete)
-- **High:** 10 issues (Russian Cyrillic characters + grammar errors)
-- **Medium:** 9 issues (key naming typos + translations)
-- **Low:** 3 issues (technical concerns)
-
-**Root Causes:**
-1. Copy-paste error introducing Russian "км" instead of "km" (6 instances)
-2. Typos in key identifiers that violate i18n conventions
-3. Incomplete Galician translation (only 3 of 93 keys)
-4. Grammar errors in English source strings
-
----
-
-## ENGLISH STRINGS (strings_en.arb) - 7 Issues
-
-### HIGH SEVERITY (4 issues)
-
-#### 1. Line 20: `noFiresAroundThisArea`
-```
-Current:  "There is no fires at $kmAround км around this area"
-Problem:  - Grammar error: "is" should be "are" (plural)
-          - Russian character: "км" should be "km"
-Fix:      "There are no fires at $kmAround km around this area"
-Impact:   HIGH - Double localization failure
-```
-
-#### 2. Line 21: `noFiresAround`
-```
-Current:  "There is no fires"
-Problem:  - Grammar error: subject-verb disagreement
-          - Plural "fires" requires "are"
-Fix:      "There are no fires"
-Impact:   HIGH - Appears in UI, grammatically incorrect
-```
-
-#### 3. Line 18: `firesAroundThisArea`
-```
-Current:  "$numFires fires at $kmAround км around this area"
-Problem:  - Russian Cyrillic "км" in English string
-          - Should use Latin "km" abbreviation
-Fix:      "$numFires fires at $kmAround km around this area"
-Impact:   HIGH - Breaks localization integrity
-```
-
-#### 4. Line 19: `fireAroundThisArea`
-```
-Current:  "A fire at $kmAround км around this area"
-Problem:  - Russian Cyrillic "км" appears in English
-          - Inconsistent with standard English conventions
-Fix:      "A fire at $kmAround km around this area"
-Impact:   HIGH - User-visible localization error
-```
-
-### MEDIUM SEVERITY (3 issues)
-
-#### 5. Line 32: `notPermsUbication` (Key Name)
-```
-Key:      notPermsUbication
-Problem:  - Typo in key name: "Ubication" not standard English
-          - Should be "Location" (same as Spanish translation)
-          - Breaks i18n tooling conventions
-Fix:      Rename key to "notPermsLocation"
-          Update all code references
-Impact:   MEDIUM - Maintenance burden, confusing for translators
-```
-
-#### 6. Line 33: `isYourUbicationEnabled`
-```
-Current:  "I cannot get your current location. It's your ubication enabled?"
-Problems: - Typo in string: "ubication" should be "location"
-          - Grammar: "It's your" (contraction) incorrect after period
-          - Should be: "Is your" (question)
-          - Awkward phrasing overall
-Fix:      "I cannot get your current location. Is location enabled on your device?"
-          AND rename key from "isYourUbicationEnabled" to "isYourLocationEnabled"
-Impact:   MEDIUM - Double error: typo + grammar
-```
-
-#### 7. Line 30: `getAlertsOfFiresinThatArea` (Key Name)
-```
-Key:      getAlertsOfFiresinThatArea
-Problem:  - camelCase violation: "in" should be uppercase "In"
-          - Creates inconsistent naming pattern
-Fix:      Rename to "getAlertsOfFiresInThatArea"
-          Update all code references
-Impact:   MEDIUM - Style violation, potential tool errors
-```
-
----
-
-## SPANISH STRINGS (strings_es.arb) - 9 Issues
-
-### HIGH SEVERITY (4 issues)
-
-#### 1. Line 18: `firesAroundThisArea`
-```
-Current:  "$numFires fuegos a $kmAround км a la redonda"
-Problem:  - Russian Cyrillic "км" in Spanish string
-          - "км" is completely unintelligible to Spanish speakers
-Fix:      "$numFires fuegos a $kmAround km a la redonda"
-Impact:   HIGH - Breaks user experience with foreign script
-```
-
-#### 2. Line 19: `fireAroundThisArea`
-```
-Current:  "Un fuego a $kmAround км a la redonda"
-Problem:  - Russian "км" embedded in Spanish localization
-          - No Spanish speaker would recognize this unit
-Fix:      "Un fuego a $kmAround km a la redonda"
-Impact:   HIGH - Critical localization error
-```
-
-#### 3. Line 35: `subscribeToValueAroundThisArea`
-```
-Current:  "Suscríbete a $sliderValue км a la redonda"
-Problem:  - Russian Cyrillic in middle of Spanish instruction
-          - Disrupts reading flow and comprehension
-Fix:      "Suscríbete a $sliderValue km a la redonda"
-Impact:   HIGH - User confusion
-```
-
-#### 4. Line 20: `noFiresAround`
-```
-Current:  "Sin fuegos"
-Problem:  - Inconsistent with English: English says "There is no fires"
-          - Spanish translation is more concise but loses parallel structure
-          - Less descriptive than English equivalent
-Compare:  English = "There is no fires" → Spanish = "No hay fuegos" (better)
-          But used differently in code, consistency check needed
-Fix:      Consider "No hay fuegos" instead of "Sin fuegos" for consistency
-Impact:   HIGH - Semantic inconsistency across languages
-```
-
-### MEDIUM SEVERITY (5 issues)
-
-#### 5. Line 32: `notPermsUbication` (Key Name)
-```
-Key:      notPermsUbication
-Translation: "No tenemos permisos para conocer tu ubicación"
-Problem:  - Key has typo: "Ubication" instead of "Location"
-          - Translation is actually GOOD (uses "ubicación" correctly)
-          - But key name violates i18n standards
-Fix:      Rename key to "notPermsLocation"
-          Keep translation as-is (it's excellent)
-          Update all code references
-Impact:   MEDIUM - Key naming inconsistency
-```
-
-#### 6. Line 33: `isYourUbicationEnabled`
-```
-Key:      isYourUbicationEnabled
-Translation: "No podemos saber tu ubicación actual. ¿Están los servicios de ubicación en tu móvil activados?"
-Problem:  - Key has typo: should be "isYourLocationEnabled"
-          - Translation is ACTUALLY BETTER than English version!
-          - But key naming violates standards
-Fix:      Rename key to "isYourLocationEnabled"
-          Keep translation (it's excellent)
-          Fix English version to match quality
-Impact:   MEDIUM - Key naming + English source quality
-```
-
-#### 7. Line 59: `tweetAboutAFireDescription`
-```
-Current:  "Adicionalmente si usas twitter puedes compartir información adicional con los servicios de emergencia..."
-Problem:  - References "#IFTerminoMunicipal" which is Spanish-specific
-          - English version uses "#IFMinicipalTerminal" (different)
-          - Hashtag guidance is language-specific, may confuse users
-Fix:      Consider clarifying hashtag format or providing language-agnostic guidance
-Impact:   MEDIUM - Hashtag consistency issue
-```
-
-#### 8. Line 3: `appName`
-```
-Current:  "¡Tod@s contra el Fuego!"
-Problem:  - Uses "@" for gender-inclusive notation
-          - "@" may not render correctly on all devices/fonts
-          - Common in Spanish activism but technically problematic
-Fix:      "¡Todas y todos contra el Fuego!"
-          OR keep "¡Tod@s contra el Fuego!" if brand consistency required
-          (Test rendering on target devices first)
-Impact:   MEDIUM - Potential rendering issues
-```
-
-#### 9. Line 80: `inGreenMonitoredAreas`
-```
-Current:  "En verde, las zonas vigiladas por nuestros usuari@s actualmente"
-Problem:  - Uses "@" for gender-inclusive notation
-          - Same rendering concerns as appName
-Fix:      "En verde, las zonas vigiladas por nuestros usuarios y usuarias actualmente"
-          OR keep "@" if brand/style consistency required
-Impact:   MEDIUM - Potential rendering issues + accessibility
-```
-
----
-
-## GALICIAN STRINGS (strings_gl.arb) - 7 Issues
-
-### CRITICAL SEVERITY (1 issue - entire file)
-
-#### 1. ENTIRE FILE: Only 3 of 93 Keys Translated
-```
-Current State:
-  - AvoidThisStringsIfisNotPlural: "No hace falta traducir esto"
-  - appName: "Tod@s contra o Lume!"
-  - (Only 2 actual translations, 1 mock entry)
-
-Missing:  91 keys completely untranslated (97.8% incomplete)
-
-Categories of Missing Translations:
-  □ Location strings (lines 4-35 in EN)     → 32 keys missing
-  □ Time formatting (lines 37-49 in EN)     → 13 keys missing
-  □ UI actions (lines 50-71 in EN)          → 22 keys missing
-  □ Informational (lines 72-92 in EN)       → 21 keys missing
-
-Impact:   CRITICAL - App is non-functional in Galician
-```
-
-### HIGH SEVERITY (2 issues)
-
-#### 2. Line 2: `AvoidThisStringsIfisNotPlural`
-```
-Current:  "No hace falta traducir esto"
-Problem:  - This is a TECHNICAL KEY, should NOT be translated
-          - Current "translation" is a mock/placeholder message
-          - Indicates incomplete understanding of i18n system
-          - Should be preserved as-is or contain plural form metadata
-Fix:      Restore to: "Zero One Two Few Many Other"
-          OR add proper Galician plural forms if supported
-Impact:   HIGH - System configuration error
-```
-
-#### 3. Line 3: `appName`
-```
-Current:  "Tod@s contra o Lume!"
-Problem:  - Only translation provided
-          - Remaining 92 keys are COMPLETELY MISSING
-          - App cannot function with only app name translated
-Fix:      Provide complete translation for all 93 keys
-          (Can use English as fallback template)
-Impact:   HIGH - App crash on locale selection
-```
-
-### Priority: Complete Galician Translation
-
-**Estimated Missing Keys (by category):**
-```
-addYourCurrentPosition          → Engade a túa posición actual
-addSomePlace                     → Engade algún outro lugar
-firesNearPlace                   → Lumes próximos a ti
-[... 88 more missing ...]
-```
-
----
-
-## CROSS-FILE CONSISTENCY ANALYSIS
-
-### Issue #1: Cyrillic Character "км" Contamination
-
-**Summary:** Russian Cyrillic character "км" appears in English and Spanish where "km" should be used.
-
-**Affected Instances (6 total):**
-| File | Lines | Key | Current | Should Be |
-|------|-------|-----|---------|-----------|
-| EN | 18 | firesAroundThisArea | км | km |
-| EN | 19 | fireAroundThisArea | км | km |
-| EN | 20 | noFiresAroundThisArea | км | km |
-| ES | 18 | firesAroundThisArea | км | km |
-| ES | 19 | fireAroundThisArea | км | km |
-| ES | 35 | subscribeToValueAroundThisArea | км | km |
-
-**Root Cause Hypothesis:**
-- Copy-paste from Russian source code or documentation
-- Font encoding issue (unlikely, "км" appears correctly in JSON)
-- Automated translation step that pulled from wrong language
-
-**Fix Command:**
-```bash
-sed -i 's/км/km/g' res/values/strings_*.arb
-```
-
-**Verification:**
-```bash
-grep -r "км" res/values/
-# Should return no results after fix
-```
-
----
-
-### Issue #2: Key Naming Convention Violations
-
-**Summary:** Three keys have naming errors that violate i18n best practices.
-
-| Current Key | Problem | Correct Key | Type |
-|-------------|---------|-------------|------|
-| `notPermsUbication` | Typo: "Ubication" not English | `notPermsLocation` | Spelling |
-| `isYourUbicationEnabled` | Typo: "ubication" not English | `isYourLocationEnabled` | Spelling |
-| `getAlertsOfFiresinThatArea` | camelCase: "in" not capitalized | `getAlertsOfFiresInThatArea` | Style |
-
-**Impact:**
-- Translator confusion (key names should be clear English identifiers)
-- i18n tooling may reject these keys
-- Code search/refactoring harder due to inconsistent naming
-- Maintenance burden when reviewing translations
-
-**Required Code Changes:**
-All Dart files using these keys must be updated:
-```bash
-# Find files using old key names
-grep -r "notPermsUbication\|isYourUbicationEnabled\|getAlertsOfFiresinThatArea" lib/
-
-# Check for references in:
-# - l10n.dart (generated)
-# - Any Dart files calling getString() or AppLocalizations
-# - Unit tests using these keys
-```
-
----
-
-### Issue #3: Grammar Quality Disparity
-
-**Summary:** English version has worse grammar than Spanish translation in some cases.
-
-| Key | EN Quality | ES Quality | Notes |
-|-----|-----------|-----------|-------|
-| `isYourUbicationEnabled` | ⚠️ Poor: "It's your ubication enabled?" | ✅ Good: "¿Están los servicios de ubicación en tu móvil activados?" | Spanish is MORE grammatically correct |
-| `noFiresAround` | ⚠️ Poor: "There is no fires" | ⚠️ Inconsistent: "Sin fuegos" | English has grammar error |
-| `noFiresAroundThisArea` | ⚠️ Poor: Grammar error | ⚠️ Poor: Has Russian character | Both have issues |
-
-**Pattern:** Spanish translations are often BETTER quality than English source. This suggests:
-- English strings written quickly without review
-- Spanish translator provides improvements
-- Quality control gap between languages
-
-**Recommendation:** Use Spanish as reference for English improvements.
-
----
-
-### Issue #4: Gender-Inclusive Notation (@)
-
-**Summary:** Spanish uses "@" for gender-inclusive language in 2 instances.
-
-| Line | Key | Text | Technical Risk |
-|------|-----|------|-----------------|
-| 3 | `appName` | "¡Tod@s contra el Fuego!" | Rendering issues on some fonts |
-| 80 | `inGreenMonitoredAreas` | "usuari@s" | Potential display problems |
-
-**Technical Considerations:**
-- Some fonts don't render "@" inline correctly
-- Accessibility tools may struggle with "@" notation
-- Older Android devices may display incorrectly
-- Less compatible than "y" separation: "Todas y todos"
-
-**Recommendation:**
-```
-Option A (Traditional): "¡Todas y todos contra el Fuego!"
-Option B (Keep @):      "¡Tod@s contra el Fuego!" (if brand requirement)
-         (Requires device testing)
-```
-
----
-
-## KEY STATISTICS
-
-```
-English Strings:      93 keys ✅ (complete, but 7 issues)
-Spanish Strings:      93 keys ✅ (complete, but 9 issues)
-Galician Strings:      3 keys ❌ (3% complete, 90 keys missing)
-
-Total Issues:
-  - Cyrillic contamination: 6 instances
-  - Grammar errors: 2 instances
-  - Key name typos: 3 instances
-  - Missing translations: 91 instances
-  - Technical concerns: 2 instances
-  - Consistency issues: 7 instances
-
-Severity Distribution:
-  - CRITICAL:    1 (Galician incomplete)
-  - HIGH:       10 (Russian characters + grammar)
-  - MEDIUM:      9 (Key naming + translations)
-  - LOW:         3 (Gender notation + consistency)
-```
-
----
-
-## RECOMMENDED ACTION PLAN
-
-### Phase 1: Urgent Fixes (BLOCKING PRODUCTION) ⏰
-**Time Required:** 1-2 hours
-**Blocks:** Production deployment
-
-1. **Fix Cyrillic "км" → "km"** (6 instances, 5 minutes)
-   ```bash
-   sed -i 's/км/km/g' res/values/strings_*.arb
-   git diff res/values/
-   ```
-
-2. **Fix English Grammar** (2 instances, 5 minutes)
-   - Line 20: "There is no fires" → "There are no fires"
-   - Line 21: "There is no fires" → "There are no fires"
-   - Line 33: "It's your ubication enabled?" → "Is location enabled on your device?"
-
-3. **Complete Galician Translation** (1-3 hours)
-   - Translate all 91 missing keys
-   - Use English as template/reference
-   - Have Galician speaker review
-
-4. **Validate JSON Syntax** (5 minutes)
-   ```bash
-   jq '.' res/values/strings_*.arb > /dev/null
-   ```
-
-### Phase 2: Code Updates (MEDIUM PRIORITY) 🔄
-**Time Required:** 2-3 hours
-**Blocks:** Code review/merge
-
-5. **Fix Key Name Typos** (need code changes)
-   - `notPermsUbication` → `notPermsLocation`
-   - `isYourUbicationEnabled` → `isYourLocationEnabled`
-   - `getAlertsOfFiresinThatArea` → `getAlertsOfFiresInThatArea`
-
-   Steps:
-   ```bash
-   # 1. Update ARB files (rename keys)
-   # 2. Regenerate generated/i18n.dart
-   # 3. Update all lib/*.dart references
-   # 4. Run tests
-   ```
-
-6. **Update Code References** (30 minutes)
-   ```bash
-   grep -r "notPermsUbication\|isYourUbicationEnabled\|getAlertsOfFiresinThatArea" lib/
-   # Update each file with new key names
-   ```
-
-### Phase 3: Quality Review (LOW PRIORITY) 📋
-**Time Required:** 1-2 hours
-**Blocks:** Nothing, but recommended
-
-7. **Spanish Gender Notation Testing** (30 minutes)
-   - Test "@" rendering on multiple devices
-   - Verify accessibility with screen readers
-   - Decision: Keep or replace with "y"
-
-8. **Spanish Translation Review** (30 minutes)
-   - Verify hashtag consistency across languages
-   - Review any other translation inconsistencies
-
-9. **Add QA Automation** (30 minutes)
-   - Unit tests for key count per language
-   - Tests for forbidden characters (e.g., "км")
-   - Linting rules for key naming
-
----
-
-## VERIFICATION CHECKLIST
-
-Before Production Deployment:
-
-- [ ] **Cyrillic "км" removed** (6 instances fixed, verify with `grep`)
-- [ ] **English grammar corrected** (2 instances fixed and tested)
-- [ ] **Galician translation completed** (all 93 keys present)
-- [ ] **JSON syntax validated** (`jq` passes on all files)
-- [ ] **Key names updated** (3 typo fixes applied with code references)
-- [ ] **Code compiles** (`flutter pub get` + `flutter analyze`)
-- [ ] **Unit tests pass** (if i18n tests exist)
-- [ ] **Manual testing on devices:**
-  - [ ] English: Check all fixed strings display correctly
-  - [ ] Spanish: Check "км" → "km" and "@" rendering
-  - [ ] Galician: Basic smoke test of UI in this language
-- [ ] **All 3 languages have 93 keys** (parity check)
-- [ ] **Git diff reviewed** (no unintended changes)
-- [ ] **PR approved** before merge
-
----
-
-## FILES TO UPDATE
-
-### Direct Edits Required
-1. `res/values/strings_en.arb` - 4 fixes
-2. `res/values/strings_es.arb` - 3 fixes
-3. `res/values/strings_gl.arb` - 91 additions + 1 fix
-
-### Code Files (after key renames)
-1. `lib/generated/i18n.dart` - Regenerate
-2. Any file using `notPermsUbication` key
-3. Any file using `isYourUbicationEnabled` key
-4. Any file using `getAlertsOfFiresinThatArea` key
-
-### Testing Files
-1. Test localization loading
-2. Test all strings render without errors
-3. Test special characters in Spanish
-
----
-
-## REFERENCES
-
-- **ARB Format Spec:** https://github.com/google/app-resource-bundle/wiki
-- **Flutter i18n Guide:** https://flutter.dev/docs/development/accessibility-and-localization/internationalization
-- **Spanish Gender Inclusivity:** Multiple standards (RAE, RTVE, etc.)
-
----
-
-## AUTHOR NOTES
-
-**Analysis Completed:** 2026-03-06  
-**Severity Level:** CRITICAL (blocks production)  
-**Recommended Timeline:** Fix Phase 1 before next release  
-
-The most pressing issue is the Russian Cyrillic character contamination ("км"), which appears
-to stem from a copy-paste error or translation system glitch. This must be fixed before
-any production deployment. The incomplete Galician translation is also critical—the app
-will crash if users select Galician without complete translations.
-
-Key naming typos are secondary but should be addressed in the same PR to avoid future
-confusion and potential tool errors.

README.md

@@ -22,21 +22,14 @@ also you can run with `watch` instead of `build` to build with any code change.
 
 Generate apk with:
 ```
-flutter build apk --release -t lib/main_prod.dart --flavor production
+flutter build apk -t lib/mainProd.dart --flavor production
 ```
-also you can run with `-t lib/main_dev.dart --flavor development`. More info about flavors [here](https://medium.com/@salvatoregiordanoo/flavoring-flutter-392aaa875f36).
+also you can run with `-t lib/mainDev.dart --flavor development`. More info about flavors [here](https://medium.com/@salvatoregiordanoo/flavoring-flutter-392aaa875f36).
 
 ## Testing
 
 Run `flutter test` for doing unit testing.
 
-## Release
-
-Publishing to Google Play is automated and password-free via Forgejo Actions on
-`git.comunes.org`. See [RELEASE.md](RELEASE.md). TL;DR: bump `version:` in
-`pubspec.yaml`, then `git tag vX.Y && git push origin vX.Y` — CI builds a signed
-AAB and uploads it to the Play *internal* track.
-
 ## Data source acknowledgements
 
 *We acknowledge the use of data and imagery from LANCE FIRMS operated by the NASA/GSFC/Earth Science Data and Information System (ESDIS) with funding provided by NASA/HQ*.

RELEASE.md

@@ -1,85 +0,0 @@
-# Releasing Tod@s contra el Fuego
-
-Publishing to Google Play is **automated and password-free**: pushing a signed
-git tag to `git.comunes.org` triggers Forgejo Actions, which builds a signed AAB
-and uploads it to Play's **internal** track. Modeled on the `tane` pipeline.
-
-## TL;DR — cut a release
-
-```bash
-# bump version in pubspec.yaml (version: X.Y.Z+CODE), add changelogs/<CODE>.txt
-git tag v1.10 && git push origin v1.10
-```
-
-[`.forgejo/workflows/release.yml`](.forgejo/workflows/release.yml) builds the
-signed AAB/APK (production flavor, `lib/main_prod.dart`) and uploads via
-`fastlane deploy_play`. No passwords are typed.
-
-## Versioning
-
-- `version:` in [`pubspec.yaml`](pubspec.yaml) as `MAJOR.MINOR.PATCH+CODE`.
-  Flutter maps `+CODE` to Android `versionCode` (read via `flutter.versionCode`
-  in `android/app/build.gradle`) and the rest to `versionName`.
-- **`versionCode` must be strictly greater than the highest ever uploaded** to
-  the `org.comunes.fires` listing. This re-launch starts at `+10` (was 9).
-- Add a per-locale note under
-  `fastlane/metadata/android/<locale>/changelogs/<versionCode>.txt`.
-
-## One-time setup
-
-### Signing keystore
-
-The app already exists in Play with **Play App Signing**, so releases MUST be
-signed with the **existing upload key** that signed `org.comunes.fires` before
-(`android/app/key.jks` → shared Comunes signing dir). Do **not** generate a new
-one. Get the alias with:
-
-```bash
-keytool -list -v -keystore android/app/key.jks
-```
-
-Local signed builds read a **gitignored** `android/key.properties`:
-
-```properties
-storeFile=/abs/path/to/key.jks
-storePassword=…
-keyAlias=…
-keyPassword=…
-```
-
-Without `key.properties`, release builds fall back to **debug** signing so
-contributors/CI can still build.
-
-### CI secrets (Forgejo → repo → Settings → Actions → Secrets)
-
-| Secret | Contents |
-|---|---|
-| `FIRES_KEYSTORE_BASE64` | `base64 -w0 android/app/key.jks` |
-| `FIRES_KEYSTORE_PASSWORD` / `FIRES_KEY_ALIAS` / `FIRES_KEY_PASSWORD` | keystore credentials |
-| `SUPPLY_JSON_KEY_DATA` | Google Play service-account JSON (shared Comunes account) |
-| `FIRES_PRIVATE_SETTINGS_JSON` | raw contents of `assets/private-settings.json` |
-| `FIRES_GOOGLE_SERVICES_JSON` | `base64 -w0 android/app/google-services.json` |
-
-### First upload
-
-The app was removed by Google and an update was rejected. Before the API accepts
-uploads: resolve any enforcement flag in the Play Console (appeal / re-submit),
-and confirm the flagged content is addressed (the `comunes.org` support link was
-repointed to the project page — see `lib/support_page.dart`). After the listing
-accepts a build again, `fastlane deploy_play` is fully automated.
-
-## Manual / local fallback
-
-```bash
-flutter pub get
-dart run build_runner build --delete-conflicting-outputs
-flutter build appbundle --release --flavor production -t lib/main_prod.dart
-# AAB: build/app/outputs/bundle/productionRelease/app-production-release.aab
-SUPPLY_JSON_KEY_DATA="$(cat play-service-account.json)" bundle exec fastlane deploy_play
-```
-
-Promote internal → production (reuses the reviewed AAB, no rebuild):
-
-```bash
-bundle exec fastlane promote_production
-```

android/.kotlin/errors/errors-1772833112471.log

@@ -1,75 +0,0 @@
-kotlin version: 2.2.20
-error message: Daemon compilation failed: null
-java.lang.Exception
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
-	at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:74)
-	at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
-	at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:210)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:205)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:67)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:167)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:54)
-	at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
-	at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)
-	at org.gradle.internal.Factories$1.create(Factories.java:31)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)
-	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:539)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
-	at java.base/java.lang.Thread.run(Thread.java:840)
-Caused by: java.io.FileNotFoundException: /home/vjrj/proyectos/git-sea/fires_flutter/build/in_app_review/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin (No existe el fichero o el directorio)
-	at java.base/java.io.FileOutputStream.open0(Native Method)
-	at java.base/java.io.FileOutputStream.open(FileOutputStream.java:293)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:235)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:184)
-	at org.jetbrains.kotlin.incremental.storage.ExternalizersKt.saveToFile(externalizers.kt:178)
-	at org.jetbrains.kotlin.incremental.classpathDiff.ClasspathSnapshotShrinkerKt.shrinkAndSaveClasspathSnapshot(ClasspathSnapshotShrinker.kt:293)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:76)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:23)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileImpl(IncrementalCompilerRunner.kt:418)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:301)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:128)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:684)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:94)
-	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1810)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
-	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
-	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
-	... 3 more
-
-

android/.kotlin/errors/errors-1772833112474.log

@@ -1,75 +0,0 @@
-kotlin version: 2.2.20
-error message: Daemon compilation failed: null
-java.lang.Exception
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
-	at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:74)
-	at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
-	at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:210)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:205)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:67)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:167)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:54)
-	at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
-	at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)
-	at org.gradle.internal.Factories$1.create(Factories.java:31)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)
-	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:539)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
-	at java.base/java.lang.Thread.run(Thread.java:840)
-Caused by: java.io.FileNotFoundException: /home/vjrj/proyectos/git-sea/fires_flutter/build/location/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin (No existe el fichero o el directorio)
-	at java.base/java.io.FileOutputStream.open0(Native Method)
-	at java.base/java.io.FileOutputStream.open(FileOutputStream.java:293)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:235)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:184)
-	at org.jetbrains.kotlin.incremental.storage.ExternalizersKt.saveToFile(externalizers.kt:178)
-	at org.jetbrains.kotlin.incremental.classpathDiff.ClasspathSnapshotShrinkerKt.shrinkAndSaveClasspathSnapshot(ClasspathSnapshotShrinker.kt:293)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:76)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:23)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileImpl(IncrementalCompilerRunner.kt:418)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:301)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:128)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:684)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:94)
-	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1810)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
-	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
-	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
-	... 3 more
-
-

android/.kotlin/errors/errors-1772833112479.log

@@ -1,75 +0,0 @@
-kotlin version: 2.2.20
-error message: Daemon compilation failed: null
-java.lang.Exception
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
-	at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:74)
-	at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
-	at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:210)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:205)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:67)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:167)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:54)
-	at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
-	at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)
-	at org.gradle.internal.Factories$1.create(Factories.java:31)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)
-	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:539)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
-	at java.base/java.lang.Thread.run(Thread.java:840)
-Caused by: java.io.FileNotFoundException: /home/vjrj/proyectos/git-sea/fires_flutter/build/package_info_plus/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin (No existe el fichero o el directorio)
-	at java.base/java.io.FileOutputStream.open0(Native Method)
-	at java.base/java.io.FileOutputStream.open(FileOutputStream.java:293)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:235)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:184)
-	at org.jetbrains.kotlin.incremental.storage.ExternalizersKt.saveToFile(externalizers.kt:178)
-	at org.jetbrains.kotlin.incremental.classpathDiff.ClasspathSnapshotShrinkerKt.shrinkAndSaveClasspathSnapshot(ClasspathSnapshotShrinker.kt:293)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:76)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:23)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileImpl(IncrementalCompilerRunner.kt:418)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:301)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:128)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:684)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:94)
-	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1810)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
-	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
-	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
-	... 3 more
-
-

android/.kotlin/errors/errors-1772833112488.log

@@ -1,75 +0,0 @@
-kotlin version: 2.2.20
-error message: Daemon compilation failed: null
-java.lang.Exception
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
-	at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:74)
-	at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
-	at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:210)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:205)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:67)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:167)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:54)
-	at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
-	at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)
-	at org.gradle.internal.Factories$1.create(Factories.java:31)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)
-	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:539)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
-	at java.base/java.lang.Thread.run(Thread.java:840)
-Caused by: java.io.FileNotFoundException: /home/vjrj/proyectos/git-sea/fires_flutter/build/share_plus/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin (No existe el fichero o el directorio)
-	at java.base/java.io.FileOutputStream.open0(Native Method)
-	at java.base/java.io.FileOutputStream.open(FileOutputStream.java:293)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:235)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:184)
-	at org.jetbrains.kotlin.incremental.storage.ExternalizersKt.saveToFile(externalizers.kt:178)
-	at org.jetbrains.kotlin.incremental.classpathDiff.ClasspathSnapshotShrinkerKt.shrinkAndSaveClasspathSnapshot(ClasspathSnapshotShrinker.kt:293)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:76)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:23)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileImpl(IncrementalCompilerRunner.kt:418)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:301)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:128)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:684)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:94)
-	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1810)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
-	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
-	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
-	... 3 more
-
-

android/.kotlin/errors/errors-1772833112491.log

@@ -1,75 +0,0 @@
-kotlin version: 2.2.20
-error message: Daemon compilation failed: null
-java.lang.Exception
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
-	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
-	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
-	at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:74)
-	at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
-	at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
-	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:210)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:205)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:67)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:167)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:60)
-	at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:54)
-	at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
-	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
-	at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)
-	at org.gradle.internal.Factories$1.create(Factories.java:31)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)
-	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)
-	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)
-	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:539)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
-	at java.base/java.lang.Thread.run(Thread.java:840)
-Caused by: java.io.FileNotFoundException: /home/vjrj/proyectos/git-sea/fires_flutter/build/shared_preferences_android/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin (No existe el fichero o el directorio)
-	at java.base/java.io.FileOutputStream.open0(Native Method)
-	at java.base/java.io.FileOutputStream.open(FileOutputStream.java:293)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:235)
-	at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:184)
-	at org.jetbrains.kotlin.incremental.storage.ExternalizersKt.saveToFile(externalizers.kt:178)
-	at org.jetbrains.kotlin.incremental.classpathDiff.ClasspathSnapshotShrinkerKt.shrinkAndSaveClasspathSnapshot(ClasspathSnapshotShrinker.kt:293)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:76)
-	at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.performWorkAfterCompilation(IncrementalJvmCompilerRunner.kt:23)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileImpl(IncrementalCompilerRunner.kt:418)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:301)
-	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:128)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:684)
-	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:94)
-	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1810)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
-	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
-	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
-	... 3 more
-
-

android/app/build.gradle

@@ -12,14 +12,9 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-// Release signing is opt-in: only load key.properties if it exists. Without it
-// (CI analyze/test jobs, contributors) builds fall back to debug signing.
 def keystorePropertiesFile = rootProject.file("key.properties")
 def keystoreProperties = new Properties()
-def hasReleaseKeystore = keystorePropertiesFile.exists()
-if (hasReleaseKeystore) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     compileSdkVersion 36
@@ -34,28 +29,23 @@ android {
         applicationId "org.comunes.fires"
         minSdkVersion flutter.minSdkVersion
         targetSdkVersion 36
-        // versionCode/versionName come from pubspec.yaml (version: X.Y.Z+CODE)
-        // so a `v*` git tag maps the release version, matching the tane flow.
-        versionCode flutter.versionCode
-        versionName flutter.versionName
+        versionCode 9
+        versionName "1.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
-        if (hasReleaseKeystore) {
-            release {
-                keyAlias keystoreProperties['keyAlias']
-                keyPassword keystoreProperties['keyPassword']
-                storeFile file(keystoreProperties['storeFile'])
-                storePassword keystoreProperties['storePassword']
-            }
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
         }
     }
 
     buildTypes {
         release {
-            // Sign with the release key when available, else debug (contributors/CI).
-            signingConfig hasReleaseKeystore ? signingConfigs.release : signingConfigs.debug
+            signingConfig signingConfigs.release
 
             minifyEnabled true
             shrinkResources true
@@ -93,3 +83,5 @@ dependencies {
 }
 
 apply plugin: 'com.google.gms.google-services'
+
+apply plugin: 'com.google.gms.google-services'

android/app/src/main/AndroidManifest.xml

@@ -1,47 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.comunes.fires">
-
-    <!-- The INTERNET permission is required for development. Specifically,
-         flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
-    <application
-        android:label="@string/app_name"
-        android:icon="@mipmap/launch_image"
-        android:enableOnBackInvokedCallback="true">
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
-            <!-- This keeps the window background of the activity showing
-                 until Flutter renders its first frame. It can be removed if
-                 there is no splash screen (such as the default splash screen
-                 defined in @style/LaunchTheme). -->
-            <!-- <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" /> -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

fastlane/Appfile

@@ -1,9 +0,0 @@
-# Google Play identity + credentials for `fastlane supply`.
-#
-# The service-account JSON is injected from CI as the SUPPLY_JSON_KEY_DATA
-# secret (raw file contents) and is NEVER committed. Locally you can instead
-# export SUPPLY_JSON_KEY_DATA, or drop a gitignored play-service-account.json
-# and point json_key_file at it.
-package_name("org.comunes.fires")
-
-json_key_data_raw(ENV["SUPPLY_JSON_KEY_DATA"]) if ENV["SUPPLY_JSON_KEY_DATA"]

fastlane/Fastfile

@@ -1,54 +0,0 @@
-# Fastlane lanes for Tod@s contra el Fuego (org.comunes.fires).
-#
-# Publishing is automated and password-free: a git tag triggers CI, which builds
-# a signed AAB and runs `deploy_play`. Credentials come from CI secrets, never
-# typed by hand:
-#   SUPPLY_JSON_KEY_DATA  Google Play service-account JSON (raw contents)
-#
-# The store listing (titles, descriptions, changelogs, screenshots) is read
-# straight from fastlane/metadata/android/<locale>/.
-
-default_platform(:android)
-
-# Release bundle produced by `flutter build appbundle --release --flavor
-# production`, relative to the project root (where fastlane runs).
-AAB_PATH = "build/app/outputs/bundle/productionRelease/app-production-release.aab".freeze
-
-platform :android do
-  desc "Upload the signed AAB + store listing to Google Play (internal track)"
-  lane :deploy_play do
-    supply(
-      track: "internal",
-      aab: AAB_PATH,
-      release_status: "completed", # internal testing has no review delay
-      skip_upload_apk: true,       # we ship the AAB, not a raw APK
-      skip_upload_changelogs: false,
-    )
-  end
-
-  desc "Push only the store listing (text + images), no binary"
-  lane :deploy_metadata do
-    supply(
-      skip_upload_aab: true,
-      skip_upload_apk: true,
-    )
-  end
-
-  # Promote the release currently on the internal track to production, reusing
-  # the SAME already-reviewed AAB (no rebuild, no new versionCode). Requires the
-  # service account to have "Release to production" permission in Play Console.
-  # Usage:  bundle exec fastlane promote_production
-  desc "Promote the internal-track release to production (no rebuild)"
-  lane :promote_production do
-    supply(
-      track: "internal",
-      track_promote_to: "production",
-      skip_upload_aab: true,
-      skip_upload_apk: true,
-      skip_upload_metadata: true,
-      skip_upload_changelogs: true,
-      skip_upload_images: true,
-      skip_upload_screenshots: true,
-    )
-  end
-end

fastlane/metadata/android/en-US/changelogs/10.txt

@@ -1,2 +0,0 @@
-All Against The Fire! is back. Upgraded to a recent Flutter, stability
-improvements and code cleanup. Fire alerts in your area based on NASA FIRMS data.

fastlane/metadata/android/en-US/full_description.txt

@@ -1,17 +0,0 @@
-All Against The Fire! notifies you about fires detected in an area of your
-interest. It helps the early detection of fires and facilitates local
-mobilization while the professional extinction services arrive.
-
-HOW IT WORKS
-• Pick the area you want to watch.
-• Get notified when a heat spot is detected in that area.
-• See active fires on the map, with their location and time.
-• Share an alert to mobilise people around you.
-
-DATA
-Heat spots come from data and imagery from LANCE FIRMS operated by the
-NASA/GSFC/Earth Science Data and Information System (ESDIS) with funding
-provided by NASA/HQ.
-
-Free software (GNU AGPL-3.0). No ads, non-profit: a community tool to prevent
-and respond to wildfires.

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +0,0 @@
-Fire alerts in your area for early detection and local response.

fastlane/metadata/android/en-US/title.txt

@@ -1 +0,0 @@
-All Against The Fire!

fastlane/metadata/android/es-ES/changelogs/10.txt

@@ -1,3 +0,0 @@
-Vuelve ¡Tod@s contra el Fuego! Actualización a Flutter reciente, mejoras de
-estabilidad y limpieza de código. Avisos de incendios en tu zona basados en
-datos de NASA FIRMS.

fastlane/metadata/android/es-ES/full_description.txt

@@ -1,17 +0,0 @@
-¡Tod@s contra el Fuego! te avisa de los incendios detectados en una zona de tu
-interés. Ayuda a la detección temprana de incendios y facilita la movilización
-local mientras llegan los servicios profesionales de extinción.
-
-CÓMO FUNCIONA
-• Elige la zona que quieres vigilar.
-• Recibe notificaciones cuando se detecta un foco de calor en esa zona.
-• Consulta los incendios activos sobre el mapa, con su ubicación y hora.
-• Comparte un aviso para movilizar a la gente de tu entorno.
-
-DATOS
-Los focos de calor proceden de datos e imágenes de LANCE FIRMS, operado por el
-Sistema de Datos e Información de Ciencias de la Tierra (ESDIS) de NASA/GSFC,
-con financiación de NASA/HQ.
-
-Software libre (GNU AGPL-3.0). Sin anuncios y sin ánimo de lucro: una
-herramienta comunitaria para prevenir y responder a los incendios.

fastlane/metadata/android/es-ES/short_description.txt

@@ -1 +0,0 @@
-Avisos de incendios en tu zona para la detección temprana y la respuesta local.

fastlane/metadata/android/es-ES/title.txt

@@ -1 +0,0 @@
-¡Tod@s contra el Fuego!

fastlane/metadata/android/gl-ES/changelogs/10.txt

@@ -1,3 +0,0 @@
-Volve Tod@s contra o Lume! Actualización a Flutter recente, melloras de
-estabilidade e limpeza de código. Avisos de lumes na túa zona baseados en datos
-de NASA FIRMS.

fastlane/metadata/android/gl-ES/full_description.txt

@@ -1,17 +0,0 @@
-Tod@s contra o Lume! avísache dos lumes detectados nunha zona do teu interese.
-Axuda á detección temperá de incendios e facilita a mobilización local mentres
-chegan os servizos profesionais de extinción.
-
-COMO FUNCIONA
-• Escolle a zona que queres vixiar.
-• Recibe notificacións cando se detecta un foco de calor nesa zona.
-• Consulta os lumes activos sobre o mapa, coa súa localización e hora.
-• Comparte un aviso para mobilizar á xente do teu contorno.
-
-DATOS
-Os focos de calor proceden de datos e imaxes de LANCE FIRMS, operado polo
-Sistema de Datos e Información de Ciencias da Terra (ESDIS) de NASA/GSFC, con
-financiamento de NASA/HQ.
-
-Software libre (GNU AGPL-3.0). Sen anuncios e sen ánimo de lucro: unha
-ferramenta comunitaria para previr e responder aos incendios.

fastlane/metadata/android/gl-ES/short_description.txt

@@ -1 +0,0 @@
-Avisos de lumes na túa zona para a detección temperá e a resposta local.

fastlane/metadata/android/gl-ES/title.txt

@@ -1 +0,0 @@
-Tod@s contra o Lume!

lib/activeFires.dart

@@ -1,22 +1,22 @@
 import 'dart:async';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:redux/redux.dart';
 
 import 'colors.dart';
-import 'fires_spinner.dart';
+import 'firesSpinner.dart';
 import 'generated/i18n.dart';
-import 'generic_map.dart';
-import 'global_fires_bottom_stats.dart';
-import 'location_utils.dart';
-import 'main_drawer.dart';
-import 'models/app_state.dart';
-import 'models/your_location.dart';
-import 'places_autocomplete_utils.dart';
+import 'genericMap.dart';
+import 'globalFiresBottomStats.dart';
+import 'locationUtils.dart';
+import 'mainDrawer.dart';
+import 'models/appState.dart';
+import 'models/yourLocation.dart';
+import 'placesAutocompleteUtils.dart';
 import 'redux/actions.dart';
-import 'widgets/rounded_btn.dart';
 
 @immutable
 class _ViewModel {
@@ -54,7 +54,6 @@ class ActiveFiresPage extends StatefulWidget {
   static const String routeName = '/fires';
 
   @override
-  // ignore: library_private_types_in_public_api
   _ActiveFiresPageState createState() => _ActiveFiresPageState();
 }
 
@@ -114,11 +113,10 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
                 : Icons.notifications_off),
             color: loc.subscribed ? fires600 : null,
             onPressed: () {
-              final YourLocation updatedLoc =
-                  loc.copyWith(subscribed: !loc.subscribed);
-              onToggle(updatedLoc);
+              loc.subscribed = !loc.subscribed;
+              onToggle(loc);
               setState(() {});
-              showSnackMsg(updatedLoc.subscribed
+              showSnackMsg(loc.subscribed
                   ? S.of(context).subscribedToFires
                   : S.of(context).unsubscribedToFires);
             }),
@@ -266,21 +264,19 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
                           return completer.future;
                         })
                     : Center(
-                        child: Column(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: <Widget>[
-                            RoundedBtn(
-                                icon: Icons.location_searching,
-                                text: S.of(context).addYourCurrentPosition,
-                                onPressed: () => onAddYourLocation(view.onAdd),
-                                backColor: fires600),
-                            const SizedBox(height: 26.0),
-                            RoundedBtn(
-                                icon: Icons.edit_location,
-                                text: S.of(context).addSomePlace,
-                                onPressed: () => onAddOtherLocation(view.onAdd),
-                                backColor: fires600),
-                          ])),
+                        child: CenteredColumn(children: <Widget>[
+                        RoundedBtn(
+                            icon: Icons.location_searching,
+                            text: S.of(context).addYourCurrentPosition,
+                            onPressed: () => onAddYourLocation(view.onAdd),
+                            backColor: fires600),
+                        const SizedBox(height: 26.0),
+                        RoundedBtn(
+                            icon: Icons.edit_location,
+                            text: S.of(context).addSomePlace,
+                            onPressed: () => onAddOtherLocation(view.onAdd),
+                            backColor: fires600),
+                      ])),
           );
         });
   }
@@ -291,7 +287,7 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
     Navigator.push(
         context,
         MaterialPageRoute<void>(
-            builder: (BuildContext context) => const GenericMap()));
+            builder: (BuildContext context) => const genericMap()));
   }
 
   void onAddYourLocation(AddYourLocationFunction onAdd) {

lib/compassMapPlugin.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 
@@ -9,7 +10,6 @@ class CompassMapPluginWidget extends StatefulWidget {
   const CompassMapPluginWidget({super.key});
 
   @override
-  // ignore: library_private_types_in_public_api
   _CompassMapPluginWidgetState createState() => _CompassMapPluginWidgetState();
 }
 
@@ -42,9 +42,7 @@ class _CompassMapPluginWidgetState extends State<CompassMapPluginWidget> {
 
   void _checkRotation() {
     try {
-      if (!mounted) {
-        return;
-      }
+      if (!mounted) return;
 
       final double rotation = _mapController.camera.rotation;
       final bool isRotated = rotation.abs() > 0.0;
@@ -78,8 +76,7 @@ class _CompassMapPluginWidgetState extends State<CompassMapPluginWidget> {
                   Positioned(
                     top: 10.0,
                     right: 10.0,
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
+                    child: CenteredRow(
                       children: <Widget>[
                         Column(
                           children: <Widget>[

lib/customStepper.dart

@@ -159,7 +159,6 @@ class CustomStepper extends StatefulWidget {
   final VoidCallback? onCustomStepCancel;
 
   @override
-  // ignore: library_private_types_in_public_api
   _CustomStepperState createState() => _CustomStepperState();
 }
 

lib/fireAlert.dart

@@ -1,13 +1,14 @@
 import 'package:community_material_icon/community_material_icon.dart';
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'custom_stepper.dart';
+import 'customStepper.dart';
 import 'generated/i18n.dart';
-import 'main_drawer.dart';
-import 'models/your_location.dart';
-import 'places_autocomplete_utils.dart';
+import 'mainDrawer.dart';
+import 'models/yourLocation.dart';
+import 'placesAutocompleteUtils.dart';
 
 class FireAlert extends StatefulWidget {
   const FireAlert({super.key});
@@ -15,7 +16,6 @@ class FireAlert extends StatefulWidget {
   static const String routeName = '/fireAlert';
 
   @override
-  // ignore: library_private_types_in_public_api
   _FireAlertState createState() => _FireAlertState();
 }
 
@@ -55,7 +55,7 @@ class _FireAlertState extends State<FireAlert> {
   }
 
   Widget buildTweetButton() {
-    final S strings = S.of(context);
+    final strings = S.of(context);
     return Align(
       alignment: const Alignment(0.0, -0.2),
       child: FloatingActionButton(
@@ -79,7 +79,7 @@ class _FireAlertState extends State<FireAlert> {
   }
 
   List<CustomStep> listWithoutNulls(List<CustomStep> children) =>
-      children.whereType<CustomStep>().toList();
+      children.where(notNull).toList();
 
   @override
   Widget build(BuildContext context) {

lib/fireMarkType.dart

@@ -4,4 +4,4 @@ enum FireMarkType {
   fire,
   industry,
   falsePos
-}
+}

lib/fireMarker.dart

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
 
-import 'fire_mark_type.dart';
-import 'fire_marker_icon.dart';
+import 'fireMarkType.dart';
+import 'fireMarkerIcon.dart';
 
 /// Create a Marker with custom positioning for fires and other map objects
-Marker fireMarker(
+Marker FireMarker(
   LatLng pos,
   FireMarkType type, [
   VoidCallback? onTap,

lib/fireMarkerIcon.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 import 'colors.dart';
-import 'fire_mark_type.dart';
+import 'fireMarkType.dart';
 
 class FireMarkerIcon extends StatelessWidget {
   const FireMarkerIcon(this.type, {super.key});

lib/fireNotificationList.dart

@@ -1,17 +1,18 @@
 import 'dart:async';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
 
-import 'custom_moment.dart';
-import 'fires_spinner.dart';
+import 'customMoment.dart';
+import 'firesSpinner.dart';
 import 'generated/i18n.dart';
-import 'generic_map.dart';
-import 'main_drawer.dart';
-import 'models/app_state.dart';
-import 'models/fire_notification.dart';
-import 'models/your_location.dart';
+import 'genericMap.dart';
+import 'mainDrawer.dart';
+import 'models/appState.dart';
+import 'models/fireNotification.dart';
+import 'models/yourLocation.dart';
 import 'redux/actions.dart';
 
 @immutable
@@ -56,7 +57,6 @@ class FireNotificationList extends StatefulWidget {
   static const String routeName = '/fireNotifications';
 
   @override
-  // ignore: library_private_types_in_public_api
   _FireNotificationListState createState() => _FireNotificationListState();
 }
 
@@ -209,24 +209,20 @@ class _FireNotificationListState extends State<FireNotificationList> {
                           child: Card(
                               child: Padding(
                                   padding: const EdgeInsets.all(20.0),
-                                  child: Column(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.center,
-                                      children: <Widget>[
-                                        const Icon(Icons.notifications_none,
-                                            size: 150.0, color: Colors.black26),
-                                        const SizedBox(height: 20.0),
-                                        Text(
-                                            S
-                                                .of(context)
-                                                .fireNotificationsDescription,
-                                            textAlign: TextAlign.center,
-                                            textScaler:
-                                                const TextScaler.linear(1.1),
-                                            style: const TextStyle(
-                                                height: 1.3,
-                                                color: Colors.black45))
-                                      ]))))
+                                  child: CenteredColumn(children: <Widget>[
+                                    const Icon(Icons.notifications_none,
+                                        size: 150.0, color: Colors.black26),
+                                    const SizedBox(height: 20.0),
+                                    Text(
+                                        S
+                                            .of(context)
+                                            .fireNotificationsDescription,
+                                        textAlign: TextAlign.center,
+                                        textScaler:
+                                            const TextScaler.linear(1.1),
+                                        style: const TextStyle(
+                                            height: 1.3, color: Colors.black45))
+                                  ]))))
                       : _buildSavedFireNotifications(
                           context,
                           view.yourLocations,
@@ -242,7 +238,7 @@ class _FireNotificationListState extends State<FireNotificationList> {
     Navigator.push(
         context,
         MaterialPageRoute<void>(
-            builder: (BuildContext context) => const GenericMap()));
+            builder: (BuildContext context) => const genericMap()));
   }
 
   Future<void> _showConfirmDialog(_ViewModel view) {

lib/firesApp.dart

@@ -1,23 +1,23 @@
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
 
-import 'active_fires.dart';
-import 'fire_alert.dart';
-import 'fire_notification_list.dart';
+import 'activeFires.dart';
+import 'fireAlert.dart';
+import 'fireNotificationList.dart';
 import 'generated/i18n.dart';
 import 'globals.dart';
-import 'home_page.dart';
-import 'intro_page.dart';
-import 'models/app_state.dart';
-import 'monitored_areas.dart';
-import 'privacy_page.dart';
+import 'homePage.dart';
+import 'introPage.dart';
+import 'models/appState.dart';
+import 'monitoredAreas.dart';
+import 'privacyPage.dart';
 import 'sandbox.dart';
-import 'support_page.dart';
+import 'supportPage.dart';
 import 'theme.dart';
-import 'theme_dev.dart';
-import 'widgets/material_app_with_intro.dart';
+import 'themeDev.dart';
 
 class FiresApp extends StatefulWidget {
   const FiresApp(this.store, {super.key});
@@ -25,7 +25,6 @@ class FiresApp extends StatefulWidget {
   final Store<AppState> store;
 
   @override
-  // ignore: library_private_types_in_public_api
   _FiresAppState createState() => _FiresAppState();
 }
 
@@ -60,7 +59,7 @@ class _FiresAppState extends State<FiresApp> {
 
   @override
   Widget build(BuildContext context) {
-    const StatefulWidget home = MaterialAppWithIntroHome(
+    final StatefulWidget home = MaterialAppWithIntroHome(
         introWidget, continueWidget, 'showInitialWizard-2018-06-27-01');
     return StoreProvider<AppState>(
         store: store,

lib/genericMap.dart

@@ -1,33 +1,33 @@
 import 'dart:core';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:latlong2/latlong.dart';
-// ignore: implementation_imports
 import 'package:redux/src/store.dart';
 import 'package:share_plus/share_plus.dart';
 
-import 'attribution_map_plugin.dart';
+import 'attributionMapPlugin.dart';
 import 'colors.dart';
-import 'compass_map_plugin.dart';
-import 'custom_moment.dart';
-import 'dummy_map_plugin.dart';
-import 'fire_mark_type.dart';
-import 'fire_marker.dart';
+import 'compassMapPlugin.dart';
+import 'customMoment.dart';
+import 'dummyMapPlugin.dart';
+import 'fireMarkType.dart';
+import 'fireMarker.dart';
 import 'generated/i18n.dart';
-import 'generic_map_bottom.dart';
+import 'genericMapBottom.dart';
 import 'globals.dart' as globals;
-import 'layer_selector_map_plugin.dart';
-import 'location_utils.dart';
-import 'models/app_state.dart';
-import 'models/false_positive_types.dart';
-import 'models/fire_notification.dart';
-import 'models/your_location.dart';
+import 'layerSelectorMapPlugin.dart';
+import 'locationUtils.dart';
+import 'models/appState.dart';
+import 'models/falsePositiveTypes.dart';
+import 'models/fireNotification.dart';
+import 'models/yourLocation.dart';
 import 'redux/actions.dart';
-import 'sentry_report.dart';
+import 'sentryReport.dart';
 import 'slider.dart';
-import 'zoom_map_plugin.dart';
+import 'zoomMapPlugin.dart';
 
 @immutable
 class _ViewModel {
@@ -72,14 +72,14 @@ class _ViewModel {
   int get hashCode => serverUrl.hashCode ^ lang.hashCode ^ mapState.hashCode;
 }
 
-class GenericMap extends StatefulWidget {
-  const GenericMap({super.key});
+class genericMap extends StatefulWidget {
+  const genericMap({super.key});
 
   @override
-  GenericMapState createState() => GenericMapState();
+  _genericMapState createState() => _genericMapState();
 }
 
-class GenericMapState extends State<GenericMap> {
+class _genericMapState extends State<genericMap> {
   // This needs to be stateful so when resizes don't get a new globalkey
   // https://github.com/flutter/flutter/issues/1632#issuecomment-180478202
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
@@ -100,12 +100,12 @@ class GenericMapState extends State<GenericMap> {
                 store.dispatch(SubscribeAction());
               },
               onSubsConfirmed: (YourLocation loc) {
-                store.dispatch(
-                    SubscribeConfirmAction(loc.copyWith(subscribed: true)));
+                loc.subscribed = true;
+                store.dispatch(SubscribeConfirmAction(loc));
               },
               onUnSubs: (YourLocation loc) {
-                store.dispatch(
-                    UnSubscribeAction(loc.copyWith(subscribed: false)));
+                loc.subscribed = false;
+                store.dispatch(UnSubscribeAction(loc));
               },
               onSlide: (YourLocation loc) {
                 store.dispatch(UpdateYourLocationMapAction(loc));
@@ -334,8 +334,7 @@ class GenericMapState extends State<GenericMap> {
                           top: constraints.maxHeight - 200,
                           right: 10.0,
                           left: 10.0,
-                          child: Row(
-                              mainAxisAlignment: MainAxisAlignment.center,
+                          child: CenteredRow(
                               // Fit sample:
                               // https://github.com/apptreesoftware/flutter_map/blob/master/flutter_map_example/lib/pages/map_controller.dart
                               children: status ==
@@ -349,8 +348,7 @@ class GenericMapState extends State<GenericMap> {
                                               _location?.distance ?? 0,
                                           onSlide: (int distance) {
                                             if (_location != null) {
-                                              _location = _location!
-                                                  .copyWith(distance: distance);
+                                              _location!.distance = distance;
                                               view.onSlide(_location!);
                                             }
                                           })
@@ -361,16 +359,11 @@ class GenericMapState extends State<GenericMap> {
         });
   }
 
-  // ignore: library_private_types_in_public_api
   List<Widget> buildAppBarActions(
-      FireMapStatus status,
-      // ignore: library_private_types_in_public_api
-      _ViewModel view,
-      YourLocation location) {
+      FireMapStatus status, _ViewModel view, YourLocation location) {
     switch (status) {
       case FireMapStatus.view:
       case FireMapStatus.unsubscribe:
-      case FireMapStatus.subscriptionConfirm:
         return <Widget>[
           IconButton(
               icon: const Icon(Icons.edit),
@@ -391,6 +384,8 @@ class GenericMapState extends State<GenericMap> {
                     '${view.mapState.fireNotification?.description ?? 'Fire'}. ${view.serverUrl}fire/${view.mapState.fireNotification?.sealed ?? ''}');
               })
         ];
+      default:
+        return <Widget>[];
     }
   }
 
@@ -404,83 +399,73 @@ class GenericMapState extends State<GenericMap> {
     final List<Marker> markers = <Marker>[];
     // Debug: building markers: fires: ${fires.length} falsePos: ${falsePosList.length} industries: ${industries.length}, isNotif: $isNotif
     // const calibrate = false; // useful when we change the fire icons size
-    for (final dynamic falsePos in falsePosList) {
+    for (final falsePos in falsePosList) {
       try {
-        final Map<String, dynamic> falsePosMap =
-            falsePos as Map<String, dynamic>;
-        final Map<String, dynamic> geo =
-            falsePosMap['geo'] as Map<String, dynamic>;
-        final List<dynamic> coords = geo['coordinates'] as List<dynamic>;
+        final List<dynamic> coords =
+            falsePos['geo']['coordinates'] as List<dynamic>;
         // print('false pos: ${coords}');
         final LatLng loc = LatLng(
             (coords[1] as num).toDouble(), (coords[0] as num).toDouble());
-        markers.add(fireMarker(loc, FireMarkType.falsePos, () {
+        markers.add(FireMarker(loc, FireMarkType.falsePos, () {
           _showFalsePositiveDialog(loc);
         }));
-        // if (calibrate) markers.add(fireMarker(loc, FireMarkType.pixel));
+        // if (calibrate) markers.add(FireMarker(loc, FireMarkType.pixel));
       } catch (e, stackTrace) {
         reportError(e, stackTrace);
       }
     }
-    for (final dynamic industry in industries) {
+    for (final industry in industries) {
       try {
         // print(fire['geo']['coordinates']);
-        final Map<String, dynamic> industryMap =
-            industry as Map<String, dynamic>;
-        final dynamic geoData = industryMap['geo'];
-        final Map<String, dynamic> geo = geoData as Map<String, dynamic>;
-        final List<dynamic> coords = geo['coordinates'] as List<dynamic>;
+        final List<dynamic> coords =
+            industry['geo']['coordinates'] as List<dynamic>;
         final LatLng loc = LatLng(
             (coords[1] as num).toDouble(), (coords[0] as num).toDouble());
-        markers.add(fireMarker(loc, FireMarkType.industry, () {
+        markers.add(FireMarker(loc, FireMarkType.industry, () {
           _showIndustryDialog(loc);
         }));
-        // if (calibrate) markers.add(fireMarker(loc, FireMarkType.pixel));
+        // if (calibrate) markers.add(FireMarker(loc, FireMarkType.pixel));
       } catch (e, stackTrace) {
         reportError(e, stackTrace);
       }
     }
-    for (final dynamic fire in fires) {
+    for (final fire in fires) {
       try {
-        final Map<String, dynamic> fireMap = fire as Map<String, dynamic>;
-        final dynamic lat = fireMap['lat'];
-        final dynamic lon = fireMap['lon'];
-        final dynamic when = fireMap['when'];
-        final dynamic type = fireMap['type'];
-        final LatLng loc =
-            LatLng((lat as num).toDouble(), (lon as num).toDouble());
-        markers.add(fireMarker(loc, FireMarkType.fire, () {
-          onFirePressed(loc, DateTime.parse(when.toString()), type as String);
+        final LatLng loc = LatLng(
+            (fire['lat'] as num).toDouble(), (fire['lon'] as num).toDouble());
+        markers.add(FireMarker(loc, FireMarkType.fire, () {
+          onFirePressed(loc, DateTime.parse(fire['when'].toString()),
+              fire['type'] as String);
         }));
-        markers.add(fireMarker(loc, FireMarkType.pixel));
+        markers.add(FireMarker(loc, FireMarkType.pixel));
       } catch (e, stackTrace) {
         reportError(e, stackTrace);
       }
     }
     markers.add(
-        fireMarker(pos, isNotif ? FireMarkType.fire : FireMarkType.position));
-    // if (calibrate) markers.add(fireMarker(pos, FireMarkType.pixel));
+        FireMarker(pos, isNotif ? FireMarkType.fire : FireMarkType.position));
+    // if (calibrate) markers.add(FireMarker(pos, FireMarkType.pixel));
     return markers;
   }
 
   void _showFireDialog(LatLng pos, DateTime date, String type) {
     final String when = Moment.fromDate(date).fromNow(context);
-    final S strings = S.of(context);
-    final String by =
-        type == 'vecinal' ? strings.byOurUsers : strings.byNASAsatellites;
     getReverseLocation(lat: pos.latitude, lon: pos.longitude)
         .then((String reverseLoc) {
+      final String by = type == 'vecinal'
+          ? S.of(context).byOurUsers
+          : S.of(context).byNASAsatellites;
       final String fireDesc =
-          strings.additionalInfoAboutFire(reverseLoc, when, by);
+          S.of(context).additionalInfoAboutFire(reverseLoc, when, by);
       showDialog<bool>(
           context: _scaffoldKey.currentContext!,
           builder: (_) => AlertDialog(
                 content: Text(fireDesc),
                 actions: <Widget>[
                   TextButton(
-                    child: Text(strings.CLOSE),
+                    child: Text(S.of(context).CLOSE),
                     onPressed: () {
-                      Navigator.pop(_scaffoldKey.currentContext!);
+                      Navigator.pop(context);
                     },
                   ),
                 ],
@@ -489,22 +474,21 @@ class GenericMapState extends State<GenericMap> {
   }
 
   void _showIndustryDialog(LatLng pos) {
-    final S strings = S.of(context);
     getReverseLocation(lat: pos.latitude, lon: pos.longitude)
         .then((String reverseLoc) {
-      final String industryDesc = '${strings.itSeemsAIndustry}\n\n'
+      final String industryDesc = '${S.of(context).itSeemsAIndustry}\n\n'
           'Type: Industry\n'
           'Location: $reverseLoc';
       showDialog<bool>(
           context: _scaffoldKey.currentContext!,
           builder: (_) => AlertDialog(
-                title: Text(strings.notAWildfire),
+                title: Text(S.of(context).notAWildfire),
                 content: Text(industryDesc),
                 actions: <Widget>[
                   TextButton(
-                    child: Text(strings.CLOSE),
+                    child: Text(S.of(context).CLOSE),
                     onPressed: () {
-                      Navigator.pop(_scaffoldKey.currentContext!);
+                      Navigator.pop(context);
                     },
                   ),
                 ],
@@ -513,22 +497,21 @@ class GenericMapState extends State<GenericMap> {
   }
 
   void _showFalsePositiveDialog(LatLng pos) {
-    final S strings = S.of(context);
     getReverseLocation(lat: pos.latitude, lon: pos.longitude)
         .then((String reverseLoc) {
-      final String falseDesc = '${strings.itSeemsNotAtForesFire}\n\n'
+      final String falseDesc = '${S.of(context).itSeemsNotAtForesFire}\n\n'
           'Type: False Positive\n'
           'Location: $reverseLoc';
       showDialog<bool>(
           context: _scaffoldKey.currentContext!,
           builder: (_) => AlertDialog(
-                title: Text(strings.notAWildfire),
+                title: Text(S.of(context).notAWildfire),
                 content: Text(falseDesc),
                 actions: <Widget>[
                   TextButton(
-                    child: Text(strings.CLOSE),
+                    child: Text(S.of(context).CLOSE),
                     onPressed: () {
-                      Navigator.pop(_scaffoldKey.currentContext!);
+                      Navigator.pop(context);
                     },
                   ),
                 ],

lib/genericMapBottom.dart

@@ -1,17 +1,17 @@
 import 'dart:async';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 
 import 'colors.dart';
-import 'custom_bottom_app_bar.dart';
-import 'custom_moment.dart';
+import 'customBottomAppBar.dart';
+import 'customMoment.dart';
 import 'generated/i18n.dart';
-import 'models/app_state.dart';
-import 'models/false_positive_types.dart';
-import 'models/fire_map_state.dart';
-import 'models/fire_notification.dart';
-import 'models/your_location.dart';
-import 'utils/widget_utils.dart';
+import 'models/appState.dart';
+import 'models/falsePositiveTypes.dart';
+import 'models/fireMapState.dart';
+import 'models/fireNotification.dart';
+import 'models/yourLocation.dart';
 
 typedef OnSave = void Function();
 typedef OnCancel = void Function();
@@ -70,7 +70,7 @@ class GenericMapBottom extends StatelessWidget {
                   padding: const EdgeInsets.all(10.0),
                   child: Column(
                       mainAxisSize: MainAxisSize.min,
-                      children: compactWidgets(<Widget?>[
+                      children: listWithoutNulls(<Widget?>[
                         Text(notif.description),
                         // TODOfire type (neighbout, NASA, etc)
                         const SizedBox(height: 5.0),
@@ -112,20 +112,17 @@ class GenericMapBottom extends StatelessWidget {
                               return DropdownMenuItem<FalsePositiveType>(
                                   value: value, child: Text(menuText));
                             }).toList(),
-                            onChanged: (FalsePositiveType? value) {
-                              final S strings = S.of(context);
-                              final ScaffoldMessengerState messenger =
-                                  ScaffoldMessenger.of(context);
+                            onChanged: (FalsePositiveType? value) async {
                               if (value != null) {
                                 onFalsePositive(notif, value);
                               }
-                              Future<void>.delayed(
-                                      const Duration(milliseconds: 500))
-                                  .then((_) {
-                                messenger.showSnackBar(SnackBar(
-                                  content: Text(strings.thanksForParticipating),
-                                ));
-                              });
+                              await Future<void>.delayed(
+                                  const Duration(milliseconds: 500));
+                              ScaffoldMessenger.of(context)
+                                  .showSnackBar(SnackBar(
+                                content:
+                                    Text(S.of(context).thanksForParticipating),
+                              ));
                             }),
                       ] as List<Widget>)))));
         }

lib/globalFiresBottomStats.dart

@@ -5,15 +5,14 @@ import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
 
 import 'colors.dart';
-import 'custom_bottom_app_bar.dart';
-import 'custom_moment.dart';
+import 'customBottomAppBar.dart';
+import 'customMoment.dart';
 import 'generated/i18n.dart';
 
 class GlobalFiresBottomStats extends StatefulWidget {
   const GlobalFiresBottomStats({super.key});
 
   @override
-  // ignore: library_private_types_in_public_api
   _GlobalFiresBottomStatsState createState() => _GlobalFiresBottomStatsState();
 }
 
@@ -31,18 +30,13 @@ class _GlobalFiresBottomStatsState extends State<GlobalFiresBottomStats> {
         .then((String result) {
       try {
         final Moment now = Moment.now();
-        final dynamic decodedResult = json.decode(result);
-        final Map<String, dynamic> resultMap =
-            decodedResult as Map<String, dynamic>;
-        final DateTime last = DateTime.parse(resultMap['value'] as String);
+        final DateTime last =
+            DateTime.parse(json.decode(result)['value'] as String);
         http
             .read(Uri.parse('${firesApiUrl}status/active-fires-count'))
             .then((String result) {
           try {
-            final dynamic decodedCountResult = json.decode(result);
-            final Map<String, dynamic> countMap =
-                decodedCountResult as Map<String, dynamic>;
-            final int count = (countMap['total'] as num).toInt();
+            final int count = (json.decode(result)['total'] as num).toInt();
             setState(() {
               lastCheck = now.from(context, last);
               activeFires = count;

lib/homePage.dart

@@ -1,26 +1,26 @@
 import 'dart:async';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:get_it/get_it.dart';
 import 'package:redux/redux.dart';
 
-import 'active_fires.dart';
+import 'activeFires.dart';
 import 'colors.dart';
-import 'fire_alert.dart';
-import 'fire_notification_list.dart';
-import 'fires_spinner.dart';
+import 'fireAlert.dart';
+import 'fireNotificationList.dart';
+import 'firesSpinner.dart';
 import 'generated/i18n.dart';
-import 'main_drawer.dart';
-import 'models/app_state.dart';
-import 'models/fire_notification.dart';
-import 'object_id_utils.dart';
+import 'mainDrawer.dart';
+import 'models/appState.dart';
+import 'models/fireNotification.dart';
+import 'objectIdUtils.dart';
 import 'redux/actions.dart';
 
-@immutable
 class _ViewModel {
-  const _ViewModel({required this.isLoaded});
+  _ViewModel({required this.isLoaded});
   final bool isLoaded;
 
   @override
@@ -39,7 +39,6 @@ class HomePage extends StatefulWidget {
   static const String routeName = '/home';
 
   @override
-  // ignore: library_private_types_in_public_api
   _HomePageState createState() => _HomePageState();
 }
 
@@ -170,52 +169,47 @@ class _HomePageState extends State<HomePage> {
                   ? const FiresSpinner()
                   : SafeArea(
                       child: Center(
-                          child: Column(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: <Widget>[
-                            Row(children: <Widget>[
-                              IconButton(
-                                  onPressed: () {
-                                    _scaffoldKey.currentState?.openDrawer();
-                                  },
-                                  icon: const Icon(Icons.menu,
-                                      size: 30.0, color: Colors.black38)),
-                            ]),
-                            Expanded(
-                                child: FractionallySizedBox(
-                                    alignment: FractionalOffset.center,
-                                    heightFactor: 0.7,
-                                    child: Image.asset('images/logo-200.png',
-                                        fit: BoxFit.fitHeight))),
-                            Expanded(
-                                child: FractionallySizedBox(
-                                    alignment: FractionalOffset.topCenter,
-                                    heightFactor: 1.0,
-                                    child: Column(
-                                      children: <Widget>[
-                                        Padding(
-                                            padding: const EdgeInsets.symmetric(
-                                                vertical: 10.0,
-                                                horizontal: 20.0),
-                                            child: FittedBox(
-                                              fit: BoxFit.scaleDown,
-                                              child: Text(S.of(context).appName,
-                                                  maxLines: 2,
-                                                  textAlign: TextAlign.center,
-                                                  style: _homeFont),
-                                            )),
-                                      ],
-                                    )))
-                          ])),
+                          child: CenteredColumn(children: <Widget>[
+                        Row(children: <Widget>[
+                          IconButton(
+                              onPressed: () {
+                                _scaffoldKey.currentState?.openDrawer();
+                              },
+                              icon: const Icon(Icons.menu,
+                                  size: 30.0, color: Colors.black38)),
+                        ]),
+                        Expanded(
+                            child: FractionallySizedBox(
+                                alignment: FractionalOffset.center,
+                                heightFactor: 0.7,
+                                child: Image.asset('images/logo-200.png',
+                                    fit: BoxFit.fitHeight))),
+                        Expanded(
+                            child: FractionallySizedBox(
+                                alignment: FractionalOffset.topCenter,
+                                heightFactor: 1.0,
+                                child: Column(
+                                  children: <Widget>[
+                                    Padding(
+                                        padding: const EdgeInsets.symmetric(
+                                            vertical: 10.0, horizontal: 20.0),
+                                        child: FittedBox(
+                                          fit: BoxFit.scaleDown,
+                                          child: Text(S.of(context).appName,
+                                              maxLines: 2,
+                                              textAlign: TextAlign.center,
+                                              style: _homeFont),
+                                        )),
+                                  ],
+                                )))
+                      ])),
                     ));
         });
   }
 
   void _showItemDialog(Map<String, dynamic> message, FireNotification notif) {
     final BuildContext? context = _scaffoldKey.currentContext;
-    if (context == null) {
-      return;
-    }
+    if (context == null) return;
     showDialog<bool>(
       context: context,
       builder: (_) => _buildDialog(context, notif),
@@ -223,7 +217,8 @@ class _HomePageState extends State<HomePage> {
       if (shouldNavigate ?? false) {
         _navigateToItemDetail(message);
       }
-    }).catchError((Object e) {});
+    }).catchError((Object e) {
+    });
   }
 
   Widget _buildDialog(BuildContext context, FireNotification item) {
@@ -248,9 +243,7 @@ class _HomePageState extends State<HomePage> {
 
   void _navigateToItemDetail(Map<String, dynamic> message) {
     final BuildContext? context = _scaffoldKey.currentContext;
-    if (context == null) {
-      return;
-    }
+    if (context == null) return;
     // Clear away dialogs
     Navigator.popUntil(context, (Route<dynamic> route) => route is PageRoute);
     /* if (!notif.getRoute(store).isCurrent) {

lib/introPage.dart

@@ -1,8 +1,8 @@
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 
 import 'generated/i18n.dart';
-import 'home_page.dart';
-import 'widgets/app_intro_page.dart';
+import 'homePage.dart';
 
 class IntroPage extends AppIntroPage {
   IntroPage({super.key})
@@ -10,9 +10,9 @@ class IntroPage extends AppIntroPage {
             items: _fireItems,
             onIntroFinish: (BuildContext context) =>
                 Navigator.pushNamed(context, HomePage.routeName));
-  static String routeName = '/intro';
+  static const String routeName = '/intro';
 
-  static List<AppIntroItem> _fireItems(BuildContext context) => <AppIntroItem>[
+  static final _fireItems = (BuildContext context) => <AppIntroItem>[
         AppIntroItem(
             icon: Icons.location_on, title: S.of(context).chooseAPlace),
         AppIntroItem(

lib/layerSelectorMapPlugin.dart

@@ -1,9 +1,10 @@
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:redux/redux.dart';
 
-import 'models/app_state.dart';
-import 'redux/fire_map_actions.dart';
+import 'models/appState.dart';
+import 'redux/fireMapActions.dart';
 
 /// Layer selector widget for changing map layers
 class LayerSelectorMapPluginWidget extends StatelessWidget {
@@ -18,11 +19,10 @@ class LayerSelectorMapPluginWidget extends StatelessWidget {
               Positioned(
                 top: constraints.maxHeight - 60,
                 left: 10.0,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
+                child: CenteredRow(
                   children: <Widget>[
                     Column(
-                      children: <Widget>[_layerSelectorButton(store)],
+                      children: <Widget>[_LayerSelectorButton(store)],
                     )
                   ],
                 ),
@@ -30,9 +30,8 @@ class LayerSelectorMapPluginWidget extends StatelessWidget {
             ]));
   }
 
-  Widget _layerSelectorButton(Store<AppState> store) {
-    final GlobalKey<PopupMenuButtonState<FireMapLayer>> key =
-        GlobalKey<PopupMenuButtonState<FireMapLayer>>();
+  Widget _LayerSelectorButton(Store<AppState> store) {
+    final GlobalKey<PopupMenuButtonState<FireMapLayer>> key = GlobalKey<PopupMenuButtonState<FireMapLayer>>();
 
     return PopupMenuButton<FireMapLayer>(
       key: key,

lib/locationUtils.dart

@@ -7,7 +7,7 @@ import 'package:location/location.dart';
 import 'package:objectid/objectid.dart';
 
 import 'generated/i18n.dart';
-import 'models/your_location.dart';
+import 'models/yourLocation.dart';
 
 Future<YourLocation> getUserLocation(
     GlobalKey<ScaffoldState> scaffoldKey) async {
@@ -18,17 +18,17 @@ Future<YourLocation> getUserLocation(
     final LocationData location = await location0.getLocation();
 
     // It seems that the lib fails with lat/lon values
-    YourLocation yl = YourLocation(
+    final YourLocation yl = YourLocation(
         id: ObjectId(), lat: location.latitude!, lon: location.longitude!);
     String address;
     try {
       address = await getReverseLocation(lat: yl.lat, lon: yl.lon);
-      yl = yl.copyWith(description: address);
+      yl.description = address;
     } catch (e) {
       try {
         address =
             await getReverseLocation(lat: yl.lat, lon: yl.lon, external: true);
-        yl = yl.copyWith(description: address);
+        yl.description = address;
       } catch (_) {
         // Ignore - fallback already attempted
       }
@@ -37,19 +37,15 @@ Future<YourLocation> getUserLocation(
   } on PlatformException catch (e) {
     final BuildContext? context = scaffoldKey.currentContext;
     if (context != null) {
-      // ignore: use_build_context_synchronously
-      final S strings = S.of(context);
-      // ignore: use_build_context_synchronously
-      final ScaffoldMessengerState messenger = ScaffoldMessenger.of(context);
       if (e.code == 'PERMISSION_DENIED') {
-        messenger.showSnackBar(SnackBar(
-          content: Text(strings.notPermsUbication),
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+          content: Text(S.of(context).notPermsUbication),
         ));
       } else if (e.code == 'PERMISSION_DENIED_NEVER_ASK') {
         // User selected "Don't ask again" - show settings prompt
       }
-      messenger.showSnackBar(SnackBar(
-        content: Text(strings.isYourUbicationEnabled),
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+        content: Text(S.of(context).isYourUbicationEnabled),
       ));
     }
     return YourLocation.noLocation;

lib/mainCommon.dart

@@ -1,19 +1,19 @@
 import 'dart:async';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:redux/redux.dart';
 
-import 'fires_app.dart';
+import 'firesApp.dart';
 import 'globals.dart' as globals;
-import 'models/app_state.dart';
-import 'models/fires_api.dart';
-import 'redux/fetch_data_middleware.dart';
+import 'models/appState.dart';
+import 'models/firesApi.dart';
+import 'redux/fetchDataMiddleware.dart';
 import 'redux/reducers.dart';
-import 'sentry_report.dart';
-import 'utils/secret_loader.dart';
+import 'sentryReport.dart';
 
 Future<PackageInfo> loadPackageInfo() async {
   final PackageInfo packageInfo = await PackageInfo.fromPlatform();
@@ -45,8 +45,7 @@ Future<void> mainCommon(List<Middleware<AppState>> otherMiddleware) async {
               firesApiKey: secrets['firesApiKey'] as String,
               serverUrl: secrets['firesApiUrl'] as String,
               firesApiUrl: "${secrets['firesApiUrl'] as String}api/v1/"),
-          middleware: List<Middleware<AppState>>.from(otherMiddleware)
-            ..add(fetchDataMiddleware));
+          middleware: List.from(otherMiddleware)..add(fetchDataMiddleware));
 
       getIt.registerSingleton<Store<AppState>>(store);
       getIt.registerSingleton<String>(store.state.firesApiUrl,

lib/mainDev.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:redux/redux.dart';
 
 import 'globals.dart' as globals;
-import 'main_common.dart';
+import 'mainCommon.dart';
 
 enum LogLevel { none, actions, all }
 

lib/mainDrawer.dart

@@ -1,20 +1,19 @@
 import 'package:badges/badges.dart' as badges_pkg;
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
-// ignore: implementation_imports
 import 'package:redux/src/store.dart';
 
-import 'active_fires.dart';
+import 'activeFires.dart';
 import 'colors.dart';
-import 'fire_alert.dart';
-import 'fire_notification_list.dart';
+import 'fireAlert.dart';
+import 'fireNotificationList.dart';
 import 'generated/i18n.dart';
 import 'globals.dart' as globals;
-import 'models/app_state.dart';
-import 'monitored_areas.dart';
-import 'privacy_page.dart';
+import 'models/appState.dart';
+import 'monitoredAreas.dart';
+import 'privacyPage.dart';
 import 'sandbox.dart';
-import 'support_page.dart';
+import 'supportPage.dart';
 
 @immutable
 class _ViewModel {

lib/mainProd.dart

@@ -1,11 +1,10 @@
-// ignore: implementation_imports
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:redux/src/store.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'globals.dart' as globals;
-import 'main_common.dart';
-import 'models/app_state.dart';
-import 'utils/secret_loader.dart';
+import 'mainCommon.dart';
+import 'models/appState.dart';
 
 Future<void> main() async {
   globals.isDevelopment = false;

lib/markdownPage.dart

@@ -5,7 +5,7 @@ import 'package:flutter/services.dart' show rootBundle;
 import 'package:flutter_markdown/flutter_markdown.dart';
 
 import 'globals.dart' as globals;
-import 'main_drawer.dart';
+import 'mainDrawer.dart';
 
 abstract class MarkdownPage extends StatefulWidget {
   const MarkdownPage(
@@ -18,7 +18,6 @@ abstract class MarkdownPage extends StatefulWidget {
   final String route;
 
   @override
-  // ignore: library_private_types_in_public_api
   _MarkdownPageState createState() => _MarkdownPageState();
 }
 

lib/models/appState.dart

@@ -1,20 +1,20 @@
 import 'dart:async';
 
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:meta/meta.dart';
 
-import '../utils/widget_utils.dart';
-import 'fire_map_state.dart';
-import 'fire_notification.dart';
+import 'fireMapState.dart';
+import 'fireNotification.dart';
 import 'user.dart';
-import 'your_location.dart';
+import 'yourLocation.dart';
 
-export 'fire_map_state.dart';
+export 'fireMapState.dart';
 
-part 'app_state.g.dart';
+part 'appState.g.dart';
 
 @immutable
 @JsonSerializable()

lib/models/appState.g.dart

@@ -1,6 +1,7 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
 
-part of 'app_state.dart';
+part of 'appState.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/models/basicLocation.dart

@@ -1,10 +1,8 @@
-import 'package:meta/meta.dart';
-
-@immutable
 class BasicLocation implements Comparable<BasicLocation> {
+
 //  static BasicLocation noLocation = new BasicLocation(lat: 0.0, lon: 0.0);
 
-  const BasicLocation({required this.lat, required this.lon, this.description});
+  BasicLocation({required this.lat, required this.lon, this.description});
 
   BasicLocation.fromJson(Map<String, dynamic> json)
       : lat = (json['lat'] as num).toDouble(),
@@ -20,8 +18,7 @@ class BasicLocation implements Comparable<BasicLocation> {
   }
 
   @override
-  bool operator ==(Object other) =>
-      other is BasicLocation && other.lat == lat && other.lon == lon;
+  bool operator ==(Object o) => o is BasicLocation && o.lat == lat && o.lon == lon;
 
   @override
   int get hashCode {

lib/models/falsePositiveTypes.dart

@@ -0,0 +1 @@
+enum FalsePositiveType { industry, controled, falsealarm }

lib/models/false_positive_types.dart

@@ -1 +0,0 @@
-enum FalsePositiveType { industry, controled, falsealarm }

lib/models/fireMapState.dart

@@ -1,7 +1,7 @@
 import 'package:meta/meta.dart';
 
-import 'fire_notification.dart';
-import 'your_location.dart';
+import 'fireNotification.dart';
+import 'yourLocation.dart';
 
 enum FireMapStatus {
   view,

lib/models/fireNotification.dart

@@ -1,16 +1,16 @@
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:objectid/objectid.dart';
 
-import '../object_id_utils.dart';
-import '../utils/widget_utils.dart';
+import '../objectIdUtils.dart';
 
-part 'fire_notification.g.dart';
+part 'fireNotification.g.dart';
 
-@immutable
-@JsonSerializable()
+@JsonSerializable(nullable: false)
 class FireNotification {
-  const FireNotification(
+
+  FireNotification(
       {required this.id,
       required this.lat,
       required this.lon,
@@ -23,7 +23,7 @@ class FireNotification {
   factory FireNotification.fromJson(Map<String, dynamic> json) =>
       _$FireNotificationFromJson(json);
   @JsonKey(toJson: objectIdToJson, fromJson: objectIdFromJson)
-  final ObjectId id;
+  ObjectId id;
   final double lat;
   final double lon;
   final String description;

lib/models/fireNotification.g.dart

@@ -1,6 +1,7 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
 
-part of 'fire_notification.dart';
+part of 'fireNotification.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/models/fireNotificationsPersist.dart

@@ -1,20 +1,19 @@
 import 'dart:async';
 import 'dart:convert';
 
-// ignore: implementation_imports
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:shared_preferences/src/shared_preferences_legacy.dart';
 
 import '../globals.dart' as globals;
-import 'fire_notification.dart';
+import 'fireNotification.dart';
 
 const String fireNotificationKey = 'fireNotifications';
 
 Future<List<FireNotification>> loadFireNotifications() async {
   return globals.prefs.then((SharedPreferences prefs) {
-    final List<String>? fireNotifications =
-        prefs.getStringList(fireNotificationKey);
+    final List<String>? FireNotifications = prefs.getStringList(fireNotificationKey);
     final List<FireNotification> persistedList = <FireNotification>[];
-    for (final String notificationString in (fireNotifications ?? <String>[])) {
+    for (final String notificationString in (FireNotifications ?? <String>[])) {
       final Map<String, dynamic> notificationMap =
           json.decode(notificationString) as Map<String, dynamic>;
       persistedList.add(FireNotification.fromJson(notificationMap));
@@ -27,9 +26,7 @@ void persistFireNotifications(List<FireNotification> notif) {
   // print('Persisting $notif');
   globals.prefs.then((SharedPreferences prefs) {
     final List<String> notifAsString = <String>[];
-    notif
-        .whereType<FireNotification>()
-        .forEach((FireNotification notification) {
+    notif.where(notNull).toList().forEach((FireNotification notification) {
       notifAsString.add(json.encode(notification.toJson()));
     });
     prefs.setStringList(fireNotificationKey, notifAsString);

lib/models/firesApi.dart

@@ -7,11 +7,11 @@ import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
 
 import '../globals.dart' as globals;
-import '../object_id_utils.dart';
+import '../objectIdUtils.dart';
 import '../redux/actions.dart';
-import 'app_state.dart';
-import 'false_positive_types.dart';
-import 'your_location.dart';
+import 'appState.dart';
+import 'falsePositiveTypes.dart';
+import 'yourLocation.dart';
 
 class FiresApi {
   FiresApi() {
@@ -28,17 +28,9 @@ class FiresApi {
     };
     final String url = '${state.firesApiUrl}mobile/users';
     try {
-      final Response<Map<String, dynamic>> response =
-          await _dio.post<Map<String, dynamic>>(url, data: params);
+      final Response<dynamic> response = await _dio.post(url, data: params);
       if (response.statusCode == 200) {
-        final Map<String, dynamic>? responseData = response.data;
-        if (responseData == null) {
-          throw Exception('Response data is null');
-        }
-        final Map<String, dynamic> data = responseData;
-        final Map<String, dynamic> dataData =
-            data['data'] as Map<String, dynamic>;
-        return dataData['userId'] as String;
+        return response.data['data']['userId'] as String;
       } else {
         throw Exception('Unexpected error on create user');
       }
@@ -53,29 +45,18 @@ class FiresApi {
     final String url =
         '${state.firesApiUrl}mobile/subscriptions/all/$apiKey/$mobileToken';
     try {
-      final Response<Map<String, dynamic>> response =
-          await _dio.get<Map<String, dynamic>>(url);
+      final Response<dynamic> response = await _dio.get(url);
       if (response.statusCode == 200) {
-        final Map<String, dynamic>? responseData = response.data;
-        if (responseData == null) {
-          throw Exception('Response data is null');
-        }
-        final Map<String, dynamic> data = responseData;
-        final Map<String, dynamic> dataData =
-            data['data'] as Map<String, dynamic>;
         final List<dynamic> dataSubscriptions =
-            dataData['subscriptions'] as List<dynamic>;
+            response.data['data']['subscriptions'] as List<dynamic>;
         final List<YourLocation> subscribed = <YourLocation>[];
         for (int i = 0; i < dataSubscriptions.length; i++) {
           final Map<String, dynamic> el =
               dataSubscriptions[i] as Map<String, dynamic>;
-          final Map<String, dynamic> location =
-              el['location'] as Map<String, dynamic>;
-          final double lat = (location['lat'] as num).toDouble();
-          final double lon = (location['lon'] as num).toDouble();
-          final Map<String, dynamic> id = el['_id'] as Map<String, dynamic>;
+          final double lat = (el['location']['lat'] as num).toDouble();
+          final double lon = (el['location']['lon'] as num).toDouble();
           subscribed.add(YourLocation(
-              id: objectIdFromJson(id['_str'] as String),
+              id: objectIdFromJson(el['_id']['_str'] as String),
               lat: lat,
               lon: lon,
               subscribed: true,
@@ -101,17 +82,9 @@ class FiresApi {
     };
     final String url = '${state.firesApiUrl}mobile/subscriptions';
     try {
-      final Response<Map<String, dynamic>> response =
-          await _dio.post<Map<String, dynamic>>(url, data: params);
+      final Response<dynamic> response = await _dio.post(url, data: params);
       if (response.statusCode == 200) {
-        final Map<String, dynamic>? responseData = response.data;
-        if (responseData == null) {
-          throw Exception('Response data is null');
-        }
-        final Map<String, dynamic> data = responseData;
-        final Map<String, dynamic> dataData =
-            data['data'] as Map<String, dynamic>;
-        return dataData['subsId'] as String;
+        return response.data['data']['subsId'] as String;
       } else {
         throw Exception('Unexpected error on subscribe');
       }
@@ -144,14 +117,11 @@ class FiresApi {
       required int distance}) async {
     final String url =
         '${state.firesApiUrl}fires-in-full/${state.firesApiKey}/$lat/$lon/$distance';
-    if (globals.isDevelopment) {
-      debugPrint(url);
-    }
+    if (globals.isDevelopment) print(url);
     try {
       final Response<dynamic> response = await _dio.get(url);
       if (response.statusCode == 200) {
-        final Map<String, dynamic> resultDecoded =
-            response.data as Map<String, dynamic>;
+        final resultDecoded = response.data;
         final int numFires = (resultDecoded['real'] as num).toInt();
         final List<dynamic> fires = resultDecoded['fires'] as List<dynamic>;
         final List<dynamic> falsePos =
@@ -181,20 +151,12 @@ class FiresApi {
     try {
       final Response<dynamic> response = await _dio.get(url);
       if (response.statusCode == 200) {
-        final Map<String, dynamic> resultDecoded =
-            response.data as Map<String, dynamic>;
+        final resultDecoded = response.data;
         final List<Polyline> union = <Polyline>[];
-        final Map<String, dynamic> dataData =
-            resultDecoded['data'] as Map<String, dynamic>;
-        final Map<String, dynamic> unionData =
-            dataData['union'] as Map<String, dynamic>;
-        final String unionValue = unionData['value'] as String;
-        final Map<String, dynamic> decodedJson =
-            json.decode(unionValue) as Map<String, dynamic>;
-        final Map<String, dynamic> geometry =
-            decodedJson['geometry'] as Map<String, dynamic>;
         final List<dynamic> multipolygon =
-            geometry['coordinates'] as List<dynamic>;
+            (json.decode(resultDecoded['data']['union']['value'] as String)
+                    as Map<String, dynamic>)['geometry']['coordinates']
+                as List<dynamic>;
         for (final dynamic polygonDynamic in multipolygon) {
           final List<dynamic> polygon = polygonDynamic as List<dynamic>;
           for (final dynamic holeDynamic in polygon) {
@@ -228,13 +190,7 @@ class FiresApi {
     try {
       final Response<dynamic> response = await _dio.post(url, data: params);
       if (response.statusCode == 200) {
-        if (globals.isDevelopment) {
-          final Map<String, dynamic> data =
-              response.data as Map<String, dynamic>;
-          final Map<String, dynamic> dataData =
-              data['data'] as Map<String, dynamic>;
-          debugPrint(dataData['upsert'].toString());
-        }
+        if (globals.isDevelopment) print(response.data['data']['upsert']);
         return true;
       } else {
         debugPrint(response.data.toString());

lib/models/user.dart

@@ -1,9 +1,9 @@
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:meta/meta.dart';
 
-import '../utils/widget_utils.dart';
-
 @immutable
 class User {
+
   const User({required this.userId, required this.lang, required this.token});
 
   const User.initial()

lib/models/yourLocation.dart

@@ -1,34 +1,33 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:meta/meta.dart';
 import 'package:objectid/objectid.dart';
 
-import '../object_id_utils.dart';
+import '../objectIdUtils.dart';
 
-part 'your_location.g.dart';
+part 'yourLocation.g.dart';
 
-@immutable
 @JsonSerializable()
 class YourLocation {
-  const YourLocation(
+  YourLocation(
       {required this.id,
       required this.lat,
       required this.lon,
       this.description = '',
       this.distance = 10,
       int? currentNumFires,
-      this.subscribed = false})
-      : currentNumFires = currentNumFires ?? 0;
+      this.subscribed = false}) {
+    this.currentNumFires = currentNumFires ?? 0;
+  }
 
   factory YourLocation.fromJson(Map<String, dynamic> json) =>
       _$YourLocationFromJson(json);
   @JsonKey(toJson: objectIdToJson, fromJson: objectIdFromJson)
-  final ObjectId id;
+  ObjectId id;
   final double lat;
   final double lon;
-  final String description;
-  final bool subscribed;
-  final int distance;
-  final int currentNumFires;
+  String description;
+  bool subscribed;
+  int distance;
+  late int currentNumFires;
 
   static YourLocation get noLocation {
     _noLocation ??= YourLocation(id: ObjectId(), lat: 0.0, lon: 0.0);

lib/models/yourLocation.g.dart

@@ -1,6 +1,7 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
 
-part of 'your_location.dart';
+part of 'yourLocation.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/models/yourLocationPersist.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
 
-// ignore: implementation_imports
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:shared_preferences/src/shared_preferences_legacy.dart';
 
 import '../globals.dart' as globals;
-import 'your_location.dart';
+import 'yourLocation.dart';
 
 const String locationKey = 'yourlocations';
 
@@ -26,7 +26,7 @@ void persistYourLocations(List<YourLocation> yl) {
   // debugPrint('Persisting $yl');
   globals.prefs.then((SharedPreferences prefs) {
     final List<String> ylAsString = <String>[];
-    yl.whereType<YourLocation>().forEach((YourLocation location) {
+    yl.where(notNull).toList().forEach((YourLocation location) {
       ylAsString.add(json.encode(location.toJson()));
     });
     prefs.setStringList(locationKey, ylAsString);

lib/monitoredAreas.dart

@@ -2,20 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:latlong2/latlong.dart';
-// ignore: implementation_imports
 import 'package:redux/src/store.dart';
 
 import 'colors.dart';
-import 'compass_map_plugin.dart';
-import 'custom_bottom_app_bar.dart';
+import 'compassMapPlugin.dart';
+import 'customBottomAppBar.dart';
 import 'generated/i18n.dart';
-import 'main_drawer.dart';
-import 'models/app_state.dart';
+import 'mainDrawer.dart';
+import 'models/appState.dart';
 
-@immutable
 class _ViewModel {
-  const _ViewModel(this.monitoredAreas);
-  final List<Polyline> monitoredAreas;
+
+  _ViewModel(this.monitoredAreas);
+  List<Polyline> monitoredAreas;
 
   @override
   bool operator ==(Object other) =>
@@ -42,7 +41,8 @@ class MonitoredAreasPage extends StatelessWidget {
         },
         builder: (BuildContext context, _ViewModel view) {
           return Scaffold(
-            appBar: AppBar(title: Text(S.of(context).monitoredAreasTitle)),
+            appBar:
+                AppBar(title: Text(S.of(context).monitoredAreasTitle)),
             drawer: MainDrawer(context, MonitoredAreasPage.routeName),
             bottomNavigationBar: CustomBottomAppBar(
                 fabLocation: FloatingActionButtonLocation.centerDocked,
@@ -51,8 +51,7 @@ class MonitoredAreasPage extends StatelessWidget {
                 actions: <Widget>[
                   Flexible(
                       child: Padding(
-                          padding:
-                              const EdgeInsets.only(left: 10.0, right: 10.0),
+                          padding: const EdgeInsets.only(left: 10.0, right: 10.0),
                           child: Column(
                               mainAxisSize: MainAxisSize.min,
                               children: <Widget>[
@@ -63,35 +62,37 @@ class MonitoredAreasPage extends StatelessWidget {
                               ])))
                 ]),
             body: Padding(
-              padding: const EdgeInsets.all(10.0),
-              child: Column(
-                children: <Widget>[
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0, bottom: 8.0),
-                    child: Text(S.of(context).inGreenMonitoredAreas),
-                  ),
-                  Flexible(
-                    child: FlutterMap(
-                      options: const MapOptions(
-                        initialCenter: LatLng(53.5775, 3.106111),
-                        initialZoom: 1.0,
-                      ),
+                    padding: const EdgeInsets.all(10.0),
+                    child: Column(
                       children: <Widget>[
-                        TileLayer(
-                            urlTemplate:
-                                'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png',
-                            subdomains: const <String>['a', 'b', 'c', 'd'],
-                            userAgentPackageName: 'com.example.fires_flutter'),
-                        const CompassMapPluginWidget(),
-                        PolylineLayer(
-                          polylines: view.monitoredAreas,
-                        )
+                        Padding(
+                          padding: const EdgeInsets.only(
+                              top: 8.0, bottom: 8.0),
+                          child: Text(S.of(context).inGreenMonitoredAreas),
+                        ),
+                        Flexible(
+                          child: FlutterMap(
+                            options: const MapOptions(
+                              initialCenter: LatLng(53.5775, 3.106111),
+                              initialZoom: 1.0,
+                            ),
+                            children: <Widget>[
+                              TileLayer(
+                                  urlTemplate:
+                                      'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png',
+                                  subdomains: const <String>['a', 'b', 'c', 'd'],
+                                  userAgentPackageName:
+                                      'com.example.fires_flutter'),
+                              const CompassMapPluginWidget(),
+                              PolylineLayer(
+                                polylines: view.monitoredAreas,
+                              )
+                            ],
+                          ),
+                        ),
                       ],
                     ),
                   ),
-                ],
-              ),
-            ),
           );
         });
   }

lib/placesAutocompleteUtils.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:geocoding/geocoding.dart';
 import 'package:objectid/objectid.dart';
 
-import 'models/your_location.dart';
+import 'models/yourLocation.dart';
 
 /// Open a places dialog for selecting a location using geocoding.
 /// Allows users to search for places by name and get coordinates.
@@ -31,7 +31,7 @@ class _PlaceSelectionDialog extends StatefulWidget {
 
 class _PlaceSelectionDialogState extends State<_PlaceSelectionDialog> {
   final TextEditingController _searchController = TextEditingController();
-  List<Location> _searchResults = <Location>[];
+  List<Location> _searchResults = [];
   bool _isSearching = false;
   String? _errorMessage;
 
@@ -44,7 +44,7 @@ class _PlaceSelectionDialogState extends State<_PlaceSelectionDialog> {
   Future<void> _searchPlaces(String query) async {
     if (query.isEmpty) {
       setState(() {
-        _searchResults = <Location>[];
+        _searchResults = [];
         _errorMessage = null;
       });
       return;
@@ -65,8 +65,8 @@ class _PlaceSelectionDialogState extends State<_PlaceSelectionDialog> {
       });
     } catch (e) {
       setState(() {
-        _errorMessage = 'Search error: $e';
-        _searchResults = <Location>[];
+        _errorMessage = 'Search error: ${e.toString()}';
+        _searchResults = [];
       });
     } finally {
       setState(() {
@@ -98,17 +98,16 @@ class _PlaceSelectionDialogState extends State<_PlaceSelectionDialog> {
     return '${location.latitude.toStringAsFixed(4)}, ${location.longitude.toStringAsFixed(4)}';
   }
 
-  Future<void> _selectLocation(Location location) async {
+  void _selectLocation(Location location) async {
     final String description = await _getPlaceName(location);
-    if (!mounted) {
-      return;
-    }
+    if (!mounted) return;
 
     final YourLocation yourLocation = YourLocation(
       id: ObjectId(),
       lat: location.latitude,
       lon: location.longitude,
       description: description,
+      distance: 10,
     );
 
     Navigator.of(context).pop(yourLocation);
@@ -148,7 +147,7 @@ class _PlaceSelectionDialogState extends State<_PlaceSelectionDialog> {
                     _searchPlaces(value);
                   } else {
                     setState(() {
-                      _searchResults = <Location>[];
+                      _searchResults = [];
                       _errorMessage = null;
                     });
                   }

lib/privacyPage.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'file_utils.dart';
+import 'fileUtils.dart';
 import 'generated/i18n.dart';
-import 'markdown_page.dart';
+import 'markdownPage.dart';
 
 class PrivacyPage extends MarkdownPage {
 

lib/redux/actions.dart

@@ -1,4 +1,4 @@
-export 'app_actions.dart';
-export 'fire_map_actions.dart';
-export 'fire_notification_actions.dart';
-export 'your_location_actions.dart';
+export 'appActions.dart';
+export 'fireMapActions.dart';
+export 'fireNotificationActions.dart';
+export 'yourLocationActions.dart';

lib/redux/appActions.dart

@@ -3,8 +3,8 @@ import 'dart:async';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter_map/flutter_map.dart';
 
-import '../models/fire_notification.dart';
-import '../models/your_location.dart';
+import '../models/fireNotification.dart';
+import '../models/yourLocation.dart';
 
 abstract class AppActions {}
 

lib/redux/appReducer.dart

@@ -1,4 +1,4 @@
-import '../models/app_state.dart';
+import '../models/appState.dart';
 import 'actions.dart';
 
 AppState appReducer(AppState state, dynamic action) {

lib/redux/errorReducer.dart

@@ -0,0 +1,3 @@
+String errorReducer(String error, action) {
+  return error;
+}

lib/redux/error_reducer.dart

@@ -1,3 +0,0 @@
-String errorReducer(String error, dynamic action) {
-  return error;
-}

lib/redux/fetchDataMiddleware.dart

@@ -1,18 +1,17 @@
 import 'dart:async';
 
-// ignore: implementation_imports
 import 'package:flutter_map/src/layer/polyline_layer.dart';
 import 'package:get_it/get_it.dart';
 import 'package:objectid/objectid.dart';
 import 'package:redux/redux.dart';
 
-import '../models/app_state.dart';
-import '../models/fire_notification.dart';
-import '../models/fire_notifications_persist.dart';
-import '../models/fires_api.dart';
-import '../models/your_location.dart';
-import '../models/your_location_persist.dart';
-import '../object_id_utils.dart';
+import '../models/appState.dart';
+import '../models/fireNotification.dart';
+import '../models/fireNotificationsPersist.dart';
+import '../models/firesApi.dart';
+import '../models/yourLocation.dart';
+import '../models/yourLocationPersist.dart';
+import '../objectIdUtils.dart';
 import 'actions.dart';
 
 // A middleware takes in 3 parameters: your Store, which you can use to
@@ -158,26 +157,23 @@ void fetchDataMiddleware(
         // If it succeeds, dispatch a success action with the YourLocations.
         // Our reducer will then update the State using these YourLocations.
         // unsubscribe all locally to sync the subs state
-        final List<YourLocation> unsubscribedLocations = localLocations
-            .map(
-                (YourLocation location) => location.copyWith(subscribed: false))
-            .toList();
+        for (final YourLocation location in localLocations) {
+          location.subscribed = false;
+        }
         for (final YourLocation subsLoc in subscribedLocations) {
-          final int index = unsubscribedLocations.indexWhere(
-              (YourLocation localLocation) => localLocation.id == subsLoc.id);
-          if (index >= 0) {
-            unsubscribedLocations[index] =
-                unsubscribedLocations[index].copyWith(subscribed: true);
-          } else {
-            unsubscribedLocations.add(subsLoc);
-          }
+          final YourLocation locSubs = localLocations.firstWhere(
+              (YourLocation localLocation) => localLocation.id == subsLoc.id,
+              orElse: () {
+            localLocations.add(subsLoc);
+            return subsLoc;
+          });
+          locSubs.subscribed = true;
         }
 
-        store
-            .dispatch(FetchYourLocationsSucceededAction(unsubscribedLocations));
-        persistYourLocations(unsubscribedLocations);
+        store.dispatch(FetchYourLocationsSucceededAction(localLocations));
+        persistYourLocations(localLocations);
 
-        for (final YourLocation yl in unsubscribedLocations) {
+        for (final YourLocation yl in localLocations) {
           api
               .getFiresInLocation(
                   state: store.state,
@@ -185,8 +181,8 @@ void fetchDataMiddleware(
                   lon: yl.lon,
                   distance: yl.distance)
               .then((UpdateFireMapStatsAction value) {
-            store.dispatch(UpdateYourLocationAction(
-                yl.copyWith(currentNumFires: value.numFires)));
+            yl.currentNumFires = value.numFires;
+            store.dispatch(UpdateYourLocationAction(yl));
           });
         }
 
@@ -247,8 +243,8 @@ void getFiresStatsInLocation(Store<AppState> store, YourLocation loc) {
           distance: loc.distance)
       .then((UpdateFireMapStatsAction result) {
     store.dispatch(result);
-    store.dispatch(UpdateYourLocationAction(
-        loc.copyWith(currentNumFires: result.numFires)));
+    loc.currentNumFires = result.numFires;
+    store.dispatch(UpdateYourLocationAction(loc));
   });
 }
 
@@ -273,7 +269,10 @@ void unsubsViaApi(
 void subscribeViaApi(Store<AppState> store, YourLocation loc,
     void Function(YourLocation) onSubs) {
   api.subscribe(store.state, loc).then((String subsId) {
-    final YourLocation sub = loc.copyWith(id: objectIdFromJson(subsId));
+    final YourLocation sub = loc;
+    // if (loc.id != subsId) {
+    sub.id = objectIdFromJson(subsId);
+    // }
     onSubs(sub);
     persistYourLocations(store.state.yourLocations);
   });

lib/redux/fireMapActions.dart

@@ -1,6 +1,6 @@
-import '../models/fire_map_state.dart';
-import '../models/fire_notification.dart';
-import '../models/your_location.dart';
+import '../models/fireMapState.dart';
+import '../models/fireNotification.dart';
+import '../models/yourLocation.dart';
 
 abstract class FiresMapActions {}
 

lib/redux/fireMapReducer.dart

@@ -1,13 +1,13 @@
 import 'package:objectid/objectid.dart';
 import 'package:redux/redux.dart';
 
-import '../models/fire_map_state.dart';
-import '../models/your_location.dart';
+import '../models/fireMapState.dart';
+import '../models/yourLocation.dart';
 import 'actions.dart';
 
-final Reducer<FireMapState> fireMapReducer =
-    combineReducers<FireMapState>(<Reducer<FireMapState>>[
-  TypedReducer<FireMapState, ShowYourLocationMapAction>(_showYourLocationMap),
+final Reducer<FireMapState> fireMapReducer = combineReducers<FireMapState>(<Reducer<FireMapState>>[
+  TypedReducer<FireMapState, ShowYourLocationMapAction>(
+      _showYourLocationMap),
   TypedReducer<FireMapState, ShowFireNotificationMapAction>(
       _showFireNotificationMap),
   TypedReducer<FireMapState, UpdateFireMapStatsAction>(
@@ -15,7 +15,8 @@ final Reducer<FireMapState> fireMapReducer =
   TypedReducer<FireMapState, SubscribeAction>(_subscribeYourLocationMap),
   TypedReducer<FireMapState, SubscribeConfirmAction>(
       _subscribeConfirmYourLocationMap),
-  TypedReducer<FireMapState, UnSubscribeAction>(_unsubscribeYourLocationMap),
+  TypedReducer<FireMapState, UnSubscribeAction>(
+      _unsubscribeYourLocationMap),
   TypedReducer<FireMapState, EditYourLocationAction>(_editYourLocationMap),
   TypedReducer<FireMapState, EditConfirmYourLocationAction>(
       _editConfirmYourLocationMap),
@@ -51,7 +52,7 @@ FireMapState _showYourLocationMap(
 
 FireMapState _showFireNotificationMap(
     FireMapState state, ShowFireNotificationMapAction action) {
-  // TODO(developer): use here real location instead of notification location?
+  // TODO: use here you real location?
   final YourLocation pseudoLoc = YourLocation(
       id: ObjectId(),
       lat: action.notif.lat,

lib/redux/fireNotificationActions.dart

@@ -1,9 +1,10 @@
-import '../models/false_positive_types.dart';
-import '../models/fire_notification.dart';
+import '../models/falsePositiveTypes.dart';
+import '../models/fireNotification.dart';
 
 abstract class FireNotificationActions {}
 
 class DeleteFireNotificationAction extends FireNotificationActions {
+
   DeleteFireNotificationAction(this.notif);
   final FireNotification notif;
 }
@@ -13,11 +14,13 @@ class DeleteAllFireNotificationAction extends FireNotificationActions {
 }
 
 class AddFireNotificationAction extends FireNotificationActions {
+
   AddFireNotificationAction(this.notif);
   final FireNotification notif;
 }
 
 class DeletedFireNotificationAction extends FireNotificationActions {
+
   DeletedFireNotificationAction(this.notif);
   final FireNotification notif;
 }
@@ -27,27 +30,32 @@ class DeletedAllFireNotificationAction extends FireNotificationActions {
 }
 
 class AddedFireNotificationAction extends FireNotificationActions {
+
   AddedFireNotificationAction(this.notif);
   final FireNotification notif;
 }
 
 class ReadFireNotificationAction extends FireNotificationActions {
+
   ReadFireNotificationAction(this.notif);
   final FireNotification notif;
 }
 
 class ReadedFireNotificationAction extends FireNotificationActions {
+
   ReadedFireNotificationAction(this.notif);
   final FireNotification notif;
 }
 
 class MarkFireAsFalsePositiveAction extends FireNotificationActions {
+
   MarkFireAsFalsePositiveAction(this.notif, this.type);
   final FireNotification notif;
   final FalsePositiveType type;
 }
 
 class UpdatedFireNotificationAction extends FireNotificationActions {
+
   UpdatedFireNotificationAction(this.notif);
   final FireNotification notif;
-}
+}

lib/redux/fireNotificationReducer.dart

@@ -1,10 +1,9 @@
 import 'package:redux/redux.dart';
 
-import '../models/fire_notification.dart';
+import '../models/fireNotification.dart';
 import 'actions.dart';
 
-final Reducer<List<FireNotification>> fireNotificationReducer =
-    combineReducers<List<FireNotification>>(<Reducer<List<FireNotification>>>[
+final Reducer<List<FireNotification>> fireNotificationReducer = combineReducers<List<FireNotification>>(<Reducer<List<FireNotification>>>[
   TypedReducer<List<FireNotification>, AddedFireNotificationAction>(
       _addedFireNotification),
   TypedReducer<List<FireNotification>, DeletedFireNotificationAction>(
@@ -19,21 +18,20 @@ final Reducer<List<FireNotification>> fireNotificationReducer =
 
 List<FireNotification> _addedFireNotification(
     List<FireNotification> notifications, AddedFireNotificationAction action) {
-  return List<FireNotification>.from(notifications)..insert(0, action.notif);
+  return List.from(notifications)..insert(0, action.notif);
 }
 
 List<FireNotification> _deletedFireNotification(
     List<FireNotification> notifications,
     DeletedFireNotificationAction action) {
-  return List<FireNotification>.from(notifications)..remove(action.notif);
+  return List.from(notifications)..remove(action.notif);
 }
 
 List<FireNotification> _updatedFireNotification(
     List<FireNotification> notifications,
     UpdatedFireNotificationAction action) {
   return notifications
-      .map((FireNotification notif) =>
-          notif.id == action.notif.id ? action.notif : notif)
+      .map((FireNotification notif) => notif.id == action.notif.id ? action.notif : notif)
       .toList();
 }
 

lib/redux/loadedReducer.dart

@@ -1,8 +1,6 @@
 import 'actions.dart';
 
 bool loadedReducer(bool isLoaded, dynamic action) {
-  if (action is FetchYourLocationsSucceededAction) {
-    return true;
-  }
+  if (action is FetchYourLocationsSucceededAction) return true;
   return isLoaded;
 }

lib/redux/loadingReducer.dart

@@ -1,8 +1,6 @@
 import 'actions.dart';
 
 bool loadingReducer(bool isLoading, dynamic action) {
-  if (action is FetchYourLocationsAction) {
-    return true;
-  }
+  if (action is FetchYourLocationsAction) return true;
   return isLoading;
 }

lib/redux/reducers.dart

@@ -1,12 +1,12 @@
-import '../models/app_state.dart';
-import 'app_reducer.dart';
-import 'error_reducer.dart';
-import 'fire_map_reducer.dart';
-import 'fire_notification_reducer.dart';
-import 'loaded_reducer.dart';
-import 'loading_reducer.dart';
-import 'user_reducer.dart';
-import 'your_locations_reducer.dart';
+import '../models/appState.dart';
+import 'appReducer.dart';
+import 'errorReducer.dart';
+import 'fireMapReducer.dart';
+import 'fireNotificationReducer.dart';
+import 'loadedReducer.dart';
+import 'loadingReducer.dart';
+import 'userReducer.dart';
+import 'yourLocationsReducer.dart';
 
 // We create the State reducer by combining many smaller reducers into one!
 AppState appStateReducer(AppState prevState, dynamic action) {

lib/redux/userReducer.dart

@@ -0,0 +1,10 @@
+import '../models/user.dart';
+import 'actions.dart';
+
+User userReducer(User user, dynamic action) {
+  if (action is OnUserCreatedAction)
+    return user.copyWith(userId: action.userId);
+  if (action is OnUserTokenAction) return user.copyWith(token: action.token);
+  if (action is OnUserLangAction) return user.copyWith(lang: action.lang);
+  return user;
+}

lib/redux/user_reducer.dart

@@ -1,15 +0,0 @@
-import '../models/user.dart';
-import 'actions.dart';
-
-User userReducer(User user, dynamic action) {
-  if (action is OnUserCreatedAction) {
-    return user.copyWith(userId: action.userId);
-  }
-  if (action is OnUserTokenAction) {
-    return user.copyWith(token: action.token);
-  }
-  if (action is OnUserLangAction) {
-    return user.copyWith(lang: action.lang);
-  }
-  return user;
-}

lib/redux/yourLocationActions.dart

@@ -1,6 +1,6 @@
 import 'package:objectid/objectid.dart';
 
-import '../models/your_location.dart';
+import '../models/yourLocation.dart';
 
 abstract class YourLocationActions {}
 

lib/redux/yourLocationsReducer.dart

@@ -1,11 +1,11 @@
 import 'package:redux/redux.dart';
 
-import '../models/your_location.dart';
+import '../models/yourLocation.dart';
 import 'actions.dart';
 
-final Reducer<List<YourLocation>> yourLocationsReducer =
-    combineReducers<List<YourLocation>>(<Reducer<List<YourLocation>>>[
-  TypedReducer<List<YourLocation>, AddedYourLocationAction>(_addedYourLocation),
+final Reducer<List<YourLocation>> yourLocationsReducer = combineReducers<List<YourLocation>>(<Reducer<List<YourLocation>>>[
+  TypedReducer<List<YourLocation>, AddedYourLocationAction>(
+      _addedYourLocation),
   TypedReducer<List<YourLocation>, DeletedYourLocationAction>(
       _deletedYourLocation),
   TypedReducer<List<YourLocation>, UpdatedYourLocationAction>(
@@ -16,7 +16,7 @@ final Reducer<List<YourLocation>> yourLocationsReducer =
 
 List<YourLocation> _addedYourLocation(
     List<YourLocation> yourLocations, AddedYourLocationAction action) {
-  return List<YourLocation>.from(yourLocations)..add(action.loc);
+  return List.from(yourLocations)..add(action.loc);
 }
 
 List<YourLocation> _deletedYourLocation(

lib/slider.dart

@@ -1,8 +1,8 @@
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 
 import 'colors.dart';
 import 'generated/i18n.dart';
-import 'utils/widget_utils.dart';
 
 typedef SlideCallback = void Function(int distance);
 
@@ -13,7 +13,6 @@ class FireDistanceSlider extends StatefulWidget {
   final SlideCallback onSlide;
 
   @override
-  // ignore: library_private_types_in_public_api
   _FireDistanceSliderState createState() => _FireDistanceSliderState();
 }
 
@@ -56,7 +55,7 @@ class _FireDistanceSliderState extends State<FireDistanceSlider> {
     );
     return Column(
       mainAxisSize: MainAxisSize.min,
-      children: compactWidgets(<Widget?>[
+      children: listWithoutNulls(<Widget>[
         const SizedBox(height: 50.0),
         Row(children: <Widget>[slider]),
         // new SizedBox(height: 5.0),

lib/supportPage.dart

@@ -1,10 +1,11 @@
+import 'package:comunes_flutter/comunes_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:in_app_review/in_app_review.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'generated/i18n.dart';
-import 'main_drawer.dart';
+import 'mainDrawer.dart';
 
 class SupportPage extends StatefulWidget {
   const SupportPage({super.key});
@@ -12,7 +13,6 @@ class SupportPage extends StatefulWidget {
   static const String routeName = '/support';
 
   @override
-  // ignore: library_private_types_in_public_api
   _SupportPageState createState() => _SupportPageState();
 }
 
@@ -26,11 +26,7 @@ class _SupportPageState extends State<SupportPage> {
         icon: const Icon(Icons.favorite_border),
         label: Text(S.of(context).comunesSupportBtn),
         onPressed: () async {
-          // Play policy: la app fue retirada por enlazar a comunes.org (que
-          // tiene página de donaciones). Apuntamos a la página del proyecto
-          // (sin donaciones) para la re-aprobación. Reversible una vez aprobada.
-          final Uri url = Uri.parse(
-              'https://git.comunes.org/comunes/todos-contra-el-fuego-mobile');
+          final Uri url = Uri.parse('https://comunes.org/');
           if (await canLaunchUrl(url)) {
             await launchUrl(url);
           }
@@ -83,7 +79,6 @@ class _SupportPageState extends State<SupportPage> {
     );
   }
 
-  @override
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -92,29 +87,23 @@ class _SupportPageState extends State<SupportPage> {
         drawer: MainDrawer(context, SupportPage.routeName),
         body: Padding(
           padding: const EdgeInsets.all(8.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: <Widget>[
-              Flexible(
-                  child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: <Widget>[
-                  Text(
-                    S.of(context).supportPageDescription,
-                    textAlign: TextAlign.center,
-                  ),
-                  const SizedBox(height: 20.0),
-                  buildSupportButton(),
-                  const SizedBox(height: 20.0),
-                  buildTranslateButton(),
-                  const SizedBox(height: 20.0),
-                  buildStarButton(),
-                  const SizedBox(height: 20.0),
-                  buildShareButton()
-                ],
-              ))
-            ],
-          ),
+          child: CenteredColumn(children: <Widget>[
+            Flexible(
+                child: CenteredColumn(children: <Widget>[
+              Text(
+                S.of(context).supportPageDescription,
+                textAlign: TextAlign.center,
+              ),
+              const SizedBox(height: 20.0),
+              buildSupportButton(),
+              const SizedBox(height: 20.0),
+              buildTranslateButton(),
+              const SizedBox(height: 20.0),
+              buildStarButton(),
+              const SizedBox(height: 20.0),
+              buildShareButton()
+            ]))
+          ]),
         ));
   }
 }

lib/utils/secret_loader.dart

@@ -1,20 +0,0 @@
-import 'dart:async' show Future;
-import 'dart:convert' show json;
-import 'package:flutter/services.dart' show rootBundle;
-
-/// Loads secret/config files from Flutter assets as JSON.
-/// Used to load configuration files at app startup.
-class SecretLoader {
-  SecretLoader({required this.secretPath});
-
-  final String secretPath;
-
-  /// Load and parse JSON from asset bundle.
-  /// Returns a map of the parsed JSON content.
-  Future<Map<String, dynamic>> load() {
-    return rootBundle.loadStructuredData<Map<String, dynamic>>(
-      secretPath,
-      (String jsonStr) async => json.decode(jsonStr) as Map<String, dynamic>,
-    );
-  }
-}

lib/utils/widget_utils.dart

@@ -1,13 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// Modern null-safe widget list compaction.
-/// Filters out null values from a list of nullable widgets.
-/// Example: compactWidgets([widget1, null, widget2]) → [widget1, widget2]
-List<Widget> compactWidgets(List<Widget?> children) =>
-    children.whereType<Widget>().toList();
-
-/// String truncation for debug output and logging.
-/// Truncates a string to [end] characters and appends '...'
-/// Example: ellipse('abcdefgh', 4) → 'abcd...'
-String ellipse(String s, [int end = 4]) =>
-    s.length > end ? '${s.substring(0, end)}...' : s;

lib/widgets/app_intro_page.dart

@@ -1,152 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:flutter/material.dart';
-import '../utils/widget_utils.dart';
-
-class AppIntroItem {
-  AppIntroItem({required this.icon, required this.title, this.subTitle = ''});
-
-  final IconData icon;
-  final String title;
-  final String subTitle;
-}
-
-typedef OnIntroFinish = void Function(BuildContext context);
-typedef ListItems = List<AppIntroItem> Function(BuildContext context);
-
-abstract class AppIntroPage extends StatelessWidget {
-  const AppIntroPage({
-    super.key,
-    required this.items,
-    required this.onIntroFinish,
-  });
-
-  static const String routeName = '/appintro';
-  final ListItems items;
-  final OnIntroFinish onIntroFinish;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: DefaultTabController(
-        length: items(context).length,
-        child: _AppIntroPageSelector(items: items, onFinish: onIntroFinish),
-      ),
-    );
-  }
-}
-
-class _AppIntroPageSelector extends StatelessWidget {
-  const _AppIntroPageSelector({required this.items, required this.onFinish});
-
-  final ListItems items;
-  final OnIntroFinish onFinish;
-
-  void _handleArrowButtonPress(BuildContext context, int delta) {
-    final TabController controller = DefaultTabController.of(context);
-    if (!controller.indexIsChanging)
-      controller.animateTo(
-          (controller.index + delta).clamp(0, items(context).length - 1));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final TabController controller = DefaultTabController.of(context);
-
-    final ThemeData theme = Theme.of(context);
-    final Color color = theme.colorScheme.secondary;
-    final TextStyle titleStyle =
-        (theme.textTheme.headlineSmall ?? const TextStyle())
-            .copyWith(color: color);
-    final TextStyle subTitleStyle =
-        theme.textTheme.titleMedium ?? const TextStyle();
-
-    return SafeArea(
-      bottom: false,
-      child: Column(
-        children: <Widget>[
-          Row(mainAxisAlignment: MainAxisAlignment.end, children: <Widget>[
-            IconButton(
-                onPressed: () {
-                  onFinish(context);
-                },
-                icon:
-                    const Icon(Icons.close, size: 30.0, color: Colors.black38)),
-          ]),
-          Expanded(child: OrientationBuilder(
-              builder: (BuildContext context, Orientation orientation) {
-            return IconTheme(
-              data: IconThemeData(
-                size: orientation == Orientation.portrait ? 200.0 : 100.0,
-                color: color,
-              ),
-              child: TabBarView(
-                  children: items(context).map((AppIntroItem item) {
-                return Container(
-                  padding: const EdgeInsets.all(12.0),
-                  child: Center(
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                      children: <Widget>[
-                        Icon(
-                          item.icon,
-                          semanticLabel: item.title,
-                        ),
-                        Padding(
-                            padding:
-                                const EdgeInsets.only(left: 16.0, right: 16.0),
-                            child: Column(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: <Widget>[
-                                Text(
-                                  item.title,
-                                  style: titleStyle,
-                                  textAlign: TextAlign.center,
-                                ),
-                                const SizedBox(height: 20.0),
-                                Text(
-                                  item.subTitle,
-                                  style: subTitleStyle,
-                                  textAlign: TextAlign.center,
-                                )
-                              ],
-                            )),
-                      ],
-                    ),
-                  ),
-                );
-              }).toList()),
-            );
-          })),
-          Container(
-              margin: const EdgeInsets.only(top: 16.0),
-              child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: compactWidgets(<Widget?>[
-                    IconButton(
-                        icon: const Icon(Icons.chevron_left),
-                        color: color,
-                        onPressed: () {
-                          _handleArrowButtonPress(context, -1);
-                        },
-                        tooltip: 'Page back'),
-                    TabPageSelector(controller: controller),
-                    IconButton(
-                        icon: const Icon(Icons.chevron_right),
-                        color: color,
-                        onPressed: () {
-                          _handleArrowButtonPress(context, 1);
-                          if (!controller.indexIsChanging &&
-                              controller.index == items(context).length - 1) {
-                            onFinish(context);
-                          }
-                        },
-                        tooltip: 'Page forward'),
-                  ]))),
-        ],
-      ),
-    );
-  }
-}

lib/widgets/material_app_with_intro.dart

@@ -1,96 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-@immutable
-abstract class MaterialAppWithIntro extends StatelessWidget {
-  const MaterialAppWithIntro(
-    this.name,
-    this.theme,
-    this.routes,
-    this.introWidget,
-    this.continueWidget,
-    this.prefsKey, {
-    super.key,
-  });
-
-  final String name;
-  final ThemeData theme;
-  final Map<String, WidgetBuilder> routes;
-  final WidgetBuilder introWidget;
-  final WidgetBuilder continueWidget;
-  final String prefsKey;
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      home: MaterialAppWithIntroHome(introWidget, continueWidget, prefsKey),
-      title: name,
-      theme: theme,
-      routes: routes,
-    );
-  }
-}
-
-class MaterialAppWithIntroHome extends StatefulWidget {
-  const MaterialAppWithIntroHome(
-    this.introWidget,
-    this.continueWidget,
-    this.prefsKey, {
-    super.key,
-  });
-
-  final WidgetBuilder introWidget;
-  final WidgetBuilder continueWidget;
-  final String prefsKey;
-
-  @override
-  // ignore: library_private_types_in_public_api
-  _MaterialAppWithIntroState createState() => _MaterialAppWithIntroState();
-}
-
-class _MaterialAppWithIntroState extends State<MaterialAppWithIntroHome> {
-  _MaterialAppWithIntroState();
-
-  late final WidgetBuilder introWidget = widget.introWidget;
-  late final WidgetBuilder continueWidget = widget.continueWidget;
-  late final String prefsKey = widget.prefsKey;
-
-  @override
-  void initState() {
-    super.initState();
-    Timer(const Duration(milliseconds: 1000), () {
-      checkFirstStart();
-    });
-  }
-
-  // https://stackoverflow.com/questions/50654195/flutter-one-time-intro-screen
-  Future<void> checkFirstStart() async {
-    final String initialWizardKey = prefsKey;
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    final bool showInitialWizard = prefs.getBool(initialWizardKey) ?? true;
-
-    if (showInitialWizard) {
-      await prefs.setBool(initialWizardKey, false);
-      if (mounted) {
-        await Navigator.of(context)
-            .pushReplacement(MaterialPageRoute<void>(builder: introWidget));
-      }
-    } else {
-      if (mounted) {
-        await Navigator.of(context)
-            .pushReplacement(MaterialPageRoute<void>(builder: continueWidget));
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return const Scaffold(
-      body: Center(
-        child: CircularProgressIndicator(),
-      ),
-    );
-  }
-}