diff --git a/README.md b/README.md
index 2d2b8a0..ae89426 100644
--- a/README.md
+++ b/README.md
@@ -1,489 +1,523 @@
-
-
-> ⚠️ **WORK IN PROGRESS (WIP)** ⚠️
-> *This repository is currently under active development. All code, data, and structures are subject to continuous changes.*
-
-
-
-

-
# WalkGuide: AI-Powered Navigation
-**Integrated Mobile Application Project**
-*Flutter Mobile Frontend × Spring Boot Backend × OOAD*
+Integrated Mobile Application Project
+Flutter Mobile Frontend x Spring Boot Backend x OOAD
-### Group Members
+WalkGuide is an accessibility-focused mobile system for visually impaired users and their guardians. The User app provides camera-based obstacle awareness, voice/TTS interaction, SOS, notifications, navigation, and call flows. The Guardian app provides monitoring, live location, SOS handling, remote configuration, notification sending, voice notes, and pairing management.
+
+## Group Members
| Name | NIM | Responsibility |
-|------|-----|---------------|
-| Bambang Herlambang | 5803024019 | - |
-| Jap Robertus | 5803024004 | - |
-| Evan William | 5803024001 | Backend Engineer (Spring Boot API & Flutter) |
+|---|---:|---|
+| Bambang Herlambang | 5803024019 | Mobile feature support, documentation, testing |
+| Jap Robertus | 5803024004 | Mobile feature support, documentation, testing |
+| Evan William | 5803024001 | Backend API, Flutter integration, architecture alignment |
-[](https://flutter.dev/)
-[](https://spring.io/projects/spring-boot)
-[](https://www.postgresql.org/)
-[](https://firebase.google.com/)
-[](https://www.agora.io/)
-[](LICENSE)
+## Project Status
-
-
+This repository is no longer a backend-only skeleton. The current codebase contains:
-[**System Architecture**](#system-architecture) · [**Tech Stack**](#tech-stack) · [**Implementations**](#implementations) · [**API Endpoints**](#api-endpoints) · [**Design Patterns**](#design-patterns) · [**Results**](#results) · [**Weekly Progress**](#weekly-progress)
+- Spring Boot backend with JWT/RBAC, Flyway migrations V1-V17, PostgreSQL, OpenAPI, WebSocket, FCM service hooks, Agora token/call notification flow, SOS acknowledge/resolve flow, pairing code flow, service/controller tests, Testcontainers setup, and k6 assets.
+- Flutter app with server connection screen, auth, role-based routing, User screens, Guardian screens, feature page UI shell, friendly error handling, offline queue/cache layer, voice note UI support, SOS handling UI, WalkGuide/YOLO support files, and Android/mobile-first dependencies.
+- OOAD documentation in `ooad-docs/`, including the 7 GoF design pattern PUML diagrams and traceability documentation.
-
+Primary demo target: Android APK connected to the Spring Boot backend.
+Chrome/web can be used for UI/debug flows, but camera, native AI, SQLite FFI, and mobile permissions are Android-first.
----
+## Overview
-## Overview — WalkGuide System
+Core objective: build an accessible navigation assistant that can help visually impaired users move more safely while allowing a Guardian to monitor, configure, and respond to events in real time.
-**Core Objective:** How can we build an ultra-low latency, accessible navigation system for visually impaired users while providing real-time oversight for their guardians?
+Important flows implemented or represented in the codebase:
-This project implements a dual-interface mobile application. The system relies on **On-Device AI (TFLite / YOLOv8n)** to eliminate network latency during obstacle detection, paired with a robust **Spring Boot backend** for secure authentication, guardian-user pairing, real-time location tracking via WebSocket, and push notifications via Firebase FCM.
-
-**Deployment:** Backend is deployed on a university server at `202.46.28.160`. The Flutter APK uses a dynamic server URL — no hardcoded addresses — allowing multi-device testing without rebuilding.
-
----
+- Register/Login with Guardian and User roles.
+- Pairing by generated pairing code / user identity flow.
+- Guardian dashboard and tools screens.
+- User SOS trigger, Guardian acknowledge and resolve.
+- Guardian text and voice-note style notification sending.
+- Notification read/read-all handling.
+- Location update and Guardian live map support.
+- AI configuration, voice command configuration, hardware shortcut configuration.
+- WalkGuide obstacle detection pipeline integration points.
+- Call token and call notification endpoints for Agora-style VoIP flow.
## System Architecture
-The study follows a strict three-pillar enterprise structure:
+The project follows a feature-first architecture across backend, mobile, and OOAD documents.
-**Pillar 1 — OOAD (Object-Oriented Analysis & Design):** Comprehensive modeling using Use Case, Class, Sequence, and ERD diagrams. The codebase strictly implements ≥ 7 GoF Design Patterns (Builder, Singleton, Facade, Repository/Proxy, Observer, Strategy, Chain of Responsibility).
+### Backend
-**Pillar 2 — Flutter (Mobile Frontend):** Implements Clean Architecture (Domain, Data, Presentation layers) with BLoC for state management. Uses `Dio` with interceptors for secure HTTP communication. Server URL is dynamically configured via `SharedPreferences` on first launch.
+Backend follows layered Spring Boot architecture:
-**Pillar 3 — Spring Boot (Backend API):** A layered architecture (Controller → Service → Repository) powered by Java 21. Features JWT-based Role-Based Access Control (RBAC), standardized `ApiResponse` envelopes, WebSocket (STOMP) for real-time data, and Firebase Admin SDK for push notifications.
+```text
+Controller -> Service -> Repository -> Entity -> PostgreSQL
+```
----
+Main backend concerns:
+
+- `controller/`: REST API endpoints.
+- `service/`: application/business logic.
+- `repository/`: Spring Data JPA persistence contracts.
+- `entity/`: database-mapped entities.
+- `dto/request` and `dto/response`: API input/output contracts.
+- `security/`: JWT utility, JWT filter, custom user details service.
+- `config/`: Security, WebSocket, OpenAPI, Firebase/FCM, seeding.
+- `websocket/`: STOMP broadcasting helper.
+- `db/migration/`: Flyway schema migrations.
+
+### Flutter
+
+Flutter uses a feature-first layout. Several critical features now have domain/data/application/presentation structure, while compatibility wrapper screens remain for the existing app routes.
+
+Main Flutter concerns:
+
+- `app/`: app shell, router, dependency injection.
+- `core/`: API service/client, services, storage/cache, AI helpers, errors.
+- `features/`: auth, server connect, pairing, SOS, notifications, WalkGuide, activity log, navigation, settings, call, guardian dashboard/tools, manual, benchmark.
+- `shared/widgets/`: common UI shell and reusable feature page components.
+
+### OOAD
+
+The `ooad-docs/` folder contains traceability and diagrams, including:
+
+- `01_Builder_Pattern.puml`
+- `02_Singleton_Pattern.puml`
+- `03_Facade_Pattern.puml`
+- `04_Repository_Proxy_Pattern.puml`
+- `05_Observer_Pattern.puml`
+- `06_Strategy_Pattern.puml`
+- `07_ChainOfResponsibility_Pattern.puml`
+- Use case, sequence, state, ERD, class, and component diagrams under `ooad-docs/diagrams/`.
## Tech Stack
-### Backend (Spring Boot)
+### Backend
-| Library / Tool | Version | Purpose |
+| Tool / Library | Current Codebase | Purpose |
|---|---|---|
-| Java | 21 | Primary language |
-| Spring Boot | 3.3.x | Main framework |
-| Spring Security | (bundled) | Auth + RBAC |
-| Spring Data JPA | (bundled) | ORM |
-| Spring WebSocket (STOMP) | (bundled) | Real-time location & notification push |
-| PostgreSQL Driver | (bundled) | DB connection — university server `202.46.28.160` |
-| Flyway | 10.x | Database schema migration |
-| JJWT | 0.11.5 | JWT access + refresh token |
-| Firebase Admin SDK | 9.x | FCM push notifications |
-| Agora RESTful API | - | Generate Agora RTC token for VoIP |
-| Springdoc OpenAPI | 2.3.0 | Swagger UI documentation |
-| Lombok | latest | Boilerplate reduction |
-| JUnit 5 + Mockito | (bundled) | Unit testing |
-| MockMvc + Testcontainers | 1.19.x | Integration testing with real PostgreSQL |
-| JaCoCo | 0.8.x | Code coverage (target ≥ 70%) |
+| Java | 21 | Backend language |
+| Spring Boot | 3.2.5 | Main backend framework |
+| Spring Security | Spring Boot managed | JWT auth and RBAC |
+| Spring Data JPA | Spring Boot managed | ORM and repositories |
+| Spring WebSocket | Spring Boot managed | STOMP realtime channels |
+| PostgreSQL Driver | Runtime dependency | University PostgreSQL database |
+| Flyway | Core + PostgreSQL module | Database migrations |
+| JJWT | 0.11.5 | JWT access token handling |
+| Springdoc OpenAPI | 2.3.0 | Swagger/OpenAPI docs |
+| Lombok | 1.18.36 | Builders and boilerplate reduction |
+| JUnit 5 / Mockito / MockMvc | Test dependencies | Unit and controller testing |
+| Testcontainers | 1.19.7 | PostgreSQL-backed integration tests |
+| JaCoCo | 0.8.11 | Coverage report |
-### Flutter (Mobile)
+### Flutter
-| Package | Version | Purpose |
+| Package | Current Codebase | Purpose |
|---|---|---|
-| flutter_bloc | 8.x | State management (sole pattern) |
-| go_router | 14.x | Navigation + role-based route guards |
-| dio | 5.x | HTTP client with interceptors |
-| shared_preferences | 2.x | Persist dynamic server URL |
-| flutter_secure_storage | 10.x | Secure JWT token storage |
-| drift | 2.x | SQLite ORM for offline cache |
-| tflite_flutter | 0.10.x | Run YOLOv8n on-device |
-| camera | 0.10.x | Camera feed for YOLO inference |
-| flutter_tts | 4.x | Text-to-Speech (ID + EN) |
-| speech_to_text | 6.x | Always-listening voice commands |
-| agora_rtc_engine | 6.x | VoIP call Guardian ↔ User |
-| firebase_messaging | 14.x | FCM push notification receiver |
-| flutter_map | 6.x | OpenStreetMap (free, no API key) |
-| geolocator | 11.x | Real-time GPS |
-| stomp_dart_client | 2.x | WebSocket STOMP for live tracking |
-| get_it | 7.x | Service locator / dependency injection |
-| dartz | 0.10.x | `Either