commit c956b94983fb32965eaf86454c9a8bafb4b526da Author: vl.arkhangelskii Date: Mon Sep 21 04:06:43 2026 +0300 feat(proj): init diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..27994b3 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,18 @@ +.env +.git/ +.gitignore +__pycache__/ +*.py[cod] +*.db +data/ +context/ +.idea/ +.vscode/ +web/node_modules/ +web/dist/ +venv/ +.venv/ +src/**/bin/ +src/**/obj/ +api/ + diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..37bf2f8 --- /dev/null +++ b/.env.example @@ -0,0 +1,29 @@ +BOT_TOKEN=your_telegram_bot_token_here +TELEGRAM_BOT_USERNAME=YourBotUsernameWithoutAt + +# Recommended with docker-compose network_mode: host +PROXY_URL=socks5://127.0.0.1:10808 + +# Required for bot → API (POST /api/auth/internal) +API_TOKEN=change-me-to-a-long-random-string + +# Bot talks to the C# API (same HTTP contract as before) +API_BASE_URL=http://127.0.0.1:51291 + +# PostgreSQL (docker-compose service `db`) +POSTGRES_DB=please_pay_me +POSTGRES_USER=ppm +POSTGRES_PASSWORD=ppm + +# Optional explicit JWT secret (defaults to derived from BOT_TOKEN) +# JWT_SECRET=change-me-long-random + +CORS_ORIGINS=* + +# Yandex ID (authorization code; secret stays on the API) +YANDEX_CLIENT_ID= +YANDEX_CLIENT_SECRET= +YANDEX_REDIRECT_URI=https://please-pay-me.ru/ +PUBLIC_WEB_ORIGIN=https://please-pay-me.ru +# Optional extra callbacks, comma-separated +# YANDEX_REDIRECT_URIS=http://localhost:51290/,http://localhost:5173/ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3dc724f --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +.env +__pycache__/ +*.py[cod] +*.db +.venv/ +venv/ +.idea/ +.vscode/ +*.egg-info/ +dist/ +build/ +web/node_modules/ +web/dist/ +web/public/*.apk diff --git a/404.html b/404.html new file mode 100644 index 0000000..41eec4a --- /dev/null +++ b/404.html @@ -0,0 +1,261 @@ + + + + + + 404 — Дожить до ЗП + + + + + + +

+ + + + + +

Страница ушла куда-то

+ Такого адреса нет.

+ +

+ На главную + Назад +

+ +

ошибка · страница не найдена

+ + diff --git a/502.html b/502.html new file mode 100644 index 0000000..c954825 --- /dev/null +++ b/502.html @@ -0,0 +1,262 @@ + + + + + + 502 — Дожить до ЗП + + + + + + +

+ + + + + +

502

Сервер не отвечает

+ Шлюз не смог достучаться до кабинета. Обычно это на минуту — обновите страницу. +

+ +

+ Обновить + На главную +

+ +

ошибка · плохой шлюз

+ + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a1f86f3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM python:3.12-slim + +ENV PYTHONDONTWRITEBYTECODE=1 \ + PYTHONUNBUFFERED=1 \ + PIP_NO_CACHE_DIR=1 \ + PIP_DISABLE_PIP_VERSION_CHECK=1 + +WORKDIR /app + +RUN groupadd --system --gid 1000 bot \ + && useradd --system --uid 1000 --gid bot --home-dir /app --shell /usr/sbin/nologin bot + +COPY requirements.txt . +RUN pip install -r requirements.txt + +COPY bot ./bot + +RUN chown -R bot:bot /app + +USER bot + +CMD ["python", "-m", "bot.main"] diff --git a/Dockerfile.api b/Dockerfile.api new file mode 100644 index 0000000..0dc385c --- /dev/null +++ b/Dockerfile.api @@ -0,0 +1,20 @@ +# syntax=docker/dockerfile:1 + +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +WORKDIR /src +COPY PleasePayMe.sln ./ +COPY src/PleasePayMe.Domain/PleasePayMe.Domain.csproj src/PleasePayMe.Domain/ +COPY src/PleasePayMe.Application/PleasePayMe.Application.csproj src/PleasePayMe.Application/ +COPY src/PleasePayMe.Infrastructure/PleasePayMe.Infrastructure.csproj src/PleasePayMe.Infrastructure/ +COPY src/PleasePayMe.Api/PleasePayMe.Api.csproj src/PleasePayMe.Api/ +RUN dotnet restore src/PleasePayMe.Api/PleasePayMe.Api.csproj +COPY src/ ./src/ +RUN dotnet publish src/PleasePayMe.Api/PleasePayMe.Api.csproj -c Release -o /app/publish /p:UseAppHost=false + +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS final +WORKDIR /app +ENV ASPNETCORE_URLS=http://+:8000 +EXPOSE 8000 +COPY --from=build /app/publish . +USER $APP_UID +ENTRYPOINT ["dotnet", "PleasePayMe.Api.dll"] diff --git a/Dockerfile.web b/Dockerfile.web new file mode 100644 index 0000000..e54b683 --- /dev/null +++ b/Dockerfile.web @@ -0,0 +1,17 @@ +# syntax=docker/dockerfile:1 + +FROM node:22-alpine AS build +WORKDIR /web +COPY web/package.json web/package-lock.json* ./ +RUN npm install +COPY web/ ./ +ARG VITE_API_BASE_URL= +ARG VITE_TELEGRAM_BOT_USERNAME= +ENV VITE_API_BASE_URL=$VITE_API_BASE_URL \ + VITE_TELEGRAM_BOT_USERNAME=$VITE_TELEGRAM_BOT_USERNAME +RUN npm run build + +FROM nginx:1.27-alpine +COPY web/nginx.conf /etc/nginx/conf.d/default.conf +COPY --from=build /web/dist /usr/share/nginx/html +EXPOSE 80 diff --git a/PleasePayMe.sln b/PleasePayMe.sln new file mode 100644 index 0000000..8458bbf --- /dev/null +++ b/PleasePayMe.sln @@ -0,0 +1,99 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PleasePayMe.Domain", "src\PleasePayMe.Domain\PleasePayMe.Domain.csproj", "{C857E6E0-79E7-425A-89AA-2249B8E97C84}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PleasePayMe.Application", "src\PleasePayMe.Application\PleasePayMe.Application.csproj", "{E5B4B880-6D8F-4224-9134-E009FE1DD84F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PleasePayMe.Infrastructure", "src\PleasePayMe.Infrastructure\PleasePayMe.Infrastructure.csproj", "{0C1C947F-D99C-4287-B664-858604606AB4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PleasePayMe.Api", "src\PleasePayMe.Api\PleasePayMe.Api.csproj", "{2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PleasePayMe.Domain.Tests", "src\PleasePayMe.Domain.Tests\PleasePayMe.Domain.Tests.csproj", "{17EDC00D-3329-4839-8A49-86F8CD7D3A15}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Debug|x64.ActiveCfg = Debug|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Debug|x64.Build.0 = Debug|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Debug|x86.ActiveCfg = Debug|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Debug|x86.Build.0 = Debug|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Release|Any CPU.Build.0 = Release|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Release|x64.ActiveCfg = Release|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Release|x64.Build.0 = Release|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Release|x86.ActiveCfg = Release|Any CPU + {C857E6E0-79E7-425A-89AA-2249B8E97C84}.Release|x86.Build.0 = Release|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Debug|x64.ActiveCfg = Debug|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Debug|x64.Build.0 = Debug|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Debug|x86.ActiveCfg = Debug|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Debug|x86.Build.0 = Debug|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Release|Any CPU.Build.0 = Release|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Release|x64.ActiveCfg = Release|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Release|x64.Build.0 = Release|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Release|x86.ActiveCfg = Release|Any CPU + {E5B4B880-6D8F-4224-9134-E009FE1DD84F}.Release|x86.Build.0 = Release|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Debug|x64.ActiveCfg = Debug|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Debug|x64.Build.0 = Debug|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Debug|x86.ActiveCfg = Debug|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Debug|x86.Build.0 = Debug|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Release|Any CPU.Build.0 = Release|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Release|x64.ActiveCfg = Release|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Release|x64.Build.0 = Release|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Release|x86.ActiveCfg = Release|Any CPU + {0C1C947F-D99C-4287-B664-858604606AB4}.Release|x86.Build.0 = Release|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Debug|x64.ActiveCfg = Debug|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Debug|x64.Build.0 = Debug|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Debug|x86.ActiveCfg = Debug|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Debug|x86.Build.0 = Debug|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Release|Any CPU.Build.0 = Release|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Release|x64.ActiveCfg = Release|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Release|x64.Build.0 = Release|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Release|x86.ActiveCfg = Release|Any CPU + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577}.Release|x86.Build.0 = Release|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Debug|x64.ActiveCfg = Debug|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Debug|x64.Build.0 = Debug|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Debug|x86.ActiveCfg = Debug|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Debug|x86.Build.0 = Debug|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Release|Any CPU.ActiveCfg = Release|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Release|Any CPU.Build.0 = Release|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Release|x64.ActiveCfg = Release|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Release|x64.Build.0 = Release|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Release|x86.ActiveCfg = Release|Any CPU + {17EDC00D-3329-4839-8A49-86F8CD7D3A15}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C857E6E0-79E7-425A-89AA-2249B8E97C84} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {E5B4B880-6D8F-4224-9134-E009FE1DD84F} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {0C1C947F-D99C-4287-B664-858604606AB4} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {2FBEDAD1-8DD6-48E5-82F0-2A0052B2C577} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {17EDC00D-3329-4839-8A49-86F8CD7D3A15} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + EndGlobalSection +EndGlobal diff --git a/README.md b/README.md new file mode 100644 index 0000000..2137485 --- /dev/null +++ b/README.md @@ -0,0 +1,141 @@ +# Please Pay Me Bot + +Telegram-бот + web-кабинет для жизни «от зарплаты до зарплаты». + +**Стек сейчас:** Telegram bot (Python) · **API ASP.NET Core + PostgreSQL** (`src/PleasePayMe.*`) · React web. +Python-папка `api/` устарела; HTTP-контракт `/api/...` для бота и web сохранён. + +## Возможности + +- Задать бюджет: сумма + дата до зарплаты +- Пересчёт дневного лимита по остатку и числу дней +- Быстрый ввод трат: `250`, `250 кофе`, `кофе 250` +- Статус / траты за сегодня / отмена последней траты +- Кнопки внизу чата для частых действий + +## Логика лимита + +``` +остаток = бюджет − все траты периода +дней_осталось = (дата_конца − сегодня) + 1 # включая сегодня +остаток_на_утро = остаток + траты_сегодня +лимит_на_день = остаток_на_утро / дней_осталось +можно_сегодня = лимит_на_день − траты_сегодня +``` + +Лимит дня не сжимается от каждой траты внутри дня (модель «утреннего конверта»). Если сегодня вылез из лимита — завтра лимит пересчитается по новому остатку. + +## Быстрый старт + +1. Создай бота у [@BotFather](https://t.me/BotFather), скопируй токен. +2. Установи зависимости: + +```bash +python -m venv .venv +# Windows Git Bash / Linux: +source .venv/Scripts/activate # или .venv/bin/activate +pip install -r requirements.txt +``` + +3. Создай `.env` из примера: + +```bash +cp .env.example .env +# пропиши BOT_TOKEN=... +``` + +4. Запуск: + +```bash +python -m bot.main +``` + +## Команды + +| Команда / кнопка | Действие | +|---|---| +| `/budget` | Новый бюджет (сумма → дата) | +| `/status` | Лимит и остаток | +| `/today` | Список трат за сегодня | +| `/history` | Траты за период бюджета (постранично) | +| `/day 12.09` | Список трат за дату | +| `/spend` | Диалог: трата за другую дату | +| `/undo` | Удалить последнюю трату | +| `/help` | Справка | + +Трата за дату одним сообщением: `за 12.09 250 кофе`, `12.09 250`, `250 кофе 12.09`. + +Данные хранятся локально в SQLite: `data/budget.db`. + +## Web-кабинет (личный, через Telegram) + +Вход через [Telegram Login Widget](https://core.telegram.org/widgets/login). После входа пользователь видит **только свой** бюджет и траты (`/api/me/...`). + +### Настройка BotFather + +1. `/setdomain` → укажи домен, с которого открывается кабинет (нужен публичный HTTPS; чистый `localhost` обычно не работает). +2. Username бота без `@` положи в `.env` как `TELEGRAM_BOT_USERNAME`. + +### API + +| Метод | Путь | Auth | Описание | +|---|---|---|---| +| POST | `/api/auth/telegram` | — | обмен данных Login Widget на JWT | +| GET | `/api/me` | Bearer JWT | профиль | +| GET | `/api/me/budget` | Bearer JWT | свой бюджет | +| GET | `/api/me/expenses` | Bearer JWT | свои траты | +| GET | `/api/budgets`… | `API_TOKEN` | админский список (опционально) | + +### Docker + +```env +BOT_TOKEN=... +TELEGRAM_BOT_USERNAME=MyPayBot +PROXY_URL=socks5://127.0.0.1:10808 +``` + +```bash +docker compose up -d --build +``` + +- кабинет: http://HOST:51290 +- API: http://HOST:51291 + +## Docker + +```bash +docker build -t please-pay-me-bot . +docker run --rm -e BOT_TOKEN=your_token -v "$(pwd)/data:/app/data" please-pay-me-bot +``` + +На Windows (PowerShell): + +```powershell +docker build -t please-pay-me-bot . +docker run --rm -e BOT_TOKEN=your_token -v ${PWD}/data:/app/data please-pay-me-bot +``` + +Том `data` сохраняет SQLite между перезапусками. + +### Прокси (Xray на хосте + бот в Docker) + +**Рекомендуемый способ:** `network_mode: host` — контейнер видит `127.0.0.1` хоста, Xray можно оставить на loopback. + +В `.env` (токен только здесь, не в compose): + +```env +BOT_TOKEN=... +PROXY_URL=socks5://127.0.0.1:10808 +``` + +```bash +docker compose up -d --build +``` + +Проверка на хосте: + +```bash +curl -x socks5h://127.0.0.1:10808 https://api.telegram.org +``` + +Если без `host` сети (bridge): Xray должен слушать `0.0.0.0`, а в `PROXY_URL` — gateway хоста (`172.17.0.1` или `host.docker.internal`). Скрипт: `./scripts/open_xray_listen.sh`. У Portainer custom-сеть часто **не** имеет маршрута к `172.17.0.1`, из‑за этого был timeout. diff --git a/api/DEPRECATED.md b/api/DEPRECATED.md new file mode 100644 index 0000000..5471e9e --- /dev/null +++ b/api/DEPRECATED.md @@ -0,0 +1,6 @@ +# Deprecated Python API + +Этот каталог больше не используется в runtime. + +Актуальный API: `src/PleasePayMe.Api` (ASP.NET Core + PostgreSQL). +Контракт HTTP (`/api/...`) сохранён для web и Telegram-бота. diff --git a/api/__init__.py b/api/__init__.py new file mode 100644 index 0000000..28b07ef --- /dev/null +++ b/api/__init__.py @@ -0,0 +1 @@ +# API package diff --git a/api/config.py b/api/config.py new file mode 100644 index 0000000..b3714a7 --- /dev/null +++ b/api/config.py @@ -0,0 +1,52 @@ +from __future__ import annotations + +from pathlib import Path + +from pydantic import field_validator +from pydantic_settings import BaseSettings, SettingsConfigDict + +BASE_DIR = Path(__file__).resolve().parent.parent + + +class ApiSettings(BaseSettings): + model_config = SettingsConfigDict( + env_file=BASE_DIR / ".env", + env_file_encoding="utf-8", + extra="ignore", + ) + + database_path: Path = BASE_DIR / "data" / "budget.db" + bot_token: str + # Shared secret for bot (/api/auth/internal) and admin /api/budgets/* + api_token: str | None = None + jwt_secret: str | None = None + jwt_ttl_seconds: int = 60 * 60 * 24 * 14 + telegram_auth_max_age_seconds: int = 60 * 60 * 24 + cors_origins: str = "*" + host: str = "0.0.0.0" + port: int = 8000 + + @field_validator("bot_token", mode="before") + @classmethod + def require_bot_token(cls, value: object) -> object: + if value is None or (isinstance(value, str) and not value.strip()): + raise ValueError("BOT_TOKEN is required for Telegram login") + return value + + @field_validator("api_token", "jwt_secret", mode="before") + @classmethod + def empty_as_none(cls, value: object) -> object: + if isinstance(value, str) and not value.strip(): + return None + return value + + @property + def session_secret(self) -> str: + return self.jwt_secret or f"ppm-jwt::{self.bot_token}" + + @property + def cors_origin_list(self) -> list[str]: + return [item.strip() for item in self.cors_origins.split(",") if item.strip()] + + +settings = ApiSettings() diff --git a/api/deps.py b/api/deps.py new file mode 100644 index 0000000..f776388 --- /dev/null +++ b/api/deps.py @@ -0,0 +1,68 @@ +from __future__ import annotations + +from dataclasses import dataclass + +from fastapi import Depends, Header, HTTPException, status +import jwt + +from api.config import settings +from api.tokens import decode_access_token + + +@dataclass(frozen=True) +class AuthUser: + user_id: int + first_name: str | None = None + last_name: str | None = None + username: str | None = None + + +def _extract_bearer(authorization: str | None) -> str | None: + if not authorization: + return None + if authorization.lower().startswith("bearer "): + return authorization[7:].strip() + return None + + +async def require_api_token( + authorization: str | None = Header(default=None), + x_api_token: str | None = Header(default=None, alias="X-API-Token"), +) -> None: + if not settings.api_token: + raise HTTPException( + status_code=status.HTTP_501_NOT_IMPLEMENTED, + detail="Admin API_TOKEN is not configured", + ) + token = (x_api_token or "").strip() or _extract_bearer(authorization) + if not token or token != settings.api_token: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Invalid or missing API token", + ) + + +async def require_user( + authorization: str | None = Header(default=None), +) -> AuthUser: + token = _extract_bearer(authorization) + if not token: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Authorization Bearer token required", + ) + try: + payload = decode_access_token(token) + user_id = int(payload["uid"]) + except (jwt.PyJWTError, KeyError, TypeError, ValueError) as exc: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Invalid or expired session", + ) from exc + + return AuthUser( + user_id=user_id, + first_name=payload.get("fn"), + last_name=payload.get("ln"), + username=payload.get("un"), + ) diff --git a/api/main.py b/api/main.py new file mode 100644 index 0000000..62ec3cb --- /dev/null +++ b/api/main.py @@ -0,0 +1,47 @@ +from __future__ import annotations + +from contextlib import asynccontextmanager + +from fastapi import FastAPI +from fastapi.middleware.cors import CORSMiddleware + +from api.config import settings +from api.routes import router as api_router +from bot.db.database import Database +from bot.db.repository import BudgetRepository +from bot.services.budget import BudgetService + + +@asynccontextmanager +async def lifespan(app: FastAPI): + db = Database(settings.database_path, read_only=False) + await db.connect() + app.state.db = db + app.state.budget_service = BudgetService(BudgetRepository(db)) + try: + yield + finally: + await db.close() + + +app = FastAPI( + title="Please Pay Me API", + version="1.0.0", + lifespan=lifespan, +) + +app.add_middleware( + CORSMiddleware, + allow_origins=settings.cors_origin_list, + allow_credentials=True, + allow_methods=["GET", "POST", "PUT", "DELETE", "OPTIONS"], + allow_headers=["Authorization", "X-API-Token", "Content-Type"], +) + + +@app.get("/api/health") +async def health() -> dict[str, str]: + return {"status": "ok"} + + +app.include_router(api_router) diff --git a/api/routes.py b/api/routes.py new file mode 100644 index 0000000..5395df9 --- /dev/null +++ b/api/routes.py @@ -0,0 +1,412 @@ +from __future__ import annotations + +from datetime import date + +from fastapi import APIRouter, Depends, HTTPException, Query, Request, status + +from api.config import settings +from api.deps import AuthUser, require_api_token, require_user +from api.schemas import ( + AuthSessionOut, + AuthUserOut, + BudgetActiveIn, + BudgetCreateIn, + BudgetOut, + BudgetStatusOut, + BudgetUpdateIn, + BudgetUpsertIn, + BudgetsListOut, + ExpenseCreateIn, + ExpenseOut, + ExpensesPageOut, + InternalAuthIn, + TelegramLoginIn, + UndoExpenseOut, +) +from api.telegram_auth import TelegramAuthError, verify_telegram_login +from api.tokens import create_access_token +from bot.services.budget import BudgetService, BudgetStatus, PeriodExpensesPage + +router = APIRouter(prefix="/api") + + +def _status_out(status_data: BudgetStatus) -> BudgetStatusOut: + b = status_data.budget + return BudgetStatusOut( + budget=BudgetOut( + id=b.id, + user_id=b.user_id, + name=b.name, + total_amount=b.total_amount, + start_date=b.start_date, + end_date=b.end_date, + currency=b.currency, + is_active=b.is_active, + ), + today=status_data.today, + days_left=status_data.days_left, + total_spent=status_data.total_spent, + remaining=status_data.remaining, + daily_limit=status_data.daily_limit, + spent_today=status_data.spent_today, + remaining_today=status_data.remaining_today, + is_over_daily=status_data.is_over_daily, + is_over_budget=status_data.is_over_budget, + is_expired=status_data.is_expired, + selected=status_data.selected, + ) + + +def _page_out(page: PeriodExpensesPage) -> ExpensesPageOut: + return ExpensesPageOut( + page=page.page, + total_pages=page.total_pages, + total_count=page.total_count, + total_sum=page.total_sum, + page_size=page.page_size, + budget_id=page.budget.id, + items=[ + ExpenseOut( + id=item.id, + budget_id=item.budget_id, + amount=item.amount, + note=item.note, + spent_at=item.spent_at, + ) + for item in page.items + ], + ) + + +def _service(request: Request) -> BudgetService: + return request.app.state.budget_service + + +@router.post("/auth/telegram", response_model=AuthSessionOut) +async def auth_telegram(body: TelegramLoginIn) -> AuthSessionOut: + try: + profile = verify_telegram_login( + body.model_dump(), + settings.bot_token, + max_age_seconds=settings.telegram_auth_max_age_seconds, + ) + except TelegramAuthError as exc: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail=str(exc), + ) from exc + + token = create_access_token(user_id=profile["id"], profile=profile) + return AuthSessionOut( + access_token=token, + user=AuthUserOut( + user_id=profile["id"], + first_name=profile.get("first_name"), + last_name=profile.get("last_name"), + username=profile.get("username"), + photo_url=profile.get("photo_url"), + ), + ) + + +@router.post( + "/auth/internal", + response_model=AuthSessionOut, + dependencies=[Depends(require_api_token)], +) +async def auth_internal(body: InternalAuthIn) -> AuthSessionOut: + profile = { + "id": body.user_id, + "first_name": body.first_name, + "last_name": body.last_name, + "username": body.username, + } + token = create_access_token(user_id=body.user_id, profile=profile) + return AuthSessionOut( + access_token=token, + user=AuthUserOut( + user_id=body.user_id, + first_name=body.first_name, + last_name=body.last_name, + username=body.username, + ), + ) + + +@router.get("/me", response_model=AuthUserOut) +async def me(user: AuthUser = Depends(require_user)) -> AuthUserOut: + return AuthUserOut( + user_id=user.user_id, + first_name=user.first_name, + last_name=user.last_name, + username=user.username, + ) + + +@router.get("/me/budgets", response_model=BudgetsListOut) +async def my_budgets( + request: Request, + user: AuthUser = Depends(require_user), +) -> BudgetsListOut: + service = _service(request) + items = await service.list_user_statuses(user.user_id) + return BudgetsListOut(items=[_status_out(item) for item in items]) + + +@router.post("/me/budgets", response_model=BudgetStatusOut) +async def create_my_budget( + body: BudgetCreateIn, + request: Request, + user: AuthUser = Depends(require_user), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.create_budget( + user_id=user.user_id, + total_amount=body.total_amount, + end_date=body.end_date, + name=body.name, + is_active=body.is_active, + select=body.select, + ) + except ValueError as exc: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=str(exc), + ) from exc + return _status_out(status_data) + + +@router.put("/me/budgets/{budget_id}", response_model=BudgetStatusOut) +async def update_my_budget( + budget_id: int, + body: BudgetUpdateIn, + request: Request, + user: AuthUser = Depends(require_user), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.update_budget( + user.user_id, + budget_id, + name=body.name, + total_amount=body.total_amount, + end_date=body.end_date, + reset_expenses=body.reset_expenses, + ) + except ValueError as exc: + code = ( + status.HTTP_404_NOT_FOUND + if "не найден" in str(exc).lower() + else status.HTTP_400_BAD_REQUEST + ) + raise HTTPException(status_code=code, detail=str(exc)) from exc + return _status_out(status_data) + + +@router.patch("/me/budgets/{budget_id}/active", response_model=BudgetStatusOut) +async def set_my_budget_active( + budget_id: int, + body: BudgetActiveIn, + request: Request, + user: AuthUser = Depends(require_user), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.set_budget_active( + user.user_id, + budget_id, + body.is_active, + ) + except ValueError as exc: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc + return _status_out(status_data) + + +@router.post("/me/budgets/{budget_id}/select", response_model=BudgetStatusOut) +async def select_my_budget( + budget_id: int, + request: Request, + user: AuthUser = Depends(require_user), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.select_budget(user.user_id, budget_id) + except ValueError as exc: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc + return _status_out(status_data) + + +@router.get("/me/budget", response_model=BudgetStatusOut) +async def my_budget( + request: Request, + user: AuthUser = Depends(require_user), + budget_id: int | None = Query(default=None), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.get_status(user.user_id, budget_id=budget_id) + except ValueError as exc: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc + return _status_out(status_data) + + +@router.get("/me/expenses", response_model=ExpensesPageOut) +async def my_expenses( + request: Request, + user: AuthUser = Depends(require_user), + page: int = Query(default=0, ge=0), + page_size: int = Query(default=20, ge=1, le=100), + spent_at: date | None = Query(default=None), + budget_id: int | None = Query(default=None), +) -> ExpensesPageOut: + service = _service(request) + try: + if spent_at is not None: + page_data = await service.get_expenses_on_date_page( + user.user_id, + spent_at, + page=page, + page_size=page_size, + budget_id=budget_id, + ) + else: + page_data = await service.get_period_expenses_page( + user.user_id, + page=page, + page_size=page_size, + budget_id=budget_id, + ) + except ValueError as exc: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc + return _page_out(page_data) + + +@router.post("/me/expenses", response_model=BudgetStatusOut) +async def create_my_expense( + body: ExpenseCreateIn, + request: Request, + user: AuthUser = Depends(require_user), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.add_expense( + user_id=user.user_id, + amount=body.amount, + note=body.note, + spent_at=body.spent_at, + budget_id=body.budget_id, + ) + except ValueError as exc: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=str(exc), + ) from exc + return _status_out(status_data) + + +@router.delete("/me/expenses/last", response_model=UndoExpenseOut) +async def undo_my_last_expense( + request: Request, + user: AuthUser = Depends(require_user), + budget_id: int | None = Query(default=None), +) -> UndoExpenseOut: + service = _service(request) + status_data, amount = await service.undo_last_expense( + user.user_id, + budget_id=budget_id, + ) + if amount is None or status_data is None: + raise HTTPException( + status_code=status.HTTP_404_NOT_FOUND, + detail="Нечего отменять", + ) + return UndoExpenseOut(deleted_amount=amount, status=_status_out(status_data)) + + +@router.put("/me/budget", response_model=BudgetStatusOut) +async def upsert_my_budget( + body: BudgetUpsertIn, + request: Request, + user: AuthUser = Depends(require_user), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.set_budget( + user_id=user.user_id, + total_amount=body.total_amount, + end_date=body.end_date, + reset_expenses=body.reset_expenses, + name=body.name, + budget_id=body.budget_id, + ) + except ValueError as exc: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=str(exc), + ) from exc + return _status_out(status_data) + + +@router.get( + "/budgets", + response_model=BudgetsListOut, + dependencies=[Depends(require_api_token)], +) +async def list_budgets(request: Request) -> BudgetsListOut: + service = _service(request) + items = await service.list_budget_summaries() + return BudgetsListOut(items=[_status_out(item) for item in items]) + + +@router.get( + "/budgets/{user_id}", + response_model=BudgetStatusOut, + dependencies=[Depends(require_api_token)], +) +async def get_budget( + user_id: int, + request: Request, + budget_id: int | None = Query(default=None), +) -> BudgetStatusOut: + service = _service(request) + try: + status_data = await service.get_status(user_id, budget_id=budget_id) + except ValueError as exc: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc + return _status_out(status_data) + + +@router.get( + "/budgets/{user_id}/expenses", + response_model=ExpensesPageOut, + dependencies=[Depends(require_api_token)], +) +async def list_expenses( + user_id: int, + request: Request, + page: int = Query(default=0, ge=0), + page_size: int = Query(default=20, ge=1, le=100), + spent_at: date | None = Query(default=None), + budget_id: int | None = Query(default=None), +) -> ExpensesPageOut: + service = _service(request) + try: + if spent_at is not None: + page_data = await service.get_expenses_on_date_page( + user_id, + spent_at, + page=page, + page_size=page_size, + budget_id=budget_id, + ) + else: + page_data = await service.get_period_expenses_page( + user_id, + page=page, + page_size=page_size, + budget_id=budget_id, + ) + except ValueError as exc: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc + return _page_out(page_data) diff --git a/api/schemas.py b/api/schemas.py new file mode 100644 index 0000000..2dd701b --- /dev/null +++ b/api/schemas.py @@ -0,0 +1,127 @@ +from __future__ import annotations + +from datetime import date + +from pydantic import BaseModel, Field + + +class BudgetOut(BaseModel): + id: int + user_id: int + name: str + total_amount: float + start_date: date + end_date: date + currency: str + is_active: bool + + +class BudgetStatusOut(BaseModel): + budget: BudgetOut + today: date + days_left: int + total_spent: float + remaining: float + daily_limit: float + spent_today: float + remaining_today: float + is_over_daily: bool + is_over_budget: bool + is_expired: bool + selected: bool = False + + +class ExpenseOut(BaseModel): + id: int + budget_id: int + amount: float + note: str | None + spent_at: date + + +class ExpensesPageOut(BaseModel): + page: int + total_pages: int + total_count: int + total_sum: float + page_size: int + budget_id: int + items: list[ExpenseOut] + + +class BudgetsListOut(BaseModel): + items: list[BudgetStatusOut] = Field(default_factory=list) + + +class TelegramLoginIn(BaseModel): + id: int + first_name: str + last_name: str | None = None + username: str | None = None + photo_url: str | None = None + auth_date: int + hash: str + + +class InternalAuthIn(BaseModel): + """Service auth for trusted clients (Telegram bot) acting as a user.""" + + user_id: int = Field(gt=0) + first_name: str | None = None + last_name: str | None = None + username: str | None = None + + +class AuthUserOut(BaseModel): + user_id: int + first_name: str | None = None + last_name: str | None = None + username: str | None = None + photo_url: str | None = None + + +class AuthSessionOut(BaseModel): + access_token: str + token_type: str = "bearer" + user: AuthUserOut + + +class ExpenseCreateIn(BaseModel): + amount: float = Field(gt=0) + note: str | None = None + spent_at: date | None = None + budget_id: int | None = None + + +class BudgetCreateIn(BaseModel): + total_amount: float = Field(gt=0) + end_date: date + name: str = "Бюджет" + is_active: bool = True + select: bool = True + + +class BudgetUpdateIn(BaseModel): + total_amount: float | None = Field(default=None, gt=0) + end_date: date | None = None + name: str | None = None + reset_expenses: bool = False + + +class BudgetActiveIn(BaseModel): + is_active: bool + + +class BudgetUpsertIn(BaseModel): + """Legacy upsert against selected budget (or create if none).""" + + total_amount: float = Field(gt=0) + end_date: date + reset_expenses: bool = True + name: str | None = None + budget_id: int | None = None + + +class UndoExpenseOut(BaseModel): + deleted_amount: float + status: BudgetStatusOut diff --git a/api/telegram_auth.py b/api/telegram_auth.py new file mode 100644 index 0000000..ff4f338 --- /dev/null +++ b/api/telegram_auth.py @@ -0,0 +1,65 @@ +from __future__ import annotations + +import hashlib +import hmac +import time +from typing import Any + + +class TelegramAuthError(ValueError): + pass + + +def verify_telegram_login( + payload: dict[str, Any], + bot_token: str, + *, + max_age_seconds: int = 86400, +) -> dict[str, Any]: + """Verify Telegram Login Widget data per Telegram docs.""" + received_hash = payload.get("hash") + if not received_hash or not isinstance(received_hash, str): + raise TelegramAuthError("Missing hash") + + check_pairs: list[str] = [] + for key in sorted(payload.keys()): + if key == "hash": + continue + value = payload[key] + if value is None: + continue + check_pairs.append(f"{key}={value}") + data_check_string = "\n".join(check_pairs) + + secret_key = hashlib.sha256(bot_token.encode("utf-8")).digest() + calculated = hmac.new( + secret_key, + data_check_string.encode("utf-8"), + hashlib.sha256, + ).hexdigest() + + if not hmac.compare_digest(calculated, received_hash): + raise TelegramAuthError("Invalid Telegram login signature") + + auth_date_raw = payload.get("auth_date") + try: + auth_date = int(auth_date_raw) + except (TypeError, ValueError) as exc: + raise TelegramAuthError("Invalid auth_date") from exc + + if max_age_seconds > 0 and time.time() - auth_date > max_age_seconds: + raise TelegramAuthError("Telegram login data expired") + + try: + user_id = int(payload["id"]) + except (KeyError, TypeError, ValueError) as exc: + raise TelegramAuthError("Missing Telegram user id") from exc + + return { + "id": user_id, + "first_name": str(payload.get("first_name") or ""), + "last_name": str(payload.get("last_name") or "") or None, + "username": str(payload.get("username") or "") or None, + "photo_url": str(payload.get("photo_url") or "") or None, + "auth_date": auth_date, + } diff --git a/api/tokens.py b/api/tokens.py new file mode 100644 index 0000000..8bace74 --- /dev/null +++ b/api/tokens.py @@ -0,0 +1,26 @@ +from __future__ import annotations + +from datetime import datetime, timedelta, timezone +from typing import Any + +import jwt + +from api.config import settings + + +def create_access_token(*, user_id: int, profile: dict[str, Any]) -> str: + now = datetime.now(timezone.utc) + payload = { + "sub": str(user_id), + "uid": user_id, + "fn": profile.get("first_name"), + "ln": profile.get("last_name"), + "un": profile.get("username"), + "iat": now, + "exp": now + timedelta(seconds=settings.jwt_ttl_seconds), + } + return jwt.encode(payload, settings.session_secret, algorithm="HS256") + + +def decode_access_token(token: str) -> dict[str, Any]: + return jwt.decode(token, settings.session_secret, algorithms=["HS256"]) diff --git a/bot/__init__.py b/bot/__init__.py new file mode 100644 index 0000000..0e632e1 --- /dev/null +++ b/bot/__init__.py @@ -0,0 +1 @@ +# Package marker diff --git a/bot/clients/__init__.py b/bot/clients/__init__.py new file mode 100644 index 0000000..6694ec6 --- /dev/null +++ b/bot/clients/__init__.py @@ -0,0 +1 @@ +"""HTTP clients for talking to the Please Pay Me API.""" diff --git a/bot/clients/budget_api.py b/bot/clients/budget_api.py new file mode 100644 index 0000000..b08e4ba --- /dev/null +++ b/bot/clients/budget_api.py @@ -0,0 +1,444 @@ +from __future__ import annotations + +import base64 +import json +from datetime import date, datetime, timedelta, timezone +from typing import Any + +import aiohttp + +from bot.db.repository import Budget, Expense +from bot.services.budget import ( + PERIOD_PAGE_SIZE, + BudgetStatus, + PeriodExpensesPage, +) + + +YANDEX_NAMESPACE_BIT = 1 << 50 + + +class BudgetApiError(Exception): + """HTTP / transport failure talking to the API.""" + + +class YandexLoginRequired(Exception): + """Bot identity is not linked to a Yandex account yet.""" + + def __init__(self, login_url: str, detail: str = "") -> None: + self.login_url = login_url + self.detail = detail or "Чтобы пользоваться ботом, войдите через Яндекс." + super().__init__(self.detail) + + +def _jwt_uid(token: str) -> int | None: + try: + payload = token.split(".")[1] + payload += "=" * (-len(payload) % 4) + data = json.loads(base64.urlsafe_b64decode(payload.encode("ascii"))) + raw = data.get("uid") or data.get("sub") + return int(raw) + except (IndexError, ValueError, TypeError, json.JSONDecodeError, OSError): + return None + + +class BudgetApiClient: + """Budget operations via the same HTTP API as the web cabinet.""" + + def __init__( + self, + *, + base_url: str, + api_token: str, + session: aiohttp.ClientSession | None = None, + ) -> None: + self._base = base_url.rstrip("/") + self._api_token = api_token + self._session = session + self._owns_session = session is None + self._tokens: dict[int, tuple[str, datetime]] = {} + + async def start(self) -> None: + if self._session is None: + self._session = aiohttp.ClientSession( + timeout=aiohttp.ClientTimeout(total=30), + ) + + async def close(self) -> None: + if self._owns_session and self._session is not None: + await self._session.close() + self._session = None + + def _ensure_session(self) -> aiohttp.ClientSession: + if self._session is None: + raise RuntimeError("BudgetApiClient is not started") + return self._session + + @staticmethod + def _detail(payload: Any, fallback: str) -> str: + if isinstance(payload, dict): + detail = payload.get("detail", fallback) + if isinstance(detail, str): + return detail + if isinstance(detail, list) and detail: + first = detail[0] + if isinstance(first, dict) and "msg" in first: + return str(first["msg"]) + return str(first) + return str(detail) + return fallback + + async def _request( + self, + method: str, + path: str, + *, + user_id: int | None = None, + json_body: dict[str, Any] | None = None, + params: dict[str, Any] | None = None, + retry_auth: bool = True, + ) -> Any: + session = self._ensure_session() + headers: dict[str, str] = {"Accept": "application/json"} + if user_id is not None: + headers["Authorization"] = f"Bearer {await self._access_token(user_id)}" + else: + headers["X-API-Token"] = self._api_token + + clean_params = None + if params: + clean_params = {k: v for k, v in params.items() if v is not None} + + url = f"{self._base}{path}" + async with session.request( + method, + url, + json=json_body, + params=clean_params, + headers=headers, + ) as resp: + if resp.status == 401 and user_id is not None and retry_auth: + self._tokens.pop(user_id, None) + await resp.read() + return await self._request( + method, + path, + user_id=user_id, + json_body=json_body, + params=params, + retry_auth=False, + ) + + if resp.status == 204: + return None + + body: Any + try: + body = await resp.json(content_type=None) + except aiohttp.ContentTypeError: + text = await resp.text() + body = {"detail": text or resp.reason} + + if resp.status >= 400: + if ( + resp.status == 403 + and isinstance(body, dict) + and body.get("code") == "yandex_required" + ): + if user_id is not None: + self._tokens.pop(user_id, None) + raise YandexLoginRequired( + str(body.get("login_url") or ""), + self._detail(body, "Чтобы пользоваться ботом, войдите через Яндекс."), + ) + message = self._detail(body, f"API error {resp.status}") + if resp.status in {400, 404}: + raise ValueError(message) + raise BudgetApiError(message) + return body + + async def ensure_yandex_login(self, telegram_user_id: int) -> None: + await self._access_token(telegram_user_id) + + async def _access_token(self, user_id: int) -> str: + now = datetime.now(timezone.utc) + cached = self._tokens.get(user_id) + if cached and cached[1] > now + timedelta(seconds=60): + uid = _jwt_uid(cached[0]) + if uid is not None and (uid & YANDEX_NAMESPACE_BIT): + return cached[0] + self._tokens.pop(user_id, None) + + data = await self._request( + "POST", + "/api/auth/internal", + json_body={"user_id": user_id}, + ) + token = str(data["access_token"]) + uid = _jwt_uid(token) + if uid is None or not (uid & YANDEX_NAMESPACE_BIT): + raise BudgetApiError("API did not issue a Yandex-linked session") + self._tokens[user_id] = (token, now + timedelta(days=1)) + return token + + @staticmethod + def _parse_date(value: str | date) -> date: + if isinstance(value, date) and not isinstance(value, datetime): + return value + return date.fromisoformat(str(value)[:10]) + + def _status_from(self, data: dict[str, Any]) -> BudgetStatus: + b = data["budget"] + budget = Budget( + id=int(b["id"]), + user_id=int(b["user_id"]), + name=str(b.get("name") or "Бюджет"), + total_amount=float(b["total_amount"]), + start_date=self._parse_date(b["start_date"]), + end_date=self._parse_date(b["end_date"]), + currency=str(b.get("currency") or "RUB"), + is_active=bool(b.get("is_active", True)), + ) + return BudgetStatus( + budget=budget, + today=self._parse_date(data["today"]), + days_left=int(data["days_left"]), + total_spent=float(data["total_spent"]), + remaining=float(data["remaining"]), + daily_limit=float(data["daily_limit"]), + spent_today=float(data["spent_today"]), + remaining_today=float(data["remaining_today"]), + is_over_daily=bool(data["is_over_daily"]), + is_over_budget=bool(data["is_over_budget"]), + is_expired=bool(data["is_expired"]), + selected=bool(data.get("selected", False)), + ) + + def _expense_from(self, data: dict[str, Any], user_id: int) -> Expense: + return Expense( + id=int(data["id"]), + user_id=user_id, + budget_id=int(data.get("budget_id") or 0), + amount=float(data["amount"]), + note=data.get("note"), + spent_at=self._parse_date(data["spent_at"]), + ) + + async def _page_from( + self, + user_id: int, + data: dict[str, Any], + budget_id: int | None = None, + ) -> PeriodExpensesPage: + status = await self.get_status( + user_id, + budget_id=budget_id or int(data.get("budget_id") or 0) or None, + ) + return PeriodExpensesPage( + budget=status.budget, + page=int(data["page"]), + total_pages=int(data["total_pages"]), + total_count=int(data["total_count"]), + total_sum=float(data["total_sum"]), + page_size=int(data["page_size"]), + items=[self._expense_from(item, user_id) for item in data.get("items", [])], + ) + + async def list_user_statuses(self, user_id: int) -> list[BudgetStatus]: + data = await self._request("GET", "/api/me/budgets", user_id=user_id) + return [self._status_from(item) for item in data.get("items", [])] + + async def get_status( + self, + user_id: int, + today: date | None = None, + budget_id: int | None = None, + ) -> BudgetStatus: + del today + data = await self._request( + "GET", + "/api/me/budget", + user_id=user_id, + params={"budget_id": budget_id} if budget_id else None, + ) + return self._status_from(data) + + async def create_budget( + self, + user_id: int, + total_amount: float, + end_date: date, + *, + name: str = "Бюджет", + start_date: date | None = None, + is_active: bool = True, + select: bool = True, + ) -> BudgetStatus: + body: dict[str, Any] = { + "total_amount": total_amount, + "end_date": end_date.isoformat(), + "name": name, + "is_active": is_active, + "select": select, + } + if start_date is not None: + body["start_date"] = start_date.isoformat() + data = await self._request( + "POST", + "/api/me/budgets", + user_id=user_id, + json_body=body, + ) + return self._status_from(data) + + async def set_budget_active( + self, + user_id: int, + budget_id: int, + is_active: bool, + ) -> BudgetStatus: + data = await self._request( + "PATCH", + f"/api/me/budgets/{budget_id}/active", + user_id=user_id, + json_body={"is_active": is_active}, + ) + return self._status_from(data) + + async def select_budget(self, user_id: int, budget_id: int) -> BudgetStatus: + data = await self._request( + "POST", + f"/api/me/budgets/{budget_id}/select", + user_id=user_id, + ) + return self._status_from(data) + + async def delete_budget(self, user_id: int, budget_id: int) -> None: + await self._request( + "DELETE", + f"/api/me/budgets/{budget_id}", + user_id=user_id, + ) + + async def set_budget( + self, + user_id: int, + total_amount: float, + end_date: date, + start_date: date | None = None, + reset_expenses: bool = True, + name: str | None = None, + budget_id: int | None = None, + ) -> BudgetStatus: + # Creating a new named budget is the common bot flow. + if budget_id is None and name is not None: + return await self.create_budget( + user_id, + total_amount, + end_date, + name=name, + start_date=start_date, + ) + body: dict[str, Any] = { + "total_amount": total_amount, + "end_date": end_date.isoformat(), + "reset_expenses": reset_expenses, + } + if name is not None: + body["name"] = name + if budget_id is not None: + body["budget_id"] = budget_id + if start_date is not None: + body["start_date"] = start_date.isoformat() + data = await self._request( + "PUT", + "/api/me/budget", + user_id=user_id, + json_body=body, + ) + return self._status_from(data) + + async def add_expense( + self, + user_id: int, + amount: float, + note: str | None = None, + spent_at: date | None = None, + budget_id: int | None = None, + ) -> BudgetStatus: + body: dict[str, Any] = {"amount": amount} + if note is not None: + body["note"] = note + if spent_at is not None: + body["spent_at"] = spent_at.isoformat() + if budget_id is not None: + body["budget_id"] = budget_id + data = await self._request( + "POST", + "/api/me/expenses", + user_id=user_id, + json_body=body, + ) + return self._status_from(data) + + async def undo_last_expense( + self, + user_id: int, + budget_id: int | None = None, + ) -> tuple[BudgetStatus | None, float | None]: + try: + data = await self._request( + "DELETE", + "/api/me/expenses/last", + user_id=user_id, + params={"budget_id": budget_id} if budget_id else None, + ) + except ValueError: + return None, None + return self._status_from(data["status"]), float(data["deleted_amount"]) + + async def get_period_expenses_page( + self, + user_id: int, + page: int = 0, + page_size: int = PERIOD_PAGE_SIZE, + budget_id: int | None = None, + ) -> PeriodExpensesPage: + data = await self._request( + "GET", + "/api/me/expenses", + user_id=user_id, + params={"page": page, "page_size": page_size, "budget_id": budget_id}, + ) + return await self._page_from(user_id, data, budget_id=budget_id) + + async def expenses_on_date( + self, + user_id: int, + day: date, + budget_id: int | None = None, + ) -> list[Expense]: + data = await self._request( + "GET", + "/api/me/expenses", + user_id=user_id, + params={ + "spent_at": day.isoformat(), + "page": 0, + "page_size": 100, + "budget_id": budget_id, + }, + ) + return [self._expense_from(item, user_id) for item in data.get("items", [])] + + async def today_expenses( + self, + user_id: int, + today: date | None = None, + budget_id: int | None = None, + ) -> list[Expense]: + return await self.expenses_on_date( + user_id, + today or date.today(), + budget_id=budget_id, + ) diff --git a/bot/config.py b/bot/config.py new file mode 100644 index 0000000..e79df9b --- /dev/null +++ b/bot/config.py @@ -0,0 +1,47 @@ +from pathlib import Path + +from pydantic import field_validator +from pydantic_settings import BaseSettings, SettingsConfigDict + +BASE_DIR = Path(__file__).resolve().parent.parent + + +class Settings(BaseSettings): + model_config = SettingsConfigDict( + env_file=BASE_DIR / ".env", + env_file_encoding="utf-8", + extra="ignore", + ) + + bot_token: str + # Same API the web cabinet uses (bot no longer opens SQLite). + api_base_url: str = "http://127.0.0.1:51291" + api_token: str + # Example for Docker → host Xray: socks5://127.0.0.1:10808 + proxy_url: str | None = None + + @field_validator("proxy_url", mode="before") + @classmethod + def empty_proxy_as_none(cls, value: object) -> object: + if value is None: + return None + if isinstance(value, str) and not value.strip(): + return None + return value + + @field_validator("api_token", mode="before") + @classmethod + def require_api_token(cls, value: object) -> object: + if value is None or (isinstance(value, str) and not value.strip()): + raise ValueError( + "API_TOKEN is required: bot authenticates to the API with it" + ) + return value + + @field_validator("api_base_url") + @classmethod + def normalize_base_url(cls, value: str) -> str: + return value.rstrip("/") + + +settings = Settings() diff --git a/bot/db/__init__.py b/bot/db/__init__.py new file mode 100644 index 0000000..0e632e1 --- /dev/null +++ b/bot/db/__init__.py @@ -0,0 +1 @@ +# Package marker diff --git a/bot/db/database.py b/bot/db/database.py new file mode 100644 index 0000000..cbb3e73 --- /dev/null +++ b/bot/db/database.py @@ -0,0 +1,243 @@ +from __future__ import annotations + +from pathlib import Path + +import aiosqlite + +SCHEMA = """ +CREATE TABLE IF NOT EXISTS users ( + user_id INTEGER PRIMARY KEY, + selected_budget_id INTEGER, + created_at TEXT NOT NULL DEFAULT (datetime('now')) +); + +CREATE TABLE IF NOT EXISTS budgets ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + name TEXT NOT NULL DEFAULT '', + total_amount REAL NOT NULL, + start_date TEXT NOT NULL, + end_date TEXT NOT NULL, + currency TEXT NOT NULL DEFAULT 'RUB', + is_active INTEGER NOT NULL DEFAULT 1, + created_at TEXT NOT NULL DEFAULT (datetime('now')), + FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE +); + +CREATE TABLE IF NOT EXISTS expenses ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + budget_id INTEGER NOT NULL, + amount REAL NOT NULL, + note TEXT, + spent_at TEXT NOT NULL, + created_at TEXT NOT NULL DEFAULT (datetime('now')), + FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE, + FOREIGN KEY (budget_id) REFERENCES budgets(id) ON DELETE CASCADE +); +""" + + +async def _ensure_indexes(conn: aiosqlite.Connection) -> None: + await conn.executescript( + """ + CREATE INDEX IF NOT EXISTS idx_budgets_user + ON budgets(user_id, is_active, id); + CREATE INDEX IF NOT EXISTS idx_expenses_budget_spent_at + ON expenses(budget_id, spent_at); + CREATE INDEX IF NOT EXISTS idx_expenses_user_spent_at + ON expenses(user_id, spent_at); + """ + ) + + +async def _table_columns(conn: aiosqlite.Connection, table: str) -> set[str]: + cursor = await conn.execute(f"PRAGMA table_info({table})") + rows = await cursor.fetchall() + return {str(row[1]) for row in rows} + + +async def _has_unique_user_on_budgets(conn: aiosqlite.Connection) -> bool: + cursor = await conn.execute("PRAGMA index_list(budgets)") + indexes = await cursor.fetchall() + for idx in indexes: + # (seq, name, unique, origin, partial) + if not idx[2]: + continue + name = idx[1] + info = await conn.execute(f"PRAGMA index_info({name})") + cols = [row[2] for row in await info.fetchall()] + if cols == ["user_id"]: + return True + return False + + +async def migrate_schema(conn: aiosqlite.Connection) -> None: + """Upgrade legacy one-budget-per-user schema in place.""" + tables = { + row[0] + for row in await ( + await conn.execute( + "SELECT name FROM sqlite_master WHERE type='table'" + ) + ).fetchall() + } + if "budgets" not in tables: + return + + budget_cols = await _table_columns(conn, "budgets") + if "name" not in budget_cols: + await conn.execute( + "ALTER TABLE budgets ADD COLUMN name TEXT NOT NULL DEFAULT ''" + ) + if "is_active" not in budget_cols: + await conn.execute( + "ALTER TABLE budgets ADD COLUMN is_active INTEGER NOT NULL DEFAULT 1" + ) + + user_cols = await _table_columns(conn, "users") + if "selected_budget_id" not in user_cols: + await conn.execute( + "ALTER TABLE users ADD COLUMN selected_budget_id INTEGER" + ) + + if await _has_unique_user_on_budgets(conn): + await conn.executescript( + """ + CREATE TABLE budgets_migrated ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + name TEXT NOT NULL DEFAULT '', + total_amount REAL NOT NULL, + start_date TEXT NOT NULL, + end_date TEXT NOT NULL, + currency TEXT NOT NULL DEFAULT 'RUB', + is_active INTEGER NOT NULL DEFAULT 1, + created_at TEXT NOT NULL DEFAULT (datetime('now')), + FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE + ); + INSERT INTO budgets_migrated ( + id, user_id, name, total_amount, start_date, end_date, + currency, is_active, created_at + ) + SELECT + id, user_id, + COALESCE(NULLIF(name, ''), 'Бюджет'), + total_amount, start_date, end_date, currency, + COALESCE(is_active, 1), created_at + FROM budgets; + DROP TABLE budgets; + ALTER TABLE budgets_migrated RENAME TO budgets; + """ + ) + + expense_cols = await _table_columns(conn, "expenses") + if "budget_id" not in expense_cols: + await conn.execute("ALTER TABLE expenses ADD COLUMN budget_id INTEGER") + await conn.execute( + """ + UPDATE expenses + SET budget_id = ( + SELECT b.id FROM budgets b + WHERE b.user_id = expenses.user_id + ORDER BY b.id DESC + LIMIT 1 + ) + WHERE budget_id IS NULL + """ + ) + # Drop orphan expenses that have no budget (should be rare) + await conn.execute("DELETE FROM expenses WHERE budget_id IS NULL") + await conn.executescript( + """ + CREATE TABLE expenses_migrated ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER NOT NULL, + budget_id INTEGER NOT NULL, + amount REAL NOT NULL, + note TEXT, + spent_at TEXT NOT NULL, + created_at TEXT NOT NULL DEFAULT (datetime('now')), + FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE, + FOREIGN KEY (budget_id) REFERENCES budgets(id) ON DELETE CASCADE + ); + INSERT INTO expenses_migrated ( + id, user_id, budget_id, amount, note, spent_at, created_at + ) + SELECT id, user_id, budget_id, amount, note, spent_at, created_at + FROM expenses; + DROP TABLE expenses; + ALTER TABLE expenses_migrated RENAME TO expenses; + """ + ) + + # Backfill selected budget for users who have budgets + await conn.execute( + """ + UPDATE users + SET selected_budget_id = ( + SELECT b.id FROM budgets b + WHERE b.user_id = users.user_id + ORDER BY b.is_active DESC, b.id DESC + LIMIT 1 + ) + WHERE selected_budget_id IS NULL + AND EXISTS (SELECT 1 FROM budgets b WHERE b.user_id = users.user_id) + """ + ) + await conn.execute( + """ + UPDATE budgets + SET name = 'Бюджет' + WHERE name IS NULL OR TRIM(name) = '' + """ + ) + await _ensure_indexes(conn) + + +class Database: + def __init__(self, path: Path, *, read_only: bool = False) -> None: + self.path = path + self.read_only = read_only + self._conn: aiosqlite.Connection | None = None + + async def connect(self) -> None: + if self.read_only: + if not self.path.exists(): + raise FileNotFoundError( + f"Database not found: {self.path}. " + "Сначала запусти API, чтобы создался data/budget.db" + ) + uri = f"file:{self.path.resolve().as_posix()}?mode=ro" + self._conn = await aiosqlite.connect(uri, uri=True) + self._conn.row_factory = aiosqlite.Row + await self._conn.execute("PRAGMA foreign_keys = ON") + return + + self.path.parent.mkdir(parents=True, exist_ok=True) + self._conn = await aiosqlite.connect(self.path) + self._conn.row_factory = aiosqlite.Row + await self._conn.execute("PRAGMA foreign_keys = ON") + try: + await self._conn.execute("PRAGMA journal_mode=WAL") + except aiosqlite.OperationalError: + pass + await self._conn.executescript(SCHEMA) + await migrate_schema(self._conn) + # Fresh DBs: migrate may no-op early if tables were just created with + # full columns — still ensure indexes exist. + budget_cols = await _table_columns(self._conn, "budgets") + if "is_active" in budget_cols: + await _ensure_indexes(self._conn) + await self._conn.commit() + + async def close(self) -> None: + if self._conn is not None: + await self._conn.close() + self._conn = None + + @property + def conn(self) -> aiosqlite.Connection: + if self._conn is None: + raise RuntimeError("Database is not connected") + return self._conn diff --git a/bot/db/repository.py b/bot/db/repository.py new file mode 100644 index 0000000..193bbb8 --- /dev/null +++ b/bot/db/repository.py @@ -0,0 +1,400 @@ +from __future__ import annotations + +from dataclasses import dataclass +from datetime import date +from typing import Any + +from bot.db.database import Database + + +@dataclass(frozen=True) +class Budget: + id: int + user_id: int + name: str + total_amount: float + start_date: date + end_date: date + currency: str + is_active: bool + + +@dataclass(frozen=True) +class Expense: + id: int + user_id: int + budget_id: int + amount: float + note: str | None + spent_at: date + + +def _parse_date(value: str) -> date: + return date.fromisoformat(value[:10]) + + +def _row_to_budget(row: Any) -> Budget: + return Budget( + id=int(row["id"]), + user_id=int(row["user_id"]), + name=str(row["name"] or "Бюджет"), + total_amount=float(row["total_amount"]), + start_date=_parse_date(row["start_date"]), + end_date=_parse_date(row["end_date"]), + currency=str(row["currency"] or "RUB"), + is_active=bool(row["is_active"]), + ) + + +def _row_to_expense(row: Any) -> Expense: + return Expense( + id=int(row["id"]), + user_id=int(row["user_id"]), + budget_id=int(row["budget_id"]), + amount=float(row["amount"]), + note=row["note"], + spent_at=_parse_date(row["spent_at"]), + ) + + +class BudgetRepository: + def __init__(self, db: Database) -> None: + self._db = db + + async def ensure_user(self, user_id: int) -> None: + await self._db.conn.execute( + "INSERT OR IGNORE INTO users(user_id) VALUES (?)", + (user_id,), + ) + await self._db.conn.commit() + + async def get_selected_budget_id(self, user_id: int) -> int | None: + cursor = await self._db.conn.execute( + "SELECT selected_budget_id FROM users WHERE user_id = ?", + (user_id,), + ) + row = await cursor.fetchone() + if row is None or row["selected_budget_id"] is None: + return None + return int(row["selected_budget_id"]) + + async def set_selected_budget_id(self, user_id: int, budget_id: int | None) -> None: + await self.ensure_user(user_id) + await self._db.conn.execute( + "UPDATE users SET selected_budget_id = ? WHERE user_id = ?", + (budget_id, user_id), + ) + await self._db.conn.commit() + + async def create_budget( + self, + user_id: int, + *, + name: str, + total_amount: float, + start_date: date, + end_date: date, + currency: str = "RUB", + is_active: bool = True, + select: bool = True, + ) -> Budget: + await self.ensure_user(user_id) + cursor = await self._db.conn.execute( + """ + INSERT INTO budgets( + user_id, name, total_amount, start_date, end_date, currency, is_active + ) + VALUES (?, ?, ?, ?, ?, ?, ?) + RETURNING * + """, + ( + user_id, + name.strip() or "Бюджет", + total_amount, + start_date.isoformat(), + end_date.isoformat(), + currency, + 1 if is_active else 0, + ), + ) + row = await cursor.fetchone() + await self._db.conn.commit() + if row is None: + raise RuntimeError("Failed to create budget") + budget = _row_to_budget(row) + if select: + await self.set_selected_budget_id(user_id, budget.id) + return budget + + async def update_budget( + self, + budget_id: int, + user_id: int, + *, + name: str | None = None, + total_amount: float | None = None, + start_date: date | None = None, + end_date: date | None = None, + currency: str | None = None, + ) -> Budget: + budget = await self.get_budget_for_user(budget_id, user_id) + if budget is None: + raise ValueError("Бюджет не найден") + + next_name = name.strip() if name is not None else budget.name + next_total = total_amount if total_amount is not None else budget.total_amount + next_start = start_date if start_date is not None else budget.start_date + next_end = end_date if end_date is not None else budget.end_date + next_currency = currency if currency is not None else budget.currency + + await self._db.conn.execute( + """ + UPDATE budgets + SET name = ?, total_amount = ?, start_date = ?, end_date = ?, currency = ? + WHERE id = ? AND user_id = ? + """, + ( + next_name or "Бюджет", + next_total, + next_start.isoformat(), + next_end.isoformat(), + next_currency, + budget_id, + user_id, + ), + ) + await self._db.conn.commit() + updated = await self.get_budget_for_user(budget_id, user_id) + if updated is None: + raise RuntimeError("Failed to update budget") + return updated + + async def set_budget_active( + self, + budget_id: int, + user_id: int, + is_active: bool, + ) -> Budget: + budget = await self.get_budget_for_user(budget_id, user_id) + if budget is None: + raise ValueError("Бюджет не найден") + await self._db.conn.execute( + "UPDATE budgets SET is_active = ? WHERE id = ? AND user_id = ?", + (1 if is_active else 0, budget_id, user_id), + ) + await self._db.conn.commit() + updated = await self.get_budget_for_user(budget_id, user_id) + if updated is None: + raise RuntimeError("Failed to update budget activity") + return updated + + async def get_budget_by_id(self, budget_id: int) -> Budget | None: + cursor = await self._db.conn.execute( + "SELECT * FROM budgets WHERE id = ?", + (budget_id,), + ) + row = await cursor.fetchone() + return _row_to_budget(row) if row else None + + async def get_budget_for_user(self, budget_id: int, user_id: int) -> Budget | None: + cursor = await self._db.conn.execute( + "SELECT * FROM budgets WHERE id = ? AND user_id = ?", + (budget_id, user_id), + ) + row = await cursor.fetchone() + return _row_to_budget(row) if row else None + + async def list_budgets_for_user(self, user_id: int) -> list[Budget]: + cursor = await self._db.conn.execute( + """ + SELECT * FROM budgets + WHERE user_id = ? + ORDER BY is_active DESC, id DESC + """, + (user_id,), + ) + rows = await cursor.fetchall() + return [_row_to_budget(row) for row in rows] + + async def resolve_budget( + self, + user_id: int, + budget_id: int | None = None, + *, + require_active: bool = False, + ) -> Budget | None: + if budget_id is not None: + budget = await self.get_budget_for_user(budget_id, user_id) + if budget is None: + return None + if require_active and not budget.is_active: + raise ValueError("Бюджет неактивен — включи его или выбери другой") + return budget + + selected_id = await self.get_selected_budget_id(user_id) + if selected_id is not None: + selected = await self.get_budget_for_user(selected_id, user_id) + if selected is not None: + if not require_active or selected.is_active: + return selected + + cursor = await self._db.conn.execute( + """ + SELECT * FROM budgets + WHERE user_id = ? + ORDER BY is_active DESC, id DESC + LIMIT 1 + """, + (user_id,), + ) + row = await cursor.fetchone() + if row is None: + return None + budget = _row_to_budget(row) + if require_active and not budget.is_active: + raise ValueError("Нет активного бюджета — создай или включи существующий") + return budget + + async def list_all_budgets(self) -> list[Budget]: + cursor = await self._db.conn.execute( + """ + SELECT * FROM budgets + ORDER BY user_id ASC, is_active DESC, id DESC + """ + ) + rows = await cursor.fetchall() + return [_row_to_budget(row) for row in rows] + + async def add_expense( + self, + user_id: int, + budget_id: int, + amount: float, + note: str | None = None, + spent_at: date | None = None, + ) -> Expense: + await self.ensure_user(user_id) + spent = spent_at or date.today() + cursor = await self._db.conn.execute( + """ + INSERT INTO expenses(user_id, budget_id, amount, note, spent_at) + VALUES (?, ?, ?, ?, ?) + RETURNING * + """, + (user_id, budget_id, amount, note, spent.isoformat()), + ) + row = await cursor.fetchone() + await self._db.conn.commit() + if row is None: + raise RuntimeError("Failed to insert expense") + return _row_to_expense(row) + + async def delete_last_expense( + self, + user_id: int, + budget_id: int | None = None, + ) -> Expense | None: + if budget_id is None: + cursor = await self._db.conn.execute( + """ + SELECT * FROM expenses + WHERE user_id = ? + ORDER BY id DESC + LIMIT 1 + """, + (user_id,), + ) + else: + cursor = await self._db.conn.execute( + """ + SELECT * FROM expenses + WHERE user_id = ? AND budget_id = ? + ORDER BY id DESC + LIMIT 1 + """, + (user_id, budget_id), + ) + row = await cursor.fetchone() + if row is None: + return None + await self._db.conn.execute("DELETE FROM expenses WHERE id = ?", (row["id"],)) + await self._db.conn.commit() + return _row_to_expense(row) + + async def spent_on_date( + self, + budget_id: int, + day: date, + ) -> float: + cursor = await self._db.conn.execute( + """ + SELECT COALESCE(SUM(amount), 0) AS total + FROM expenses + WHERE budget_id = ? AND spent_at = ? + """, + (budget_id, day.isoformat()), + ) + row = await cursor.fetchone() + return float(row["total"]) if row else 0.0 + + async def list_expenses_on_date( + self, + budget_id: int, + day: date, + ) -> list[Expense]: + cursor = await self._db.conn.execute( + """ + SELECT * FROM expenses + WHERE budget_id = ? AND spent_at = ? + ORDER BY id ASC + """, + (budget_id, day.isoformat()), + ) + rows = await cursor.fetchall() + return [_row_to_expense(row) for row in rows] + + async def count_expenses_for_budget(self, budget_id: int) -> int: + cursor = await self._db.conn.execute( + "SELECT COUNT(*) AS cnt FROM expenses WHERE budget_id = ?", + (budget_id,), + ) + row = await cursor.fetchone() + return int(row["cnt"]) if row else 0 + + async def sum_expenses_for_budget(self, budget_id: int) -> float: + cursor = await self._db.conn.execute( + """ + SELECT COALESCE(SUM(amount), 0) AS total + FROM expenses + WHERE budget_id = ? + """, + (budget_id,), + ) + row = await cursor.fetchone() + return float(row["total"]) if row else 0.0 + + async def list_expenses_for_budget( + self, + budget_id: int, + *, + limit: int, + offset: int, + ) -> list[Expense]: + cursor = await self._db.conn.execute( + """ + SELECT * FROM expenses + WHERE budget_id = ? + ORDER BY spent_at DESC, id DESC + LIMIT ? OFFSET ? + """, + (budget_id, limit, offset), + ) + rows = await cursor.fetchall() + return [_row_to_expense(row) for row in rows] + + async def clear_expenses_for_budget_id(self, budget_id: int) -> None: + await self._db.conn.execute( + "DELETE FROM expenses WHERE budget_id = ?", + (budget_id,), + ) + await self._db.conn.commit() diff --git a/bot/handlers/__init__.py b/bot/handlers/__init__.py new file mode 100644 index 0000000..0e632e1 --- /dev/null +++ b/bot/handlers/__init__.py @@ -0,0 +1 @@ +# Package marker diff --git a/bot/handlers/budget.py b/bot/handlers/budget.py new file mode 100644 index 0000000..3482067 --- /dev/null +++ b/bot/handlers/budget.py @@ -0,0 +1,781 @@ +from __future__ import annotations + +from datetime import date + +from aiogram import F, Router +from aiogram.filters import Command, CommandObject, CommandStart, StateFilter +from aiogram.fsm.context import FSMContext +from aiogram.types import ( + CallbackQuery, + InlineKeyboardButton, + InlineKeyboardMarkup, + KeyboardButton, + Message, + ReplyKeyboardMarkup, + ReplyKeyboardRemove, +) + +from bot.clients.budget_api import BudgetApiError +from bot.handlers.yandex_gate import YandexLoginGateMiddleware +from bot.handlers.states import BudgetSetup, DatedExpense +from bot.services.budget import BudgetService, PeriodExpensesPage +from bot.services.parsing import ( + format_date, + format_money, + format_status, + parse_amount, + parse_end_date, + parse_expense_message, + parse_spent_date, +) + +router = Router() +router.message.middleware(YandexLoginGateMiddleware()) +router.callback_query.middleware(YandexLoginGateMiddleware()) + +HELP_TEXT = """\ +Я помогаю дотянуть до зарплаты без сюрпризов. + +Команды: +/budget — новый бюджет (имя · сумма · дата) +/budgets — список бюджетов, выбрать / вкл-выкл / удалить +/status — сколько можно тратить сегодня +/today — траты за сегодня +/history — траты за весь период (постранично) +/day 12.09 — траты за дату +/spend — трата за другую дату (диалог) +/undo — отменить последнюю трату +/cancel — отменить текущий диалог +/help — эта справка + +Быстрый ввод трат: +• 250 +• 250 кофе +• кофе 250 +• за 12.09 250 кофе +• 250 кофе за 12.09 +• 12.09 250 кофе +""" + +MENU_STATUS = "📊 Статус" +MENU_TODAY = "🧾 Сегодня" +MENU_HISTORY = "📒 Период" +MENU_DATED = "📅 За дату" +MENU_UNDO = "↩️ Отмена траты" +MENU_BUDGET = "💰 Новый бюджет" +MENU_BUDGETS = "🗂 Бюджеты" + +HISTORY_CB_PREFIX = "hist:" +BUDGET_SELECT_PREFIX = "bsel:" +BUDGET_TOGGLE_PREFIX = "btgl:" +BUDGET_DELETE_PREFIX = "bdel:" + + +def main_keyboard() -> ReplyKeyboardMarkup: + return ReplyKeyboardMarkup( + keyboard=[ + [KeyboardButton(text=MENU_STATUS), KeyboardButton(text=MENU_TODAY)], + [KeyboardButton(text=MENU_HISTORY), KeyboardButton(text=MENU_DATED)], + [KeyboardButton(text=MENU_BUDGETS), KeyboardButton(text=MENU_BUDGET)], + [KeyboardButton(text=MENU_UNDO)], + ], + resize_keyboard=True, + ) + + +def format_period_page(page_data: PeriodExpensesPage) -> str: + budget = page_data.budget + header = ( + f"📒 {budget.name}\n" + f"Траты {format_date(budget.start_date)}–{format_date(budget.end_date)}\n" + f"Всего записей: {page_data.total_count} · " + f"сумма: {format_money(page_data.total_sum)}\n" + f"Страница {page_data.page + 1}/{page_data.total_pages}" + ) + if not page_data.items: + return header + "\n\nПока нет трат за период." + + lines = [] + for item in page_data.items: + note = f" — {item.note}" if item.note else "" + lines.append( + f"• {format_date(item.spent_at)} · {format_money(item.amount)}{note}" + ) + return header + "\n\n" + "\n".join(lines) + + +def format_budgets_list(items) -> str: + if not items: + return "Бюджетов пока нет. Создай: /budget" + lines = ["Твои бюджеты:"] + for status in items: + b = status.budget + marks = [] + if status.selected: + marks.append("текущий") + marks.append("активен" if b.is_active else "выкл") + mark = ", ".join(marks) + lines.append( + f"• #{b.id} {b.name} — {format_money(b.total_amount)} " + f"до {format_date(b.end_date)} ({mark})" + ) + lines.append("\nКнопки: выбрать · вкл/выкл · удалить.") + return "\n".join(lines) + + +def budgets_keyboard(items) -> InlineKeyboardMarkup | None: + if not items: + return None + rows: list[list[InlineKeyboardButton]] = [] + for status in items: + b = status.budget + select_label = f"{'✓ ' if status.selected else ''}{b.name}"[:28] + toggle_label = "Выкл" if b.is_active else "Вкл" + rows.append( + [ + InlineKeyboardButton( + text=select_label, + callback_data=f"{BUDGET_SELECT_PREFIX}{b.id}", + ), + InlineKeyboardButton( + text=toggle_label, + callback_data=f"{BUDGET_TOGGLE_PREFIX}{b.id}", + ), + InlineKeyboardButton( + text="🗑", + callback_data=f"{BUDGET_DELETE_PREFIX}{b.id}", + ), + ] + ) + return InlineKeyboardMarkup(inline_keyboard=rows) + + +def history_keyboard(page_data: PeriodExpensesPage) -> InlineKeyboardMarkup | None: + if page_data.total_pages <= 1: + return None + + buttons: list[InlineKeyboardButton] = [] + if page_data.page > 0: + buttons.append( + InlineKeyboardButton( + text="‹ Назад", + callback_data=f"{HISTORY_CB_PREFIX}{page_data.page - 1}", + ) + ) + buttons.append( + InlineKeyboardButton( + text=f"{page_data.page + 1}/{page_data.total_pages}", + callback_data=f"{HISTORY_CB_PREFIX}nop", + ) + ) + if page_data.page + 1 < page_data.total_pages: + buttons.append( + InlineKeyboardButton( + text="Вперёд ›", + callback_data=f"{HISTORY_CB_PREFIX}{page_data.page + 1}", + ) + ) + return InlineKeyboardMarkup(inline_keyboard=[buttons]) + + +async def _reply_expense_saved( + message: Message, + *, + amount: float, + note: str | None, + spent_at: date | None, + status, +) -> None: + note_part = f" ({note})" if note else "" + date_part = f" за {format_date(spent_at)}" if spent_at else "" + await message.answer( + f"Записал {format_money(amount)}{note_part}{date_part}.\n\n" + f"{format_status(status)}", + reply_markup=main_keyboard(), + ) + + +async def _save_expense( + message: Message, + budget_service: BudgetService, + *, + amount: float, + note: str | None, + spent_at: date | None, + state: FSMContext | None = None, +) -> bool: + try: + status = await budget_service.add_expense( + user_id=message.from_user.id, + amount=amount, + note=note, + spent_at=spent_at, + ) + except ValueError as exc: + await message.answer(str(exc), reply_markup=main_keyboard()) + if state is not None: + await state.clear() + return False + except BudgetApiError as exc: + await message.answer( + f"API недоступен: {exc}", + reply_markup=main_keyboard(), + ) + if state is not None: + await state.clear() + return False + + if state is not None: + await state.clear() + await _reply_expense_saved( + message, + amount=amount, + note=note, + spent_at=spent_at, + status=status, + ) + return True + + +# --- Global commands / menu (always win over FSM) --- + + +@router.message(CommandStart()) +async def cmd_start(message: Message, state: FSMContext) -> None: + await state.clear() + await message.answer( + "Привет! Я бот «от зарплаты до зарплаты».\n\n" + "1) Задай бюджет: /budget\n" + "2) Пиши траты: 250 или кофе 250\n" + "3) За другую дату: за 12.09 250 кофе\n" + "4) Смотри лимит: /status", + reply_markup=main_keyboard(), + ) + + +@router.message(Command("help")) +async def cmd_help(message: Message, state: FSMContext) -> None: + await state.clear() + await message.answer(HELP_TEXT, reply_markup=main_keyboard()) + + +@router.message(Command("cancel")) +@router.message(F.text.casefold() == "отмена") +async def cmd_cancel(message: Message, state: FSMContext) -> None: + current = await state.get_state() + if current is None: + await message.answer("Нечего отменять.", reply_markup=main_keyboard()) + return + await state.clear() + await message.answer("Ок, отменил.", reply_markup=main_keyboard()) + + +@router.message(Command("status")) +@router.message(F.text == MENU_STATUS) +async def cmd_status( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + await state.clear() + try: + status = await budget_service.get_status(message.from_user.id) + except ValueError as exc: + await message.answer(str(exc), reply_markup=main_keyboard()) + return + await message.answer(format_status(status), reply_markup=main_keyboard()) + + +@router.message(Command("today")) +@router.message(F.text == MENU_TODAY) +async def cmd_today( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + await state.clear() + try: + status = await budget_service.get_status(message.from_user.id) + except ValueError as exc: + await message.answer(str(exc), reply_markup=main_keyboard()) + return + + expenses = await budget_service.today_expenses(message.from_user.id) + if not expenses: + body = "Сегодня трат пока нет." + else: + lines = [] + for item in expenses: + note = f" — {item.note}" if item.note else "" + lines.append(f"• {format_money(item.amount)}{note}") + body = "Траты сегодня:\n" + "\n".join(lines) + + await message.answer( + f"{body}\n\n{format_status(status)}", + reply_markup=main_keyboard(), + ) + + +@router.message(Command("history")) +@router.message(F.text == MENU_HISTORY) +async def cmd_history( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + await state.clear() + try: + page_data = await budget_service.get_period_expenses_page( + message.from_user.id, + page=0, + ) + except ValueError as exc: + await message.answer(str(exc), reply_markup=main_keyboard()) + return + + await message.answer( + format_period_page(page_data), + reply_markup=history_keyboard(page_data) or main_keyboard(), + ) + + +@router.callback_query(F.data.startswith(HISTORY_CB_PREFIX)) +async def cb_history_page( + callback: CallbackQuery, + budget_service: BudgetService, +) -> None: + raw = (callback.data or "")[len(HISTORY_CB_PREFIX) :] + if raw == "nop": + await callback.answer() + return + + try: + page = int(raw) + except ValueError: + await callback.answer("Некорректная страница", show_alert=True) + return + + try: + page_data = await budget_service.get_period_expenses_page( + callback.from_user.id, + page=page, + ) + except ValueError as exc: + await callback.answer(str(exc), show_alert=True) + return + + text = format_period_page(page_data) + markup = history_keyboard(page_data) + if callback.message: + await callback.message.edit_text(text, reply_markup=markup) + await callback.answer() + + +@router.message(Command("day")) +async def cmd_day( + message: Message, + command: CommandObject, + state: FSMContext, + budget_service: BudgetService, +) -> None: + await state.clear() + args = (command.args or "").strip() + if not args: + await message.answer( + "Укажи дату: /day 12.09\n" + "Или список трат за сегодня: /today", + reply_markup=main_keyboard(), + ) + return + + try: + day = parse_spent_date(args) + except ValueError as exc: + await message.answer(str(exc), reply_markup=main_keyboard()) + return + + try: + status = await budget_service.get_status(message.from_user.id) + except ValueError as exc: + await message.answer(str(exc), reply_markup=main_keyboard()) + return + + expenses = await budget_service.expenses_on_date(message.from_user.id, day) + if not expenses: + body = f"За {format_date(day)} трат нет." + else: + lines = [] + for item in expenses: + note = f" — {item.note}" if item.note else "" + lines.append(f"• {format_money(item.amount)}{note}") + body = f"Траты за {format_date(day)}:\n" + "\n".join(lines) + + await message.answer( + f"{body}\n\n{format_status(status)}", + reply_markup=main_keyboard(), + ) + + +@router.message(Command("undo")) +@router.message(F.text == MENU_UNDO) +async def cmd_undo( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + await state.clear() + status, amount = await budget_service.undo_last_expense(message.from_user.id) + if amount is None: + await message.answer("Нечего отменять.", reply_markup=main_keyboard()) + return + + text = f"Удалил последнюю трату: {format_money(amount)}." + if status is not None: + text += f"\n\n{format_status(status)}" + await message.answer(text, reply_markup=main_keyboard()) + + +@router.message(Command("budget")) +@router.message(F.text == MENU_BUDGET) +async def cmd_budget(message: Message, state: FSMContext) -> None: + await state.set_state(BudgetSetup.waiting_name) + await message.answer( + "Новый бюджет. Как назвать? (например: Зарплата, Отпуск)\n" + "Или «-» чтобы оставить «Бюджет».\n" + "Отмена: /cancel", + reply_markup=ReplyKeyboardRemove(), + ) + + +@router.message(Command("budgets")) +@router.message(F.text == MENU_BUDGETS) +async def cmd_budgets( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + await state.clear() + try: + items = await budget_service.list_user_statuses(message.from_user.id) + except (ValueError, BudgetApiError) as exc: + await message.answer(f"Не удалось загрузить: {exc}", reply_markup=main_keyboard()) + return + await message.answer( + format_budgets_list(items), + reply_markup=budgets_keyboard(items) or main_keyboard(), + ) + + +@router.callback_query(F.data.startswith(BUDGET_SELECT_PREFIX)) +async def cb_budget_select( + callback: CallbackQuery, + budget_service: BudgetService, +) -> None: + raw = (callback.data or "")[len(BUDGET_SELECT_PREFIX) :] + try: + budget_id = int(raw) + except ValueError: + await callback.answer("Некорректный id", show_alert=True) + return + try: + status = await budget_service.select_budget(callback.from_user.id, budget_id) + items = await budget_service.list_user_statuses(callback.from_user.id) + except ValueError as exc: + await callback.answer(str(exc), show_alert=True) + return + if callback.message: + await callback.message.edit_text( + format_budgets_list(items) + f"\n\nТекущий: {status.budget.name}", + reply_markup=budgets_keyboard(items), + ) + await callback.answer(f"Выбран: {status.budget.name}") + + +@router.callback_query(F.data.startswith(BUDGET_TOGGLE_PREFIX)) +async def cb_budget_toggle( + callback: CallbackQuery, + budget_service: BudgetService, +) -> None: + raw = (callback.data or "")[len(BUDGET_TOGGLE_PREFIX) :] + try: + budget_id = int(raw) + except ValueError: + await callback.answer("Некорректный id", show_alert=True) + return + try: + current = await budget_service.get_status( + callback.from_user.id, + budget_id=budget_id, + ) + status = await budget_service.set_budget_active( + callback.from_user.id, + budget_id, + not current.budget.is_active, + ) + items = await budget_service.list_user_statuses(callback.from_user.id) + except ValueError as exc: + await callback.answer(str(exc), show_alert=True) + return + if callback.message: + await callback.message.edit_text( + format_budgets_list(items), + reply_markup=budgets_keyboard(items), + ) + state_label = "включён" if status.budget.is_active else "выключен" + await callback.answer(f"{status.budget.name}: {state_label}") + + +@router.callback_query(F.data.startswith(BUDGET_DELETE_PREFIX)) +async def cb_budget_delete( + callback: CallbackQuery, + budget_service: BudgetService, +) -> None: + raw = (callback.data or "")[len(BUDGET_DELETE_PREFIX) :] + try: + budget_id = int(raw) + except ValueError: + await callback.answer("Некорректный id", show_alert=True) + return + try: + current = await budget_service.get_status( + callback.from_user.id, + budget_id=budget_id, + ) + name = current.budget.name + await budget_service.delete_budget(callback.from_user.id, budget_id) + items = await budget_service.list_user_statuses(callback.from_user.id) + except (ValueError, BudgetApiError) as exc: + await callback.answer(str(exc), show_alert=True) + return + if callback.message: + await callback.message.edit_text( + format_budgets_list(items), + reply_markup=budgets_keyboard(items) or None, + ) + await callback.answer(f"Удалён: {name}") + + +@router.message(Command("spend")) +@router.message(F.text == MENU_DATED) +async def cmd_spend_dated(message: Message, state: FSMContext) -> None: + await state.set_state(DatedExpense.waiting_date) + await message.answer( + "Трата за дату — одним сообщением или по шагам.\n\n" + "Сразу: 12.09 250 кб\n" + "Или только дата: 12.09\n" + "Отмена: /cancel", + reply_markup=ReplyKeyboardRemove(), + ) + + +# --- FSM: budget --- + + +@router.message(BudgetSetup.waiting_name) +async def budget_name(message: Message, state: FSMContext) -> None: + raw = (message.text or "").strip() + name = "Бюджет" if raw in {"", "-", "—"} else raw[:64] + await state.update_data(name=name) + await state.set_state(BudgetSetup.waiting_amount) + await message.answer( + f"Название: {name}.\n" + "Сколько денег в этом бюджете? (например: 25000)" + ) + + +@router.message(BudgetSetup.waiting_amount) +async def budget_amount(message: Message, state: FSMContext) -> None: + try: + amount = parse_amount(message.text or "") + except ValueError as exc: + await message.answer(f"{exc}\nПопробуй ещё раз, например: 25000") + return + + await state.update_data(amount=amount) + await state.set_state(BudgetSetup.waiting_end_date) + await message.answer( + "До какой даты нужно протянуть?\n" + "Форматы: 25.09 · 25.09.2026 · 2026-09-25" + ) + + +@router.message(BudgetSetup.waiting_end_date) +async def budget_end_date( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + try: + end_date = parse_end_date(message.text or "") + except ValueError as exc: + await message.answer(f"{exc}\nПример: 25.09.2026") + return + + data = await state.get_data() + amount = float(data["amount"]) + name = str(data.get("name") or "Бюджет") + + try: + status = await budget_service.create_budget( + user_id=message.from_user.id, + total_amount=amount, + end_date=end_date, + name=name, + ) + except ValueError as exc: + await message.answer(str(exc)) + return + except BudgetApiError as exc: + await message.answer(f"API недоступен: {exc}") + return + + await state.clear() + await message.answer( + f"Бюджет «{name}» создан: {format_money(amount)} до {format_date(end_date)}.\n\n" + f"{format_status(status)}", + reply_markup=main_keyboard(), + ) + + +# --- FSM: dated expense --- + + +@router.message(DatedExpense.waiting_date) +async def dated_expense_date( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + text = (message.text or "").strip() + if not text: + await message.answer("Введи дату, например: 12.09") + return + + # One-shot: "12.09 250 кб" / "за 12.09 250 кб" + try: + amount, note, spent_at = parse_expense_message(text) + except ValueError: + amount, note, spent_at = None, None, None + + if amount is not None and spent_at is not None: + await _save_expense( + message, + budget_service, + amount=amount, + note=note, + spent_at=spent_at, + state=state, + ) + return + + # Date only, or "12.09 кб" (date + note without amount) + tokens = text.split() + try: + spent_at = parse_spent_date(tokens[0].rstrip(":")) + except ValueError: + await message.answer( + "Не понял дату.\n" + "Примеры: 12.09 или 12.09 250 кб\n" + "Отмена: /cancel" + ) + return + + if spent_at > date.today(): + await message.answer("Нельзя добавить трату на будущую дату. Введи другую:") + return + + rest = " ".join(tokens[1:]).strip() + if rest: + try: + amount, note, nested = parse_expense_message(rest) + except ValueError: + # "12.09 кб" → дата есть, суммы нет: запомним заметку и спросим сумму + await state.update_data(spent_at=spent_at.isoformat(), note_hint=rest) + await state.set_state(DatedExpense.waiting_expense) + await message.answer( + f"Дата: {format_date(spent_at)}, заметка: {rest}.\n" + "Теперь сумму, например: 250" + ) + return + + if nested is not None: + spent_at = nested + await _save_expense( + message, + budget_service, + amount=amount, + note=note, + spent_at=spent_at, + state=state, + ) + return + + await state.update_data(spent_at=spent_at.isoformat(), note_hint=None) + await state.set_state(DatedExpense.waiting_expense) + await message.answer( + f"Дата: {format_date(spent_at)}.\n" + "Теперь сумма (и комментарий): 250 или 250 кб" + ) + + +@router.message(DatedExpense.waiting_expense) +async def dated_expense_amount( + message: Message, + state: FSMContext, + budget_service: BudgetService, +) -> None: + data = await state.get_data() + spent_at = date.fromisoformat(data["spent_at"]) + note_hint = data.get("note_hint") + + try: + amount, note, nested_date = parse_expense_message(message.text or "") + except ValueError as exc: + await message.answer(f"{exc}") + return + + if nested_date is not None: + spent_at = nested_date + if note is None and note_hint: + note = note_hint + + await _save_expense( + message, + budget_service, + amount=amount, + note=note, + spent_at=spent_at, + state=state, + ) + + +# --- Free-text expense (no active dialog) --- + + +@router.message(StateFilter(None), F.text) +async def add_expense_from_text( + message: Message, + budget_service: BudgetService, +) -> None: + text = (message.text or "").strip() + if text.startswith("/"): + return + + try: + amount, note, spent_at = parse_expense_message(text) + except ValueError: + await message.answer( + "Не понял. Примеры:\n" + "• 250 / 250 кофе / кофе 250\n" + "• за 12.09 250 кофе\n" + "• /spend — диалог за дату" + ) + return + + await _save_expense( + message, + budget_service, + amount=amount, + note=note, + spent_at=spent_at, + ) diff --git a/bot/handlers/states.py b/bot/handlers/states.py new file mode 100644 index 0000000..6b6f988 --- /dev/null +++ b/bot/handlers/states.py @@ -0,0 +1,12 @@ +from aiogram.fsm.state import State, StatesGroup + + +class BudgetSetup(StatesGroup): + waiting_name = State() + waiting_amount = State() + waiting_end_date = State() + + +class DatedExpense(StatesGroup): + waiting_date = State() + waiting_expense = State() diff --git a/bot/handlers/yandex_gate.py b/bot/handlers/yandex_gate.py new file mode 100644 index 0000000..f75e584 --- /dev/null +++ b/bot/handlers/yandex_gate.py @@ -0,0 +1,53 @@ +from __future__ import annotations + +from typing import Any, Awaitable, Callable + +from aiogram import BaseMiddleware +from aiogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup, Message, TelegramObject + +from bot.clients.budget_api import YandexLoginRequired + +YANDEX_REQUIRED_TEXT = """\ +Чтобы пользоваться ботом, войдите через Яндекс. + +Так Telegram, сайт и приложение — один аккаунт, и бюджеты не потеряются. + +Откройте ссылку, примите документы и нажмите «Войти через Яндекс». Потом вернитесь в бот и напишите /start. +""" + + +def yandex_login_keyboard(login_url: str) -> InlineKeyboardMarkup | None: + url = (login_url or "").strip() + if not url.startswith(("https://", "http://")): + return None + return InlineKeyboardMarkup( + inline_keyboard=[[InlineKeyboardButton(text="Войти через Яндекс", url=url)]] + ) + + +class YandexLoginGateMiddleware(BaseMiddleware): + async def __call__( + self, + handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]], + event: TelegramObject, + data: dict[str, Any], + ) -> Any: + user = getattr(event, "from_user", None) + service = data.get("budget_service") + ensure = getattr(service, "ensure_yandex_login", None) + if user is None or not callable(ensure): + return await handler(event, data) + + try: + await ensure(user.id) + except YandexLoginRequired as exc: + markup = yandex_login_keyboard(exc.login_url) + if isinstance(event, Message): + await event.answer(YANDEX_REQUIRED_TEXT, reply_markup=markup) + elif isinstance(event, CallbackQuery): + await event.answer() + if event.message: + await event.message.answer(YANDEX_REQUIRED_TEXT, reply_markup=markup) + return None + + return await handler(event, data) diff --git a/bot/main.py b/bot/main.py new file mode 100644 index 0000000..08c9051 --- /dev/null +++ b/bot/main.py @@ -0,0 +1,51 @@ +from __future__ import annotations + +import asyncio +import logging + +from aiogram import Bot, Dispatcher +from aiogram.client.session.aiohttp import AiohttpSession +from aiogram.fsm.storage.memory import MemoryStorage + +from bot.clients.budget_api import BudgetApiClient +from bot.config import settings +from bot.handlers.budget import router as budget_router + +logging.basicConfig( + level=logging.INFO, + format="%(asctime)s [%(levelname)s] %(name)s: %(message)s", +) +logger = logging.getLogger(__name__) + + +def create_bot() -> Bot: + if settings.proxy_url: + logger.info("Using proxy for Telegram API: %s", settings.proxy_url) + session = AiohttpSession(proxy=settings.proxy_url) + else: + session = AiohttpSession() + return Bot(token=settings.bot_token, session=session) + + +async def main() -> None: + budget_service = BudgetApiClient( + base_url=settings.api_base_url, + api_token=settings.api_token, + ) + await budget_service.start() + + bot = create_bot() + dp = Dispatcher(storage=MemoryStorage()) + dp["budget_service"] = budget_service + dp.include_router(budget_router) + + try: + logger.info("Bot started (API %s)", settings.api_base_url) + await dp.start_polling(bot) + finally: + await budget_service.close() + await bot.session.close() + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/bot/services/__init__.py b/bot/services/__init__.py new file mode 100644 index 0000000..0e632e1 --- /dev/null +++ b/bot/services/__init__.py @@ -0,0 +1 @@ +# Package marker diff --git a/bot/services/budget.py b/bot/services/budget.py new file mode 100644 index 0000000..4a724bf --- /dev/null +++ b/bot/services/budget.py @@ -0,0 +1,397 @@ +from __future__ import annotations + +from dataclasses import dataclass +from datetime import date +from math import ceil + +from bot.db.repository import Budget, BudgetRepository, Expense + +PERIOD_PAGE_SIZE = 8 + + +@dataclass(frozen=True) +class BudgetStatus: + budget: Budget + today: date + days_left: int + total_spent: float + remaining: float + daily_limit: float + spent_today: float + remaining_today: float + is_over_daily: bool + is_over_budget: bool + is_expired: bool + selected: bool = False + + +@dataclass(frozen=True) +class PeriodExpensesPage: + budget: Budget + page: int + total_pages: int + total_count: int + total_sum: float + page_size: int + items: list[Expense] + + +class BudgetService: + def __init__(self, repo: BudgetRepository) -> None: + self._repo = repo + + async def list_user_statuses(self, user_id: int) -> list[BudgetStatus]: + budgets = await self._repo.list_budgets_for_user(user_id) + selected_id = await self._repo.get_selected_budget_id(user_id) + return [ + await self.get_status_for_budget( + budget, + selected=(budget.id == selected_id), + ) + for budget in budgets + ] + + async def create_budget( + self, + user_id: int, + total_amount: float, + end_date: date, + *, + name: str = "Бюджет", + start_date: date | None = None, + is_active: bool = True, + select: bool = True, + ) -> BudgetStatus: + start = start_date or date.today() + if end_date < start: + raise ValueError("Дата окончания не может быть раньше сегодняшнего дня") + if total_amount <= 0: + raise ValueError("Сумма бюджета должна быть больше нуля") + + budget = await self._repo.create_budget( + user_id, + name=name, + total_amount=total_amount, + start_date=start, + end_date=end_date, + is_active=is_active, + select=select, + ) + return await self.get_status_for_budget(budget, selected=select) + + async def update_budget( + self, + user_id: int, + budget_id: int, + *, + name: str | None = None, + total_amount: float | None = None, + end_date: date | None = None, + start_date: date | None = None, + reset_expenses: bool = False, + ) -> BudgetStatus: + existing = await self._repo.get_budget_for_user(budget_id, user_id) + if existing is None: + raise ValueError("Бюджет не найден") + + next_end = end_date if end_date is not None else existing.end_date + next_start = start_date if start_date is not None else existing.start_date + if next_end < next_start: + raise ValueError("Дата окончания не может быть раньше даты начала") + if total_amount is not None and total_amount <= 0: + raise ValueError("Сумма бюджета должна быть больше нуля") + + if reset_expenses: + await self._repo.clear_expenses_for_budget_id(budget_id) + + budget = await self._repo.update_budget( + budget_id, + user_id, + name=name, + total_amount=total_amount, + start_date=start_date, + end_date=end_date, + ) + selected_id = await self._repo.get_selected_budget_id(user_id) + return await self.get_status_for_budget( + budget, + selected=(budget.id == selected_id), + ) + + async def set_budget_active( + self, + user_id: int, + budget_id: int, + is_active: bool, + ) -> BudgetStatus: + budget = await self._repo.set_budget_active(budget_id, user_id, is_active) + selected_id = await self._repo.get_selected_budget_id(user_id) + if not is_active and selected_id == budget_id: + # Prefer another active budget as selected. + others = await self._repo.list_budgets_for_user(user_id) + next_selected = next((b.id for b in others if b.is_active), None) + await self._repo.set_selected_budget_id(user_id, next_selected) + selected_id = next_selected + return await self.get_status_for_budget( + budget, + selected=(budget.id == selected_id), + ) + + async def select_budget(self, user_id: int, budget_id: int) -> BudgetStatus: + budget = await self._repo.get_budget_for_user(budget_id, user_id) + if budget is None: + raise ValueError("Бюджет не найден") + await self._repo.set_selected_budget_id(user_id, budget_id) + return await self.get_status_for_budget(budget, selected=True) + + async def set_budget( + self, + user_id: int, + total_amount: float, + end_date: date, + start_date: date | None = None, + reset_expenses: bool = True, + name: str | None = None, + budget_id: int | None = None, + ) -> BudgetStatus: + """Backward-compatible: update selected/specified budget or create new.""" + if budget_id is not None: + return await self.update_budget( + user_id, + budget_id, + name=name, + total_amount=total_amount, + end_date=end_date, + start_date=start_date, + reset_expenses=reset_expenses, + ) + + current = await self._repo.resolve_budget(user_id) + if current is None: + return await self.create_budget( + user_id, + total_amount, + end_date, + name=name or "Бюджет", + start_date=start_date, + ) + return await self.update_budget( + user_id, + current.id, + name=name, + total_amount=total_amount, + end_date=end_date, + start_date=start_date, + reset_expenses=reset_expenses, + ) + + async def add_expense( + self, + user_id: int, + amount: float, + note: str | None = None, + spent_at: date | None = None, + budget_id: int | None = None, + ) -> BudgetStatus: + if amount <= 0: + raise ValueError("Сумма траты должна быть больше нуля") + budget = await self._repo.resolve_budget( + user_id, + budget_id, + require_active=True, + ) + if budget is None: + raise ValueError("Сначала задай бюджет: /budget") + + day = spent_at or date.today() + if day > date.today(): + raise ValueError("Нельзя добавить трату на будущую дату") + if day < budget.start_date or day > budget.end_date: + raise ValueError( + "Дата вне периода бюджета " + f"({budget.start_date.strftime('%d.%m.%Y')}–" + f"{budget.end_date.strftime('%d.%m.%Y')})" + ) + + await self._repo.add_expense( + user_id, + budget.id, + amount=amount, + note=note, + spent_at=day, + ) + selected_id = await self._repo.get_selected_budget_id(user_id) + return await self.get_status_for_budget( + budget, + selected=(budget.id == selected_id), + ) + + async def expenses_on_date( + self, + user_id: int, + day: date, + budget_id: int | None = None, + ) -> list[Expense]: + budget = await self._repo.resolve_budget(user_id, budget_id) + if budget is None: + raise ValueError("Сначала задай бюджет: /budget") + return await self._repo.list_expenses_on_date(budget.id, day) + + async def today_expenses( + self, + user_id: int, + today: date | None = None, + budget_id: int | None = None, + ) -> list[Expense]: + day = today or date.today() + return await self.expenses_on_date(user_id, day, budget_id=budget_id) + + async def get_expenses_on_date_page( + self, + user_id: int, + day: date, + page: int = 0, + page_size: int = PERIOD_PAGE_SIZE, + budget_id: int | None = None, + ) -> PeriodExpensesPage: + budget = await self._repo.resolve_budget(user_id, budget_id) + if budget is None: + raise ValueError("Сначала задай бюджет: /budget") + + if page < 0: + page = 0 + if page_size < 1: + page_size = PERIOD_PAGE_SIZE + + items_all = await self._repo.list_expenses_on_date(budget.id, day) + total_count = len(items_all) + total_sum = sum(item.amount for item in items_all) + total_pages = max(1, ceil(total_count / page_size)) if total_count else 1 + if page >= total_pages: + page = total_pages - 1 + + start = page * page_size + items = items_all[start : start + page_size] + return PeriodExpensesPage( + budget=budget, + page=page, + total_pages=total_pages, + total_count=total_count, + total_sum=total_sum, + page_size=page_size, + items=items, + ) + + async def get_period_expenses_page( + self, + user_id: int, + page: int = 0, + page_size: int = PERIOD_PAGE_SIZE, + budget_id: int | None = None, + ) -> PeriodExpensesPage: + budget = await self._repo.resolve_budget(user_id, budget_id) + if budget is None: + raise ValueError("Сначала задай бюджет: /budget") + + if page < 0: + page = 0 + if page_size < 1: + page_size = PERIOD_PAGE_SIZE + + total_count = await self._repo.count_expenses_for_budget(budget.id) + total_sum = await self._repo.sum_expenses_for_budget(budget.id) + total_pages = max(1, ceil(total_count / page_size)) if total_count else 1 + if page >= total_pages: + page = total_pages - 1 + + items = await self._repo.list_expenses_for_budget( + budget.id, + limit=page_size, + offset=page * page_size, + ) + return PeriodExpensesPage( + budget=budget, + page=page, + total_pages=total_pages, + total_count=total_count, + total_sum=total_sum, + page_size=page_size, + items=items, + ) + + async def list_budget_summaries(self) -> list[BudgetStatus]: + budgets = await self._repo.list_all_budgets() + return [await self.get_status_for_budget(budget) for budget in budgets] + + async def undo_last_expense( + self, + user_id: int, + budget_id: int | None = None, + ) -> tuple[BudgetStatus | None, float | None]: + budget = await self._repo.resolve_budget(user_id, budget_id) + target_id = budget.id if budget else None + deleted = await self._repo.delete_last_expense(user_id, target_id) + if deleted is None: + return None, None + status = await self.get_status( + user_id, + budget_id=deleted.budget_id, + ) + return status, deleted.amount + + async def get_status( + self, + user_id: int, + today: date | None = None, + budget_id: int | None = None, + ) -> BudgetStatus: + budget = await self._repo.resolve_budget(user_id, budget_id) + if budget is None: + raise ValueError("Сначала задай бюджет: /budget") + selected_id = await self._repo.get_selected_budget_id(user_id) + return await self.get_status_for_budget( + budget, + today=today, + selected=(budget.id == selected_id), + ) + + async def get_status_for_budget( + self, + budget: Budget, + today: date | None = None, + *, + selected: bool = False, + ) -> BudgetStatus: + day = today or date.today() + total_spent = await self._repo.sum_expenses_for_budget(budget.id) + spent_today = await self._repo.spent_on_date(budget.id, day) + remaining = budget.total_amount - total_spent + + if day > budget.end_date: + days_left = 0 + daily_limit = 0.0 + remaining_today = 0.0 + is_expired = True + else: + days_left = (budget.end_date - day).days + 1 + remaining_at_day_start = remaining + spent_today + daily_limit = ( + remaining_at_day_start / days_left if days_left > 0 else 0.0 + ) + remaining_today = daily_limit - spent_today + is_expired = False + + return BudgetStatus( + budget=budget, + today=day, + days_left=days_left, + total_spent=total_spent, + remaining=remaining, + daily_limit=max(daily_limit, 0.0), + spent_today=spent_today, + remaining_today=remaining_today, + is_over_daily=spent_today > daily_limit and days_left > 0, + is_over_budget=remaining < 0, + is_expired=is_expired, + selected=selected, + ) diff --git a/bot/services/parsing.py b/bot/services/parsing.py new file mode 100644 index 0000000..c87defb --- /dev/null +++ b/bot/services/parsing.py @@ -0,0 +1,213 @@ +from __future__ import annotations + +import re +from datetime import date + +AMOUNT_RE = re.compile( + r"^\s*(?P\d+(?:[.,]\d{1,2})?)\s*(?P.*)?$", + re.UNICODE, +) +NOTE_FIRST_RE = re.compile( + r"^\s*(?P.+?)\s+(?P\d+(?:[.,]\d{1,2})?)\s*$", + re.UNICODE, +) +DATE_RE = re.compile( + r"^(?P\d{1,2})[./](?P\d{1,2})(?:[./](?P\d{2,4}))?$" +) +# Unambiguous date token: ISO, with year, slash, or zero-padded month (12.09) +DATE_TOKEN_RE = re.compile( + r"(?P" + r"\d{4}-\d{2}-\d{2}" + r"|" + r"\d{1,2}[./]\d{1,2}[./]\d{2,4}" + r"|" + r"\d{1,2}/\d{1,2}" + r"|" + r"\d{1,2}\.(?:0[1-9]|1[0-2])" + r")" +) +ZA_DATE_RE = re.compile( + r"(?i)(?:^|\s)за\s+(?P" + r"\d{4}-\d{2}-\d{2}" + r"|" + r"\d{1,2}[./]\d{1,2}(?:[./]\d{2,4})?" + r")" + r"(?=\s|$)" +) + + +def parse_amount(value: str) -> float: + normalized = value.strip().replace(",", ".").replace(" ", "") + amount = float(normalized) + if amount <= 0: + raise ValueError("Сумма должна быть больше нуля") + return round(amount, 2) + + +def parse_spent_date(value: str, today: date | None = None) -> date: + """Parse expense date. Bare DD.MM prefers current/past year (not future).""" + day = today or date.today() + raw = value.strip() + + try: + return date.fromisoformat(raw) + except ValueError: + pass + + match = DATE_RE.match(raw) + if not match: + raise ValueError("Дата в формате ДД.ММ или ДД.ММ.ГГГГ") + + d = int(match.group("d")) + m = int(match.group("m")) + y_raw = match.group("y") + if y_raw is None: + try: + candidate = date(day.year, m, d) + except ValueError as exc: + raise ValueError("Некорректная дата") from exc + if candidate > day: + try: + candidate = date(day.year - 1, m, d) + except ValueError as exc: + raise ValueError("Некорректная дата") from exc + return candidate + + y = int(y_raw) + if y < 100: + y += 2000 + try: + return date(y, m, d) + except ValueError as exc: + raise ValueError("Некорректная дата") from exc + + +def parse_end_date(value: str, today: date | None = None) -> date: + """Parse DD.MM, DD.MM.YYYY, YYYY-MM-DD (for budget end — may roll to next year).""" + day = today or date.today() + raw = value.strip() + + try: + return date.fromisoformat(raw) + except ValueError: + pass + + match = DATE_RE.match(raw) + if not match: + raise ValueError("Дата в формате ДД.ММ или ДД.ММ.ГГГГ") + + d = int(match.group("d")) + m = int(match.group("m")) + y_raw = match.group("y") + if y_raw is None: + y = day.year + candidate = date(y, m, d) + if candidate < day: + candidate = date(y + 1, m, d) + return candidate + + y = int(y_raw) + if y < 100: + y += 2000 + return date(y, m, d) + + +def _parse_amount_and_note(raw: str) -> tuple[float, str | None]: + text = raw.strip() + if not text: + raise ValueError("Не понял трату. Примеры: 250, 250 кофе, кофе 250") + + first_token = text.split()[0] + if re.fullmatch(r"\d+(?:[.,]\d{1,2})?", first_token): + match = AMOUNT_RE.match(text) + if not match: + raise ValueError("Не понял трату. Примеры: 250, 250 кофе, кофе 250") + amount = parse_amount(match.group("amount")) + note = (match.group("note") or "").strip() or None + return amount, note + + match = NOTE_FIRST_RE.match(text) + if match: + amount = parse_amount(match.group("amount")) + note = match.group("note").strip() or None + return amount, note + + raise ValueError("Не понял трату. Примеры: 250, 250 кофе, кофе 250") + + +def parse_expense_message( + text: str, + today: date | None = None, +) -> tuple[float, str | None, date | None]: + """Parse expense text. + + Examples: + - 250 / 250 кофе / кофе 250 + - за 12.09 250 кофе + - 250 кофе за 12.09 + - 12.09 250 кофе + - 250 кофе 12.09 + """ + raw = text.strip() + if not raw: + raise ValueError("Пустое сообщение") + + spent_at: date | None = None + body = raw + + za_match = ZA_DATE_RE.search(raw) + if za_match: + spent_at = parse_spent_date(za_match.group("date"), today=today) + body = (raw[: za_match.start()] + " " + raw[za_match.end() :]).strip() + else: + tokens = raw.split() + if len(tokens) >= 2: + first = tokens[0].rstrip(":") + last = tokens[-1] + if DATE_TOKEN_RE.fullmatch(first): + spent_at = parse_spent_date(first, today=today) + body = " ".join(tokens[1:]) + elif DATE_TOKEN_RE.fullmatch(last): + spent_at = parse_spent_date(last, today=today) + body = " ".join(tokens[:-1]) + + amount, note = _parse_amount_and_note(body) + return amount, note, spent_at + + +def format_money(amount: float, currency: str = "₽") -> str: + sign = "-" if amount < 0 else "" + return f"{sign}{abs(amount):,.2f} {currency}".replace(",", " ") + + +def format_date(value: date) -> str: + return value.strftime("%d.%m.%Y") + + +def format_status(status) -> str: + from bot.services.budget import BudgetStatus + + assert isinstance(status, BudgetStatus) + currency = "₽" + active = "активен" if status.budget.is_active else "неактивен" + selected = " · текущий" if status.selected else "" + lines = [ + f"🏷 {status.budget.name} ({active}{selected})", + f"📅 До {format_date(status.budget.end_date)} · дней осталось: {status.days_left}", + f"💰 Бюджет: {format_money(status.budget.total_amount, currency)}", + f"🧾 Потрачено: {format_money(status.total_spent, currency)}", + f"🛡 Остаток: {format_money(status.remaining, currency)}", + "", + f"📊 Лимит на день: {format_money(status.daily_limit, currency)}", + f"🛒 Сегодня: {format_money(status.spent_today, currency)}", + f"✅ Ещё можно сегодня: {format_money(status.remaining_today, currency)}", + ] + + if status.is_expired: + lines.append("\n⚠️ Период бюджета закончился. Задай новый: /budget") + elif status.is_over_budget: + lines.append("\n🚨 Бюджет уже превышен.") + elif status.is_over_daily: + lines.append("\n⚠️ Сегодняшний лимит превышен — завтра лимит пересчитается по остатку.") + + return "\n".join(lines) diff --git a/context/2026-09-09_02-00-35_paycheck-bot-mvp.md b/context/2026-09-09_02-00-35_paycheck-bot-mvp.md new file mode 100644 index 0000000..7e5a9b4 --- /dev/null +++ b/context/2026-09-09_02-00-35_paycheck-bot-mvp.md @@ -0,0 +1,32 @@ +# 2026-09-09 — Telegram-бот «от зарплаты до зарплаты» + +## Запрос +Сделать бота: ввод суммы и даты «до зарплаты», расчёт дневного лимита, быстрый учёт дневных трат. + +## Решение +С нуля собран Telegram-бот на **aiogram 3** + **SQLite (aiosqlite)**. + +### Структура +- `bot/main.py` — точка входа, polling +- `bot/config.py` — `BOT_TOKEN` из `.env` +- `bot/db/` — схема, репозиторий +- `bot/services/budget.py` — лимит дня от остатка на утро (`(остаток+траты_сегодня)/дней`), модель «утреннего конверта» +- `bot/services/parsing.py` — парсинг сумм/дат/трат +- `bot/handlers/budget.py` — команды и FSM настройки бюджета + +### UX +- `/budget` → сумма → дата +- Трата одним сообщением: `250`, `250 кофе`, `кофе 250` +- `/status`, `/today`, `/undo` +- Reply-клавиатура: Статус / Сегодня / Новый бюджет / Отмена траты + +### Запуск +1. Токен от BotFather в `.env` +2. `pip install -r requirements.txt` +3. `python -m bot.main` + +## Не сделано (можно следующим шагом) +- Категории трат и отчёты за период +- Напоминание вечером, если лимит не выбран +- Мультивалютность / несколько бюджетов +- Деплой (systemd / Docker) diff --git a/context/2026-09-13_04-51-08_dockerfile.md b/context/2026-09-13_04-51-08_dockerfile.md new file mode 100644 index 0000000..f754e46 --- /dev/null +++ b/context/2026-09-13_04-51-08_dockerfile.md @@ -0,0 +1,15 @@ +# 2026-09-13 — Dockerfile для бота + +## Запрос +Написать Dockerfile. + +## Сделано +- `Dockerfile` — `python:3.12-slim`, non-root user `bot`, `CMD python -m bot.main` +- `.dockerignore` — исключает `.venv`, `.env`, `data/`, кэши +- В README добавлен пример `docker build` / `docker run` с volume для SQLite + +## Запуск +```bash +docker build -t please-pay-me-bot . +docker run --rm -e BOT_TOKEN=... -v ./data:/app/data please-pay-me-bot +``` diff --git a/context/2026-09-13_05-01-34_docker-xray-proxy.md b/context/2026-09-13_05-01-34_docker-xray-proxy.md new file mode 100644 index 0000000..0da8cda --- /dev/null +++ b/context/2026-09-13_05-01-34_docker-xray-proxy.md @@ -0,0 +1,21 @@ +# 2026-09-13 — SOCKS5-прокси для бота в Docker + +## Запрос +Xray на хосте (10808/10809) слушает 127.0.0.1; контейнер его не видит. Нужно открыть listen на 0.0.0.0 и настроить aiogram через SOCKS5. + +## Сделано в репозитории +- `aiohttp-socks` в `requirements.txt` +- `PROXY_URL` в `bot/config.py` (опционально) +- `bot/main.py` — `AiohttpSession(proxy=...)` (официальный API aiogram 3, без `_connector_init`) +- `scripts/open_xray_listen.sh` — правки Xray на Ubuntu-хосте + restart +- `docker-compose.yml` — `PROXY_URL=socks5://172.17.0.1:10808` по умолчанию +- README: секция прокси + firewall warning + +## На хосте (вручную) +```bash +./scripts/open_xray_listen.sh +# в .env: PROXY_URL=socks5://172.17.0.1:10808 +docker compose up -d --build +``` + +Конфиг `/usr/local/etc/xray/config.json` с этой Windows-машины недоступен — правки только через скрипт на Ubuntu. diff --git a/context/2026-09-13_05-06-42_fix-proxy-timeout-host-net.md b/context/2026-09-13_05-06-42_fix-proxy-timeout-host-net.md new file mode 100644 index 0000000..470c52b --- /dev/null +++ b/context/2026-09-13_05-06-42_fix-proxy-timeout-host-net.md @@ -0,0 +1,17 @@ +# 2026-09-13 — Fix: ProxyTimeout к 172.17.0.1 + +## Симптом +Контейнер: `Proxy connection timed out` к `socks5://172.17.0.1:10808`. + +## Причина +В bridge/Portainer-сети хост `172.17.0.1:10808` часто недоступен (Xray на 127.0.0.1 и/или другая docker-сеть). + +## Исправление +- `docker-compose.yml`: `network_mode: host` + `PROXY_URL=socks5://127.0.0.1:10808` +- Убран захардкоженный `BOT_TOKEN` из compose (был в логах/файле — нужен revoke у BotFather) +- Xray можно оставить на `127.0.0.1` (безопаснее, чем 0.0.0.0) + +## Действия на сервере +1. BotFather → revoke/перевыпустить токен +2. В `.env`: новый токен + `PROXY_URL=socks5://127.0.0.1:10808` +3. `docker compose up -d --build` diff --git a/context/2026-09-13_05-11-16_dated-expenses.md b/context/2026-09-13_05-11-16_dated-expenses.md new file mode 100644 index 0000000..ecb8a56 --- /dev/null +++ b/context/2026-09-13_05-11-16_dated-expenses.md @@ -0,0 +1,13 @@ +# 2026-09-13 — Траты за произвольную дату + +## Запрос +Возможность добавлять трату за определённое число. + +## Сделано +- Парсер: `за 12.09 250 кофе`, `250 кофе за 12.09`, `12.09 250`, `250 кофе 12.09` +- Дата без года для трат берёт прошлое/текущее (не будущее), в отличие от даты бюджета +- `BudgetService.add_expense(..., spent_at=)` с проверкой периода бюджета +- FSM `/spend` и кнопка «📅 За дату» +- `/day 12.09` — список трат за дату + +Месяц в дате с точкой лучше писать двузначно (`12.09`), чтобы не путать с суммой `12.5`. diff --git a/context/2026-09-13_05-15-40_fix-dated-fsm-stuck.md b/context/2026-09-13_05-15-40_fix-dated-fsm-stuck.md new file mode 100644 index 0000000..4f8baf3 --- /dev/null +++ b/context/2026-09-13_05-15-40_fix-dated-fsm-stuck.md @@ -0,0 +1,11 @@ +# 2026-09-13 — Fix: FSM «За дату» глотал все сообщения + +## Баг +После «📅 За дату» состояние `waiting_date` было зарегистрировано раньше `/status`, `/today`, `/day`. Любой ввод (включая кнопки) шёл в парсер даты. Сообщение `12.09 кб` целиком не парсилось как дата → вечный цикл ошибки. + +## Исправление +- Команды и кнопки меню регистрируются **до** FSM и сбрасывают state +- На шаге даты: one-shot `12.09 250 кб`, либо дата из первого токена (`12.09 кб` → дата + заметка, потом спросить сумму) +- Подсказка про `/cancel` + +После деплоя: если бот всё ещё «залип» — один раз `/cancel` или `/help`. diff --git a/context/2026-09-13_05-20-03_period-history-pagination.md b/context/2026-09-13_05-20-03_period-history-pagination.md new file mode 100644 index 0000000..9a68df3 --- /dev/null +++ b/context/2026-09-13_05-20-03_period-history-pagination.md @@ -0,0 +1,11 @@ +# 2026-09-13 — Постраничный просмотр трат периода + +## Запрос +Просматривать траты за текущий период бюджета постранично. + +## Сделано +- Репозиторий: `count/sum/list_expenses_in_period` с LIMIT/OFFSET +- `BudgetService.get_period_expenses_page` (по 8 записей, новые сверху) +- `/history` и кнопка «📒 Период» +- Inline «‹ Назад» / «N/M» / «Вперёд ›» +- Сумма статуса периода тоже считается строго в границах бюджета diff --git a/context/2026-09-13_06-55-26_api-web-cabinet.md b/context/2026-09-13_06-55-26_api-web-cabinet.md new file mode 100644 index 0000000..a823532 --- /dev/null +++ b/context/2026-09-13_06-55-26_api-web-cabinet.md @@ -0,0 +1,27 @@ +# 2026-09-13 — API + веб-кабинет для бюджетов и трат + +## Запрос +Сделать API и фронт для просмотра бюджетов и трат. + +## Сделано +### API (`api/`) +- FastAPI, тот же SQLite (`data/budget.db`, WAL) +- `GET /api/health` без токена +- `GET /api/budgets`, `/api/budgets/{user_id}`, `/api/budgets/{user_id}/expenses` +- Auth: `X-API-Token` / Bearer `API_TOKEN` + +### Web (`web/`) +- React + Vite + React Router +- Список бюджетов, деталка со статусом и постраничными тратами +- Токен в localStorage + +### Docker +- `Dockerfile.api` (multi-stage: npm build + uvicorn) +- `docker-compose.yml`: сервисы `bot` + `web` (:8000) + +## Запуск +```bash +# .env: API_TOKEN=... +docker compose up -d --build +# кабинет: http://HOST:8000 +``` diff --git a/context/2026-09-13_07-18-38_clarify-compose-tokens.md b/context/2026-09-13_07-18-38_clarify-compose-tokens.md new file mode 100644 index 0000000..e599665 --- /dev/null +++ b/context/2026-09-13_07-18-38_clarify-compose-tokens.md @@ -0,0 +1,8 @@ +# 2026-09-13 — Уточнение docker-compose: BOT_TOKEN vs API_TOKEN + +## Вопрос +Почему у bot убран токен и зачем фронту токен бота? + +## Ответ +1. **BOT_TOKEN не убирался у бота** — убрали только хардкод из compose (токен светился в логах). Бот читал его из `.env` через `env_file`. Сейчас явно: `BOT_TOKEN: ${BOT_TOKEN}`. +2. **Фронту BOT_TOKEN не нужен.** Нужен отдельный `API_TOKEN` для защиты read-only API кабинета. У сервиса `web` убран `env_file`, чтобы Telegram-токен туда вообще не попадал. diff --git a/context/2026-09-13_07-20-59_split-web-api-ports.md b/context/2026-09-13_07-20-59_split-web-api-ports.md new file mode 100644 index 0000000..85f269b --- /dev/null +++ b/context/2026-09-13_07-20-59_split-web-api-ports.md @@ -0,0 +1,10 @@ +# 2026-09-13 — Разделение портов фронт/API + +## Запрос +Фронт на внешнем порту 51290, API на 51291; фронт ходит на localhost:51291. + +## Сделано +- `api` сервис: `51291:8000`, только FastAPI (без статики) +- `web` сервис: nginx `51290:80`, `VITE_API_BASE_URL=http://localhost:51291` +- CORS по умолчанию: `http://localhost:51290`, `http://127.0.0.1:51290` +- `web/src/api.ts` собирает абсолютные URL к API diff --git a/context/2026-09-13_07-28-00_pretty-404.md b/context/2026-09-13_07-28-00_pretty-404.md new file mode 100644 index 0000000..db3bd82 --- /dev/null +++ b/context/2026-09-13_07-28-00_pretty-404.md @@ -0,0 +1,4 @@ +# 2026-09-13 — Красивая 404 + +Стилизована под кабинет (Syne/Manrope, зелёный градиент, motion). +Файлы: корневой `404.html` + `web/public/404.html`, nginx `error_page 404`. diff --git a/context/2026-09-13_07-47-00_nginx-api-proxy.md b/context/2026-09-13_07-47-00_nginx-api-proxy.md new file mode 100644 index 0000000..5203703 --- /dev/null +++ b/context/2026-09-13_07-47-00_nginx-api-proxy.md @@ -0,0 +1,4 @@ +# 2026-09-13 — Nginx proxy /api → API + +Фронт ходит на same-origin `/api`. Nginx проксирует на `http://api:8000` (сервис compose = хост `localhost:51291`). +`VITE_API_BASE_URL` по умолчанию пустой. Vite dev proxy → `http://localhost:51291`. diff --git a/context/2026-09-13_07-51-00_fix-api-readonly-sqlite.md b/context/2026-09-13_07-51-00_fix-api-readonly-sqlite.md new file mode 100644 index 0000000..aa5a72c --- /dev/null +++ b/context/2026-09-13_07-51-00_fix-api-readonly-sqlite.md @@ -0,0 +1,11 @@ +# 2026-09-13 — Fix: API readonly database + +## Ошибка +`sqlite3.OperationalError: attempt to write a readonly database` на `PRAGMA journal_mode=WAL`. + +## Причина +API (uid 1001) и бот (uid 1000) делили `./data`; WAL/схема требуют запись. + +## Исправление +- `Database(read_only=True)` для API: `file:...?mode=ro`, без WAL и SCHEMA +- `Dockerfile.api` — uid 1000 как у бота diff --git a/context/2026-09-13_07-54-00_fix-nginx-api-html-json.md b/context/2026-09-13_07-54-00_fix-nginx-api-html-json.md new file mode 100644 index 0000000..480a341 --- /dev/null +++ b/context/2026-09-13_07-54-00_fix-nginx-api-html-json.md @@ -0,0 +1,11 @@ +# 2026-09-13 — Fix: JSON.parse на фронте + +## Симптом +`JSON.parse: unexpected character at line 1 column 1` — в ответ на `/api/budgets` приходил HTML `index.html` (SPA fallback). + +## Причина +В `web/nginx.conf` не было `location /api/` → `try_files` отдавал фронт. + +## Исправление +Вернул `proxy_pass http://api:8000` для `/api/`, улучшил разбор ошибок во фронте. +Пересобрать: `docker compose up -d --build web` diff --git a/context/2026-09-13_07-59-21_telegram-login-cabinet.md b/context/2026-09-13_07-59-21_telegram-login-cabinet.md new file mode 100644 index 0000000..0aa7fd9 --- /dev/null +++ b/context/2026-09-13_07-59-21_telegram-login-cabinet.md @@ -0,0 +1,10 @@ +# 2026-09-13 — Личный кабинет через Telegram Login + +## Сделано +- POST `/api/auth/telegram` — проверка Login Widget + JWT +- GET `/api/me`, `/api/me/budget`, `/api/me/expenses` — только свой user_id +- Фронт: кнопка Telegram Login, кабинет своего бюджета +- Env: `BOT_TOKEN`, `TELEGRAM_BOT_USERNAME` (+ опционально `API_TOKEN` для админских `/api/budgets`) + +## BotFather +`/setdomain` на домен кабинета (нужен публичный HTTPS). diff --git a/context/2026-09-13_08-11-27_web-write-expenses-budget.md b/context/2026-09-13_08-11-27_web-write-expenses-budget.md new file mode 100644 index 0000000..a75000d --- /dev/null +++ b/context/2026-09-13_08-11-27_web-write-expenses-budget.md @@ -0,0 +1,13 @@ +# 2026-09-13 — Write API + формы трат/бюджета в кабинете + +## Сделано +- API: `read_only=False` +- `POST /api/me/expenses`, `DELETE /api/me/expenses/last`, `PUT /api/me/budget` +- Фронт: формы «Добавить трату» и «Задать/обновить бюджет» +- CORS: PUT/DELETE + +## На сервере +```bash +sudo chown -R 1000:1000 ./data +docker compose up -d --build api web +``` diff --git a/context/2026-09-13_08-25-18_web-ui-redesign.md b/context/2026-09-13_08-25-18_web-ui-redesign.md new file mode 100644 index 0000000..094c896 --- /dev/null +++ b/context/2026-09-13_08-25-18_web-ui-redesign.md @@ -0,0 +1,9 @@ +# 2026-09-13 — Редизайн web-кабинета + +## UX +- Login: brand-first, один CTA (Telegram) +- Кабинет: hero = остаток; быстрая трата; история; настройки бюджета в `

` +- Flash с aria-live, skeleton, focus-visible, reduced-motion +- Крупные touch-target (48px), sticky topbar + +Сохранить палитру леса/зелени проекта. Пересборка: `docker compose up -d --build web` diff --git a/context/2026-09-13_10-00-00_web-strict-system-ui.md b/context/2026-09-13_10-00-00_web-strict-system-ui.md new file mode 100644 index 0000000..4caf343 --- /dev/null +++ b/context/2026-09-13_10-00-00_web-strict-system-ui.md @@ -0,0 +1,4 @@ +# 2026-09-13 — Строгий системный UI кабинета + +Светлая тема, IBM Plex Sans/Mono, шкала отступов 4–48px, hairline-границы, +без glow/градиентов. Суммы в mono. Секции: Обзор → Операция → Журнал → Параметры. diff --git a/context/2026-09-13_10-15-00_product-design-system.md b/context/2026-09-13_10-15-00_product-design-system.md new file mode 100644 index 0000000..04025aa --- /dev/null +++ b/context/2026-09-13_10-15-00_product-design-system.md @@ -0,0 +1,26 @@ +# 2026-09-13 — Системный продуктовый дизайн (web) + +Заложена расширяемая дизайн-система кабинета вместо монолита `App.tsx`. + +## Структура + +- `web/src/design/` — токены (`tokens.css`), base, стили shell/UI +- `web/src/components/ui/` — Button, Field, Flash, ProgressBar, MetricGrid, PageHeader, Section, EmptyState, Banner +- `web/src/components/layout/` — AppShell, AuthLayout, `PRIMARY_NAV` (точка расширения меню) +- `web/src/auth/` — AuthProvider, RequireAuth +- `web/src/cabinet/` — CabinetProvider (бюджет/траты), CabinetLayout +- `web/src/pages/` — Login, Overview, Operations, Journal, Period (+ ComingSoon заготовка) + +## Маршруты + +`/login` · `/` · `/operations` · `/journal` · `/period` +В nav зарезервированы «Отчёты» и «Настройки» (`soon: true`). + +## Как добавлять фичу + +1. Пункт в `PRIMARY_NAV` +2. Route под `CabinetLayout` в `App.tsx` +3. Страница в `pages/`, UI из `components/ui` +4. Доменное состояние — в `cabinet/` или новый context + +Сборка `npm run build` проходит успешно. diff --git a/context/2026-09-13_10-25-00_bot-via-api.md b/context/2026-09-13_10-25-00_bot-via-api.md new file mode 100644 index 0000000..f46c8b1 --- /dev/null +++ b/context/2026-09-13_10-25-00_bot-via-api.md @@ -0,0 +1,18 @@ +# 2026-09-13 — Бот ходит в БД только через API + +## Цель +Единый путь записи/чтения: web и Telegram-бот → FastAPI → SQLite. +Бот больше не монтирует `./data` и не открывает `budget.db`. + +## API +- `POST /api/auth/internal` + `X-API-Token` / `API_TOKEN` → JWT как у web +- Бот вызывает те же `/api/me/budget`, `/api/me/expenses`, undo, upsert +- `GET /api/me/expenses?spent_at=YYYY-MM-DD` — траты за день (для /today, /day) + +## Bot +- `bot/clients/budget_api.py` — `BudgetApiClient` (aiohttp) +- `bot/config.py`: `API_BASE_URL`, `API_TOKEN` (обязателен) +- Compose: bot без volume data; `API_BASE_URL=http://127.0.0.1:51291` при host network + +## Деплой +Пересобрать `api` + `bot`, убедиться что `API_TOKEN` одинаковый в обоих сервисах. diff --git a/context/2026-09-13_10-40-00_multi-budget-active.md b/context/2026-09-13_10-40-00_multi-budget-active.md new file mode 100644 index 0000000..e4f41e2 --- /dev/null +++ b/context/2026-09-13_10-40-00_multi-budget-active.md @@ -0,0 +1,23 @@ +# 2026-09-13 — Несколько бюджетов + is_active + +## Модель +- У пользователя много строк в `budgets` (снят UNIQUE user_id) +- Поля: `name`, `is_active`, `users.selected_budget_id` +- `expenses.budget_id` — траты привязаны к конкретному бюджету +- Миграция на старте API (`migrate_schema`) для старых БД + +## Семантика +- **Активный** — можно писать траты +- **Текущий (selected)** — default для /status, операций, журнала +- Неактивный отклоняет новые expenses + +## API +- `GET/POST /api/me/budgets` +- `PUT /api/me/budgets/{id}` +- `PATCH /api/me/budgets/{id}/active` +- `POST /api/me/budgets/{id}/select` +- `budget_id` на expenses / budget GET + +## Клиенты +- Web: страница `/budgets`, переключатель вкл/выкл и «текущий» +- Bot: `/budgets`, `/budget` создаёт новый; inline select/toggle diff --git a/context/2026-09-13_10-50-00_csharp-api-postgres.md b/context/2026-09-13_10-50-00_csharp-api-postgres.md new file mode 100644 index 0000000..7a7e067 --- /dev/null +++ b/context/2026-09-13_10-50-00_csharp-api-postgres.md @@ -0,0 +1,18 @@ +# 2026-09-13 — API на C# + PostgreSQL + +## Что сделано +- Новый стек: `src/PleasePayMe.*` (Domain / Application / Infrastructure / Api) +- EF Core + Npgsql, миграция `InitialCreate`, авто-`Migrate()` на старте +- HTTP-контракт прежний (`/api/auth/*`, `/api/me/*`, `/api/budgets/*`, snake_case JSON, `{detail}`) +- Docker: сервис `db` (postgres:16), `Dockerfile.api` → ASP.NET +- Python `api/` помечен deprecated; бот и web без смены контракта + +## Запуск +```bash +docker compose up -d --build +``` +Переменные: `BOT_TOKEN`, `API_TOKEN`, `POSTGRES_*`. + +## Данные +SQLite `data/budget.db` в compose больше не используется. +Перенос старых данных — отдельной задачей (не автоматический). diff --git a/context/2026-09-13_10-55-00_delete-budgets.md b/context/2026-09-13_10-55-00_delete-budgets.md new file mode 100644 index 0000000..dfe9e73 --- /dev/null +++ b/context/2026-09-13_10-55-00_delete-budgets.md @@ -0,0 +1,5 @@ +# 2026-09-13 — Удаление бюджетов + +- `DELETE /api/me/budgets/{id}` → 204; траты каскадом; selected переназначается +- Web: кнопка «Удалить» с confirm на странице Бюджеты +- Bot: кнопка 🗑 в `/budgets` diff --git a/context/2026-09-13_11-00-00_work-jobs-section.md b/context/2026-09-13_11-00-00_work-jobs-section.md new file mode 100644 index 0000000..362384b --- /dev/null +++ b/context/2026-09-13_11-00-00_work-jobs-section.md @@ -0,0 +1,14 @@ +# 2026-09-13 — Раздел «Работа» + +## Модель +- Таблица `jobs`: name, salary_amount, pay_days (integer[] 1–31), is_active +- Если дня нет в месяце (напр. 31) — берётся последний день месяца +- API считает `next_pay_dates` (ближайшие выплаты) + +## API +- `GET/POST /api/me/jobs` +- `PUT/DELETE /api/me/jobs/{id}` + +## Web +- Навигация «Работа» → `/work` +- Список + форма: название, ЗП, дни (текст `5, 20` + быстрые чипы) diff --git a/context/2026-09-13_11-10-00_job-split-weekend.md b/context/2026-09-13_11-10-00_job-split-weekend.md new file mode 100644 index 0000000..1ba5121 --- /dev/null +++ b/context/2026-09-13_11-10-00_job-split-weekend.md @@ -0,0 +1,6 @@ +# 2026-09-13 — Работа: доля выплат + сдвиг с выходных + +- Максимум 2 дня в `pay_days` +- `first_pay_percent` — доля более раннего дня; второй = 100 − first +- `weekend_policy`: `before_weekend` | `after_weekend` (сб/вс → пт или пн) +- `next_pays[]`: дата (уже с учётом сдвига), scheduled_day, percent, amount diff --git a/context/2026-09-13_11-20-00_budget-start-date.md b/context/2026-09-13_11-20-00_budget-start-date.md new file mode 100644 index 0000000..973cc94 --- /dev/null +++ b/context/2026-09-13_11-20-00_budget-start-date.md @@ -0,0 +1,5 @@ +# 2026-09-13 — Выбор даты начала бюджета + +- API уже принимал `start_date` (create/update/upsert); upsert теперь пробрасывает дату. +- Web: поле «С даты» в Бюджеты и Период; по умолчанию `todayIso()` при создании. +- Bot client: `create_budget` / `set_budget` передают `start_date`, если задан (иначе API = сегодня). diff --git a/context/2026-09-13_11-25-00_calendar-budgets-pays.md b/context/2026-09-13_11-25-00_calendar-budgets-pays.md new file mode 100644 index 0000000..cc5117b --- /dev/null +++ b/context/2026-09-13_11-25-00_calendar-budgets-pays.md @@ -0,0 +1,6 @@ +# 2026-09-13 — Календарь бюджетов и выплат + +- Маршрут `/calendar`, пункт «Календарь» в nav +- Полоски цвета = периоды бюджетов (стабильный цвет по id) +- Кружки = дни ЗП (с учётом weekend_policy, как в PaySchedule) +- Клик по дню — детали; легенда ниже сетки diff --git a/context/2026-09-13_11-30-00_calendar-expenses.md b/context/2026-09-13_11-30-00_calendar-expenses.md new file mode 100644 index 0000000..a87e83e --- /dev/null +++ b/context/2026-09-13_11-30-00_calendar-expenses.md @@ -0,0 +1,5 @@ +# 2026-09-13 — Календарь 2.0: траты на днях + +- API `GET /api/me/expenses/range?from=&to=` — траты по всем бюджетам пользователя (≤93 дня) +- Ячейка: точка + компактная сумма трат за день +- Клик по дню → блок «Операции» (сумма, заметка, бюджет) + контекст (бюджеты/ЗП) diff --git a/context/2026-09-19_22-30-00_expenses-without-active-all-journal.md b/context/2026-09-19_22-30-00_expenses-without-active-all-journal.md new file mode 100644 index 0000000..3c31824 --- /dev/null +++ b/context/2026-09-19_22-30-00_expenses-without-active-all-journal.md @@ -0,0 +1,6 @@ +# 2026-09-19 — Траты без активного бюджета + журнал «все» + +- `AddExpense`: больше не требует `is_active`; для неактивного бюджета даты периода не ограничивают +- `GET /api/me/expenses?all=true` — пагинация по всем бюджетам пользователя (`budget_id: null`) +- Журнал: переключатель **Все / Текущий** (по умолчанию все); в режиме «все» видно имя бюджета +- Операции: выбор бюджета в форме, в т.ч. выключенного diff --git a/context/2026-09-19_23-10-00_mobile-widgetbook.md b/context/2026-09-19_23-10-00_mobile-widgetbook.md new file mode 100644 index 0000000..c24fc75 --- /dev/null +++ b/context/2026-09-19_23-10-00_mobile-widgetbook.md @@ -0,0 +1,18 @@ +# 2026-09-19 — Flutter mobile + portable Widgetbook + +## Mobile app (`mobile/`) +- Flutter scaffold (android/ios/web/windows) +- Theme tokens aligned with web `tokens.css` + light/dark `ThemeData` +- UI kit: atoms / molecules / navigation / feedback / sample screens +- IBM Plex Sans via `google_fonts` + +## Widgetbook (`mobile/widgetbook/`) +- Separate package (`please_pay_me_widgetbook`) path-depends on app +- Catalog: Atoms, Molecules, Navigation, Feedback, Screens + knobs +- Addons: MaterialTheme (light/dark), Localization (ru/en), Viewport (iPhone/Android) +- Smoke tests: `flutter test` — all use-cases registered + +## Run +```bash +cd mobile/widgetbook && flutter pub get && flutter run -d chrome +``` diff --git a/context/2026-09-19_23-20-00_mobile-run-ps1.md b/context/2026-09-19_23-20-00_mobile-run-ps1.md new file mode 100644 index 0000000..845ea21 --- /dev/null +++ b/context/2026-09-19_23-20-00_mobile-run-ps1.md @@ -0,0 +1,5 @@ +# 2026-09-19 — PS1 скрипты запуска mobile/widgetbook + +- `mobile/run.ps1` — app или `-Target widgetbook` +- `mobile/widgetbook/run.ps1` — каталог UI (`-Device chrome|windows|edge`) +- Ищут Flutter в PATH и `%USERPROFILE%\flutter\bin` diff --git a/context/2026-09-19_23-25-00_widgetbook-windows-support.md b/context/2026-09-19_23-25-00_widgetbook-windows-support.md new file mode 100644 index 0000000..d778e5d --- /dev/null +++ b/context/2026-09-19_23-25-00_widgetbook-windows-support.md @@ -0,0 +1,5 @@ +# 2026-09-19 — Widgetbook: добавлен Windows desktop support + +- `flutter create . --platforms=windows,web,android,ios` в `mobile/widgetbook` +- Исправлена заглушка `test/widget_test.dart` после create +- Повтор: `.\run.ps1 -Device windows` diff --git a/context/2026-09-19_23-55-00_mobile-ios-kit.md b/context/2026-09-19_23-55-00_mobile-ios-kit.md new file mode 100644 index 0000000..e15f1d3 --- /dev/null +++ b/context/2026-09-19_23-55-00_mobile-ios-kit.md @@ -0,0 +1,66 @@ +# 2026-09-19 — Мобильный UI-кит переведён на iOS (Cupertino) + +## Запрос +Widgetbook запустился, но Material-компоненты визуально не устроили. Задача — сделать +компоненты «из iOS kit». + +## Что сделано + +### Токены и тема (`mobile/lib/theme/`) +- `tokens.dart` переписан под Apple HIG: семантические цвета (`label`, `secondaryLabel`, + `separator`, `opaqueSeparator`, `groupedBackground`, `groupedSurface`, `barBackground`) + и системная палитра (`systemRed/Orange/Green/Gray/Gray3/Gray5/Gray6`) объявлены как + `CupertinoDynamicColor.withBrightness` — light/dark резолвится самим фреймворком через + `AppColors.of(context, color)`. +- Бренд-тинт остался зелёным (`accent` = #12885A / #3CD68C в тёмной) и подменяет systemBlue. +- Типографика — шкала SF Pro: largeTitle 34 … caption2 11 с нативными letterSpacing. +- Размеры контролов: 50 / 44 / 34 pt, hairline 0.5, радиусы 6/10/12/16/capsule. +- `app_theme.dart` теперь возвращает `CupertinoThemeData` (`buildLightTheme` / + `buildDarkTheme`), шрифт — Inter через google_fonts как кросс-платформенная замена SF Pro + (на Windows/web SF недоступен). + +### Компоненты (`mobile/lib/ui/`) +Material-версии удалены, вместо них Cupertino: +- atoms: `AppButton` (filled/tinted/gray/plain/destructive × large/medium/small), + `AppTextField` (CupertinoTextField + error/prefix/clear), `AppText` (именованные + конструкторы по шкале iOS) + `AppSectionHeader`, `AppIcon` + `AppIconBadge` + (Settings-style скруглённый квадрат). +- molecules: `AppListSection` (inset-grouped, header/footer, hairline с indent), + `AppListTile` (leading/value/chevron, press-highlight, destructive), `AppSwitchRow` + (CupertinoSwitch), `AppCard`, `AppChip` (капсула), `AppAvatar`. +- navigation: `AppNavBar` (реализует `ObstructingPreferredSizeWidget`, есть subtitle), + `AppLargeNavBar` (`CupertinoSliverNavigationBar`), `AppTabBar` (наследник + `CupertinoTabBar`, чтобы отдавать в `CupertinoTabScaffold`), `AppSegmentedControl` + (`CupertinoSlidingSegmentedControl`), `AppAlert` + `showAppAlert` + `showAppActionSheet`. +- feedback: `AppSpinner` (`CupertinoActivityIndicator`), `AppProgressBar` (4pt капсула), + `AppSkeleton` / `AppSkeletonRow`, `AppToast` + `showAppToast` (blur-капсула через + OverlayEntry — в iOS нет SnackBar). +- screens: Feed (large title + сегменты + группы + empty/loading), Detail (hero-сумма, + прогресс, группа параметров, кнопки), Profile (Settings-подобный экран со свитчами). +- `main.dart` переведён на `CupertinoApp` + `CupertinoTabScaffold`. + +### Widgetbook (`mobile/widgetbook/`) +- `Widgetbook.cupertino` + `CupertinoThemeAddon` вместо material-варианта. +- Новый `lib/support/preview.dart` — `IosPreview` кладёт use-case на grouped-фон, + чтобы карточки и разделители читались как в приложении. +- Каталог: Atoms (Button/TextField/Typography/Icons), Molecules (Card/ListTile/SwitchRow/ + Chip/Avatar), Navigation (NavBar/TabBar/SegmentedControl/Alert), Feedback (Progress/ + Skeleton/Toast), Screens (Feed/Detail/Profile) — 42 use-case. +- Knobs: добавлены `knobEnum` и `knobTint` (дропдаун по системным тинтам), убран + deprecated `knobs.list`. + +### Тесты +`widgetbook/test/catalog_smoke_test.dart` больше не проверяет только структуру: каждый +use-case пампится в light и dark внутри `WidgetbookScope` (knobs читают `WidgetbookState` +из контекста, иначе падает «No Widgetbook found in the context»). В тестах отключён +`GoogleFonts.config.allowRuntimeFetching` и вызван `TestWidgetsFlutterBinding.ensureInitialized()`. + +## Результат +- `flutter analyze` (mobile + widgetbook) — 0 issues. +- `flutter test` — 84 теста в widgetbook + 1 в приложении, всё зелёное. + +## Запуск +```powershell +cd mobile\widgetbook +.\run.ps1 -Device windows +``` diff --git a/context/2026-09-20_00-40-00_mobile-app-assembled.md b/context/2026-09-20_00-40-00_mobile-app-assembled.md new file mode 100644 index 0000000..38eca9b --- /dev/null +++ b/context/2026-09-20_00-40-00_mobile-app-assembled.md @@ -0,0 +1,72 @@ +# 2026-09-20 — Мобильное приложение Please Pay Me собрано на iOS-ките + +## Запрос +«Собери теперь приложение please-pay-me, используя эти компоненты» — то есть поверх +Cupertino-кита из прошлой сессии сделать рабочее приложение против существующего API. + +## Что сделано + +### Слой данных (`lib/data/`) +- `models/` — `Budget`, `BudgetStatus` (+ вычисляемые `spentProgress` / `dailyProgress`), + `Expense`, `ExpensesPage`, `Job`, `UpcomingPay`, `WeekendPolicy`, `AuthUser`, `AuthSession`. + Зеркалят `web/src/types.ts`, парсятся через `models/json.dart` — толерантные + коэрсеры (`int`/`double`/`string`), потому что API отдаёт числа из C#-рекордов. +- `api/api_client.dart` — транспорт на `http`: Bearer-токен через `tokenProvider`, + маппинг `detail`/`title` в `ApiException`, отдельная обработка 401 с колбэком + `onUnauthorized` (разлогинивает сессию). +- `repositories/` — интерфейсы `BudgetRepository` / `ExpenseRepository` / + `JobRepository` / `UserRepository` + REST-реализации на все ручки `MeController`. +- `demo/demo_backend.dart` — in-memory бэкенд, повторяющий математику конверта + (`dailyLimit = remaining / daysLeft`). Используется в демо-режиме, превью и тестах; + `DemoBackend.empty()` — для пустых состояний. + +### Ядро (`lib/core/`) +- `config/app_config.dart` — `PPM_API_BASE_URL`, `PPM_WEB_URL`, `PPM_DEMO` через + `--dart-define`; пустой адрес API автоматически включает демо-режим. +- `storage/session_storage.dart` — интерфейс + `SharedPreferences` и in-memory реализации. +- `state/async_value.dart` — sealed `AsyncLoading/AsyncData/AsyncError` с `map(...)`, + чтобы экраны матчились по состоянию, а не жонглировали тремя nullable-полями. +- `format/formatters.dart` — деньги (`1 234,50 ₽`), русские плюрали, «Сегодня/Вчера». + +### Состояние (`lib/features/*/`) +- `SessionController` — владеет авторизацией и выдаёт репозитории (REST или demo), + так что остальное приложение не знает про токены. `sessionKey` пересобирает + фичевые контроллеры при входе/выходе. +- `BudgetsController` — источник правды по конвертам (список, выбранный, мутации + с авто-перезагрузкой, возврат текста ошибки вместо исключения). +- `JournalController` — пагинация + группировка по дням + скоуп «текущий/все». +- `JobsController` — работы и ближайшая выплата. + +### Экраны (`lib/features/`, `lib/app/`) +Пять вкладок: Обзор, Журнал, Бюджеты, Работа, Профиль (+ экран входа и сплэш). +Формы — модальные шиты: новая/редактирование траты, бюджета, работы; все они +принимают `onSubmit`, возвращающий текст ошибки, и не знают про репозитории. +`_SessionGate` разводит `restoring / signedOut / signedIn`. + +### Кит +Удалены демо-экраны `lib/ui/screens/*`; добавлены `AppEmptyState`, `AppErrorView`, +`AppLoadingView`, `showAppDatePicker`, `showAppFormSheet`. + +### Widgetbook +Папка Screens теперь показывает **настоящие экраны** приложения на `DemoScope` +(demo-бэкенд + провайдеры), включая пустые состояния, формы и полный таб-бар. + +### Авторизация — известное ограничение +Telegram Login Widget работает только в вебе. Мобильный клиент принимает JWT из +`localStorage.ppm_session_jwt` веб-кабинета и валидирует его через `GET /api/me`. +Нативный вход (WebView с Telegram-виджетом либо one-time code через бота) +не делался — это отдельное продуктовое решение. + +## Тесты +- `mobile`: 32 теста — парсинг моделей, форматтеры, все контроллеры на demo-бэкенде, + виджет-сценарии (вход, табы, пустые состояния, запись траты end-to-end). +- `mobile/widgetbook`: 100 — каждый use-case рендерится в light и dark. +- `flutter analyze` по обоим пакетам — 0 issues. +- `flutter build windows --debug` проходит (проверка плагинов shared_preferences/url_launcher). + +## Запуск +```powershell +cd mobile +.\run.ps1 # демо-данные +.\run.ps1 -ApiBaseUrl https://ppm.example.com +``` diff --git a/context/2026-09-20_01-20-00_telegram-webview-login.md b/context/2026-09-20_01-20-00_telegram-webview-login.md new file mode 100644 index 0000000..4eb75d3 --- /dev/null +++ b/context/2026-09-20_01-20-00_telegram-webview-login.md @@ -0,0 +1,69 @@ +# 2026-09-20 — Вход через WebView + Telegram Login Widget + +## Запрос +Реализовать нативный вход: открыть кабинет в WebView и забрать JWT через +JS-канал. Бэкенд не менять. + +## Почему не «просто открыть страницу» + +Telegram Login Widget в обычном браузере работает через iframe + `data-onauth`. +В Android/iOS WebView этот путь ломается: + +- popup (`window.open` на `oauth.telegram.org`) не возвращает `opener`; +- iframe режется third-party cookies и User-Agent с маркером `; wv`; +- callback `onTelegramAuth` просто не вызывается. + +Поэтому в WebView виджет переключается на **redirect-режим** (`data-auth-url`), +а Flutter забирает уже готовый JWT, который кабинет и так кладёт в +`localStorage.ppm_session_jwt`. API (`POST /api/auth/telegram`) не трогали. + +## Поток + +1. Экран входа на iOS/Android показывает «Войти через Telegram». +2. Открывается fullscreen WebView на `{cabinet}/login`. +3. Кабинет видит канал `window.PpmAuth` → ставит виджету `data-auth-url=/login`. +4. Пользователь логинится в Telegram; редирект приходит на `/login?id&hash&…`. +5. `telegramPayloadFromQuery` собирает payload, кабинет зовёт тот же + `loginWithTelegram` / `POST /api/auth/telegram`. +6. `setSession` пишет JWT в `localStorage` и зовёт `PpmAuth.postMessage`. +7. Flutter парсит сообщение, закрывает WebView, проверяет токен через + `GET /api/me`, кладёт сессию в `SharedPreferences`. + +Запасные пути, если кабинет ещё не задеплоен с мостом: + +- JS в WebView хукает `localStorage.setItem('ppm_session_jwt')` и поллит ключ; +- на Windows/web WebView нет — форма «вставить токен»; +- «Демо-режим» по-прежнему без сети. + +## Что изменилось + +### Web (не API) +- `web/src/auth/telegramRedirect.ts` — разбор query и `postTokenToNativeApp`. +- `TelegramLoginButton` — `data-auth-url` только если есть `window.PpmAuth`. +- `LoginPage` — автологин, если в URL уже лежит telegram-payload. +- `setSession` — после записи токена шлёт его в канал. + +### Mobile +- `TelegramLoginScreen` (`webview_flutter`): канал `PpmAuth`, Chrome UA без + `; wv`, third-party cookies на Android, `tg://` уходит во внешнее приложение, + кнопка «назад» после oauth.telegram.org. +- `resolveCabinetLoginUri` всегда открывает `/login`. +- `INTERNET` в main `AndroidManifest` (раньше был только в debug). +- iOS: `LSApplicationQueriesSchemes` для `tg` / `telegram`. +- `PPM_WEB_URL` по умолчанию = `PPM_API_BASE_URL` (один origin за nginx). + +## Тесты +- `resolveApiBaseUrl` / `resolveCabinetLoginUri` / парсер канала. +- виджет: инжектированный launcher отдаёт JWT → `GET /api/me` → signed in. +- 32 теста приложения, 102 в Widgetbook, `flutter analyze` чистый. + +## Запуск против живого кабинета + +```powershell +cd mobile +.\run.ps1 -Device windows # на Windows будет форма токена +# на телефоне: +.\run.ps1 -ApiBaseUrl https://<домен-кабинета> +``` + +Нужен публичный HTTPS и BotFather `/setdomain` на этот домен — как для веба. diff --git a/context/2026-09-20_01-35-00_mobile-dotenv.md b/context/2026-09-20_01-35-00_mobile-dotenv.md new file mode 100644 index 0000000..5115bad --- /dev/null +++ b/context/2026-09-20_01-35-00_mobile-dotenv.md @@ -0,0 +1,22 @@ +# 2026-09-20 — API URL мобильного приложения из `.env` + +## Запрос +Задавать `ApiBaseUrl` через переменные `.env`, а не флагом `run.ps1`. + +## Решение +Конфиг читается из `mobile/.env` и уходит во Flutter как +`--dart-define-from-file` — без `flutter_dotenv` в ассетах (иначе gitignored +`.env` ломал бы CI: asset обязан существовать в момент сборки). + +Порядок в `AppConfig.fromEnvironment`: +1. `--dart-define` (в т.ч. из файла) +2. явно переданная map (тесты) +3. пустой URL → демо-режим + +`run.ps1`: если `.env` нет — копирует `.env.example`. `-ApiBaseUrl` / `-WebUrl` +остались как разовый override поверх файла. Скрипт сохранён в UTF-8 с BOM и +без вложенных кавычек — иначе PowerShell 5.1 на Windows-1251 сыпется +`TerminatorExpectedAtEndOfString`. + +Ключи: `PPM_API_BASE_URL`, `PPM_WEB_URL`, `PPM_DEMO`. +Локальный `.env` в gitignore (есть и в корневом). diff --git a/context/2026-09-20_02-00-00_yandex-login.md b/context/2026-09-20_02-00-00_yandex-login.md new file mode 100644 index 0000000..632c79c --- /dev/null +++ b/context/2026-09-20_02-00-00_yandex-login.md @@ -0,0 +1,37 @@ +# 2026-09-20 — Вход через Яндекс ID (web + mobile) + +## Запрос +Кнопка «Войти через Яндекс» в кабинете и в приложении. Client ID / secret +уже заведены в Yandex OAuth. + +## Решение +Authorization code. Secret только на API (`YANDEX_CLIENT_SECRET` в `.env`, +не в web/mobile и не в git). Клиенты получают `client_id` с +`GET /api/auth/providers` и шлют `code` + `redirect_uri` в +`POST /api/auth/yandex`. + +API меняет код на токен Яндекса (`oauth.yandex.ru/token`), читает профиль +(`login.yandex.ru/info`) и выдаёт тот же JWT, что и Telegram. + +`users.user_id` для Яндекса: ` (1 << 50) | yandexId ` — не пересекается с +Telegram id и остаётся внутри `Number.MAX_SAFE_INTEGER`, чтобы JSON в +браузере и Flutter не терял точность. + +`redirect_uri` сверяется с allowlist (продакшен `https://please-pay-me.ru/`, +localhost:51290 и :5173, плюс `YANDEX_REDIRECT_URI` / `YANDEX_REDIRECT_URIS`). + +## Потоки + +- Web: кнопка → `oauth.yandex.ru/authorize` → возврат на `/?code=` + (как в кабинете Яндекса) → `RequireAuth` переносит query на `/login` → + `loginWithYandex` → `setSession`. +- Mobile: своя кнопка → WebView на Яндекс → перехват `{кабинет}/?code=` + → `POST /api/auth/yandex` из Flutter. + +## Что нужно в консоли Яндекса +Redirect URI: `https://please-pay-me.ru/` — как зарегистрировано в Яндексе. + +## Секрет +Значения записаны в корневой `.env` (gitignore). В репозиторий не коммитятся. +Секрет светился в чате — если репозиторий общий, лучше перевыпустить в +кабинете Яндекса. diff --git a/context/2026-09-20_02-10-00_pretty-502.md b/context/2026-09-20_02-10-00_pretty-502.md new file mode 100644 index 0000000..15a671b --- /dev/null +++ b/context/2026-09-20_02-10-00_pretty-502.md @@ -0,0 +1,8 @@ +# 2026-09-20 — Страница 502 + +По аналогии с `404.html`: тот же тёмный градиент, Syne/Manrope, motion. +Текст про недоступный шлюз, кнопки «Обновить» и «На главную». + +Файлы: корневой `502.html` + `web/public/502.html`. +nginx: `error_page 502 503 504 /502.html` — 503/504 на ту же страницу, +потому что при мёртвом API приходит не только 502. diff --git a/context/2026-09-20_02-15-00_yandex-redirect-root.md b/context/2026-09-20_02-15-00_yandex-redirect-root.md new file mode 100644 index 0000000..fe08a04 --- /dev/null +++ b/context/2026-09-20_02-15-00_yandex-redirect-root.md @@ -0,0 +1,8 @@ +# 2026-09-20 — Yandex redirect_uri = корень сайта + +В кабинете Яндекса Callback URL: `https://please-pay-me.ru/` (не `/login`). +Клиенты слали `/login` → Яндекс отвечал «redirect_uri не совпадает». + +Теперь authorize и обмен кода используют `https://please-pay-me.ru/`. +Возврат `/?code=` RequireAuth переносит на `/login?code=`, чтобы SPA +не выкинула query. Mobile перехватывает тот же корень. diff --git a/context/2026-09-20_02-35-00_web-ios-kit.md b/context/2026-09-20_02-35-00_web-ios-kit.md new file mode 100644 index 0000000..d315795 --- /dev/null +++ b/context/2026-09-20_02-35-00_web-ios-kit.md @@ -0,0 +1,22 @@ +# 2026-09-20 — Web UI-кит как в mobile iOS kit + +Кабинет переведён на те же токены и примитивы, что Flutter `mobile/lib/ui`. + +## Токены +`web/src/design/tokens.css` — Apple HIG: accent #12885A / #3CD68C, label / +separator / grouped surfaces, SF-шкала, 4pt сетка, радиусы 6/10/12/16. +Светлая и тёмная тема через `prefers-color-scheme`. Шрифт Inter. +Старые `--color-*` оставлены как алиасы. + +## Кит +`web/src/ui/` — AppButton (filled/tinted/gray/plain/destructive), AppText, +AppTextField, AppListSection/Tile, AppSegmented, AppProgress, AppEmpty/Error, +Chip, Avatar, Skeleton. Стили в `kit.css`. + +Старые `components/ui` (Button, Field, PageHeader, MetricGrid, …) — тонкие +обёртки над китом, страницы не ломаются. + +## Оболочка +AppShell: translucent bar, inset-grouped нав на десктопе, капсулы на узком +экране. Обзор и журнал собраны на list/segmented. Остальные экраны получают +iOS-вид через те же кнопки, поля и `data-list`. diff --git a/context/2026-09-20_02-40-00_login-url-from-env.md b/context/2026-09-20_02-40-00_login-url-from-env.md new file mode 100644 index 0000000..328a3d4 --- /dev/null +++ b/context/2026-09-20_02-40-00_login-url-from-env.md @@ -0,0 +1,5 @@ +# 2026-09-20 — Адрес кабинета только из `.env` + +С экрана входа убрано поле «Адрес кабинета». Origin берётся из +`PPM_WEB_URL` / `PPM_API_BASE_URL` (`https://please-pay-me.ru/`). +Поле токена осталось только в запасном режиме. diff --git a/context/2026-09-20_02-45-00_yandex-unavailable-toast.md b/context/2026-09-20_02-45-00_yandex-unavailable-toast.md new file mode 100644 index 0000000..2e82221 --- /dev/null +++ b/context/2026-09-20_02-45-00_yandex-unavailable-toast.md @@ -0,0 +1,11 @@ +# 2026-09-20 — Почему «Яндекс недоступен» + +Тост шёл из `_yandex == null`: `GET /api/auth/providers` не вызывался, +потому что `AppConfig.fromEnvironment()` читает только `--dart-define`. +Запуск из IDE без `run.ps1` оставлял URL пустым, ошибку глотали. + +На проде `/api/auth/providers` уже отдаёт `enabled: true`. + +Фикс: `main()` читает `mobile/.env` с диска (dart-define по-прежнему +главнее). По тапу провайдеры перезапрашиваются, в тосте — реальная +причина. На Windows WebView нет — отдельное сообщение. diff --git a/context/2026-09-20_02-48-00_config-production-default.md b/context/2026-09-20_02-48-00_config-production-default.md new file mode 100644 index 0000000..aaeefec --- /dev/null +++ b/context/2026-09-20_02-48-00_config-production-default.md @@ -0,0 +1,4 @@ +# 2026-09-20 — Дефолт кабинета + +Если `PPM_API_BASE_URL` / `PPM_WEB_URL` не заданы, `AppConfig` берёт +`https://please-pay-me.ru`. Демо только при `PPM_DEMO=true`. diff --git a/context/2026-09-20_02-50-00_profile-theme-switcher.md b/context/2026-09-20_02-50-00_profile-theme-switcher.md new file mode 100644 index 0000000..8d48d37 --- /dev/null +++ b/context/2026-09-20_02-50-00_profile-theme-switcher.md @@ -0,0 +1,6 @@ +# 2026-09-20 — Переключатель темы в профиле + +На экране профиля: Системная / Светлая / Тёмная (`AppSegmentedControl`). +`ThemeController` хранит выбор в SharedPreferences (`ppm_theme_preference`), +отдельно от JWT — тема переживает logout. `PleasePayMeApp` резолвит +brightness и прокидывает его в `CupertinoTheme` + `MediaQuery.platformBrightness`. diff --git a/context/2026-09-20_02-52-00_android-dark-nav-bar.md b/context/2026-09-20_02-52-00_android-dark-nav-bar.md new file mode 100644 index 0000000..7439fbf --- /dev/null +++ b/context/2026-09-20_02-52-00_android-dark-nav-bar.md @@ -0,0 +1,5 @@ +# 2026-09-20 — Android nav bar в тёмной теме + +Системная нижняя панель: прозрачный чёрный (`#00000000`), без contrast +scrim (`enforceNavigationBarContrast=false`). Иконки светлые. Edge-to-edge +включается в `main`, стиль окна — в `values-night`. diff --git a/context/2026-09-20_02-55-00_splash-screen.md b/context/2026-09-20_02-55-00_splash-screen.md new file mode 100644 index 0000000..edfa3e3 --- /dev/null +++ b/context/2026-09-20_02-55-00_splash-screen.md @@ -0,0 +1,6 @@ +# 2026-09-20 — Сплэш Please Pay Me + +Фирменный экран запуска: зелёный знак ₽, название, слоган, спиннер. +Нативный Android (вкл. 12+ splash API) и iOS launch — тот же фон +`#F2F2F7` / `#000000`, чтобы не было вспышки. `main` рисует сплэш сразу +и держит его минимум 850 мс, пока восстанавливается сессия. diff --git a/context/2026-09-20_03-05-00_legal-docs.md b/context/2026-09-20_03-05-00_legal-docs.md new file mode 100644 index 0000000..cc8cfbd --- /dev/null +++ b/context/2026-09-20_03-05-00_legal-docs.md @@ -0,0 +1,7 @@ +# 2026-09-20 — Правовые документы + +Публичные страницы `/legal/offer|privacy|consent|cookies`. +Футер на логине и в кабинете. Cookie-баннер при первом заходе +(технические / все, отказ от Метрики). Чекбоксы оферты и согласия +на входе в web и mobile; в профиле — «Правовая информация» со +ссылками на веб-версии. Реквизиты ИП Архангельский В.А. diff --git a/context/2026-09-20_03-18-00_app-name-icon.md b/context/2026-09-20_03-18-00_app-name-icon.md new file mode 100644 index 0000000..f332bf0 --- /dev/null +++ b/context/2026-09-20_03-18-00_app-name-icon.md @@ -0,0 +1,5 @@ +# 2026-09-20 — Название и иконка + +Отображаемое имя: **Дожить до ЗП**. Иконка: зелёный квадрат #12885A и белый ₽. +Проставлена в Android (adaptive), iOS, Windows, favicon кабинета. +`AppBrand.name` / `APP_NAME` — единый источник в UI. diff --git a/context/2026-09-20_03-31-00_rustore-icon.md b/context/2026-09-20_03-31-00_rustore-icon.md new file mode 100644 index 0000000..8e66481 --- /dev/null +++ b/context/2026-09-20_03-31-00_rustore-icon.md @@ -0,0 +1,4 @@ +# 2026-09-20 — Иконка для RuStore + +`mobile/assets/branding/rustore_icon_512.png`: 512×512, 1:1, ~145 КБ. +Уменьшена из `app_icon.png` (1024). diff --git a/context/2026-09-20_03-52-00_web-apk-download.md b/context/2026-09-20_03-52-00_web-apk-download.md new file mode 100644 index 0000000..0bf10b9 --- /dev/null +++ b/context/2026-09-20_03-52-00_web-apk-download.md @@ -0,0 +1,6 @@ +# 2026-09-20 — Скачать APK с сайта + +Ссылка `/dozhit-do-zp.apk` на логине и в футере. +Файл: `web/public/dozhit-do-zp.apk` (gitignore, 53 МБ). +Перед деплоем веб скопировать свежий +`mobile/build/app/outputs/flutter-apk/app-release.apk`. diff --git a/context/2026-09-20_04-55-00_telegram-yandex-link.md b/context/2026-09-20_04-55-00_telegram-yandex-link.md new file mode 100644 index 0000000..22030d6 --- /dev/null +++ b/context/2026-09-20_04-55-00_telegram-yandex-link.md @@ -0,0 +1,7 @@ +# 2026-09-20 Telegram → Yandex identity link + +Вход везде только через Яндекс. Бот больше не выдаёт JWT по сырому Telegram `user_id`: пока аккаунт не связан с Яндексом, `POST /api/auth/internal` отвечает 403 `yandex_required` и ссылкой `https://please-pay-me.ru/?tg_link={token}`. + +После входа через Яндекс веб вызывает `POST /api/auth/telegram-link/complete`. API пишет `telegram_yandex_links` и переносит бюджеты / траты / работы с Telegram-id на Yandex-namespaced id (`1<<50 | yandexId`). Дальше бот, кабинет и приложение работают с одним `user_id`. + +`POST /api/auth/telegram` отключён (403). Старые Telegram-сессии в кабинете сбрасываются. diff --git a/data/budget.db-shm b/data/budget.db-shm new file mode 100644 index 0000000..f1e8d76 Binary files /dev/null and b/data/budget.db-shm differ diff --git a/data/budget.db-wal b/data/budget.db-wal new file mode 100644 index 0000000..2d2703b Binary files /dev/null and b/data/budget.db-wal differ diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5669c74 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,72 @@ +services: + db: + image: postgres:16-alpine + restart: unless-stopped + environment: + POSTGRES_DB: ${POSTGRES_DB:-please_pay_me} + POSTGRES_USER: ${POSTGRES_USER:-ppm} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-ppm} + volumes: + - pgdata:/var/lib/postgresql/data + ports: + - "5432:5432" + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-ppm} -d ${POSTGRES_DB:-please_pay_me}"] + interval: 5s + timeout: 5s + retries: 10 + + bot: + build: . + restart: unless-stopped + network_mode: host + env_file: + - .env + environment: + BOT_TOKEN: ${BOT_TOKEN} + PROXY_URL: ${PROXY_URL:-socks5://127.0.0.1:10808} + API_BASE_URL: ${API_BASE_URL:-http://127.0.0.1:51291} + API_TOKEN: ${API_TOKEN} + depends_on: + api: + condition: service_started + + api: + build: + context: . + dockerfile: Dockerfile.api + restart: unless-stopped + ports: + - "51291:8000" + environment: + BOT_TOKEN: ${BOT_TOKEN} + API_TOKEN: ${API_TOKEN} + JWT_SECRET: ${JWT_SECRET:-} + CORS_ORIGINS: ${CORS_ORIGINS:-*} + YANDEX_CLIENT_ID: ${YANDEX_CLIENT_ID:-} + YANDEX_CLIENT_SECRET: ${YANDEX_CLIENT_SECRET:-} + YANDEX_REDIRECT_URI: ${YANDEX_REDIRECT_URI:-https://please-pay-me.ru/} + YANDEX_REDIRECT_URIS: ${YANDEX_REDIRECT_URIS:-} + PUBLIC_WEB_ORIGIN: ${PUBLIC_WEB_ORIGIN:-https://please-pay-me.ru} + ConnectionStrings__Default: >- + Host=db;Port=5432;Database=${POSTGRES_DB:-please_pay_me};Username=${POSTGRES_USER:-ppm};Password=${POSTGRES_PASSWORD:-ppm} + ASPNETCORE_URLS: http://+:8000 + depends_on: + db: + condition: service_healthy + + web: + build: + context: . + dockerfile: Dockerfile.web + args: + VITE_API_BASE_URL: ${VITE_API_BASE_URL:-} + VITE_TELEGRAM_BOT_USERNAME: ${TELEGRAM_BOT_USERNAME} + restart: unless-stopped + ports: + - "51290:80" + depends_on: + - api + +volumes: + pgdata: diff --git a/mobile/.env.example b/mobile/.env.example new file mode 100644 index 0000000..dca668b --- /dev/null +++ b/mobile/.env.example @@ -0,0 +1,6 @@ +# Optional. Empty keys fall back to https://please-pay-me.ru +# run.ps1 passes this file via --dart-define-from-file. + +PPM_API_BASE_URL=https://please-pay-me.ru/ +PPM_WEB_URL=https://please-pay-me.ru/ +PPM_DEMO=false diff --git a/mobile/.gitignore b/mobile/.gitignore new file mode 100644 index 0000000..4f08a54 --- /dev/null +++ b/mobile/.gitignore @@ -0,0 +1,52 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ +/coverage/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release + +# Widget Preview related +.widget_preview/ + +# Local runtime config (see .env.example) +.env + diff --git a/mobile/.metadata b/mobile/.metadata new file mode 100644 index 0000000..a7644bb --- /dev/null +++ b/mobile/.metadata @@ -0,0 +1,39 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "6a19cca56475dbfba1478ee68d7bd0c2ef891da1" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: android + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: ios + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: web + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: windows + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/mobile/README.md b/mobile/README.md new file mode 100644 index 0000000..dbb9221 --- /dev/null +++ b/mobile/README.md @@ -0,0 +1,93 @@ +# Please Pay Me — Flutter mobile + +Мобильный кабинет для бюджета «от зарплаты до зарплаты». UI построен на +iOS-ките (Cupertino, Apple HIG), данные — REST API из `src/PleasePayMe.Api`. + +## Запуск + +```powershell +cd mobile +copy .env.example .env # один раз +# отредактируй PPM_API_BASE_URL в .env +.\run.ps1 +.\run.ps1 -Device chrome +.\run.ps1 -Target widgetbook +``` + +`run.ps1` читает `mobile/.env` и передаёт его во Flutter как +`--dart-define-from-file`. Если файла нет — копирует `.env.example`. + +```bash +export PATH="$HOME/flutter/bin:$PATH" +cd mobile +flutter pub get +flutter run -d windows --dart-define-from-file=.env +``` + +### Конфигурация (`mobile/.env`) + +| Переменная | Назначение | +| --- | --- | +| `PPM_API_BASE_URL` | адрес API; если пусто — `https://please-pay-me.ru` | +| `PPM_WEB_URL` | веб-кабинет; если пусто — тот же origin, что API | +| `PPM_DEMO` | `true` — принудительный in-memory backend | + +### Авторизация + +На iOS и Android: + +- **Telegram** — кабинет в WebView, JWT забирается из + `localStorage.ppm_session_jwt` через канал `PpmAuth`. +- **Яндекс** — WebView на `oauth.yandex.ru`. Код возвращается на + `{кабинет}/` (как Callback URL в кабинете Яндекса), приложение шлёт + его в `POST /api/auth/yandex`. Client secret живёт только на API. + +Приложение проверяет JWT через `GET /api/me` и кладёт сессию в +`SharedPreferences`. + +На Windows / в браузере WebView нет: остаётся ручной ввод токена. Альтернатива +на любой платформе — «Демо-режим» (`DemoBackend` без сети). + +В кабинете Яндекса должен быть Redirect URI `https://<домен>/` +(для продакшена — `https://please-pay-me.ru/`). BotFather → `/setdomain` +для Telegram — тот же домен. + +## Экраны + +| Вкладка | Что делает | +| --- | --- | +| Обзор | остаток бюджета, дневной лимит, трата в один тап, ближайшая выплата | +| Журнал | операции по дням, фильтр «текущий / все бюджеты», подгрузка страниц | +| Бюджеты | выбор активного конверта, создание, редактирование, архив, удаление | +| Работа | оклад, дни выплат, правило выходных, график ближайших зарплат | +| Профиль | пользователь, режим подключения, выход | + +## Структура + +``` +mobile/ +├── lib/ +│ ├── app/ # CupertinoApp, session gate, таб-бар +│ ├── core/ # config, storage, AsyncValue, форматтеры +│ ├── data/ +│ │ ├── api/ # ApiClient (http + маппинг ошибок) +│ │ ├── models/ # Budget/Expense/Job/AuthUser + JSON-хелперы +│ │ ├── repositories/ # интерфейсы + REST-реализации +│ │ └── demo/ # in-memory backend (превью, тесты, демо-режим) +│ ├── features/ # overview / journal / budgets / work / profile / auth +│ ├── theme/ # токены Apple HIG + CupertinoThemeData +│ └── ui/ # дизайн-система (atoms → molecules → navigation) +└── widgetbook/ # переносимый каталог компонентов и экранов +``` + +Слои связаны через интерфейсы репозиториев: экраны знают только +`BudgetRepository` / `ExpenseRepository` / `JobRepository`, а `SessionController` +подставляет REST- или demo-реализацию. Поэтому и Widgetbook, и виджет-тесты +гоняют настоящие экраны без сети. + +## Тесты + +```bash +cd mobile && flutter test # модели, форматтеры, контроллеры, сквозной сценарий +cd mobile/widgetbook && flutter test # рендер каждого use-case в light и dark +``` diff --git a/mobile/analysis_options.yaml b/mobile/analysis_options.yaml new file mode 100644 index 0000000..d23a834 --- /dev/null +++ b/mobile/analysis_options.yaml @@ -0,0 +1,36 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +analyzer: + exclude: + - build/** + - android/** + - ios/** + - web/** + - windows/** + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/mobile/android/.gitignore b/mobile/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/mobile/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/mobile/android/app/build.gradle.kts b/mobile/android/app/build.gradle.kts new file mode 100644 index 0000000..ff694fb --- /dev/null +++ b/mobile/android/app/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id("com.android.application") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.pleasepayme.please_pay_me" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.pleasepayme.please_pay_me" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + // Uses the version code from pubspec.yaml. When using split APKs, 1000 * ABI_VERSION + // is added automatically by Flutter. (https://developer.android.com/studio/build/configure-apk-splits#configure-APK-versions) + // You can force using the value of versionCode by specifying the `-P force-version-code-ignoring-abi=true` + // flag during build. + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +flutter { + source = "../.." +} diff --git a/mobile/android/app/src/debug/AndroidManifest.xml b/mobile/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/mobile/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..2acf4be --- /dev/null +++ b/mobile/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/android/app/src/main/kotlin/com/pleasepayme/please_pay_me/MainActivity.kt b/mobile/android/app/src/main/kotlin/com/pleasepayme/please_pay_me/MainActivity.kt new file mode 100644 index 0000000..fbffd1d --- /dev/null +++ b/mobile/android/app/src/main/kotlin/com/pleasepayme/please_pay_me/MainActivity.kt @@ -0,0 +1,5 @@ +package com.pleasepayme.please_pay_me + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/mobile/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..5d9ced2 Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/mobile/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/mobile/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e2e725a Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/mobile/android/app/src/main/res/drawable-v21/launch_background.xml b/mobile/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..9088876 --- /dev/null +++ b/mobile/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..5ef9895 Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1f8cf41 Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6262877 Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/mobile/android/app/src/main/res/drawable/ic_splash_mark.xml b/mobile/android/app/src/main/res/drawable/ic_splash_mark.xml new file mode 100644 index 0000000..a7571aa --- /dev/null +++ b/mobile/android/app/src/main/res/drawable/ic_splash_mark.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/mobile/android/app/src/main/res/drawable/ic_splash_ruble.xml b/mobile/android/app/src/main/res/drawable/ic_splash_ruble.xml new file mode 100644 index 0000000..d048f97 --- /dev/null +++ b/mobile/android/app/src/main/res/drawable/ic_splash_ruble.xml @@ -0,0 +1,10 @@ + + + + diff --git a/mobile/android/app/src/main/res/drawable/launch_background.xml b/mobile/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..9088876 --- /dev/null +++ b/mobile/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..c79c58a --- /dev/null +++ b/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..eb50e08 Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..753b3ab Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..890602b Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..8f1e5ea Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..49b122e Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/mobile/android/app/src/main/res/values-night-v31/styles.xml b/mobile/android/app/src/main/res/values-night-v31/styles.xml new file mode 100644 index 0000000..f91628a --- /dev/null +++ b/mobile/android/app/src/main/res/values-night-v31/styles.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/mobile/android/app/src/main/res/values-night/colors.xml b/mobile/android/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..5f41835 --- /dev/null +++ b/mobile/android/app/src/main/res/values-night/colors.xml @@ -0,0 +1,5 @@ + + + #000000 + #3CD68C + diff --git a/mobile/android/app/src/main/res/values-night/styles.xml b/mobile/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..7319b6a --- /dev/null +++ b/mobile/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,30 @@ + + + + + + + diff --git a/mobile/android/app/src/main/res/values-v31/styles.xml b/mobile/android/app/src/main/res/values-v31/styles.xml new file mode 100644 index 0000000..4588b82 --- /dev/null +++ b/mobile/android/app/src/main/res/values-v31/styles.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/mobile/android/app/src/main/res/values/colors.xml b/mobile/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..e4adee3 --- /dev/null +++ b/mobile/android/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #F2F2F7 + #12885A + #12885A + \ No newline at end of file diff --git a/mobile/android/app/src/main/res/values/strings.xml b/mobile/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..3612387 --- /dev/null +++ b/mobile/android/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Дожить до ЗП + diff --git a/mobile/android/app/src/main/res/values/styles.xml b/mobile/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..d4191b7 --- /dev/null +++ b/mobile/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/mobile/android/app/src/profile/AndroidManifest.xml b/mobile/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/mobile/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/mobile/android/build.gradle.kts b/mobile/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/mobile/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties new file mode 100644 index 0000000..e96108c --- /dev/null +++ b/mobile/android/gradle.properties @@ -0,0 +1,6 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +# This newDsl flag was added by the Flutter template +android.newDsl=false +# This builtInKotlin flag was added by the Flutter template +android.builtInKotlin=false diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a20f2c4 --- /dev/null +++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip diff --git a/mobile/android/settings.gradle.kts b/mobile/android/settings.gradle.kts new file mode 100644 index 0000000..b28021a --- /dev/null +++ b/mobile/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "9.1.0" apply false + id("org.jetbrains.kotlin.android") version "2.4.0" apply false +} + +include(":app") diff --git a/mobile/assets/branding/app_icon.png b/mobile/assets/branding/app_icon.png new file mode 100644 index 0000000..35bbf19 Binary files /dev/null and b/mobile/assets/branding/app_icon.png differ diff --git a/mobile/assets/branding/rustore_icon_512.png b/mobile/assets/branding/rustore_icon_512.png new file mode 100644 index 0000000..14f4632 Binary files /dev/null and b/mobile/assets/branding/rustore_icon_512.png differ diff --git a/mobile/ios/.gitignore b/mobile/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/mobile/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/mobile/ios/Flutter/AppFrameworkInfo.plist b/mobile/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..391a902 --- /dev/null +++ b/mobile/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/mobile/ios/Flutter/Debug.xcconfig b/mobile/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/mobile/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/mobile/ios/Flutter/Release.xcconfig b/mobile/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/mobile/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..a3c2e5e --- /dev/null +++ b/mobile/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,647 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.pleasepayme.pleasePayMe; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.pleasepayme.pleasePayMe.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.pleasepayme.pleasePayMe.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.pleasepayme.pleasePayMe.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.pleasepayme.pleasePayMe; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.pleasepayme.pleasePayMe; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..c3fedb2 --- /dev/null +++ b/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/ios/Runner.xcworkspace/contents.xcworkspacedata b/mobile/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/mobile/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/mobile/ios/Runner/AppDelegate.swift b/mobile/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..c30b367 --- /dev/null +++ b/mobile/ios/Runner/AppDelegate.swift @@ -0,0 +1,16 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } +} diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d0d98aa --- /dev/null +++ b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1 @@ +{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}} \ No newline at end of file diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..177e55b Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..bc581d3 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..964097a Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..d0485d9 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..91efcfb Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..e3a25c6 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..05c41cc Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..964097a Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..287bdd6 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..1114bbf Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png new file mode 100644 index 0000000..371ad3d Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png new file mode 100644 index 0000000..b77ed8f Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 0000000..399dc98 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 0000000..54001c2 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..1114bbf Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..22e748a Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png new file mode 100644 index 0000000..eb50e08 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png new file mode 100644 index 0000000..8f1e5ea Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..0f21da7 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..4531266 Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..ca2db6a Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/mobile/ios/Runner/Assets.xcassets/SplashBackground.colorset/Contents.json b/mobile/ios/Runner/Assets.xcassets/SplashBackground.colorset/Contents.json new file mode 100644 index 0000000..689b9b2 --- /dev/null +++ b/mobile/ios/Runner/Assets.xcassets/SplashBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.969", + "green" : "0.949", + "red" : "0.949" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.000", + "green" : "0.000", + "red" : "0.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..2143525 --- /dev/null +++ b/mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/ios/Runner/Base.lproj/Main.storyboard b/mobile/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/mobile/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist new file mode 100644 index 0000000..f27a536 --- /dev/null +++ b/mobile/ios/Runner/Info.plist @@ -0,0 +1,77 @@ + + + + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Дожить до ЗП + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + please_pay_me + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + LSApplicationQueriesSchemes + + tg + telegram + https + http + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/mobile/ios/Runner/Runner-Bridging-Header.h b/mobile/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/mobile/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/mobile/ios/Runner/SceneDelegate.swift b/mobile/ios/Runner/SceneDelegate.swift new file mode 100644 index 0000000..b9ce8ea --- /dev/null +++ b/mobile/ios/Runner/SceneDelegate.swift @@ -0,0 +1,6 @@ +import Flutter +import UIKit + +class SceneDelegate: FlutterSceneDelegate { + +} diff --git a/mobile/ios/RunnerTests/RunnerTests.swift b/mobile/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/mobile/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/mobile/lib/app/app.dart b/mobile/lib/app/app.dart new file mode 100644 index 0000000..c8c9e33 --- /dev/null +++ b/mobile/lib/app/app.dart @@ -0,0 +1,115 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:please_pay_me/app/home_tabs.dart'; +import 'package:please_pay_me/features/auth/login_screen.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/features/splash/splash_screen.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/features/work/jobs_controller.dart'; +import 'package:please_pay_me/core/branding/app_brand.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:provider/provider.dart'; + +class PleasePayMeApp extends StatelessWidget { + PleasePayMeApp({super.key, required this.session, ThemeController? theme}) + : theme = theme ?? ThemeController(store: MemoryThemeStore()); + + final SessionController session; + final ThemeController theme; + + @override + Widget build(BuildContext context) { + return MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: session), + ChangeNotifierProvider.value(value: theme), + ], + child: Consumer( + builder: (context, theme, _) { + final platform = MediaQuery.platformBrightnessOf(context); + final brightness = theme.resolve(platform); + + return CupertinoApp( + title: AppBrand.name, + theme: brightness == Brightness.dark ? buildDarkTheme() : buildLightTheme(), + locale: const Locale('ru'), + supportedLocales: const [Locale('ru'), Locale('en')], + localizationsDelegates: const [ + GlobalCupertinoLocalizations.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + ], + builder: (context, child) { + final overlay = systemUiOverlayFor(brightness); + SystemChrome.setSystemUIOverlayStyle(overlay); + return AnnotatedRegion( + value: overlay, + child: MediaQuery( + data: MediaQuery.of(context).copyWith(platformBrightness: brightness), + child: child!, + ), + ); + }, + home: const _SessionGate(), + ); + }, + ), + ); + } +} + +class _SessionGate extends StatelessWidget { + const _SessionGate(); + + @override + Widget build(BuildContext context) { + final session = context.watch(); + + return switch (session.status) { + SessionStatus.restoring => const SplashScreen(), + SessionStatus.signedOut => const LoginScreen(), + SessionStatus.signedIn => AppDataScope( + key: ValueKey(session.sessionKey), + session: session, + child: const HomeTabs(), + ), + }; + } +} + +/// Feature controllers bound to the current session. Rebuilt from scratch when +/// the session changes, so no stale data survives a re-login. +class AppDataScope extends StatelessWidget { + const AppDataScope({ + super.key, + required this.session, + required this.child, + }); + + final SessionController session; + final Widget child; + + @override + Widget build(BuildContext context) { + return MultiProvider( + providers: [ + ChangeNotifierProvider( + create: (_) => BudgetsController( + budgets: session.budgets, + expenses: session.expenses, + )..load(), + ), + ChangeNotifierProvider( + create: (_) => JournalController(expenses: session.expenses)..load(), + ), + ChangeNotifierProvider( + create: (_) => JobsController(jobs: session.jobs)..load(), + ), + ], + child: child, + ); + } +} + diff --git a/mobile/lib/app/home_tabs.dart b/mobile/lib/app/home_tabs.dart new file mode 100644 index 0000000..3de923a --- /dev/null +++ b/mobile/lib/app/home_tabs.dart @@ -0,0 +1,56 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/features/budgets/budgets_screen.dart'; +import 'package:please_pay_me/features/journal/journal_screen.dart'; +import 'package:please_pay_me/features/overview/overview_screen.dart'; +import 'package:please_pay_me/features/profile/profile_screen.dart'; +import 'package:please_pay_me/features/work/work_screen.dart'; +import 'package:please_pay_me/ui/ui.dart'; + +/// Root tab bar. Each tab keeps its own navigator so modal sheets and alerts +/// stay inside the tab, as iOS expects. +class HomeTabs extends StatelessWidget { + const HomeTabs({super.key}); + + static const _tabs = [ + AppTabItem( + icon: CupertinoIcons.chart_pie, + activeIcon: CupertinoIcons.chart_pie_fill, + label: 'Обзор', + ), + AppTabItem( + icon: CupertinoIcons.list_bullet, + label: 'Журнал', + ), + AppTabItem( + icon: CupertinoIcons.money_rubl_circle, + activeIcon: CupertinoIcons.money_rubl_circle_fill, + label: 'Бюджеты', + ), + AppTabItem( + icon: CupertinoIcons.briefcase, + activeIcon: CupertinoIcons.briefcase_fill, + label: 'Работа', + ), + AppTabItem( + icon: CupertinoIcons.person, + activeIcon: CupertinoIcons.person_fill, + label: 'Профиль', + ), + ]; + + @override + Widget build(BuildContext context) { + return CupertinoTabScaffold( + tabBar: AppTabBar(items: _tabs, currentIndex: 0, onTap: (_) {}), + tabBuilder: (context, index) => CupertinoTabView( + builder: (context) => switch (index) { + 0 => const OverviewScreen(), + 1 => const JournalScreen(), + 2 => const BudgetsScreen(), + 3 => const WorkScreen(), + _ => const ProfileScreen(), + }, + ), + ); + } +} diff --git a/mobile/lib/core/branding/app_brand.dart b/mobile/lib/core/branding/app_brand.dart new file mode 100644 index 0000000..4148ec8 --- /dev/null +++ b/mobile/lib/core/branding/app_brand.dart @@ -0,0 +1,4 @@ +/// User-facing product name on the home screen and in the UI. +abstract final class AppBrand { + static const name = 'Дожить до ЗП'; +} diff --git a/mobile/lib/core/config/app_config.dart b/mobile/lib/core/config/app_config.dart new file mode 100644 index 0000000..5a32465 --- /dev/null +++ b/mobile/lib/core/config/app_config.dart @@ -0,0 +1,58 @@ +import 'package:please_pay_me/core/config/env_file.dart'; + +/// Runtime configuration. +/// +/// Values are resolved in this order: +/// 1. `--dart-define=PPM_*` / `--dart-define-from-file=.env` (CI and `run.ps1`) +/// 2. key/value map parsed from `mobile/.env` (tests and explicit loaders) +/// 3. production cabinet if nothing is set +class AppConfig { + static const productionOrigin = 'https://please-pay-me.ru'; + + const AppConfig({ + required this.apiBaseUrl, + required this.webCabinetUrl, + this.demoMode = false, + }); + + factory AppConfig.fromEnvironment({Map file = const {}}) { + const definedApi = String.fromEnvironment('PPM_API_BASE_URL'); + const definedWeb = String.fromEnvironment('PPM_WEB_URL'); + const definedDemo = String.fromEnvironment('PPM_DEMO'); + + return AppConfig.fromMap({ + ...file, + if (definedApi.isNotEmpty) 'PPM_API_BASE_URL': definedApi, + if (definedWeb.isNotEmpty) 'PPM_WEB_URL': definedWeb, + if (definedDemo.isNotEmpty) 'PPM_DEMO': definedDemo, + }); + } + + factory AppConfig.fromMap(Map values) { + final apiBase = normalizeUrl(values['PPM_API_BASE_URL'] ?? ''); + final webUrl = normalizeUrl(values['PPM_WEB_URL'] ?? ''); + final demoForced = parseEnvFlag(values['PPM_DEMO']); + final resolvedApi = apiBase.isEmpty ? productionOrigin : apiBase; + final resolvedWeb = webUrl.isEmpty ? resolvedApi : webUrl; + + return AppConfig( + apiBaseUrl: resolvedApi, + webCabinetUrl: resolvedWeb, + demoMode: demoForced, + ); + } + + static const demo = AppConfig(apiBaseUrl: '', webCabinetUrl: '', demoMode: true); + + final String apiBaseUrl; + final String webCabinetUrl; + final bool demoMode; + + AppConfig copyWith({String? apiBaseUrl, String? webCabinetUrl, bool? demoMode}) { + return AppConfig( + apiBaseUrl: apiBaseUrl ?? this.apiBaseUrl, + webCabinetUrl: webCabinetUrl ?? this.webCabinetUrl, + demoMode: demoMode ?? this.demoMode, + ); + } +} diff --git a/mobile/lib/core/config/env_file.dart b/mobile/lib/core/config/env_file.dart new file mode 100644 index 0000000..ffbe9fe --- /dev/null +++ b/mobile/lib/core/config/env_file.dart @@ -0,0 +1,41 @@ +/// Minimal `.env` parser (KEY=VALUE, `#` comments, optional quotes). +/// +/// Kept tiny and dependency-free so config loading is easy to test and does +/// not pull `flutter_dotenv` into the production graph. +Map parseEnvFile(String source) { + final values = {}; + + for (final raw in source.split(RegExp(r'\r?\n'))) { + final line = raw.trim(); + if (line.isEmpty || line.startsWith('#')) continue; + + final separator = line.indexOf('='); + if (separator <= 0) continue; + + final key = line.substring(0, separator).trim(); + if (key.isEmpty) continue; + + var value = line.substring(separator + 1).trim(); + if (value.length >= 2) { + final quote = value[0]; + if ((quote == '"' || quote == "'") && value.endsWith(quote)) { + value = value.substring(1, value.length - 1); + } + } + + values[key] = value; + } + + return values; +} + +String normalizeUrl(String url) => url.trim().replaceAll(RegExp(r'/$'), ''); + +bool parseEnvFlag(String? raw, {bool fallback = false}) { + if (raw == null || raw.trim().isEmpty) return fallback; + return switch (raw.trim().toLowerCase()) { + '1' || 'true' || 'yes' || 'on' => true, + '0' || 'false' || 'no' || 'off' => false, + _ => fallback, + }; +} diff --git a/mobile/lib/core/config/env_loader.dart b/mobile/lib/core/config/env_loader.dart new file mode 100644 index 0000000..977f3d3 --- /dev/null +++ b/mobile/lib/core/config/env_loader.dart @@ -0,0 +1,3 @@ +import 'env_loader_stub.dart' if (dart.library.io) 'env_loader_io.dart' as impl; + +Future> loadEnvFile() => impl.loadEnvFileImpl(); diff --git a/mobile/lib/core/config/env_loader_io.dart b/mobile/lib/core/config/env_loader_io.dart new file mode 100644 index 0000000..8ff3e13 --- /dev/null +++ b/mobile/lib/core/config/env_loader_io.dart @@ -0,0 +1,15 @@ +import 'dart:io'; + +import 'package:please_pay_me/core/config/env_file.dart'; + +/// Reads `mobile/.env` when the process cwd is the package or the repo root. +/// Dart-defines from `run.ps1` still win in [AppConfig.fromEnvironment]. +Future> loadEnvFileImpl() async { + for (final path in const ['.env', 'mobile/.env']) { + final file = File(path); + if (await file.exists()) { + return parseEnvFile(await file.readAsString()); + } + } + return const {}; +} diff --git a/mobile/lib/core/config/env_loader_stub.dart b/mobile/lib/core/config/env_loader_stub.dart new file mode 100644 index 0000000..05027e7 --- /dev/null +++ b/mobile/lib/core/config/env_loader_stub.dart @@ -0,0 +1 @@ +Future> loadEnvFileImpl() async => const {}; diff --git a/mobile/lib/core/format/formatters.dart b/mobile/lib/core/format/formatters.dart new file mode 100644 index 0000000..5d6df1b --- /dev/null +++ b/mobile/lib/core/format/formatters.dart @@ -0,0 +1,60 @@ +import 'package:intl/intl.dart'; + +/// `1 234,50 ₽` — same shape as the web cabinet. +String formatMoney(double amount, {String currency = 'RUB', bool compact = false}) { + final symbol = switch (currency) { + 'RUB' => '₽', + 'USD' => r'$', + 'EUR' => '€', + _ => currency, + }; + + final formatter = compact + ? NumberFormat.decimalPattern('ru') + : NumberFormat('#,##0.00', 'ru'); + final value = compact ? amount.round() : amount; + + return '${formatter.format(value)} $symbol'.replaceAll('\u00A0', ' '); +} + +String formatSignedMoney(double amount, {String currency = 'RUB'}) { + final sign = amount < 0 ? '+' : '−'; + return '$sign${formatMoney(amount.abs(), currency: currency)}'; +} + +String formatDay(DateTime date) => DateFormat('d MMMM', 'ru').format(date); + +String formatShortDate(DateTime date) => DateFormat('dd.MM.yyyy').format(date); + +String formatWeekday(DateTime date) => DateFormat('EEEE', 'ru').format(date); + +/// `Сегодня` / `Вчера` / `12 сентября` — headers of the journal. +String formatRelativeDay(DateTime date, {DateTime? now}) { + final today = _dayOf(now ?? DateTime.now()); + final day = _dayOf(date); + final diff = today.difference(day).inDays; + + return switch (diff) { + 0 => 'Сегодня', + 1 => 'Вчера', + _ => formatDay(day), + }; +} + +/// `осталось 5 дней` — Russian plural rules. +String formatDaysLeft(int days) { + if (days <= 0) return 'период завершён'; + return 'осталось ${plural(days, 'день', 'дня', 'дней')}'; +} + +String plural(int count, String one, String few, String many) { + final mod100 = count % 100; + final mod10 = count % 10; + + if (mod100 >= 11 && mod100 <= 14) return '$count $many'; + if (mod10 == 1) return '$count $one'; + if (mod10 >= 2 && mod10 <= 4) return '$count $few'; + return '$count $many'; +} + +DateTime _dayOf(DateTime value) => DateTime(value.year, value.month, value.day); diff --git a/mobile/lib/core/legal/legal_links.dart b/mobile/lib/core/legal/legal_links.dart new file mode 100644 index 0000000..21ede65 --- /dev/null +++ b/mobile/lib/core/legal/legal_links.dart @@ -0,0 +1,24 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/config/env_file.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:url_launcher/url_launcher.dart'; + +abstract final class LegalLinks { + static const offer = '/legal/offer'; + static const privacy = '/legal/privacy'; + static const consent = '/legal/consent'; + static const cookies = '/legal/cookies'; + + static Uri resolve(String cabinetUrl, String path) { + final base = cabinetUrl.isEmpty ? AppConfig.productionOrigin : cabinetUrl; + return Uri.parse('${normalizeUrl(base)}$path'); + } +} + +Future openLegalDocument(BuildContext context, Uri uri) async { + final opened = await launchUrl(uri, mode: LaunchMode.externalApplication); + if (!opened && context.mounted) { + await showAppToast(context, message: 'Не удалось открыть документ'); + } +} diff --git a/mobile/lib/core/state/async_value.dart b/mobile/lib/core/state/async_value.dart new file mode 100644 index 0000000..e046883 --- /dev/null +++ b/mobile/lib/core/state/async_value.dart @@ -0,0 +1,41 @@ +/// Minimal async state container so screens can pattern-match over +/// loading / data / error instead of juggling three nullable fields. +sealed class AsyncValue { + const AsyncValue(); + + const factory AsyncValue.loading() = AsyncLoading; + const factory AsyncValue.data(T value) = AsyncData; + const factory AsyncValue.error(String message) = AsyncError; + + T? get valueOrNull => this is AsyncData ? (this as AsyncData).value : null; + + bool get isLoading => this is AsyncLoading; + + R map({ + required R Function() loading, + required R Function(T value) data, + required R Function(String message) error, + }) { + return switch (this) { + AsyncLoading() => loading(), + AsyncData(value: final v) => data(v), + AsyncError(message: final m) => error(m), + }; + } +} + +final class AsyncLoading extends AsyncValue { + const AsyncLoading(); +} + +final class AsyncData extends AsyncValue { + const AsyncData(this.value); + + final T value; +} + +final class AsyncError extends AsyncValue { + const AsyncError(this.message); + + final String message; +} diff --git a/mobile/lib/core/storage/session_storage.dart b/mobile/lib/core/storage/session_storage.dart new file mode 100644 index 0000000..2892a57 --- /dev/null +++ b/mobile/lib/core/storage/session_storage.dart @@ -0,0 +1,78 @@ +import 'package:shared_preferences/shared_preferences.dart'; + +/// Persisted session: JWT, API address and the cached user profile. +abstract interface class SessionStorage { + Future> readAll(); + + Future write({ + required String token, + required String baseUrl, + required String user, + }); + + Future clear(); +} + +class PrefsSessionStorage implements SessionStorage { + const PrefsSessionStorage(); + + static const _tokenKey = 'ppm_token'; + static const _baseUrlKey = 'ppm_base_url'; + static const _userKey = 'ppm_user'; + + @override + Future> readAll() async { + final prefs = await SharedPreferences.getInstance(); + return { + 'token': prefs.getString(_tokenKey), + 'baseUrl': prefs.getString(_baseUrlKey), + 'user': prefs.getString(_userKey), + }; + } + + @override + Future write({ + required String token, + required String baseUrl, + required String user, + }) async { + final prefs = await SharedPreferences.getInstance(); + await prefs.setString(_tokenKey, token); + await prefs.setString(_baseUrlKey, baseUrl); + await prefs.setString(_userKey, user); + } + + @override + Future clear() async { + final prefs = await SharedPreferences.getInstance(); + await prefs.remove(_tokenKey); + await prefs.remove(_baseUrlKey); + await prefs.remove(_userKey); + } +} + +/// Used by tests and previews — no platform channels involved. +class InMemorySessionStorage implements SessionStorage { + InMemorySessionStorage([Map? initial]) + : _values = {...?initial}; + + final Map _values; + + @override + Future> readAll() async => Map.of(_values); + + @override + Future write({ + required String token, + required String baseUrl, + required String user, + }) async { + _values + ..['token'] = token + ..['baseUrl'] = baseUrl + ..['user'] = user; + } + + @override + Future clear() async => _values.clear(); +} diff --git a/mobile/lib/data/api/api_client.dart b/mobile/lib/data/api/api_client.dart new file mode 100644 index 0000000..8a51610 --- /dev/null +++ b/mobile/lib/data/api/api_client.dart @@ -0,0 +1,124 @@ +import 'dart:convert'; + +import 'package:http/http.dart' as http; +import 'package:please_pay_me/data/models/json.dart'; + +class ApiException implements Exception { + const ApiException(this.message, {this.statusCode}); + + final String message; + final int? statusCode; + + bool get isUnauthorized => statusCode == 401; + + @override + String toString() => message; +} + +/// Thin JSON transport over the PleasePayMe REST API. +/// +/// Keeps auth concerns out of repositories: the token is supplied lazily so a +/// re-login does not require rebuilding the whole object graph. +class ApiClient { + ApiClient({ + required String baseUrl, + required String? Function() tokenProvider, + http.Client? httpClient, + this.onUnauthorized, + this.timeout = const Duration(seconds: 15), + }) : _baseUrl = baseUrl.replaceAll(RegExp(r'/$'), ''), + _tokenProvider = tokenProvider, + _http = httpClient ?? http.Client(); + + final String _baseUrl; + final String? Function() _tokenProvider; + final http.Client _http; + final void Function()? onUnauthorized; + final Duration timeout; + + Future> getJson(String path, {Map? query}) async { + return asMap(await _send('GET', path, query: query)); + } + + Future> postJson( + String path, { + Map? body, + Map? query, + }) async { + return asMap(await _send('POST', path, body: body, query: query)); + } + + Future> putJson(String path, {Map? body}) async { + return asMap(await _send('PUT', path, body: body)); + } + + Future> patchJson(String path, {Map? body}) async { + return asMap(await _send('PATCH', path, body: body)); + } + + Future> deleteJson(String path, {Map? query}) async { + return asMap(await _send('DELETE', path, query: query)); + } + + Future _send( + String method, + String path, { + Map? body, + Map? query, + }) async { + final uri = Uri.parse('$_baseUrl$path').replace( + queryParameters: query?.isEmpty ?? true ? null : query, + ); + + final request = http.Request(method, uri); + request.headers['Accept'] = 'application/json'; + final token = _tokenProvider(); + if (token != null && token.isNotEmpty) { + request.headers['Authorization'] = 'Bearer $token'; + } + if (body != null) { + request.headers['Content-Type'] = 'application/json'; + request.body = jsonEncode(body); + } + + late final http.Response response; + try { + final streamed = await _http.send(request).timeout(timeout); + response = await http.Response.fromStream(streamed); + } on Exception catch (error) { + throw ApiException('Нет связи с сервером: $error'); + } + + if (response.statusCode == 401) { + onUnauthorized?.call(); + throw const ApiException('Сессия истекла, войдите заново', statusCode: 401); + } + + final raw = utf8.decode(response.bodyBytes); + + if (response.statusCode >= 400) { + throw ApiException(_extractError(raw, response.statusCode), statusCode: response.statusCode); + } + + if (response.statusCode == 204 || raw.trim().isEmpty) return null; + + try { + return jsonDecode(raw); + } on FormatException { + throw ApiException('Сервер вернул не JSON (HTTP ${response.statusCode})'); + } + } + + String _extractError(String raw, int statusCode) { + try { + final parsed = asMap(jsonDecode(raw)); + final detail = asStringOrNull(parsed['detail']) ?? asStringOrNull(parsed['title']); + if (detail != null) return detail; + } on FormatException { + // Fall through to the raw payload. + } + return raw.trim().isEmpty ? 'Ошибка запроса (HTTP $statusCode)' : raw.trim(); + } + + void close() => _http.close(); +} diff --git a/mobile/lib/data/demo/demo_backend.dart b/mobile/lib/data/demo/demo_backend.dart new file mode 100644 index 0000000..75b953d --- /dev/null +++ b/mobile/lib/data/demo/demo_backend.dart @@ -0,0 +1,413 @@ +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/data/models/auth_user.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/data/models/expense.dart'; +import 'package:please_pay_me/data/models/job.dart'; +import 'package:please_pay_me/data/repositories/repositories.dart'; + +/// In-memory backend used for Widgetbook previews, widget tests and for +/// running the app without a server (`PPM_DEMO=true`). +/// +/// Mirrors the envelope math of `IBudgetService` closely enough that screens +/// behave the same as against the real API. +class DemoBackend { + DemoBackend({DateTime? today, bool seed = true}) + : _today = _dayOf(today ?? DateTime.now()) { + if (seed) _seed(); + } + + /// Backend without any data — used for empty-state previews and tests. + factory DemoBackend.empty({DateTime? today}) => + DemoBackend(today: today, seed: false); + + final DateTime _today; + final List _budgets = []; + final List _expenses = []; + final List _jobs = []; + + int _selectedBudgetId = 1; + int _nextExpenseId = 100; + int _nextBudgetId = 3; + int _nextJobId = 2; + + static const user = AuthUser( + userId: 1, + firstName: 'Владимир', + username: 'pleasepayme', + ); + + BudgetRepository get budgets => _DemoBudgetRepository(this); + + ExpenseRepository get expenses => _DemoExpenseRepository(this); + + JobRepository get jobs => _DemoJobRepository(this); + + UserRepository get users => _DemoUserRepository(); + + void _seed() { + _budgets.addAll([ + Budget( + id: 1, + userId: 1, + name: 'До аванса', + totalAmount: 42000, + startDate: _today.subtract(const Duration(days: 6)), + endDate: _today.add(const Duration(days: 8)), + currency: 'RUB', + isActive: true, + ), + Budget( + id: 2, + userId: 1, + name: 'Отпуск', + totalAmount: 90000, + startDate: _today.subtract(const Duration(days: 40)), + endDate: _today.subtract(const Duration(days: 5)), + currency: 'RUB', + isActive: false, + ), + ]); + + _expenses.addAll([ + Expense(id: 1, budgetId: 1, amount: 1840, note: 'Продукты', spentAt: _today), + Expense(id: 2, budgetId: 1, amount: 250, note: 'Кофе', spentAt: _today), + Expense( + id: 3, + budgetId: 1, + amount: 640, + note: 'Такси', + spentAt: _today.subtract(const Duration(days: 1)), + ), + Expense( + id: 4, + budgetId: 1, + amount: 3200, + note: 'Аптека', + spentAt: _today.subtract(const Duration(days: 2)), + ), + Expense( + id: 5, + budgetId: 2, + amount: 15000, + note: 'Билеты', + spentAt: _today.subtract(const Duration(days: 20)), + ), + ]); + + _jobs.add( + Job( + id: 1, + userId: 1, + name: 'Основная работа', + salaryAmount: 180000, + currency: 'RUB', + payDays: const [5, 20], + firstPayPercent: 40, + weekendPolicy: WeekendPolicy.beforeWeekend, + isActive: true, + nextPays: [ + UpcomingPay( + date: _today.add(const Duration(days: 8)), + scheduledDay: 20, + percent: 60, + amount: 108000, + ), + UpcomingPay( + date: _today.add(const Duration(days: 23)), + scheduledDay: 5, + percent: 40, + amount: 72000, + ), + ], + ), + ); + } + + Budget _budgetById(int? id) { + if (_budgets.isEmpty) { + throw const ApiException('Сначала создайте бюджет'); + } + final budgetId = id ?? _selectedBudgetId; + return _budgets.firstWhere( + (budget) => budget.id == budgetId, + orElse: () => _budgets.first, + ); + } + + BudgetStatus statusOf(Budget budget) { + final spent = _expenses + .where((expense) => expense.budgetId == budget.id) + .fold(0, (sum, expense) => sum + expense.amount); + final spentToday = _expenses + .where((e) => e.budgetId == budget.id && _dayOf(e.spentAt) == _today) + .fold(0, (sum, expense) => sum + expense.amount); + + final daysLeft = budget.endDate.difference(_today).inDays + 1; + final safeDays = daysLeft < 1 ? 0 : daysLeft; + final remaining = budget.totalAmount - spent; + final dailyLimit = safeDays == 0 ? 0.0 : (remaining <= 0 ? 0.0 : remaining / safeDays); + + return BudgetStatus( + budget: budget, + today: _today, + daysLeft: safeDays, + totalSpent: spent, + remaining: remaining, + dailyLimit: dailyLimit, + spentToday: spentToday, + remainingToday: dailyLimit - spentToday, + isOverDaily: spentToday > dailyLimit, + isOverBudget: remaining < 0, + isExpired: safeDays == 0, + selected: budget.id == _selectedBudgetId, + ); + } + + static DateTime _dayOf(DateTime value) => DateTime(value.year, value.month, value.day); +} + +class _DemoBudgetRepository implements BudgetRepository { + const _DemoBudgetRepository(this._backend); + + final DemoBackend _backend; + + @override + Future> list() async { + return _backend._budgets.map(_backend.statusOf).toList() + ..sort((a, b) { + if (a.selected != b.selected) return a.selected ? -1 : 1; + return b.budget.endDate.compareTo(a.budget.endDate); + }); + } + + @override + Future status({int? budgetId}) async { + return _backend.statusOf(_backend._budgetById(budgetId)); + } + + @override + Future create({ + required String name, + required double totalAmount, + required DateTime endDate, + DateTime? startDate, + }) async { + final budget = Budget( + id: _backend._nextBudgetId++, + userId: 1, + name: name, + totalAmount: totalAmount, + startDate: startDate ?? _backend._today, + endDate: endDate, + currency: 'RUB', + isActive: true, + ); + _backend._budgets.add(budget); + _backend._selectedBudgetId = budget.id; + return _backend.statusOf(budget); + } + + @override + Future update({ + required int budgetId, + String? name, + double? totalAmount, + DateTime? endDate, + DateTime? startDate, + bool resetExpenses = false, + }) async { + final index = _backend._budgets.indexWhere((budget) => budget.id == budgetId); + final current = _backend._budgets[index]; + final updated = Budget( + id: current.id, + userId: current.userId, + name: name ?? current.name, + totalAmount: totalAmount ?? current.totalAmount, + startDate: startDate ?? current.startDate, + endDate: endDate ?? current.endDate, + currency: current.currency, + isActive: current.isActive, + ); + _backend._budgets[index] = updated; + if (resetExpenses) { + _backend._expenses.removeWhere((expense) => expense.budgetId == budgetId); + } + return _backend.statusOf(updated); + } + + @override + Future select(int budgetId) async { + _backend._selectedBudgetId = budgetId; + return _backend.statusOf(_backend._budgetById(budgetId)); + } + + @override + Future setActive(int budgetId, {required bool isActive}) async { + final index = _backend._budgets.indexWhere((budget) => budget.id == budgetId); + final current = _backend._budgets[index]; + final updated = Budget( + id: current.id, + userId: current.userId, + name: current.name, + totalAmount: current.totalAmount, + startDate: current.startDate, + endDate: current.endDate, + currency: current.currency, + isActive: isActive, + ); + _backend._budgets[index] = updated; + return _backend.statusOf(updated); + } + + @override + Future delete(int budgetId) async { + _backend._budgets.removeWhere((budget) => budget.id == budgetId); + _backend._expenses.removeWhere((expense) => expense.budgetId == budgetId); + if (_backend._selectedBudgetId == budgetId && _backend._budgets.isNotEmpty) { + _backend._selectedBudgetId = _backend._budgets.first.id; + } + } +} + +class _DemoExpenseRepository implements ExpenseRepository { + const _DemoExpenseRepository(this._backend); + + final DemoBackend _backend; + + @override + Future page({ + required int page, + int pageSize = 20, + int? budgetId, + bool all = false, + }) async { + final scope = all + ? _backend._expenses + : _backend._expenses + .where((e) => e.budgetId == (budgetId ?? _backend._selectedBudgetId)); + + final sorted = scope.toList() + ..sort((a, b) { + final byDate = b.spentAt.compareTo(a.spentAt); + return byDate != 0 ? byDate : b.id.compareTo(a.id); + }); + + final from = (page - 1) * pageSize; + final items = from >= sorted.length + ? [] + : sorted.sublist(from, (from + pageSize).clamp(0, sorted.length)); + + return ExpensesPage( + page: page, + totalPages: sorted.isEmpty ? 1 : (sorted.length / pageSize).ceil(), + totalCount: sorted.length, + pageSize: pageSize, + totalSum: sorted.fold(0, (sum, expense) => sum + expense.amount), + budgetId: all ? null : (budgetId ?? _backend._selectedBudgetId), + items: items, + ); + } + + @override + Future create({ + required double amount, + String? note, + DateTime? spentAt, + int? budgetId, + }) async { + final budget = _backend._budgetById(budgetId); + _backend._expenses.add( + Expense( + id: _backend._nextExpenseId++, + budgetId: budget.id, + amount: amount, + note: note, + spentAt: spentAt ?? _backend._today, + ), + ); + return _backend.statusOf(budget); + } + + @override + Future undoLast({int? budgetId}) async { + final budget = _backend._budgetById(budgetId); + final scoped = _backend._expenses.where((e) => e.budgetId == budget.id).toList(); + if (scoped.isEmpty) return 0; + + scoped.sort((a, b) => b.id.compareTo(a.id)); + final last = scoped.first; + _backend._expenses.removeWhere((expense) => expense.id == last.id); + return last.amount; + } +} + +class _DemoJobRepository implements JobRepository { + const _DemoJobRepository(this._backend); + + final DemoBackend _backend; + + @override + Future> list() async => List.unmodifiable(_backend._jobs); + + @override + Future create({ + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + }) async { + final job = Job( + id: _backend._nextJobId++, + userId: 1, + name: name, + salaryAmount: salaryAmount, + currency: 'RUB', + payDays: payDays, + firstPayPercent: firstPayPercent, + weekendPolicy: weekendPolicy, + isActive: true, + nextPays: const [], + ); + _backend._jobs.add(job); + return job; + } + + @override + Future update({ + required int jobId, + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + bool isActive = true, + }) async { + final index = _backend._jobs.indexWhere((job) => job.id == jobId); + final current = _backend._jobs[index]; + final updated = Job( + id: current.id, + userId: current.userId, + name: name, + salaryAmount: salaryAmount, + currency: current.currency, + payDays: payDays, + firstPayPercent: firstPayPercent, + weekendPolicy: weekendPolicy, + isActive: isActive, + nextPays: current.nextPays, + ); + _backend._jobs[index] = updated; + return updated; + } + + @override + Future delete(int jobId) async { + _backend._jobs.removeWhere((job) => job.id == jobId); + } +} + +class _DemoUserRepository implements UserRepository { + @override + Future me() async => DemoBackend.user; +} diff --git a/mobile/lib/data/models/auth_user.dart b/mobile/lib/data/models/auth_user.dart new file mode 100644 index 0000000..1b10120 --- /dev/null +++ b/mobile/lib/data/models/auth_user.dart @@ -0,0 +1,79 @@ +import 'dart:convert'; + +import 'package:please_pay_me/data/models/json.dart'; + +class AuthUser { + const AuthUser({ + required this.userId, + this.firstName, + this.lastName, + this.username, + this.photoUrl, + }); + + factory AuthUser.fromJson(Map json) { + return AuthUser( + userId: asInt(json['user_id']), + firstName: asStringOrNull(json['first_name']), + lastName: asStringOrNull(json['last_name']), + username: asStringOrNull(json['username']), + photoUrl: asStringOrNull(json['photo_url']), + ); + } + + static AuthUser? tryDecode(String? raw) { + if (raw == null || raw.isEmpty) return null; + try { + return AuthUser.fromJson(asMap(jsonDecode(raw))); + } on FormatException { + return null; + } + } + + final int userId; + final String? firstName; + final String? lastName; + final String? username; + final String? photoUrl; + + String get displayName { + final full = [firstName, lastName].whereType().join(' ').trim(); + if (full.isNotEmpty) return full; + if (username != null) return '@$username'; + return 'Пользователь $userId'; + } + + String get handle => username != null ? '@$username' : 'id $userId'; + + String get initials { + final source = firstName?.trim().isNotEmpty == true + ? firstName!.trim() + : username?.trim() ?? ''; + if (source.isEmpty) return ''; + return source.substring(0, 1); + } + + Map toJson() => { + 'user_id': userId, + 'first_name': firstName, + 'last_name': lastName, + 'username': username, + 'photo_url': photoUrl, + }; + + String encode() => jsonEncode(toJson()); +} + +class AuthSession { + const AuthSession({required this.accessToken, required this.user}); + + factory AuthSession.fromJson(Map json) { + return AuthSession( + accessToken: asString(json['access_token']), + user: AuthUser.fromJson(asMap(json['user'])), + ); + } + + final String accessToken; + final AuthUser user; +} diff --git a/mobile/lib/data/models/budget.dart b/mobile/lib/data/models/budget.dart new file mode 100644 index 0000000..48750dc --- /dev/null +++ b/mobile/lib/data/models/budget.dart @@ -0,0 +1,108 @@ +import 'package:please_pay_me/data/models/json.dart'; + +class Budget { + const Budget({ + required this.id, + required this.userId, + required this.name, + required this.totalAmount, + required this.startDate, + required this.endDate, + required this.currency, + required this.isActive, + }); + + factory Budget.fromJson(Map json) { + return Budget( + id: asInt(json['id']), + userId: asInt(json['user_id']), + name: asString(json['name']), + totalAmount: asDouble(json['total_amount']), + startDate: asDate(json['start_date']), + endDate: asDate(json['end_date']), + currency: asString(json['currency'], fallback: 'RUB'), + isActive: asBool(json['is_active']), + ); + } + + final int id; + final int userId; + final String name; + final double totalAmount; + final DateTime startDate; + final DateTime endDate; + final String currency; + final bool isActive; +} + +/// Budget plus the server-computed daily envelope math. +class BudgetStatus { + const BudgetStatus({ + required this.budget, + required this.today, + required this.daysLeft, + required this.totalSpent, + required this.remaining, + required this.dailyLimit, + required this.spentToday, + required this.remainingToday, + required this.isOverDaily, + required this.isOverBudget, + required this.isExpired, + required this.selected, + }); + + factory BudgetStatus.fromJson(Map json) { + return BudgetStatus( + budget: Budget.fromJson(asMap(json['budget'])), + today: asDate(json['today']), + daysLeft: asInt(json['days_left']), + totalSpent: asDouble(json['total_spent']), + remaining: asDouble(json['remaining']), + dailyLimit: asDouble(json['daily_limit']), + spentToday: asDouble(json['spent_today']), + remainingToday: asDouble(json['remaining_today']), + isOverDaily: asBool(json['is_over_daily']), + isOverBudget: asBool(json['is_over_budget']), + isExpired: asBool(json['is_expired']), + selected: asBool(json['selected']), + ); + } + + final Budget budget; + final DateTime today; + final int daysLeft; + final double totalSpent; + final double remaining; + final double dailyLimit; + final double spentToday; + final double remainingToday; + final bool isOverDaily; + final bool isOverBudget; + final bool isExpired; + final bool selected; + + /// 0..1 — share of the budget already spent. + double get spentProgress { + if (budget.totalAmount <= 0) return 0; + return (totalSpent / budget.totalAmount).clamp(0.0, 1.0); + } + + /// 0..1 — share of today's envelope already spent. + double get dailyProgress { + if (dailyLimit <= 0) return spentToday > 0 ? 1 : 0; + return (spentToday / dailyLimit).clamp(0.0, 1.0); + } +} + +class BudgetsList { + const BudgetsList({required this.items}); + + factory BudgetsList.fromJson(Map json) { + return BudgetsList( + items: asList(json['items']).map(BudgetStatus.fromJson).toList(), + ); + } + + final List items; +} diff --git a/mobile/lib/data/models/expense.dart b/mobile/lib/data/models/expense.dart new file mode 100644 index 0000000..a8c7fe5 --- /dev/null +++ b/mobile/lib/data/models/expense.dart @@ -0,0 +1,82 @@ +import 'package:please_pay_me/data/models/json.dart'; + +class Expense { + const Expense({ + required this.id, + required this.budgetId, + required this.amount, + required this.spentAt, + this.note, + }); + + factory Expense.fromJson(Map json) { + return Expense( + id: asInt(json['id']), + budgetId: asInt(json['budget_id']), + amount: asDouble(json['amount']), + spentAt: asDate(json['spent_at']), + note: asStringOrNull(json['note']), + ); + } + + final int id; + final int budgetId; + final double amount; + final DateTime spentAt; + final String? note; +} + +class ExpensesPage { + const ExpensesPage({ + required this.page, + required this.totalPages, + required this.totalCount, + required this.pageSize, + required this.totalSum, + required this.items, + this.budgetId, + }); + + factory ExpensesPage.fromJson(Map json) { + return ExpensesPage( + page: asInt(json['page'], fallback: 1), + totalPages: asInt(json['total_pages'], fallback: 1), + totalCount: asInt(json['total_count']), + pageSize: asInt(json['page_size'], fallback: 20), + totalSum: asDouble(json['total_sum']), + budgetId: json['budget_id'] == null ? null : asInt(json['budget_id']), + items: asList(json['items']).map(Expense.fromJson).toList(), + ); + } + + static const empty = ExpensesPage( + page: 1, + totalPages: 1, + totalCount: 0, + pageSize: 20, + totalSum: 0, + items: [], + ); + + final int page; + final int totalPages; + final int totalCount; + final int pageSize; + final double totalSum; + final int? budgetId; + final List items; + + bool get hasMore => page < totalPages; + + ExpensesPage copyWithItems(List items, {int? page}) { + return ExpensesPage( + page: page ?? this.page, + totalPages: totalPages, + totalCount: totalCount, + pageSize: pageSize, + totalSum: totalSum, + budgetId: budgetId, + items: items, + ); + } +} diff --git a/mobile/lib/data/models/job.dart b/mobile/lib/data/models/job.dart new file mode 100644 index 0000000..35dd520 --- /dev/null +++ b/mobile/lib/data/models/job.dart @@ -0,0 +1,95 @@ +import 'package:please_pay_me/data/models/json.dart'; + +enum WeekendPolicy { + beforeWeekend('before_weekend', 'До выходных'), + afterWeekend('after_weekend', 'После выходных'); + + const WeekendPolicy(this.wire, this.label); + + factory WeekendPolicy.fromWire(Object? value) { + return WeekendPolicy.values.firstWhere( + (policy) => policy.wire == asString(value), + orElse: () => WeekendPolicy.beforeWeekend, + ); + } + + final String wire; + final String label; +} + +class UpcomingPay { + const UpcomingPay({ + required this.date, + required this.scheduledDay, + required this.percent, + required this.amount, + }); + + factory UpcomingPay.fromJson(Map json) { + return UpcomingPay( + date: asDate(json['date']), + scheduledDay: asInt(json['scheduled_day']), + percent: asDouble(json['percent']), + amount: asDouble(json['amount']), + ); + } + + final DateTime date; + final int scheduledDay; + final double percent; + final double amount; +} + +class Job { + const Job({ + required this.id, + required this.userId, + required this.name, + required this.salaryAmount, + required this.currency, + required this.payDays, + required this.firstPayPercent, + required this.weekendPolicy, + required this.isActive, + required this.nextPays, + }); + + factory Job.fromJson(Map json) { + final rawDays = json['pay_days']; + return Job( + id: asInt(json['id']), + userId: asInt(json['user_id']), + name: asString(json['name']), + salaryAmount: asDouble(json['salary_amount']), + currency: asString(json['currency'], fallback: 'RUB'), + payDays: rawDays is List ? rawDays.map(asInt).toList() : const [], + firstPayPercent: asDouble(json['first_pay_percent']), + weekendPolicy: WeekendPolicy.fromWire(json['weekend_policy']), + isActive: asBool(json['is_active']), + nextPays: asList(json['next_pays']).map(UpcomingPay.fromJson).toList(), + ); + } + + final int id; + final int userId; + final String name; + final double salaryAmount; + final String currency; + final List payDays; + final double firstPayPercent; + final WeekendPolicy weekendPolicy; + final bool isActive; + final List nextPays; + + UpcomingPay? get nextPay => nextPays.isEmpty ? null : nextPays.first; +} + +class JobsList { + const JobsList({required this.items}); + + factory JobsList.fromJson(Map json) { + return JobsList(items: asList(json['items']).map(Job.fromJson).toList()); + } + + final List items; +} diff --git a/mobile/lib/data/models/json.dart b/mobile/lib/data/models/json.dart new file mode 100644 index 0000000..928b359 --- /dev/null +++ b/mobile/lib/data/models/json.dart @@ -0,0 +1,63 @@ +/// Tolerant JSON coercion helpers. +/// +/// The API is generated from C# records, so numbers may arrive as `int` or +/// `double` and nullable strings as `null`; parsing must not crash the UI. +library; + +int asInt(Object? value, {int fallback = 0}) { + if (value is int) return value; + if (value is num) return value.toInt(); + if (value is String) return int.tryParse(value) ?? fallback; + return fallback; +} + +double asDouble(Object? value, {double fallback = 0}) { + if (value is double) return value; + if (value is num) return value.toDouble(); + if (value is String) return double.tryParse(value.replaceAll(',', '.')) ?? fallback; + return fallback; +} + +bool asBool(Object? value, {bool fallback = false}) { + if (value is bool) return value; + if (value is String) return value.toLowerCase() == 'true'; + return fallback; +} + +String asString(Object? value, {String fallback = ''}) { + if (value is String) return value; + if (value == null) return fallback; + return value.toString(); +} + +String? asStringOrNull(Object? value) { + if (value is String && value.isNotEmpty) return value; + return null; +} + +/// Parses `YYYY-MM-DD` (and full ISO timestamps) as a local calendar day. +DateTime asDate(Object? value) { + final raw = asString(value); + if (raw.isEmpty) return DateTime.now(); + final parsed = DateTime.tryParse(raw); + if (parsed == null) return DateTime.now(); + return DateTime(parsed.year, parsed.month, parsed.day); +} + +Map asMap(Object? value) { + if (value is Map) return value; + if (value is Map) return value.cast(); + return const {}; +} + +List> asList(Object? value) { + if (value is! List) return const []; + return value.map(asMap).toList(); +} + +/// `YYYY-MM-DD` — the format every date-typed endpoint expects. +String formatIsoDate(DateTime date) { + final month = date.month.toString().padLeft(2, '0'); + final day = date.day.toString().padLeft(2, '0'); + return '${date.year}-$month-$day'; +} diff --git a/mobile/lib/data/repositories/api_repositories.dart b/mobile/lib/data/repositories/api_repositories.dart new file mode 100644 index 0000000..857befe --- /dev/null +++ b/mobile/lib/data/repositories/api_repositories.dart @@ -0,0 +1,193 @@ +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/data/models/auth_user.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/data/models/expense.dart'; +import 'package:please_pay_me/data/models/job.dart'; +import 'package:please_pay_me/data/models/json.dart'; +import 'package:please_pay_me/data/repositories/repositories.dart'; + +class ApiBudgetRepository implements BudgetRepository { + const ApiBudgetRepository(this._client); + + final ApiClient _client; + + @override + Future> list() async { + final json = await _client.getJson('/api/me/budgets'); + return BudgetsList.fromJson(json).items; + } + + @override + Future status({int? budgetId}) async { + final json = await _client.getJson( + '/api/me/budget', + query: {if (budgetId != null) 'budget_id': '$budgetId'}, + ); + return BudgetStatus.fromJson(json); + } + + @override + Future create({ + required String name, + required double totalAmount, + required DateTime endDate, + DateTime? startDate, + }) async { + final json = await _client.postJson('/api/me/budgets', body: { + 'name': name, + 'total_amount': totalAmount, + 'end_date': formatIsoDate(endDate), + 'start_date': startDate == null ? null : formatIsoDate(startDate), + 'is_active': true, + 'select': true, + }); + return BudgetStatus.fromJson(json); + } + + @override + Future update({ + required int budgetId, + String? name, + double? totalAmount, + DateTime? endDate, + DateTime? startDate, + bool resetExpenses = false, + }) async { + final json = await _client.putJson('/api/me/budgets/$budgetId', body: { + if (name != null) 'name': name, + if (totalAmount != null) 'total_amount': totalAmount, + if (endDate != null) 'end_date': formatIsoDate(endDate), + if (startDate != null) 'start_date': formatIsoDate(startDate), + 'reset_expenses': resetExpenses, + }); + return BudgetStatus.fromJson(json); + } + + @override + Future select(int budgetId) async { + final json = await _client.postJson('/api/me/budgets/$budgetId/select'); + return BudgetStatus.fromJson(json); + } + + @override + Future setActive(int budgetId, {required bool isActive}) async { + final json = await _client.patchJson( + '/api/me/budgets/$budgetId/active', + body: {'is_active': isActive}, + ); + return BudgetStatus.fromJson(json); + } + + @override + Future delete(int budgetId) => _client.deleteJson('/api/me/budgets/$budgetId'); +} + +class ApiExpenseRepository implements ExpenseRepository { + const ApiExpenseRepository(this._client); + + final ApiClient _client; + + @override + Future page({ + required int page, + int pageSize = 20, + int? budgetId, + bool all = false, + }) async { + final json = await _client.getJson('/api/me/expenses', query: { + 'page': '$page', + 'page_size': '$pageSize', + if (all) 'all': 'true' else if (budgetId != null) 'budget_id': '$budgetId', + }); + return ExpensesPage.fromJson(json); + } + + @override + Future create({ + required double amount, + String? note, + DateTime? spentAt, + int? budgetId, + }) async { + final json = await _client.postJson('/api/me/expenses', body: { + 'amount': amount, + 'note': note, + 'spent_at': spentAt == null ? null : formatIsoDate(spentAt), + 'budget_id': budgetId, + }); + return BudgetStatus.fromJson(json); + } + + @override + Future undoLast({int? budgetId}) async { + final json = await _client.deleteJson( + '/api/me/expenses/last', + query: {if (budgetId != null) 'budget_id': '$budgetId'}, + ); + return asDouble(json['deleted_amount']); + } +} + +class ApiJobRepository implements JobRepository { + const ApiJobRepository(this._client); + + final ApiClient _client; + + @override + Future> list() async { + final json = await _client.getJson('/api/me/jobs'); + return JobsList.fromJson(json).items; + } + + @override + Future create({ + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + }) async { + final json = await _client.postJson('/api/me/jobs', body: { + 'name': name, + 'salary_amount': salaryAmount, + 'pay_days': payDays, + 'first_pay_percent': firstPayPercent, + 'weekend_policy': weekendPolicy.wire, + 'is_active': true, + }); + return Job.fromJson(json); + } + + @override + Future update({ + required int jobId, + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + bool isActive = true, + }) async { + final json = await _client.putJson('/api/me/jobs/$jobId', body: { + 'name': name, + 'salary_amount': salaryAmount, + 'pay_days': payDays, + 'first_pay_percent': firstPayPercent, + 'weekend_policy': weekendPolicy.wire, + 'is_active': isActive, + }); + return Job.fromJson(json); + } + + @override + Future delete(int jobId) => _client.deleteJson('/api/me/jobs/$jobId'); +} + +class ApiUserRepository implements UserRepository { + const ApiUserRepository(this._client); + + final ApiClient _client; + + @override + Future me() async => AuthUser.fromJson(await _client.getJson('/api/me')); +} diff --git a/mobile/lib/data/repositories/repositories.dart b/mobile/lib/data/repositories/repositories.dart new file mode 100644 index 0000000..1cf1536 --- /dev/null +++ b/mobile/lib/data/repositories/repositories.dart @@ -0,0 +1,80 @@ +import 'package:please_pay_me/data/models/auth_user.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/data/models/expense.dart'; +import 'package:please_pay_me/data/models/job.dart'; + +/// Contracts the UI depends on. Implemented by the REST backend and by the +/// in-memory demo backend used for previews and tests. +abstract interface class BudgetRepository { + Future> list(); + + Future status({int? budgetId}); + + Future create({ + required String name, + required double totalAmount, + required DateTime endDate, + DateTime? startDate, + }); + + Future update({ + required int budgetId, + String? name, + double? totalAmount, + DateTime? endDate, + DateTime? startDate, + bool resetExpenses = false, + }); + + Future select(int budgetId); + + Future setActive(int budgetId, {required bool isActive}); + + Future delete(int budgetId); +} + +abstract interface class ExpenseRepository { + Future page({ + required int page, + int pageSize = 20, + int? budgetId, + bool all = false, + }); + + Future create({ + required double amount, + String? note, + DateTime? spentAt, + int? budgetId, + }); + + Future undoLast({int? budgetId}); +} + +abstract interface class JobRepository { + Future> list(); + + Future create({ + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + }); + + Future update({ + required int jobId, + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + bool isActive = true, + }); + + Future delete(int jobId); +} + +abstract interface class UserRepository { + Future me(); +} diff --git a/mobile/lib/features/auth/login_screen.dart b/mobile/lib/features/auth/login_screen.dart new file mode 100644 index 0000000..4f0da83 --- /dev/null +++ b/mobile/lib/features/auth/login_screen.dart @@ -0,0 +1,331 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/branding/app_brand.dart'; +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/features/auth/telegram_login.dart'; +import 'package:please_pay_me/features/auth/yandex_login.dart'; +import 'package:please_pay_me/features/legal/legal_consent.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:provider/provider.dart'; + +/// Opens the cabinet and returns the harvested JWT. +typedef TelegramLoginLauncher = Future Function( + BuildContext context, + String cabinetUrl, +); + +/// Opens Yandex OAuth and returns the JWT issued by `/api/auth/yandex`. +typedef YandexLoginLauncher = Future Function( + BuildContext context, { + required String clientId, + required String redirectUri, +}); + +/// Sign-in screen. +/// +/// Cabinet / API origin comes from `.env` (`PPM_WEB_URL`, `PPM_API_BASE_URL`). +/// Telegram: cabinet WebView + JWT channel. Yandex: OAuth code in a WebView, +/// exchanged on the API so the client secret never leaves the server. +class LoginScreen extends StatefulWidget { + const LoginScreen({ + super.key, + this.launchTelegramLogin, + this.launchYandexLogin, + }); + + /// Injection point for tests and Widgetbook, where no WebView exists. + final TelegramLoginLauncher? launchTelegramLogin; + final YandexLoginLauncher? launchYandexLogin; + + @override + State createState() => _LoginScreenState(); +} + +class _LoginScreenState extends State { + final _tokenController = TextEditingController(); + + bool _busy = false; + late bool _tokenMode = !_webLoginAvailable; + YandexAuthProvider? _yandex; + String? _providersError; + LegalAcceptance _legal = const LegalAcceptance(); + + bool get _webLoginAvailable => + widget.launchTelegramLogin != null || isTelegramWebLoginSupported; + + bool get _yandexLoginAvailable => + widget.launchYandexLogin != null || isYandexWebLoginSupported; + + String _cabinetUrl(SessionController session) { + if (session.webCabinetUrl.isNotEmpty) return session.webCabinetUrl; + return session.baseUrl; + } + + String _apiBase(SessionController session) { + return resolveApiBaseUrl( + cabinetUrl: _cabinetUrl(session), + configuredApiBaseUrl: session.configuredApiBaseUrl, + ); + } + + @override + void initState() { + super.initState(); + _loadProviders(); + } + + @override + void dispose() { + _tokenController.dispose(); + super.dispose(); + } + + Future _loadProviders() async { + final session = context.read(); + final apiBase = _apiBase(session); + if (apiBase.isEmpty) { + if (mounted) { + setState(() { + _providersError = 'Не задан PPM_API_BASE_URL в .env'; + }); + } else { + _providersError = 'Не задан PPM_API_BASE_URL в .env'; + } + return; + } + + try { + final providers = await fetchAuthProviders(apiBase, httpClient: session.httpClient); + if (!mounted) return; + setState(() { + _yandex = providers.yandex; + _providersError = providers.yandex?.usable == true + ? null + : 'API не включил Яндекс (нет YANDEX_CLIENT_ID/SECRET на сервере)'; + }); + } on ApiException catch (error) { + if (!mounted) return; + setState(() { + _yandex = null; + _providersError = error.message; + }); + } catch (error) { + if (!mounted) return; + setState(() { + _yandex = null; + _providersError = error.toString(); + }); + } + } + + Future _ensureCabinetUrl(SessionController session) async { + if (_cabinetUrl(session).isNotEmpty) return true; + await showAppToast( + context, + message: 'Задайте PPM_WEB_URL в mobile/.env', + icon: CupertinoIcons.exclamationmark_circle_fill, + ); + return false; + } + + @override + Widget build(BuildContext context) { + final session = context.watch(); + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: SafeArea( + child: ListView( + padding: const EdgeInsets.only(top: AppSpacing.s7, bottom: AppSpacing.s6), + children: [ + const Padding( + padding: EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppIcon( + CupertinoIcons.money_rubl_circle_fill, + size: 48, + color: AppColors.accent, + ), + SizedBox(height: AppSpacing.s3), + AppText.largeTitle(AppBrand.name), + SizedBox(height: AppSpacing.s1), + AppText.subhead( + 'Бюджет от зарплаты до зарплаты. Войдите через Яндекс.', + ), + ], + ), + ), + const SizedBox(height: AppSpacing.s6), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + LegalConsentBlock( + value: _legal, + cabinetUrl: _cabinetUrl(session), + onChanged: (next) => setState(() => _legal = next), + ), + const SizedBox(height: AppSpacing.s5), + if (_tokenMode) ...[ + AppTextField( + label: 'Токен доступа', + placeholder: 'eyJhbGciOi…', + controller: _tokenController, + enabled: !_busy, + errorText: session.lastError, + ), + const SizedBox(height: AppSpacing.s5), + AppButton( + label: 'Войти по токену', + loading: _busy, + onPressed: _legal.accepted ? _signInWithToken : null, + ), + ] else ...[ + if (session.lastError != null) ...[ + AppText.footnote(session.lastError!, color: AppColors.systemRed), + const SizedBox(height: AppSpacing.s3), + ], + const SizedBox(height: AppSpacing.s3), + AppButton( + label: 'Войти через Яндекс', + style: AppButtonStyle.gray, + loading: _busy, + onPressed: _legal.accepted ? _signInWithYandex : null, + ), + ], + ], + ), + ), + const SizedBox(height: AppSpacing.s5), + const AppListSection( + header: 'Что умеет', + footer: 'Один кабинет на телефоне и в браузере — бюджет не разъедется.', + children: [ + AppListTile( + leading: AppIcon(CupertinoIcons.calendar, color: AppColors.accent), + title: 'Бюджет от зарплаты до зарплаты', + subtitle: 'Остаток и дневной лимит на каждый день периода', + showChevron: false, + ), + AppListTile( + leading: AppIcon(CupertinoIcons.money_rubl, color: AppColors.accent), + title: 'Траты в один тап', + subtitle: 'Журнал по дням, несколько конвертов параллельно', + showChevron: false, + ), + AppListTile( + leading: AppIcon(CupertinoIcons.briefcase, color: AppColors.accent), + title: 'График выплат', + subtitle: 'Оклад, дни зарплаты и правило выходных', + showChevron: false, + ), + ], + ), + ], + ), + ), + ); + } + + Future _signInWithTelegram() async { + final session = context.read(); + if (!await _ensureCabinetUrl(session)) return; + + final cabinetUrl = _cabinetUrl(session); + final launcher = widget.launchTelegramLogin ?? + (ctx, url) => showTelegramLogin(context: ctx, cabinetUrl: url); + + setState(() => _busy = true); + final token = await launcher(context, cabinetUrl); + + if (!mounted) return; + + if (token == null || token.isEmpty) { + setState(() => _busy = false); + return; + } + + await session.signInWithToken(baseUrl: _apiBase(session), token: token); + if (mounted) setState(() => _busy = false); + } + + Future _signInWithYandex() async { + final session = context.read(); + if (!await _ensureCabinetUrl(session)) return; + + if (_yandex == null || !(_yandex?.usable ?? false)) { + setState(() => _busy = true); + await _loadProviders(); + if (mounted) setState(() => _busy = false); + } + + final provider = _yandex; + if (provider == null || !provider.usable) { + await showAppToast( + context, + message: _providersError ?? 'Вход через Яндекс недоступен', + icon: CupertinoIcons.exclamationmark_circle_fill, + ); + return; + } + + if (!_yandexLoginAvailable) { + await showAppToast( + context, + message: 'Яндекс в приложении работает на телефоне. На Windows откройте кабинет в браузере.', + icon: CupertinoIcons.device_phone_portrait, + ); + return; + } + + final cabinetUrl = _cabinetUrl(session); + final apiBase = _apiBase(session); + final redirectUri = cabinetYandexRedirectUri( + cabinetUrl, + configured: provider.redirectUri, + ); + + setState(() => _busy = true); + + final launcher = widget.launchYandexLogin; + final token = launcher != null + ? await launcher(context, clientId: provider.clientId, redirectUri: redirectUri) + : await showYandexLogin( + context: context, + clientId: provider.clientId, + redirectUri: redirectUri, + exchangeCode: (code) => exchangeYandexCode( + apiBaseUrl: apiBase, + code: code, + redirectUri: redirectUri, + httpClient: session.httpClient, + ), + ); + + if (!mounted) return; + + if (token == null || token.isEmpty) { + setState(() => _busy = false); + return; + } + + await session.signInWithToken(baseUrl: apiBase, token: token); + if (mounted) setState(() => _busy = false); + } + + Future _signInWithToken() async { + final session = context.read(); + if (!await _ensureCabinetUrl(session)) return; + + setState(() => _busy = true); + await session.signInWithToken( + baseUrl: _apiBase(session), + token: _tokenController.text, + ); + if (mounted) setState(() => _busy = false); + } +} diff --git a/mobile/lib/features/auth/session_controller.dart b/mobile/lib/features/auth/session_controller.dart new file mode 100644 index 0000000..d0a7c74 --- /dev/null +++ b/mobile/lib/features/auth/session_controller.dart @@ -0,0 +1,186 @@ +import 'package:flutter/foundation.dart'; +import 'package:http/http.dart' as http; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/storage/session_storage.dart'; +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/data/demo/demo_backend.dart'; +import 'package:please_pay_me/data/models/auth_user.dart'; +import 'package:please_pay_me/data/repositories/api_repositories.dart'; +import 'package:please_pay_me/data/repositories/repositories.dart'; + +enum SessionStatus { restoring, signedOut, signedIn } + +/// Owns authentication and hands out repositories bound to the current +/// session, so the rest of the app never sees tokens or base URLs. +class SessionController extends ChangeNotifier { + SessionController({ + required AppConfig config, + required SessionStorage storage, + http.Client? httpClient, + DemoBackend? demoBackend, + }) : _config = config, + _storage = storage, + _httpClient = httpClient, + _demo = demoBackend ?? DemoBackend(); + + final SessionStorage _storage; + final http.Client? _httpClient; + final DemoBackend _demo; + + AppConfig _config; + SessionStatus _status = SessionStatus.restoring; + AuthUser? _user; + String? _token; + String _baseUrl = ''; + bool _isDemo = false; + String? _lastError; + + SessionStatus get status => _status; + AuthUser? get user => _user; + String get baseUrl => _baseUrl.isEmpty ? _config.apiBaseUrl : _baseUrl; + String get webCabinetUrl => _config.webCabinetUrl; + + /// API address baked in at build time; empty when it must be derived from + /// the cabinet URL the user typed. + String get configuredApiBaseUrl => _config.apiBaseUrl; + bool get isDemo => _isDemo; + String? get lastError => _lastError; + http.Client? get httpClient => _httpClient; + + /// Changes whenever the backing data source changes, so feature controllers + /// can be rebuilt from scratch on login / logout. + String get sessionKey => '${_isDemo ? 'demo' : baseUrl}:${_user?.userId ?? 0}'; + + BudgetRepository get budgets => _repositories.budgets; + ExpenseRepository get expenses => _repositories.expenses; + JobRepository get jobs => _repositories.jobs; + UserRepository get users => _repositories.users; + + _Repositories get _repositories { + if (_isDemo || _token == null) return _demoRepositories; + return _apiRepositories ??= _buildApiRepositories(); + } + + _Repositories? _apiRepositories; + + late final _Repositories _demoRepositories = _Repositories( + budgets: _demo.budgets, + expenses: _demo.expenses, + jobs: _demo.jobs, + users: _demo.users, + ); + + _Repositories _buildApiRepositories() { + final client = ApiClient( + baseUrl: baseUrl, + tokenProvider: () => _token, + httpClient: _httpClient, + onUnauthorized: signOut, + ); + return _Repositories( + budgets: ApiBudgetRepository(client), + expenses: ApiExpenseRepository(client), + jobs: ApiJobRepository(client), + users: ApiUserRepository(client), + ); + } + + Future restore() async { + final stored = await _storage.readAll(); + final token = stored['token']; + final baseUrl = stored['baseUrl']; + + if (token != null && token.isNotEmpty && baseUrl != null && baseUrl.isNotEmpty) { + _token = token; + _baseUrl = baseUrl; + _isDemo = false; + _apiRepositories = null; + _user = AuthUser.tryDecode(stored['user']); + _status = SessionStatus.signedIn; + notifyListeners(); + return; + } + + if (_config.demoMode && _config.apiBaseUrl.isEmpty) { + _status = SessionStatus.signedOut; + notifyListeners(); + return; + } + + _status = SessionStatus.signedOut; + notifyListeners(); + } + + /// Signs in with a JWT issued by Telegram or Yandex (`POST /api/auth/*`). + Future signInWithToken({required String baseUrl, required String token}) async { + final normalizedUrl = baseUrl.trim().replaceAll(RegExp(r'/$'), ''); + final normalizedToken = token.trim(); + + if (normalizedUrl.isEmpty || normalizedToken.isEmpty) { + _lastError = 'Укажите адрес кабинета и токен'; + notifyListeners(); + return false; + } + + _lastError = null; + _baseUrl = normalizedUrl; + _token = normalizedToken; + _isDemo = false; + _apiRepositories = null; + + try { + final user = await _repositories.users.me(); + _user = user; + _status = SessionStatus.signedIn; + _config = _config.copyWith(apiBaseUrl: normalizedUrl, demoMode: false); + await _storage.write( + token: normalizedToken, + baseUrl: normalizedUrl, + user: user.encode(), + ); + notifyListeners(); + return true; + } on ApiException catch (error) { + _token = null; + _apiRepositories = null; + _lastError = error.message; + _status = SessionStatus.signedOut; + notifyListeners(); + return false; + } + } + + /// Runs the app against [DemoBackend] — no server required. + void startDemo() { + _isDemo = true; + _token = null; + _user = DemoBackend.user; + _lastError = null; + _status = SessionStatus.signedIn; + notifyListeners(); + } + + Future signOut() async { + await _storage.clear(); + _token = null; + _user = null; + _isDemo = false; + _apiRepositories = null; + _status = SessionStatus.signedOut; + notifyListeners(); + } +} + +class _Repositories { + const _Repositories({ + required this.budgets, + required this.expenses, + required this.jobs, + required this.users, + }); + + final BudgetRepository budgets; + final ExpenseRepository expenses; + final JobRepository jobs; + final UserRepository users; +} diff --git a/mobile/lib/features/auth/telegram_login.dart b/mobile/lib/features/auth/telegram_login.dart new file mode 100644 index 0000000..1bd937d --- /dev/null +++ b/mobile/lib/features/auth/telegram_login.dart @@ -0,0 +1,316 @@ +import 'dart:async'; +import 'dart:convert'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; +import 'package:please_pay_me/data/models/json.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:url_launcher/url_launcher.dart'; +import 'package:webview_flutter/webview_flutter.dart'; +import 'package:webview_flutter_android/webview_flutter_android.dart'; + +/// Name of the JavaScript channel injected into the cabinet page. +/// Must stay in sync with `web/src/auth/telegramRedirect.ts`. +const telegramAuthChannel = 'PpmAuth'; + +/// Chrome-like UA without the `; wv` token Android WebView inserts. +/// Telegram's widget rejects the default WebView user-agent on some devices. +const telegramWebViewUserAgent = + 'Mozilla/5.0 (Linux; Android 13; Mobile) AppleWebKit/537.36 ' + '(KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36'; + +/// Runs inside the cabinet and hands the JWT back to Flutter. +/// +/// Two paths, both without backend changes: +/// 1. The web app posts to `PpmAuth` from `setSession` right after login. +/// 2. This script hooks `localStorage.setItem` and polls, so an already-open +/// session (or an older cabinet build) still works. +const telegramTokenProbeJs = ''' +(function () { + function ping() { + try { + var token = window.localStorage.getItem('ppm_session_jwt'); + if (token && window.$telegramAuthChannel) { + $telegramAuthChannel.postMessage(JSON.stringify({ token: token })); + } + } catch (error) {} + } + + if (!window.__ppmAuthHooked) { + window.__ppmAuthHooked = true; + try { + var original = window.localStorage.setItem.bind(window.localStorage); + window.localStorage.setItem = function (key, value) { + original(key, value); + if (key === 'ppm_session_jwt') ping(); + }; + } catch (error) {} + } + + ping(); +})(); +'''; + +/// WebView login only exists on mobile; desktop and web fall back to the token +/// form. +bool get isTelegramWebLoginSupported { + if (kIsWeb) return false; + return defaultTargetPlatform == TargetPlatform.android || + defaultTargetPlatform == TargetPlatform.iOS; +} + +/// The cabinet and the API share an origin (nginx proxies `/api`), so the API +/// address can be derived unless it was configured explicitly. +String resolveApiBaseUrl({ + required String cabinetUrl, + String configuredApiBaseUrl = '', +}) { + if (configuredApiBaseUrl.trim().isNotEmpty) { + return configuredApiBaseUrl.trim().replaceAll(RegExp(r'/$'), ''); + } + + return resolveCabinetOrigin(cabinetUrl); +} + +/// Origin of the cabinet URL — used both as the API base and as a sanity check. +String resolveCabinetOrigin(String cabinetUrl) { + final uri = resolveCabinetLoginUri(cabinetUrl); + return uri.hasPort && !_isDefaultPort(uri) + ? '${uri.scheme}://${uri.host}:${uri.port}' + : '${uri.scheme}://${uri.host}'; +} + +/// Always open `/login` so the Telegram widget is on screen. +Uri resolveCabinetLoginUri(String cabinetUrl) { + var raw = cabinetUrl.trim(); + if (raw.isEmpty) return Uri.parse('https://localhost/login'); + + if (!raw.contains('://')) { + raw = 'https://$raw'; + } + + final uri = Uri.parse(raw); + final path = uri.path; + if (path.isEmpty || path == '/') { + return uri.replace(path: '/login'); + } + return uri; +} + +bool _isDefaultPort(Uri uri) { + return (uri.scheme == 'https' && uri.port == 443) || + (uri.scheme == 'http' && uri.port == 80); +} + +/// Extracts the JWT from the payload posted by [telegramTokenProbeJs]. +String? parseTelegramAuthMessage(String raw) { + try { + final token = asString(asMap(jsonDecode(raw))['token']); + return token.isEmpty ? null : token; + } on FormatException { + return null; + } +} + +bool isExternalAuthScheme(Uri uri) { + return uri.scheme == 'tg' || uri.scheme == 'telegram'; +} + +bool isTelegramOAuthHost(String host) { + return host == 'oauth.telegram.org' || + host == 'telegram.org' || + host.endsWith('.telegram.org'); +} + +/// Opens the cabinet in an in-app browser and resolves with the JWT once the +/// user has signed in through the Telegram Login Widget. +Future showTelegramLogin({ + required BuildContext context, + required String cabinetUrl, +}) { + return Navigator.of(context, rootNavigator: true).push( + CupertinoPageRoute( + fullscreenDialog: true, + builder: (_) => TelegramLoginScreen(cabinetUrl: cabinetUrl), + ), + ); +} + +class TelegramLoginScreen extends StatefulWidget { + const TelegramLoginScreen({super.key, required this.cabinetUrl}); + + final String cabinetUrl; + + @override + State createState() => _TelegramLoginScreenState(); +} + +class _TelegramLoginScreenState extends State { + late final WebViewController _controller; + Timer? _poll; + bool _loading = true; + bool _completed = false; + bool _canGoBack = false; + String? _error; + + Uri get _startUri => resolveCabinetLoginUri(widget.cabinetUrl); + + @override + void initState() { + super.initState(); + + _controller = WebViewController() + ..setJavaScriptMode(JavaScriptMode.unrestricted) + ..setUserAgent(telegramWebViewUserAgent) + ..setBackgroundColor(const Color(0x00000000)) + ..addJavaScriptChannel( + telegramAuthChannel, + onMessageReceived: (message) => _onToken(message.message), + ) + ..setNavigationDelegate( + NavigationDelegate( + onNavigationRequest: _onNavigationRequest, + onPageStarted: (_) { + if (mounted) setState(() => _loading = true); + }, + onPageFinished: (_) { + _refreshCanGoBack(); + if (mounted) setState(() => _loading = false); + _probe(); + }, + onWebResourceError: (error) { + if (!mounted || _completed) return; + // Subframe errors (the Telegram iframe) must not kill the page. + if (error.isForMainFrame == false) return; + setState(() { + _loading = false; + _error = error.description; + }); + }, + ), + ); + + _configureAndroid(); + _controller.loadRequest(_startUri); + + // The widget writes the token after an async callback, so polling is more + // reliable than a single probe on page load. + _poll = Timer.periodic(const Duration(milliseconds: 700), (_) => _probe()); + } + + Future _configureAndroid() async { + if (kIsWeb || defaultTargetPlatform != TargetPlatform.android) return; + + final platform = _controller.platform; + if (platform is! AndroidWebViewController) return; + + final cookies = AndroidWebViewCookieManager( + const PlatformWebViewCookieManagerCreationParams(), + ); + await cookies.setAcceptThirdPartyCookies(platform, true); + } + + @override + void dispose() { + _poll?.cancel(); + super.dispose(); + } + + Future _probe() async { + if (_completed) return; + try { + await _controller.runJavaScript(telegramTokenProbeJs); + } on PlatformException { + // The page may be mid-navigation; the next tick retries. + } + } + + Future _onNavigationRequest(NavigationRequest request) async { + final uri = Uri.tryParse(request.url); + if (uri == null) return NavigationDecision.navigate; + + if (isExternalAuthScheme(uri)) { + await launchUrl(uri, mode: LaunchMode.externalApplication); + return NavigationDecision.prevent; + } + + return NavigationDecision.navigate; + } + + Future _refreshCanGoBack() async { + final canGoBack = await _controller.canGoBack(); + if (mounted && canGoBack != _canGoBack) { + setState(() => _canGoBack = canGoBack); + } + } + + void _onToken(String raw) { + if (_completed) return; + + final token = parseTelegramAuthMessage(raw); + if (token == null) return; + + _completed = true; + _poll?.cancel(); + Navigator.of(context).pop(token); + } + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: AppNavBar( + title: 'Вход через Telegram', + subtitle: _startUri.host, + leading: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () => Navigator.of(context).pop(), + child: const AppText.body('Закрыть', color: AppColors.accent), + ), + trailing: Row( + mainAxisSize: MainAxisSize.min, + children: [ + if (_canGoBack) + CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () async { + await _controller.goBack(); + await _refreshCanGoBack(); + }, + child: const AppIcon(CupertinoIcons.back, color: AppColors.accent), + ), + CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () { + setState(() => _error = null); + _controller.reload(); + }, + child: const AppIcon(CupertinoIcons.refresh, color: AppColors.accent), + ), + ], + ), + ), + child: SafeArea( + child: _error != null + ? AppErrorView( + message: _error!, + onRetry: () { + setState(() => _error = null); + _controller.reload(); + }, + ) + : Stack( + children: [ + WebViewWidget(controller: _controller), + if (_loading) const Center(child: AppSpinner()), + ], + ), + ), + ); + } +} diff --git a/mobile/lib/features/auth/yandex_login.dart b/mobile/lib/features/auth/yandex_login.dart new file mode 100644 index 0000000..e8f7e77 --- /dev/null +++ b/mobile/lib/features/auth/yandex_login.dart @@ -0,0 +1,332 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; +import 'package:http/http.dart' as http; +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/data/models/auth_user.dart'; +import 'package:please_pay_me/data/models/json.dart'; +import 'package:please_pay_me/features/auth/telegram_login.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:webview_flutter/webview_flutter.dart'; +import 'package:webview_flutter_android/webview_flutter_android.dart'; + +const yandexAuthorizeHost = 'oauth.yandex.ru'; + +/// Same platforms as Telegram WebView login. +bool get isYandexWebLoginSupported => isTelegramWebLoginSupported; + +class YandexAuthProvider { + const YandexAuthProvider({ + required this.enabled, + required this.clientId, + this.redirectUri, + }); + + final bool enabled; + final String clientId; + final String? redirectUri; + + bool get usable => enabled && clientId.isNotEmpty; + + factory YandexAuthProvider.fromJson(Map json) { + return YandexAuthProvider( + enabled: asBool(json['enabled']), + clientId: asString(json['client_id']), + redirectUri: asStringOrNull(json['redirect_uri']), + ); + } +} + +class AuthProviders { + const AuthProviders({this.yandex}); + + final YandexAuthProvider? yandex; + + factory AuthProviders.fromJson(Map json) { + final raw = json['yandex']; + if (raw is! Map) return const AuthProviders(); + return AuthProviders(yandex: YandexAuthProvider.fromJson(asMap(raw))); + } +} + +class YandexOAuthCallback { + const YandexOAuthCallback({this.code, this.error}); + + final String? code; + final String? error; +} + +Uri yandexAuthorizeUri({ + required String clientId, + required String redirectUri, +}) { + return Uri.https(yandexAuthorizeHost, '/authorize', { + 'response_type': 'code', + 'client_id': clientId, + 'redirect_uri': redirectUri, + 'force_confirm': 'yes', + }); +} + +/// Callback registered in the Yandex app: origin + trailing slash. +String cabinetYandexRedirectUri(String cabinetUrl, {String? configured}) { + if (configured != null && configured.isNotEmpty) { + final parsed = Uri.tryParse(configured); + if (parsed != null && parsed.host.toLowerCase() == Uri.parse(resolveCabinetOrigin(cabinetUrl)).host.toLowerCase()) { + return configured; + } + } + return '${resolveCabinetOrigin(cabinetUrl)}/'; +} + +/// @deprecated use [cabinetYandexRedirectUri] +String cabinetLoginRedirectUri(String cabinetUrl) => cabinetYandexRedirectUri(cabinetUrl); + +/// True when [uri] is the registered cabinet callback (code or error). +YandexOAuthCallback? parseYandexCallback(Uri uri, {required String redirectUri}) { + final expected = Uri.tryParse(redirectUri); + if (expected == null) return null; + if (uri.host.toLowerCase() != expected.host.toLowerCase()) return null; + + final expectedPath = expected.path.isEmpty ? '/' : expected.path; + if (_normalizePath(uri.path) != _normalizePath(expectedPath)) return null; + + final code = uri.queryParameters['code']?.trim(); + final error = uri.queryParameters['error_description']?.trim() ?? + uri.queryParameters['error']?.trim(); + + if ((code == null || code.isEmpty) && (error == null || error.isEmpty)) { + return null; + } + + return YandexOAuthCallback( + code: code == null || code.isEmpty ? null : code, + error: error == null || error.isEmpty ? null : error, + ); +} + +String _normalizePath(String path) { + if (path.isEmpty) return '/'; + return path.length > 1 && path.endsWith('/') ? path.substring(0, path.length - 1) : path; +} + +Future fetchAuthProviders( + String apiBaseUrl, { + http.Client? httpClient, +}) async { + final client = ApiClient( + baseUrl: apiBaseUrl, + tokenProvider: () => null, + httpClient: httpClient, + ); + return AuthProviders.fromJson(await client.getJson('/api/auth/providers')); +} + +Future exchangeYandexCode({ + required String apiBaseUrl, + required String code, + required String redirectUri, + http.Client? httpClient, +}) async { + final client = ApiClient( + baseUrl: apiBaseUrl, + tokenProvider: () => null, + httpClient: httpClient, + ); + final session = AuthSession.fromJson( + await client.postJson( + '/api/auth/yandex', + body: {'code': code, 'redirect_uri': redirectUri}, + ), + ); + return session.accessToken; +} + +/// Opens Yandex OAuth in a WebView, intercepts the cabinet callback, exchanges +/// the code on the API and returns a JWT. +Future showYandexLogin({ + required BuildContext context, + required String clientId, + required String redirectUri, + required Future Function(String code) exchangeCode, +}) { + return Navigator.of(context, rootNavigator: true).push( + CupertinoPageRoute( + fullscreenDialog: true, + builder: (_) => YandexLoginScreen( + clientId: clientId, + redirectUri: redirectUri, + exchangeCode: exchangeCode, + ), + ), + ); +} + +class YandexLoginScreen extends StatefulWidget { + const YandexLoginScreen({ + super.key, + required this.clientId, + required this.redirectUri, + required this.exchangeCode, + }); + + final String clientId; + final String redirectUri; + final Future Function(String code) exchangeCode; + + @override + State createState() => _YandexLoginScreenState(); +} + +class _YandexLoginScreenState extends State { + late final WebViewController _controller; + bool _loading = true; + bool _completed = false; + String? _error; + + Uri get _startUri => yandexAuthorizeUri( + clientId: widget.clientId, + redirectUri: widget.redirectUri, + ); + + @override + void initState() { + super.initState(); + + _controller = WebViewController() + ..setJavaScriptMode(JavaScriptMode.unrestricted) + ..setUserAgent(telegramWebViewUserAgent) + ..setBackgroundColor(const Color(0x00000000)) + ..setNavigationDelegate( + NavigationDelegate( + onNavigationRequest: _onNavigationRequest, + onPageStarted: (url) { + if (mounted) setState(() => _loading = true); + _tryFinish(url); + }, + onPageFinished: (_) { + if (mounted) setState(() => _loading = false); + }, + onWebResourceError: (error) { + if (!mounted || _completed) return; + if (error.isForMainFrame == false) return; + setState(() { + _loading = false; + _error = error.description; + }); + }, + ), + ); + + _configureAndroid(); + _controller.loadRequest(_startUri); + } + + Future _configureAndroid() async { + if (kIsWeb || defaultTargetPlatform != TargetPlatform.android) return; + + final platform = _controller.platform; + if (platform is! AndroidWebViewController) return; + + final cookies = AndroidWebViewCookieManager( + const PlatformWebViewCookieManagerCreationParams(), + ); + await cookies.setAcceptThirdPartyCookies(platform, true); + } + + Future _onNavigationRequest(NavigationRequest request) async { + if (await _tryFinish(request.url)) { + return NavigationDecision.prevent; + } + return NavigationDecision.navigate; + } + + Future _tryFinish(String url) async { + if (_completed) return true; + + final uri = Uri.tryParse(url); + if (uri == null) return false; + + final callback = parseYandexCallback(uri, redirectUri: widget.redirectUri); + if (callback == null) return false; + + if (callback.error != null) { + _completed = true; + if (mounted) { + setState(() { + _loading = false; + _error = callback.error; + }); + } + return true; + } + + final code = callback.code; + if (code == null) return false; + + _completed = true; + if (mounted) setState(() => _loading = true); + + try { + final token = await widget.exchangeCode(code); + if (!mounted) return true; + Navigator.of(context).pop(token); + } on ApiException catch (error) { + if (!mounted) return true; + setState(() { + _loading = false; + _error = error.message; + _completed = false; + }); + } + return true; + } + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: AppNavBar( + title: 'Вход через Яндекс', + subtitle: yandexAuthorizeHost, + leading: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () => Navigator.of(context).pop(), + child: const AppText.body('Закрыть', color: AppColors.accent), + ), + trailing: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () { + setState(() { + _error = null; + _completed = false; + }); + _controller.loadRequest(_startUri); + }, + child: const AppIcon(CupertinoIcons.refresh, color: AppColors.accent), + ), + ), + child: SafeArea( + child: _error != null + ? AppErrorView( + message: _error!, + onRetry: () { + setState(() { + _error = null; + _completed = false; + }); + _controller.loadRequest(_startUri); + }, + ) + : Stack( + children: [ + WebViewWidget(controller: _controller), + if (_loading) const Center(child: AppSpinner()), + ], + ), + ), + ); + } +} diff --git a/mobile/lib/features/budgets/budget_form_sheet.dart b/mobile/lib/features/budgets/budget_form_sheet.dart new file mode 100644 index 0000000..6601390 --- /dev/null +++ b/mobile/lib/features/budgets/budget_form_sheet.dart @@ -0,0 +1,256 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; + +/// Create / edit form for an envelope. +class BudgetFormSheet extends StatefulWidget { + const BudgetFormSheet({super.key, required this.onSubmit, this.initial}); + + final BudgetStatus? initial; + + final Future Function({ + required String name, + required double totalAmount, + required DateTime startDate, + required DateTime endDate, + required bool resetExpenses, + }) onSubmit; + + @override + State createState() => _BudgetFormSheetState(); +} + +class _BudgetFormSheetState extends State { + late final _nameController = TextEditingController( + text: widget.initial?.budget.name ?? '', + ); + late final _amountController = TextEditingController( + text: widget.initial == null + ? '' + : widget.initial!.budget.totalAmount.toStringAsFixed(0), + ); + + late DateTime _startDate = widget.initial?.budget.startDate ?? DateTime.now(); + late DateTime _endDate = + widget.initial?.budget.endDate ?? DateTime.now().add(const Duration(days: 14)); + + bool _resetExpenses = false; + bool _saving = false; + String? _error; + + bool get _isEditing => widget.initial != null; + + @override + void dispose() { + _nameController.dispose(); + _amountController.dispose(); + super.dispose(); + } + + Future _submit() async { + final name = _nameController.text.trim(); + final amount = double.tryParse( + _amountController.text.trim().replaceAll(',', '.').replaceAll(' ', ''), + ); + + if (name.isEmpty) { + setState(() => _error = 'Введите название бюджета'); + return; + } + if (amount == null || amount <= 0) { + setState(() => _error = 'Введите сумму больше нуля'); + return; + } + if (!_endDate.isAfter(_startDate)) { + setState(() => _error = 'Дата окончания должна быть позже начала'); + return; + } + + setState(() { + _saving = true; + _error = null; + }); + + final error = await widget.onSubmit( + name: name, + totalAmount: amount, + startDate: _startDate, + endDate: _endDate, + resetExpenses: _resetExpenses, + ); + + if (!mounted) return; + + if (error != null) { + setState(() { + _saving = false; + _error = error; + }); + return; + } + + Navigator.of(context).pop(true); + } + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: AppNavBar( + title: _isEditing ? 'Бюджет' : 'Новый бюджет', + leading: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: _saving ? null : () => Navigator.of(context).pop(false), + child: const AppText.body('Отмена', color: AppColors.accent), + ), + ), + child: SafeArea( + child: ListView( + padding: const EdgeInsets.only(top: AppSpacing.s4, bottom: AppSpacing.s6), + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppTextField( + label: 'Название', + placeholder: 'До аванса', + controller: _nameController, + enabled: !_saving, + ), + const SizedBox(height: AppSpacing.s4), + AppTextField( + label: 'Сумма на период', + placeholder: '0', + controller: _amountController, + enabled: !_saving, + keyboardType: const TextInputType.numberWithOptions(decimal: true), + ), + ], + ), + ), + const SizedBox(height: AppSpacing.s5), + AppListSection( + header: 'Период', + footer: 'Дневной лимит = остаток ÷ количество оставшихся дней.', + children: [ + AppListTile( + title: 'Начало', + value: formatShortDate(_startDate), + onTap: _saving ? null : () => _pickDate(isStart: true), + ), + AppListTile( + title: 'Окончание', + value: formatShortDate(_endDate), + onTap: _saving ? null : () => _pickDate(isStart: false), + ), + ], + ), + if (_isEditing) ...[ + const SizedBox(height: AppSpacing.s5), + AppListSection( + footer: 'Сбросить траты — обнулить потраченное по этому бюджету.', + children: [ + AppSwitchRow( + title: 'Сбросить траты', + value: _resetExpenses, + onChanged: _saving ? null : (v) => setState(() => _resetExpenses = v), + ), + ], + ), + ], + if (_error != null) + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.gutter, + AppSpacing.s3, + AppSpacing.gutter, + 0, + ), + child: AppText.footnote(_error!, color: AppColors.systemRed), + ), + const SizedBox(height: AppSpacing.s5), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: AppButton( + label: _isEditing ? 'Сохранить' : 'Создать бюджет', + loading: _saving, + onPressed: _submit, + ), + ), + ], + ), + ), + ); + } + + Future _pickDate({required bool isStart}) async { + final picked = await showAppDatePicker( + context: context, + initialDate: isStart ? _startDate : _endDate, + minimumDate: isStart ? null : _startDate, + ); + if (picked == null || !mounted) return; + + setState(() { + if (isStart) { + _startDate = picked; + if (!_endDate.isAfter(_startDate)) { + _endDate = _startDate.add(const Duration(days: 14)); + } + } else { + _endDate = picked; + } + }); + } +} + +/// Opens the sheet wired to [BudgetsController]. +Future showBudgetFormSheet({ + required BuildContext context, + required BudgetsController controller, + BudgetStatus? initial, +}) async { + final saved = await showAppFormSheet( + context: context, + builder: (_) => BudgetFormSheet( + initial: initial, + onSubmit: ({ + required name, + required totalAmount, + required startDate, + required endDate, + required resetExpenses, + }) { + if (initial == null) { + return controller.create( + name: name, + totalAmount: totalAmount, + endDate: endDate, + startDate: startDate, + ); + } + return controller.update( + budgetId: initial.budget.id, + name: name, + totalAmount: totalAmount, + endDate: endDate, + startDate: startDate, + resetExpenses: resetExpenses, + ); + }, + ), + ); + + if (saved == true && context.mounted) { + await showAppToast( + context, + message: initial == null ? 'Бюджет создан' : 'Бюджет обновлён', + ); + } +} diff --git a/mobile/lib/features/budgets/budgets_controller.dart b/mobile/lib/features/budgets/budgets_controller.dart new file mode 100644 index 0000000..9ffcd49 --- /dev/null +++ b/mobile/lib/features/budgets/budgets_controller.dart @@ -0,0 +1,137 @@ +import 'package:flutter/foundation.dart'; +import 'package:please_pay_me/core/state/async_value.dart'; +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/data/repositories/repositories.dart'; + +/// Source of truth for budgets: the overview, the budget list and the expense +/// form all read the selected envelope from here. +class BudgetsController extends ChangeNotifier { + BudgetsController({ + required BudgetRepository budgets, + required ExpenseRepository expenses, + }) : _budgets = budgets, + _expenses = expenses; + + final BudgetRepository _budgets; + final ExpenseRepository _expenses; + + AsyncValue> _state = const AsyncValue.loading(); + bool _mutating = false; + + AsyncValue> get state => _state; + + /// True while a write is in flight — used to disable buttons. + bool get isMutating => _mutating; + + List get items => _state.valueOrNull ?? const []; + + /// Currently selected envelope; `null` when the user has no budgets at all. + BudgetStatus? get selected { + final all = items; + if (all.isEmpty) return null; + for (final status in all) { + if (status.selected) return status; + } + return all.first; + } + + bool get hasBudgets => items.isNotEmpty; + + Future load({bool silent = false}) async { + if (!silent) { + _state = const AsyncValue.loading(); + notifyListeners(); + } + + try { + _state = AsyncValue.data(await _budgets.list()); + } on ApiException catch (error) { + _state = AsyncValue.error(error.message); + } + notifyListeners(); + } + + Future select(int budgetId) { + return _mutate(() => _budgets.select(budgetId)); + } + + Future setActive(int budgetId, {required bool isActive}) { + return _mutate(() => _budgets.setActive(budgetId, isActive: isActive)); + } + + Future create({ + required String name, + required double totalAmount, + required DateTime endDate, + DateTime? startDate, + }) { + return _mutate( + () => _budgets.create( + name: name, + totalAmount: totalAmount, + endDate: endDate, + startDate: startDate, + ), + ); + } + + Future update({ + required int budgetId, + String? name, + double? totalAmount, + DateTime? endDate, + DateTime? startDate, + bool resetExpenses = false, + }) { + return _mutate( + () => _budgets.update( + budgetId: budgetId, + name: name, + totalAmount: totalAmount, + endDate: endDate, + startDate: startDate, + resetExpenses: resetExpenses, + ), + ); + } + + Future delete(int budgetId) => _mutate(() => _budgets.delete(budgetId)); + + Future addExpense({ + required double amount, + String? note, + DateTime? spentAt, + int? budgetId, + }) { + return _mutate( + () => _expenses.create( + amount: amount, + note: note, + spentAt: spentAt, + budgetId: budgetId ?? selected?.budget.id, + ), + ); + } + + Future undoLastExpense() { + return _mutate(() => _expenses.undoLast(budgetId: selected?.budget.id)); + } + + /// Runs a write, reloads the list and returns an error message or `null`. + Future _mutate(Future Function() action) async { + _mutating = true; + notifyListeners(); + + try { + await action(); + await load(silent: true); + return null; + } on ApiException catch (error) { + return error.message; + } finally { + _mutating = false; + notifyListeners(); + } + } +} diff --git a/mobile/lib/features/budgets/budgets_screen.dart b/mobile/lib/features/budgets/budgets_screen.dart new file mode 100644 index 0000000..68951a8 --- /dev/null +++ b/mobile/lib/features/budgets/budgets_screen.dart @@ -0,0 +1,201 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/features/budgets/budget_form_sheet.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:provider/provider.dart'; + +/// All envelopes: pick the active one, edit, archive or delete. +class BudgetsScreen extends StatelessWidget { + const BudgetsScreen({super.key}); + + @override + Widget build(BuildContext context) { + final controller = context.watch(); + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: CustomScrollView( + physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()), + slivers: [ + AppLargeNavBar( + title: 'Бюджеты', + trailing: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () => showBudgetFormSheet(context: context, controller: controller), + child: const AppIcon(CupertinoIcons.add_circled, color: AppColors.accent), + ), + ), + CupertinoSliverRefreshControl(onRefresh: () => controller.load(silent: true)), + SliverToBoxAdapter( + child: controller.state.map( + loading: () => AppListSection( + children: List.generate(3, (_) => const AppSkeletonRow()), + ), + error: (message) => AppErrorView(message: message, onRetry: controller.load), + data: (items) => items.isEmpty + ? AppEmptyState( + icon: CupertinoIcons.money_rubl_circle, + title: 'Бюджетов нет', + message: 'Создайте первый конверт до следующей зарплаты.', + actionLabel: 'Создать бюджет', + onAction: () => + showBudgetFormSheet(context: context, controller: controller), + ) + : _BudgetsList(items: items, controller: controller), + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s7)), + ], + ), + ); + } +} + +class _BudgetsList extends StatelessWidget { + const _BudgetsList({required this.items, required this.controller}); + + final List items; + final BudgetsController controller; + + @override + Widget build(BuildContext context) { + final active = items.where((status) => !status.isExpired).toList(); + final archived = items.where((status) => status.isExpired).toList(); + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + if (active.isNotEmpty) + AppListSection( + header: 'Активные', + footer: 'Нажмите, чтобы сделать бюджет текущим.', + separatorIndent: 60, + children: [ + for (final status in active) + _BudgetRow(status: status, controller: controller), + ], + ), + if (archived.isNotEmpty) ...[ + const SizedBox(height: AppSpacing.s5), + AppListSection( + header: 'Завершённые', + separatorIndent: 60, + children: [ + for (final status in archived) + _BudgetRow(status: status, controller: controller), + ], + ), + ], + ], + ); + } +} + +class _BudgetRow extends StatelessWidget { + const _BudgetRow({required this.status, required this.controller}); + + final BudgetStatus status; + final BudgetsController controller; + + @override + Widget build(BuildContext context) { + final currency = status.budget.currency; + final subtitle = status.isExpired + ? 'Завершён ${formatShortDate(status.budget.endDate)}' + : '${formatDaysLeft(status.daysLeft)} · лимит ${formatMoney(status.dailyLimit, currency: currency)}'; + + return AppListTile( + leading: AppIconBadge( + icon: status.selected ? CupertinoIcons.checkmark_alt : CupertinoIcons.tray_full, + color: status.selected + ? AppColors.accent + : status.isExpired + ? AppColors.systemGray + : AppColors.systemOrange, + ), + title: status.budget.name, + subtitle: subtitle, + value: formatMoney(status.remaining, currency: currency), + onTap: () => _openActions(context), + ); + } + + Future _openActions(BuildContext context) async { + final journal = context.read(); + final index = await showAppActionSheet( + context: context, + title: status.budget.name, + message: 'Остаток ${formatMoney(status.remaining, currency: status.budget.currency)}', + actions: [ + if (!status.selected) const AppActionSheetAction(label: 'Сделать текущим', isDefault: true), + const AppActionSheetAction(label: 'Редактировать'), + AppActionSheetAction(label: status.budget.isActive ? 'В архив' : 'Вернуть из архива'), + const AppActionSheetAction(label: 'Удалить', destructive: true), + ], + ); + + if (index == null || !context.mounted) return; + + final actions = [ + if (!status.selected) 'select', + 'edit', + 'archive', + 'delete', + ]; + + switch (actions[index]) { + case 'select': + final error = await controller.select(status.budget.id); + journal.bindBudget(controller.selected?.budget.id); + await journal.load(silent: true); + if (context.mounted) { + await showAppToast(context, message: error ?? 'Бюджет выбран'); + } + case 'edit': + await showBudgetFormSheet( + context: context, + controller: controller, + initial: status, + ); + case 'archive': + final error = await controller.setActive( + status.budget.id, + isActive: !status.budget.isActive, + ); + if (context.mounted) { + await showAppToast( + context, + message: error ?? (status.budget.isActive ? 'Бюджет в архиве' : 'Бюджет активен'), + ); + } + case 'delete': + await _confirmDelete(context, journal); + } + } + + Future _confirmDelete(BuildContext context, JournalController journal) async { + final confirmed = await showAppAlert( + context: context, + title: 'Удалить «${status.budget.name}»?', + message: 'Вместе с бюджетом удалятся все его операции.', + confirmLabel: 'Удалить', + cancelLabel: 'Отмена', + destructive: true, + ); + + if (confirmed != true) return; + + final error = await controller.delete(status.budget.id); + journal.bindBudget(controller.selected?.budget.id); + await journal.load(silent: true); + + if (context.mounted) { + await showAppToast(context, message: error ?? 'Бюджет удалён'); + } + } +} diff --git a/mobile/lib/features/expenses/expense_actions.dart b/mobile/lib/features/expenses/expense_actions.dart new file mode 100644 index 0000000..f842a6b --- /dev/null +++ b/mobile/lib/features/expenses/expense_actions.dart @@ -0,0 +1,73 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/expenses/expense_form_sheet.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:provider/provider.dart'; + +/// Opens the expense form and keeps the journal in sync on success. +Future showExpenseFormSheet({ + required BuildContext context, + required BudgetsController controller, +}) async { + final selected = controller.selected; + final journal = context.read(); + + final saved = await showAppFormSheet( + context: context, + builder: (_) => ExpenseFormSheet( + budgetName: selected?.budget.name, + remainingToday: selected?.remainingToday, + onSubmit: ({required amount, note, required spentAt}) => controller.addExpense( + amount: amount, + note: note, + spentAt: spentAt, + ), + ), + ); + + if (saved != true) return; + + await journal.load(silent: true); + if (context.mounted) { + await showAppToast(context, message: 'Трата записана'); + } +} + +Future undoLastExpense({ + required BuildContext context, + required BudgetsController controller, +}) async { + final journal = context.read(); + final confirmed = await showAppAlert( + context: context, + title: 'Отменить последнюю трату?', + message: 'Операция будет удалена из текущего бюджета.', + confirmLabel: 'Отменить трату', + cancelLabel: 'Закрыть', + destructive: true, + ); + + if (confirmed != true) return; + + final error = await controller.undoLastExpense(); + await journal.load(silent: true); + + if (!context.mounted) return; + + await showAppToast( + context, + message: error ?? 'Последняя трата удалена', + icon: error == null + ? CupertinoIcons.arrow_uturn_left_circle_fill + : CupertinoIcons.exclamationmark_circle_fill, + ); +} + +/// Shared row renderer so the journal and the overview look identical. +String expenseTitle(String? note) => note?.trim().isNotEmpty == true ? note!.trim() : 'Без комментария'; + +String expenseAmount(double amount, {String currency = 'RUB'}) { + return formatSignedMoney(amount, currency: currency); +} diff --git a/mobile/lib/features/expenses/expense_form_sheet.dart b/mobile/lib/features/expenses/expense_form_sheet.dart new file mode 100644 index 0000000..6b6b4c2 --- /dev/null +++ b/mobile/lib/features/expenses/expense_form_sheet.dart @@ -0,0 +1,208 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; + +typedef ExpenseSubmit = Future Function({ + required double amount, + String? note, + required DateTime spentAt, +}); + +/// Modal form for a new expense. Submits through the caller so the sheet has +/// no knowledge of repositories. +class ExpenseFormSheet extends StatefulWidget { + const ExpenseFormSheet({ + super.key, + required this.onSubmit, + this.budgetName, + this.remainingToday, + }); + + final ExpenseSubmit onSubmit; + final String? budgetName; + final double? remainingToday; + + @override + State createState() => _ExpenseFormSheetState(); +} + +class _ExpenseFormSheetState extends State { + final _amountController = TextEditingController(); + final _noteController = TextEditingController(); + + DateTime _date = DateTime.now(); + bool _saving = false; + String? _error; + + static const _quickAmounts = [100.0, 250.0, 500.0, 1000.0]; + + @override + void dispose() { + _amountController.dispose(); + _noteController.dispose(); + super.dispose(); + } + + double? get _amount { + final raw = _amountController.text.trim().replaceAll(',', '.').replaceAll(' ', ''); + final value = double.tryParse(raw); + return value != null && value > 0 ? value : null; + } + + Future _submit() async { + final amount = _amount; + if (amount == null) { + setState(() => _error = 'Введите сумму больше нуля'); + return; + } + + setState(() { + _saving = true; + _error = null; + }); + + final note = _noteController.text.trim(); + final error = await widget.onSubmit( + amount: amount, + note: note.isEmpty ? null : note, + spentAt: _date, + ); + + if (!mounted) return; + + if (error != null) { + setState(() { + _saving = false; + _error = error; + }); + return; + } + + Navigator.of(context).pop(true); + } + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: AppNavBar( + title: 'Новая трата', + subtitle: widget.budgetName, + leading: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: _saving ? null : () => Navigator.of(context).pop(false), + child: const AppText.body('Отмена', color: AppColors.accent), + ), + ), + child: SafeArea( + child: ListView( + padding: const EdgeInsets.only(top: AppSpacing.s4, bottom: AppSpacing.s6), + children: [ + AppCard( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const AppText.footnote('Сумма'), + const SizedBox(height: AppSpacing.s1), + CupertinoTextField.borderless( + controller: _amountController, + autofocus: true, + placeholder: '0', + keyboardType: const TextInputType.numberWithOptions(decimal: true), + style: AppTypography.largeTitle.copyWith( + color: AppColors.of(context, AppColors.label), + ), + placeholderStyle: AppTypography.largeTitle.copyWith( + color: AppColors.of(context, AppColors.tertiaryLabel), + ), + padding: EdgeInsets.zero, + suffix: const AppText.title('₽', color: AppColors.secondaryLabel), + onChanged: (_) => setState(() => _error = null), + onSubmitted: (_) => _submit(), + ), + if (widget.remainingToday != null) ...[ + const SizedBox(height: AppSpacing.s2), + AppText.footnote( + 'На сегодня осталось ${formatMoney(widget.remainingToday!)}', + color: widget.remainingToday! < 0 + ? AppColors.systemRed + : AppColors.secondaryLabel, + ), + ], + ], + ), + ), + const SizedBox(height: AppSpacing.s3), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: Row( + children: [ + for (final amount in _quickAmounts) ...[ + AppChip( + label: formatMoney(amount, compact: true), + onPressed: () => setState(() { + _amountController.text = amount.toStringAsFixed(0); + _error = null; + }), + ), + const SizedBox(width: AppSpacing.s2), + ], + ], + ), + ), + const SizedBox(height: AppSpacing.s5), + AppListSection( + children: [ + AppListTile( + title: 'Дата', + value: formatRelativeDay(_date), + onTap: _saving ? null : _pickDate, + ), + ], + ), + const SizedBox(height: AppSpacing.s4), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: AppTextField( + controller: _noteController, + placeholder: 'Комментарий', + prefixIcon: CupertinoIcons.text_alignleft, + enabled: !_saving, + ), + ), + if (_error != null) + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.gutter, + AppSpacing.s3, + AppSpacing.gutter, + 0, + ), + child: AppText.footnote(_error!, color: AppColors.systemRed), + ), + const SizedBox(height: AppSpacing.s5), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: AppButton( + label: 'Записать трату', + loading: _saving, + onPressed: _submit, + ), + ), + ], + ), + ), + ); + } + + Future _pickDate() async { + final picked = await showAppDatePicker( + context: context, + initialDate: _date, + maximumDate: DateTime.now(), + ); + if (picked != null && mounted) setState(() => _date = picked); + } +} diff --git a/mobile/lib/features/journal/journal_controller.dart b/mobile/lib/features/journal/journal_controller.dart new file mode 100644 index 0000000..fd18997 --- /dev/null +++ b/mobile/lib/features/journal/journal_controller.dart @@ -0,0 +1,116 @@ +import 'package:flutter/foundation.dart'; +import 'package:please_pay_me/core/state/async_value.dart'; +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/data/models/expense.dart'; +import 'package:please_pay_me/data/repositories/repositories.dart'; + +enum JournalScope { + current('Текущий'), + all('Все бюджеты'); + + const JournalScope(this.label); + + final String label; +} + +class ExpenseGroup { + const ExpenseGroup({required this.day, required this.items}); + + final DateTime day; + final List items; + + double get total => items.fold(0, (sum, expense) => sum + expense.amount); +} + +/// Paginated journal of operations with day grouping. +class JournalController extends ChangeNotifier { + JournalController({required ExpenseRepository expenses, this.pageSize = 20}) + : _expenses = expenses; + + final ExpenseRepository _expenses; + final int pageSize; + + AsyncValue _state = const AsyncValue.loading(); + JournalScope _scope = JournalScope.current; + int? _budgetId; + bool _loadingMore = false; + + AsyncValue get state => _state; + JournalScope get scope => _scope; + bool get isLoadingMore => _loadingMore; + + List get items => _state.valueOrNull?.items ?? const []; + + bool get hasMore => _state.valueOrNull?.hasMore ?? false; + + double get totalSum => _state.valueOrNull?.totalSum ?? 0; + + /// Operations bucketed by day, newest first — the journal renders one + /// inset-grouped section per bucket. + List get groups { + final buckets = >{}; + for (final expense in items) { + final day = DateTime(expense.spentAt.year, expense.spentAt.month, expense.spentAt.day); + buckets.putIfAbsent(day, () => []).add(expense); + } + + final days = buckets.keys.toList()..sort((a, b) => b.compareTo(a)); + return [for (final day in days) ExpenseGroup(day: day, items: buckets[day]!)]; + } + + void bindBudget(int? budgetId) { + if (_budgetId == budgetId) return; + _budgetId = budgetId; + load(silent: true); + } + + Future setScope(JournalScope scope) async { + if (_scope == scope) return; + _scope = scope; + notifyListeners(); + await load(); + } + + Future load({bool silent = false}) async { + if (!silent) { + _state = const AsyncValue.loading(); + notifyListeners(); + } + + try { + _state = AsyncValue.data(await _fetch(1)); + } on ApiException catch (error) { + _state = AsyncValue.error(error.message); + } + notifyListeners(); + } + + Future loadMore() async { + final current = _state.valueOrNull; + if (current == null || !current.hasMore || _loadingMore) return; + + _loadingMore = true; + notifyListeners(); + + try { + final next = await _fetch(current.page + 1); + _state = AsyncValue.data( + next.copyWithItems([...current.items, ...next.items]), + ); + } on ApiException catch (error) { + _state = AsyncValue.error(error.message); + } finally { + _loadingMore = false; + notifyListeners(); + } + } + + Future _fetch(int page) { + return _expenses.page( + page: page, + pageSize: pageSize, + budgetId: _scope == JournalScope.all ? null : _budgetId, + all: _scope == JournalScope.all, + ); + } +} diff --git a/mobile/lib/features/journal/journal_screen.dart b/mobile/lib/features/journal/journal_screen.dart new file mode 100644 index 0000000..49a2f9b --- /dev/null +++ b/mobile/lib/features/journal/journal_screen.dart @@ -0,0 +1,143 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/expenses/expense_actions.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:provider/provider.dart'; + +/// Operations grouped by day, with current-budget / all-budgets scope. +class JournalScreen extends StatelessWidget { + const JournalScreen({super.key}); + + @override + Widget build(BuildContext context) { + final journal = context.watch(); + final budgets = context.watch(); + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: CustomScrollView( + physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()), + slivers: [ + AppLargeNavBar( + title: 'Журнал', + trailing: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: budgets.hasBudgets + ? () => showExpenseFormSheet(context: context, controller: budgets) + : null, + child: const AppIcon(CupertinoIcons.add_circled, color: AppColors.accent), + ), + ), + CupertinoSliverRefreshControl(onRefresh: () => journal.load(silent: true)), + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.only(top: AppSpacing.s2, bottom: AppSpacing.s4), + child: AppSegmentedControl( + labels: JournalScope.values.map((scope) => scope.label).toList(), + index: JournalScope.values.indexOf(journal.scope), + onChanged: (index) => journal.setScope(JournalScope.values[index]), + ), + ), + ), + SliverToBoxAdapter( + child: journal.state.map( + loading: () => AppListSection( + children: List.generate(4, (_) => const AppSkeletonRow(hasLeading: false)), + ), + error: (message) => AppErrorView(message: message, onRetry: journal.load), + data: (_) => _JournalBody(journal: journal), + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s7)), + ], + ), + ); + } +} + +class _JournalBody extends StatelessWidget { + const _JournalBody({required this.journal}); + + final JournalController journal; + + @override + Widget build(BuildContext context) { + final groups = journal.groups; + + if (groups.isEmpty) { + final budgets = context.read(); + return AppEmptyState( + icon: CupertinoIcons.doc_text, + title: 'Операций пока нет', + message: journal.scope == JournalScope.all + ? 'Как только появится первая трата, она появится здесь.' + : 'В текущем бюджете ещё ничего не потрачено.', + actionLabel: budgets.hasBudgets ? 'Добавить трату' : null, + onAction: budgets.hasBudgets + ? () => showExpenseFormSheet(context: context, controller: budgets) + : null, + ); + } + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppCard( + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const AppText.footnote('Всего операций'), + AppText.title('${journal.state.valueOrNull?.totalCount ?? 0}'), + ], + ), + ), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const AppText.footnote('Сумма'), + AppText.title(formatMoney(journal.totalSum)), + ], + ), + ), + ], + ), + ), + const SizedBox(height: AppSpacing.s5), + for (final group in groups) ...[ + AppListSection( + header: formatRelativeDay(group.day), + footer: 'Итого за день: ${formatMoney(group.total)}', + children: [ + for (final expense in group.items) + AppListTile( + title: expenseTitle(expense.note), + subtitle: formatWeekday(expense.spentAt), + value: expenseAmount(expense.amount), + showChevron: false, + ), + ], + ), + const SizedBox(height: AppSpacing.s5), + ], + if (journal.hasMore) + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: AppButton( + label: 'Показать ещё', + style: AppButtonStyle.gray, + loading: journal.isLoadingMore, + onPressed: journal.loadMore, + ), + ), + ], + ); + } +} diff --git a/mobile/lib/features/legal/legal_consent.dart b/mobile/lib/features/legal/legal_consent.dart new file mode 100644 index 0000000..6666b0f --- /dev/null +++ b/mobile/lib/features/legal/legal_consent.dart @@ -0,0 +1,143 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/legal/legal_links.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; + +class LegalAcceptance { + const LegalAcceptance({this.offer = false, this.consent = false}); + + final bool offer; + final bool consent; + + bool get accepted => offer && consent; + + LegalAcceptance copyWith({bool? offer, bool? consent}) { + return LegalAcceptance(offer: offer ?? this.offer, consent: consent ?? this.consent); + } +} + +class LegalConsentBlock extends StatelessWidget { + const LegalConsentBlock({ + super.key, + required this.value, + required this.onChanged, + required this.cabinetUrl, + }); + + final LegalAcceptance value; + final ValueChanged onChanged; + final String cabinetUrl; + + @override + Widget build(BuildContext context) { + return Column( + children: [ + _LegalCheckRow( + checkboxKey: const Key('legal-offer-check'), + value: value.offer, + onChanged: (next) => onChanged(value.copyWith(offer: next)), + child: Text.rich( + TextSpan( + style: TextStyle( + fontSize: 13, + height: 1.35, + color: AppColors.of(context, AppColors.secondaryLabel), + ), + children: [ + const TextSpan(text: 'Я принимаю условия '), + _LinkSpan( + text: 'Пользовательского соглашения', + color: AppColors.of(context, AppColors.accent), + onTap: () => openLegalDocument(context, LegalLinks.resolve(cabinetUrl, LegalLinks.offer)), + ), + const TextSpan(text: ' (публичной оферты).'), + ], + ), + ), + ), + const SizedBox(height: AppSpacing.s3), + _LegalCheckRow( + checkboxKey: const Key('legal-consent-check'), + value: value.consent, + onChanged: (next) => onChanged(value.copyWith(consent: next)), + child: Text.rich( + TextSpan( + style: TextStyle( + fontSize: 13, + height: 1.35, + color: AppColors.of(context, AppColors.secondaryLabel), + ), + children: [ + const TextSpan( + text: + 'Я даю согласие на обработку моих персональных данных (email, аватар, данные о транзакциях), полученных от сервиса Яндекс и введённых мной, в целях предоставления доступа к Сервису. Согласие действует до его отзыва. ', + ), + _LinkSpan( + text: 'Текст согласия', + color: AppColors.of(context, AppColors.accent), + onTap: () => + openLegalDocument(context, LegalLinks.resolve(cabinetUrl, LegalLinks.consent)), + ), + ], + ), + ), + ), + ], + ); + } +} + +class _LinkSpan extends WidgetSpan { + _LinkSpan({required String text, required Color color, required VoidCallback onTap}) + : super( + alignment: PlaceholderAlignment.baseline, + baseline: TextBaseline.alphabetic, + child: GestureDetector( + onTap: onTap, + child: Text( + text, + style: TextStyle( + fontSize: 13, + height: 1.35, + color: color, + decoration: TextDecoration.underline, + ), + ), + ), + ); +} + +class _LegalCheckRow extends StatelessWidget { + const _LegalCheckRow({ + this.checkboxKey, + required this.value, + required this.onChanged, + required this.child, + }); + + final Key? checkboxKey; + final bool value; + final ValueChanged onChanged; + final Widget child; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => onChanged(!value), + behavior: HitTestBehavior.opaque, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon( + key: checkboxKey, + value ? CupertinoIcons.checkmark_square_fill : CupertinoIcons.square, + size: 22, + color: AppColors.of(context, value ? AppColors.accent : AppColors.systemGray), + ), + const SizedBox(width: AppSpacing.s2), + Expanded(child: child), + ], + ), + ); + } +} diff --git a/mobile/lib/features/overview/overview_screen.dart b/mobile/lib/features/overview/overview_screen.dart new file mode 100644 index 0000000..61e9ea5 --- /dev/null +++ b/mobile/lib/features/overview/overview_screen.dart @@ -0,0 +1,289 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/data/models/job.dart'; +import 'package:please_pay_me/features/budgets/budget_form_sheet.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/expenses/expense_actions.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/features/work/jobs_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:provider/provider.dart'; + +/// Home tab: current envelope, today's allowance and quick actions. +class OverviewScreen extends StatelessWidget { + const OverviewScreen({super.key}); + + @override + Widget build(BuildContext context) { + final budgets = context.watch(); + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: CustomScrollView( + physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()), + slivers: [ + const AppLargeNavBar(title: 'Обзор'), + CupertinoSliverRefreshControl( + onRefresh: () async { + await Future.wait([ + budgets.load(silent: true), + context.read().load(silent: true), + context.read().load(silent: true), + ]); + }, + ), + SliverToBoxAdapter( + child: budgets.state.map( + loading: () => const AppLoadingView(), + error: (message) => AppErrorView(message: message, onRetry: budgets.load), + data: (_) { + final selected = budgets.selected; + if (selected == null) return _NoBudgets(controller: budgets); + return _OverviewBody(status: selected); + }, + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s7)), + ], + ), + ); + } +} + +class _NoBudgets extends StatelessWidget { + const _NoBudgets({required this.controller}); + + final BudgetsController controller; + + @override + Widget build(BuildContext context) { + return AppEmptyState( + icon: CupertinoIcons.money_rubl_circle, + title: 'Бюджета пока нет', + message: 'Создайте конверт до следующей зарплаты — приложение посчитает дневной лимит.', + actionLabel: 'Создать бюджет', + onAction: () => showBudgetFormSheet(context: context, controller: controller), + ); + } +} + +class _OverviewBody extends StatelessWidget { + const _OverviewBody({required this.status}); + + final BudgetStatus status; + + @override + Widget build(BuildContext context) { + final budgets = context.watch(); + final currency = status.budget.currency; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppCard( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Expanded(child: AppText.headline(status.budget.name)), + AppChip( + label: status.isExpired + ? 'Завершён' + : formatDaysLeft(status.daysLeft).replaceFirst('осталось ', ''), + selected: !status.isExpired, + ), + ], + ), + const SizedBox(height: AppSpacing.s3), + const AppText.footnote('Остаток бюджета'), + AppText.largeTitle( + formatMoney(status.remaining, currency: currency), + color: status.isOverBudget ? AppColors.systemRed : AppColors.label, + ), + const SizedBox(height: AppSpacing.s4), + AppProgressBar( + value: status.spentProgress, + color: status.isOverBudget ? AppColors.systemRed : AppColors.accent, + ), + const SizedBox(height: AppSpacing.s2), + AppText.footnote( + 'Потрачено ${formatMoney(status.totalSpent, currency: currency)} ' + 'из ${formatMoney(status.budget.totalAmount, currency: currency)}', + ), + ], + ), + ), + const SizedBox(height: AppSpacing.s4), + _TodayCard(status: status), + const SizedBox(height: AppSpacing.s4), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: Row( + children: [ + Expanded( + child: AppButton( + label: 'Добавить трату', + icon: CupertinoIcons.plus, + onPressed: budgets.isMutating + ? null + : () => showExpenseFormSheet(context: context, controller: budgets), + ), + ), + const SizedBox(width: AppSpacing.s3), + AppButton( + label: 'Отменить', + style: AppButtonStyle.gray, + expanded: false, + onPressed: budgets.isMutating + ? null + : () => undoLastExpense(context: context, controller: budgets), + ), + ], + ), + ), + const SizedBox(height: AppSpacing.s5), + const _NextPaySection(), + const _RecentOperations(), + ], + ); + } +} + +class _TodayCard extends StatelessWidget { + const _TodayCard({required this.status}); + + final BudgetStatus status; + + @override + Widget build(BuildContext context) { + final currency = status.budget.currency; + final overspent = status.isOverDaily; + + return AppCard( + title: 'Сегодня', + subtitle: formatDay(status.today), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Expanded( + child: _Metric( + label: 'Дневной лимит', + value: formatMoney(status.dailyLimit, currency: currency), + ), + ), + Expanded( + child: _Metric( + label: 'Потрачено', + value: formatMoney(status.spentToday, currency: currency), + color: overspent ? AppColors.systemRed : AppColors.label, + ), + ), + ], + ), + const SizedBox(height: AppSpacing.s4), + AppProgressBar( + value: status.dailyProgress, + color: overspent ? AppColors.systemRed : AppColors.systemGreen, + ), + const SizedBox(height: AppSpacing.s2), + AppText.footnote( + overspent + ? 'Лимит превышен на ${formatMoney(status.spentToday - status.dailyLimit, currency: currency)}' + : 'Можно потратить ещё ${formatMoney(status.remainingToday, currency: currency)}', + color: overspent ? AppColors.systemRed : AppColors.secondaryLabel, + ), + ], + ), + ); + } +} + +class _Metric extends StatelessWidget { + const _Metric({required this.label, required this.value, this.color = AppColors.label}); + + final String label; + final String value; + final Color color; + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText.footnote(label), + const SizedBox(height: 2), + AppText.title(value, color: color), + ], + ); + } +} + +class _NextPaySection extends StatelessWidget { + const _NextPaySection(); + + @override + Widget build(BuildContext context) { + final jobs = context.watch(); + final pay = jobs.nextPay; + if (pay == null) return const SizedBox.shrink(); + + return Padding( + padding: const EdgeInsets.only(bottom: AppSpacing.s5), + child: AppListSection( + header: 'Ближайшая выплата', + separatorIndent: 60, + children: [ + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.money_rubl_circle_fill, + color: AppColors.systemGreen, + ), + title: formatMoney(pay.amount), + subtitle: '${formatDay(pay.date)} · ${pay.percent.round()}% оклада', + value: _daysUntil(pay), + showChevron: false, + ), + ], + ), + ); + } + + String _daysUntil(UpcomingPay pay) { + final now = DateTime.now(); + final days = pay.date.difference(DateTime(now.year, now.month, now.day)).inDays; + return switch (days) { + <= 0 => 'сегодня', + 1 => 'завтра', + _ => 'через ${plural(days, 'день', 'дня', 'дней')}', + }; + } +} + +class _RecentOperations extends StatelessWidget { + const _RecentOperations(); + + @override + Widget build(BuildContext context) { + final journal = context.watch(); + final recent = journal.items.take(3).toList(); + if (recent.isEmpty) return const SizedBox.shrink(); + + return AppListSection( + header: 'Последние операции', + children: [ + for (final expense in recent) + AppListTile( + title: expense.note ?? 'Без комментария', + subtitle: formatRelativeDay(expense.spentAt), + value: formatSignedMoney(expense.amount), + showChevron: false, + ), + ], + ); + } +} diff --git a/mobile/lib/features/profile/profile_screen.dart b/mobile/lib/features/profile/profile_screen.dart new file mode 100644 index 0000000..7ef8db3 --- /dev/null +++ b/mobile/lib/features/profile/profile_screen.dart @@ -0,0 +1,228 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/branding/app_brand.dart'; +import 'package:please_pay_me/core/legal/legal_links.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/features/work/jobs_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:provider/provider.dart'; + +class ProfileScreen extends StatelessWidget { + const ProfileScreen({super.key}); + + @override + Widget build(BuildContext context) { + final session = context.watch(); + final user = session.user; + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: CustomScrollView( + physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()), + slivers: [ + const AppLargeNavBar(title: 'Профиль'), + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.gutter, + AppSpacing.s2, + AppSpacing.gutter, + AppSpacing.s5, + ), + child: Row( + children: [ + AppAvatar( + initials: user?.initials, + imageUrl: user?.photoUrl, + radius: 32, + ), + const SizedBox(width: AppSpacing.s4), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText.title(user?.displayName ?? 'Гость'), + AppText.subhead(user?.handle ?? 'не авторизован'), + ], + ), + ), + ], + ), + ), + ), + SliverToBoxAdapter( + child: AppListSection( + header: 'Подключение', + footer: session.isDemo + ? 'Демо-режим: данные живут только в памяти устройства.' + : 'Данные синхронизируются с веб-кабинетом «${AppBrand.name}».', + separatorIndent: 60, + children: [ + AppListTile( + leading: AppIconBadge( + icon: session.isDemo + ? CupertinoIcons.wrench_fill + : CupertinoIcons.cloud_fill, + color: session.isDemo ? AppColors.systemOrange : AppColors.systemGreen, + ), + title: 'Режим', + value: session.isDemo ? 'Демо' : 'Сервер', + showChevron: false, + ), + if (!session.isDemo) + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.link, + color: AppColors.systemGray, + ), + title: 'Адрес API', + subtitle: session.baseUrl, + showChevron: false, + ), + ], + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s5)), + SliverToBoxAdapter( + child: AppListSection( + header: 'Оформление', + footer: 'Системная повторяет тему устройства.', + children: [ + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.s3, + AppSpacing.s3, + AppSpacing.s3, + AppSpacing.s3, + ), + child: AppSegmentedControl( + padding: EdgeInsets.zero, + labels: const ['Системная', 'Светлая', 'Тёмная'], + index: context.watch().preference.index, + onChanged: (index) { + context.read().setPreference( + ThemePreference.values[index], + ); + }, + ), + ), + ], + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s5)), + SliverToBoxAdapter( + child: AppListSection( + separatorIndent: 60, + children: [ + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.arrow_clockwise, + color: AppColors.accent, + ), + title: 'Обновить данные', + onTap: () => _refreshAll(context), + ), + ], + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s5)), + SliverToBoxAdapter( + child: AppListSection( + header: 'Правовая информация', + footer: 'Открывается веб-версия на please-pay-me.ru.', + separatorIndent: 60, + children: [ + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.doc_text, + color: AppColors.accent, + ), + title: 'Пользовательское соглашение', + onTap: () => openLegalDocument( + context, + LegalLinks.resolve(session.webCabinetUrl, LegalLinks.offer), + ), + ), + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.lock_shield, + color: AppColors.systemGray, + ), + title: 'Политика конфиденциальности', + onTap: () => openLegalDocument( + context, + LegalLinks.resolve(session.webCabinetUrl, LegalLinks.privacy), + ), + ), + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.checkmark_shield, + color: AppColors.systemGray, + ), + title: 'Согласие на обработку данных', + onTap: () => openLegalDocument( + context, + LegalLinks.resolve(session.webCabinetUrl, LegalLinks.consent), + ), + ), + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.circle_grid_hex, + color: AppColors.systemGray, + ), + title: 'Политика cookie', + onTap: () => openLegalDocument( + context, + LegalLinks.resolve(session.webCabinetUrl, LegalLinks.cookies), + ), + ), + ], + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s5)), + SliverToBoxAdapter( + child: AppListSection( + footer: '${AppBrand.name} · версия 0.1.0', + children: [ + AppListTile( + title: 'Выйти', + destructive: true, + showChevron: false, + onTap: () => _signOut(context, session), + ), + ], + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s7)), + ], + ), + ); + } + + Future _refreshAll(BuildContext context) async { + await Future.wait([ + context.read().load(silent: true), + context.read().load(silent: true), + context.read().load(silent: true), + ]); + + if (context.mounted) { + await showAppToast(context, message: 'Данные обновлены'); + } + } + + Future _signOut(BuildContext context, SessionController session) async { + final confirmed = await showAppAlert( + context: context, + title: 'Выйти из аккаунта?', + message: 'Токен будет удалён с устройства.', + confirmLabel: 'Выйти', + cancelLabel: 'Отмена', + destructive: true, + ); + + if (confirmed == true) await session.signOut(); + } +} diff --git a/mobile/lib/features/splash/splash_screen.dart b/mobile/lib/features/splash/splash_screen.dart new file mode 100644 index 0000000..213b01f --- /dev/null +++ b/mobile/lib/features/splash/splash_screen.dart @@ -0,0 +1,129 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/branding/app_brand.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; + +/// Branded launch screen. Native Android/iOS splash uses the same background +/// and mark so the first Flutter frame does not flash. +class SplashScreen extends StatefulWidget { + const SplashScreen({super.key}); + + @override + State createState() => _SplashScreenState(); +} + +class _SplashScreenState extends State with SingleTickerProviderStateMixin { + late final AnimationController _controller; + late final Animation _mark; + late final Animation _copy; + late final Animation _spinner; + + @override + void initState() { + super.initState(); + _controller = AnimationController( + vsync: this, + duration: const Duration(milliseconds: 720), + )..forward(); + _mark = CurvedAnimation( + parent: _controller, + curve: const Interval(0, 0.55, curve: Curves.easeOutCubic), + ); + _copy = CurvedAnimation( + parent: _controller, + curve: const Interval(0.28, 0.85, curve: Curves.easeOut), + ); + _spinner = CurvedAnimation( + parent: _controller, + curve: const Interval(0.55, 1, curve: Curves.easeOut), + ); + } + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final dark = CupertinoTheme.of(context).brightness == Brightness.dark; + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: AnimatedBuilder( + animation: _controller, + builder: (context, _) { + return Stack( + fit: StackFit.expand, + children: [ + _Wash(dark: dark), + SafeArea( + child: Column( + children: [ + const Spacer(flex: 3), + Opacity( + opacity: _mark.value, + child: Transform.scale( + scale: 0.86 + (0.14 * _mark.value), + child: const AppBrandMark(), + ), + ), + const SizedBox(height: AppSpacing.s5), + Opacity( + opacity: _copy.value, + child: Transform.translate( + offset: Offset(0, 10 * (1 - _copy.value)), + child: const Column( + children: [ + AppText.largeTitle(AppBrand.name, textAlign: TextAlign.center), + SizedBox(height: AppSpacing.s2), + AppText.subhead( + 'Бюджет от зарплаты до зарплаты', + color: AppColors.secondaryLabel, + textAlign: TextAlign.center, + ), + ], + ), + ), + ), + const Spacer(flex: 4), + Opacity( + opacity: _spinner.value, + child: const Padding( + padding: EdgeInsets.only(bottom: AppSpacing.s7), + child: AppSpinner(), + ), + ), + ], + ), + ), + ], + ); + }, + ), + ); + } +} + +class _Wash extends StatelessWidget { + const _Wash({required this.dark}); + + final bool dark; + + @override + Widget build(BuildContext context) { + final accent = AppColors.of(context, AppColors.accent).withValues(alpha: dark ? 0.14 : 0.1); + return IgnorePointer( + child: DecoratedBox( + decoration: BoxDecoration( + gradient: RadialGradient( + center: const Alignment(0, -0.18), + radius: 0.85, + colors: [accent, const Color(0x00000000)], + ), + ), + ), + ); + } +} diff --git a/mobile/lib/features/work/job_form_sheet.dart b/mobile/lib/features/work/job_form_sheet.dart new file mode 100644 index 0000000..1ebda97 --- /dev/null +++ b/mobile/lib/features/work/job_form_sheet.dart @@ -0,0 +1,304 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/data/models/job.dart'; +import 'package:please_pay_me/features/work/jobs_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; + +/// Create / edit form for a job and its payday schedule. +class JobFormSheet extends StatefulWidget { + const JobFormSheet({super.key, required this.onSubmit, this.initial}); + + final Job? initial; + + final Future Function({ + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + }) onSubmit; + + @override + State createState() => _JobFormSheetState(); +} + +class _JobFormSheetState extends State { + late final _nameController = TextEditingController(text: widget.initial?.name ?? ''); + late final _salaryController = TextEditingController( + text: widget.initial == null ? '' : widget.initial!.salaryAmount.toStringAsFixed(0), + ); + + late int _firstDay = widget.initial?.payDays.firstOrNull ?? 5; + late int? _secondDay = + (widget.initial?.payDays.length ?? 0) > 1 ? widget.initial!.payDays[1] : 20; + late double _firstPercent = widget.initial?.firstPayPercent ?? 40; + late WeekendPolicy _policy = widget.initial?.weekendPolicy ?? WeekendPolicy.beforeWeekend; + + bool _saving = false; + String? _error; + + bool get _isEditing => widget.initial != null; + + @override + void dispose() { + _nameController.dispose(); + _salaryController.dispose(); + super.dispose(); + } + + Future _submit() async { + final name = _nameController.text.trim(); + final salary = double.tryParse( + _salaryController.text.trim().replaceAll(',', '.').replaceAll(' ', ''), + ); + + if (name.isEmpty) { + setState(() => _error = 'Введите название работы'); + return; + } + if (salary == null || salary <= 0) { + setState(() => _error = 'Введите оклад больше нуля'); + return; + } + + setState(() { + _saving = true; + _error = null; + }); + + final error = await widget.onSubmit( + name: name, + salaryAmount: salary, + payDays: [_firstDay, if (_secondDay != null) _secondDay!], + firstPayPercent: _secondDay == null ? 100 : _firstPercent, + weekendPolicy: _policy, + ); + + if (!mounted) return; + + if (error != null) { + setState(() { + _saving = false; + _error = error; + }); + return; + } + + Navigator.of(context).pop(true); + } + + @override + Widget build(BuildContext context) { + final salary = double.tryParse( + _salaryController.text.trim().replaceAll(',', '.').replaceAll(' ', ''), + ) ?? + 0; + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: AppNavBar( + title: _isEditing ? 'Работа' : 'Новая работа', + leading: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: _saving ? null : () => Navigator.of(context).pop(false), + child: const AppText.body('Отмена', color: AppColors.accent), + ), + ), + child: SafeArea( + child: ListView( + padding: const EdgeInsets.only(top: AppSpacing.s4, bottom: AppSpacing.s6), + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppTextField( + label: 'Название', + placeholder: 'Основная работа', + controller: _nameController, + enabled: !_saving, + ), + const SizedBox(height: AppSpacing.s4), + AppTextField( + label: 'Оклад в месяц', + placeholder: '0', + controller: _salaryController, + enabled: !_saving, + keyboardType: const TextInputType.numberWithOptions(decimal: true), + onChanged: (_) => setState(() {}), + ), + ], + ), + ), + const SizedBox(height: AppSpacing.s5), + AppListSection( + header: 'Дни выплат', + footer: 'Если день выпадает на выходные, выплата сдвигается по правилу ниже.', + children: [ + AppListTile( + title: 'Первая выплата', + value: '$_firstDay числа', + onTap: _saving ? null : () => _pickDay(isFirst: true), + ), + AppSwitchRow( + title: 'Вторая выплата', + value: _secondDay != null, + onChanged: _saving + ? null + : (value) => setState(() => _secondDay = value ? 20 : null), + ), + if (_secondDay != null) + AppListTile( + title: 'Вторая выплата', + value: '$_secondDay числа', + onTap: _saving ? null : () => _pickDay(isFirst: false), + ), + ], + ), + if (_secondDay != null) ...[ + const SizedBox(height: AppSpacing.s5), + AppCard( + title: 'Доля первой выплаты', + subtitle: '${_firstPercent.round()}% — ' + '${formatMoney(salary * _firstPercent / 100)} из ${formatMoney(salary)}', + child: CupertinoSlider( + value: _firstPercent, + min: 5, + max: 95, + divisions: 18, + activeColor: AppColors.of(context, AppColors.accent), + onChanged: _saving ? null : (v) => setState(() => _firstPercent = v), + ), + ), + ], + const SizedBox(height: AppSpacing.s5), + const AppSectionHeader('Если выплата на выходных'), + AppSegmentedControl( + labels: WeekendPolicy.values.map((policy) => policy.label).toList(), + index: WeekendPolicy.values.indexOf(_policy), + onChanged: (index) => setState(() => _policy = WeekendPolicy.values[index]), + ), + if (_error != null) + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.gutter, + AppSpacing.s3, + AppSpacing.gutter, + 0, + ), + child: AppText.footnote(_error!, color: AppColors.systemRed), + ), + const SizedBox(height: AppSpacing.s5), + Padding( + padding: const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + child: AppButton( + label: _isEditing ? 'Сохранить' : 'Добавить работу', + loading: _saving, + onPressed: _submit, + ), + ), + ], + ), + ), + ); + } + + Future _pickDay({required bool isFirst}) async { + final initial = isFirst ? _firstDay : (_secondDay ?? 20); + var picked = initial; + + final result = await showCupertinoModalPopup( + context: context, + builder: (ctx) => Container( + height: 280, + color: AppColors.of(ctx, AppColors.groupedSurface), + child: SafeArea( + top: false, + child: Column( + children: [ + Expanded( + child: CupertinoPicker( + itemExtent: 36, + scrollController: FixedExtentScrollController(initialItem: initial - 1), + onSelectedItemChanged: (index) => picked = index + 1, + children: [ + for (var day = 1; day <= 31; day++) Center(child: AppText.body('$day числа')), + ], + ), + ), + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.gutter, + AppSpacing.s2, + AppSpacing.gutter, + AppSpacing.s3, + ), + child: AppButton( + label: 'Готово', + onPressed: () => Navigator.of(ctx).pop(picked), + ), + ), + ], + ), + ), + ), + ); + + if (result == null || !mounted) return; + setState(() { + if (isFirst) { + _firstDay = result; + } else { + _secondDay = result; + } + }); + } +} + +Future showJobFormSheet({ + required BuildContext context, + required JobsController controller, + Job? initial, +}) async { + final saved = await showAppFormSheet( + context: context, + builder: (_) => JobFormSheet( + initial: initial, + onSubmit: ({ + required name, + required salaryAmount, + required payDays, + required firstPayPercent, + required weekendPolicy, + }) { + if (initial == null) { + return controller.create( + name: name, + salaryAmount: salaryAmount, + payDays: payDays, + firstPayPercent: firstPayPercent, + weekendPolicy: weekendPolicy, + ); + } + return controller.update( + jobId: initial.id, + name: name, + salaryAmount: salaryAmount, + payDays: payDays, + firstPayPercent: firstPayPercent, + weekendPolicy: weekendPolicy, + ); + }, + ), + ); + + if (saved == true && context.mounted) { + await showAppToast( + context, + message: initial == null ? 'Работа добавлена' : 'Работа обновлена', + ); + } +} diff --git a/mobile/lib/features/work/jobs_controller.dart b/mobile/lib/features/work/jobs_controller.dart new file mode 100644 index 0000000..322ea92 --- /dev/null +++ b/mobile/lib/features/work/jobs_controller.dart @@ -0,0 +1,95 @@ +import 'package:flutter/foundation.dart'; +import 'package:please_pay_me/core/state/async_value.dart'; +import 'package:please_pay_me/data/api/api_client.dart'; +import 'package:please_pay_me/data/models/job.dart'; +import 'package:please_pay_me/data/repositories/repositories.dart'; + +class JobsController extends ChangeNotifier { + JobsController({required JobRepository jobs}) : _jobs = jobs; + + final JobRepository _jobs; + + AsyncValue> _state = const AsyncValue.loading(); + bool _mutating = false; + + AsyncValue> get state => _state; + bool get isMutating => _mutating; + List get items => _state.valueOrNull ?? const []; + + /// Nearest payday across all jobs — shown on the overview screen. + UpcomingPay? get nextPay { + final pays = items.expand((job) => job.nextPays).toList() + ..sort((a, b) => a.date.compareTo(b.date)); + return pays.isEmpty ? null : pays.first; + } + + Future load({bool silent = false}) async { + if (!silent) { + _state = const AsyncValue.loading(); + notifyListeners(); + } + + try { + _state = AsyncValue.data(await _jobs.list()); + } on ApiException catch (error) { + _state = AsyncValue.error(error.message); + } + notifyListeners(); + } + + Future create({ + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + }) { + return _mutate( + () => _jobs.create( + name: name, + salaryAmount: salaryAmount, + payDays: payDays, + firstPayPercent: firstPayPercent, + weekendPolicy: weekendPolicy, + ), + ); + } + + Future update({ + required int jobId, + required String name, + required double salaryAmount, + required List payDays, + required double firstPayPercent, + required WeekendPolicy weekendPolicy, + }) { + return _mutate( + () => _jobs.update( + jobId: jobId, + name: name, + salaryAmount: salaryAmount, + payDays: payDays, + firstPayPercent: firstPayPercent, + weekendPolicy: weekendPolicy, + ), + ); + } + + Future delete(int jobId) => _mutate(() => _jobs.delete(jobId)); + + Future _mutate(Future Function() action) async { + _mutating = true; + notifyListeners(); + + try { + await action(); + await load(silent: true); + return null; + } on ApiException catch (error) { + return error.message; + } finally { + _mutating = false; + notifyListeners(); + } + } +} diff --git a/mobile/lib/features/work/work_screen.dart b/mobile/lib/features/work/work_screen.dart new file mode 100644 index 0000000..94e965d --- /dev/null +++ b/mobile/lib/features/work/work_screen.dart @@ -0,0 +1,166 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; +import 'package:please_pay_me/data/models/job.dart'; +import 'package:please_pay_me/features/work/job_form_sheet.dart'; +import 'package:please_pay_me/features/work/jobs_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:provider/provider.dart'; + +/// Jobs and their payday schedule. +class WorkScreen extends StatelessWidget { + const WorkScreen({super.key}); + + @override + Widget build(BuildContext context) { + final controller = context.watch(); + + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: CustomScrollView( + physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()), + slivers: [ + AppLargeNavBar( + title: 'Работа', + trailing: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () => showJobFormSheet(context: context, controller: controller), + child: const AppIcon(CupertinoIcons.add_circled, color: AppColors.accent), + ), + ), + CupertinoSliverRefreshControl(onRefresh: () => controller.load(silent: true)), + SliverToBoxAdapter( + child: controller.state.map( + loading: () => AppListSection( + children: List.generate(2, (_) => const AppSkeletonRow()), + ), + error: (message) => AppErrorView(message: message, onRetry: controller.load), + data: (jobs) => jobs.isEmpty + ? AppEmptyState( + icon: CupertinoIcons.briefcase, + title: 'Работа не добавлена', + message: 'Укажите оклад и дни выплат — приложение подскажет даты зарплаты.', + actionLabel: 'Добавить работу', + onAction: () => + showJobFormSheet(context: context, controller: controller), + ) + : Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (final job in jobs) ...[ + _JobCard(job: job, controller: controller), + const SizedBox(height: AppSpacing.s5), + ], + ], + ), + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: AppSpacing.s7)), + ], + ), + ); + } +} + +class _JobCard extends StatelessWidget { + const _JobCard({required this.job, required this.controller}); + + final Job job; + final JobsController controller; + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppListSection( + header: job.name, + separatorIndent: 60, + children: [ + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.briefcase_fill, + color: AppColors.accent, + ), + title: 'Оклад', + value: formatMoney(job.salaryAmount, currency: job.currency), + showChevron: false, + ), + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.calendar, + color: AppColors.systemOrange, + ), + title: 'Дни выплат', + value: job.payDays.map((day) => '$day').join(' и '), + showChevron: false, + ), + AppListTile( + leading: const AppIconBadge( + icon: CupertinoIcons.arrow_left_right, + color: AppColors.systemGray, + ), + title: 'Выходные', + value: job.weekendPolicy.label, + showChevron: false, + ), + AppListTile( + title: 'Настроить', + onTap: () => _openActions(context), + ), + ], + ), + if (job.nextPays.isNotEmpty) ...[ + const SizedBox(height: AppSpacing.s4), + AppListSection( + header: 'Ближайшие выплаты', + children: [ + for (final pay in job.nextPays) + AppListTile( + title: formatDay(pay.date), + subtitle: '${pay.percent.round()}% оклада · ${pay.scheduledDay} числа', + value: formatMoney(pay.amount, currency: job.currency), + showChevron: false, + ), + ], + ), + ], + ], + ); + } + + Future _openActions(BuildContext context) async { + final index = await showAppActionSheet( + context: context, + title: job.name, + actions: const [ + AppActionSheetAction(label: 'Редактировать', isDefault: true), + AppActionSheetAction(label: 'Удалить', destructive: true), + ], + ); + + if (index == null || !context.mounted) return; + + if (index == 0) { + await showJobFormSheet(context: context, controller: controller, initial: job); + return; + } + + final confirmed = await showAppAlert( + context: context, + title: 'Удалить «${job.name}»?', + message: 'График выплат тоже будет удалён.', + confirmLabel: 'Удалить', + cancelLabel: 'Отмена', + destructive: true, + ); + + if (confirmed != true) return; + + final error = await controller.delete(job.id); + if (context.mounted) { + await showAppToast(context, message: error ?? 'Работа удалена'); + } + } +} diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart new file mode 100644 index 0000000..03a3645 --- /dev/null +++ b/mobile/lib/main.dart @@ -0,0 +1,28 @@ +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; +import 'package:intl/date_symbol_data_local.dart'; +import 'package:please_pay_me/app/app.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/config/env_loader.dart'; +import 'package:please_pay_me/core/storage/session_storage.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; + +Future main() async { + WidgetsFlutterBinding.ensureInitialized(); + await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); + await initializeDateFormatting('ru'); + + final session = SessionController( + config: AppConfig.fromEnvironment(file: await loadEnvFile()), + storage: const PrefsSessionStorage(), + ); + final theme = ThemeController(); + await theme.restore(); + + runApp(PleasePayMeApp(session: session, theme: theme)); + await Future.wait([ + session.restore(), + Future.delayed(const Duration(milliseconds: 850)), + ]); +} diff --git a/mobile/lib/theme/app_theme.dart b/mobile/lib/theme/app_theme.dart new file mode 100644 index 0000000..0e71171 --- /dev/null +++ b/mobile/lib/theme/app_theme.dart @@ -0,0 +1,53 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/services.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// Inter is the closest cross-platform stand-in for SF Pro, so the catalog +/// looks the same on Windows/web as it does on device. +TextStyle _sf(TextStyle style, {Color? color}) { + return GoogleFonts.inter(textStyle: style, color: color); +} + +CupertinoTextThemeData _textTheme() { + return CupertinoTextThemeData( + primaryColor: AppColors.accent, + textStyle: _sf(AppTypography.body, color: AppColors.label), + actionTextStyle: _sf(AppTypography.body, color: AppColors.accent), + tabLabelTextStyle: _sf(AppTypography.caption2, color: AppColors.secondaryLabel), + navTitleTextStyle: _sf(AppTypography.headline, color: AppColors.label), + navLargeTitleTextStyle: _sf(AppTypography.largeTitle, color: AppColors.label), + navActionTextStyle: _sf(AppTypography.body, color: AppColors.accent), + ); +} + +CupertinoThemeData buildLightTheme() => _buildTheme(Brightness.light); + +CupertinoThemeData buildDarkTheme() => _buildTheme(Brightness.dark); + +CupertinoThemeData _buildTheme(Brightness brightness) { + return CupertinoThemeData( + brightness: brightness, + primaryColor: AppColors.accent, + primaryContrastingColor: const Color(0xFFFFFFFF), + scaffoldBackgroundColor: AppColors.groupedBackground, + barBackgroundColor: AppColors.barBackground, + applyThemeToAll: true, + textTheme: _textTheme(), + ); +} + +/// Android system bars. Dark uses transparent black so the 3-button / gesture +/// bar does not get a gray contrast scrim over the tab bar. +SystemUiOverlayStyle systemUiOverlayFor(Brightness brightness) { + final dark = brightness == Brightness.dark; + return SystemUiOverlayStyle( + statusBarColor: const Color(0x00000000), + statusBarBrightness: brightness, + statusBarIconBrightness: dark ? Brightness.light : Brightness.dark, + systemNavigationBarColor: dark ? const Color(0x00000000) : const Color(0x00FFFFFF), + systemNavigationBarDividerColor: const Color(0x00000000), + systemNavigationBarIconBrightness: dark ? Brightness.light : Brightness.dark, + systemNavigationBarContrastEnforced: false, + ); +} diff --git a/mobile/lib/theme/theme.dart b/mobile/lib/theme/theme.dart new file mode 100644 index 0000000..ec7e9fc --- /dev/null +++ b/mobile/lib/theme/theme.dart @@ -0,0 +1,3 @@ +export 'app_theme.dart'; +export 'theme_controller.dart'; +export 'tokens.dart'; diff --git a/mobile/lib/theme/theme_controller.dart b/mobile/lib/theme/theme_controller.dart new file mode 100644 index 0000000..e51270a --- /dev/null +++ b/mobile/lib/theme/theme_controller.dart @@ -0,0 +1,81 @@ +import 'package:flutter/cupertino.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +enum ThemePreference { + system, + light, + dark; + + static ThemePreference parse(String? raw) { + return switch (raw) { + 'light' => ThemePreference.light, + 'dark' => ThemePreference.dark, + _ => ThemePreference.system, + }; + } + + Brightness resolve(Brightness platform) => switch (this) { + ThemePreference.system => platform, + ThemePreference.light => Brightness.light, + ThemePreference.dark => Brightness.dark, + }; +} + +abstract interface class ThemePreferenceStore { + Future read(); + Future write(String value); +} + +class PrefsThemeStore implements ThemePreferenceStore { + const PrefsThemeStore(); + + static const key = 'ppm_theme_preference'; + + @override + Future read() async { + final prefs = await SharedPreferences.getInstance(); + return prefs.getString(key); + } + + @override + Future write(String value) async { + final prefs = await SharedPreferences.getInstance(); + await prefs.setString(key, value); + } +} + +class MemoryThemeStore implements ThemePreferenceStore { + MemoryThemeStore([this.value]); + + String? value; + + @override + Future read() async => value; + + @override + Future write(String next) async => value = next; +} + +/// Survives logout: appearance is a device preference, not a session one. +class ThemeController extends ChangeNotifier { + ThemeController({ThemePreferenceStore? store}) : _store = store ?? const PrefsThemeStore(); + + final ThemePreferenceStore _store; + ThemePreference _preference = ThemePreference.system; + + ThemePreference get preference => _preference; + + Brightness resolve(Brightness platform) => _preference.resolve(platform); + + Future restore() async { + _preference = ThemePreference.parse(await _store.read()); + notifyListeners(); + } + + Future setPreference(ThemePreference value) async { + if (_preference == value) return; + _preference = value; + notifyListeners(); + await _store.write(value.name); + } +} diff --git a/mobile/lib/theme/tokens.dart b/mobile/lib/theme/tokens.dart new file mode 100644 index 0000000..e4b364e --- /dev/null +++ b/mobile/lib/theme/tokens.dart @@ -0,0 +1,138 @@ +/// Design tokens for the iOS-styled kit. +/// +/// Semantic colors follow Apple HIG (label / separator / grouped background) +/// and are declared as [CupertinoDynamicColor] so widgets resolve light & dark +/// automatically. Brand tint stays green to match the web cabinet. +library; + +import 'package:flutter/cupertino.dart'; + +abstract final class AppColors { + /// Brand tint — replaces `systemBlue` across the kit. + static const accent = CupertinoDynamicColor.withBrightness( + color: Color(0xFF12885A), + darkColor: Color(0xFF3CD68C), + ); + + static const accentSoft = CupertinoDynamicColor.withBrightness( + color: Color(0xFFE4F4EC), + darkColor: Color(0xFF14301F), + ); + + // —— iOS system palette —— + static const systemRed = CupertinoDynamicColor.withBrightness( + color: Color(0xFFFF3B30), + darkColor: Color(0xFFFF453A), + ); + static const systemOrange = CupertinoDynamicColor.withBrightness( + color: Color(0xFFFF9500), + darkColor: Color(0xFFFF9F0A), + ); + static const systemGreen = CupertinoDynamicColor.withBrightness( + color: Color(0xFF34C759), + darkColor: Color(0xFF30D158), + ); + static const systemGray = CupertinoDynamicColor.withBrightness( + color: Color(0xFF8E8E93), + darkColor: Color(0xFF8E8E93), + ); + static const systemGray3 = CupertinoDynamicColor.withBrightness( + color: Color(0xFFC7C7CC), + darkColor: Color(0xFF48484A), + ); + static const systemGray5 = CupertinoDynamicColor.withBrightness( + color: Color(0xFFE5E5EA), + darkColor: Color(0xFF2C2C2E), + ); + static const systemGray6 = CupertinoDynamicColor.withBrightness( + color: Color(0xFFF2F2F7), + darkColor: Color(0xFF1C1C1E), + ); + + // —— Text hierarchy —— + static const label = CupertinoDynamicColor.withBrightness( + color: Color(0xFF000000), + darkColor: Color(0xFFFFFFFF), + ); + static const secondaryLabel = CupertinoDynamicColor.withBrightness( + color: Color(0x993C3C43), + darkColor: Color(0x99EBEBF5), + ); + static const tertiaryLabel = CupertinoDynamicColor.withBrightness( + color: Color(0x4D3C3C43), + darkColor: Color(0x4DEBEBF5), + ); + + // —— Separators & surfaces —— + static const separator = CupertinoDynamicColor.withBrightness( + color: Color(0x4A3C3C43), + darkColor: Color(0xA6545458), + ); + static const opaqueSeparator = CupertinoDynamicColor.withBrightness( + color: Color(0xFFC6C6C8), + darkColor: Color(0xFF38383A), + ); + static const groupedBackground = CupertinoDynamicColor.withBrightness( + color: Color(0xFFF2F2F7), + darkColor: Color(0xFF000000), + ); + static const groupedSurface = CupertinoDynamicColor.withBrightness( + color: Color(0xFFFFFFFF), + darkColor: Color(0xFF1C1C1E), + ); + static const barBackground = CupertinoDynamicColor.withBrightness( + color: Color(0xF0F9F9F9), + darkColor: Color(0xF01D1D1D), + ); + + static Color of(BuildContext context, Color color) => + CupertinoDynamicColor.resolve(color, context); +} + +/// 4pt grid; iOS content inset is 16. +abstract final class AppSpacing { + static const double s1 = 4; + static const double s2 = 8; + static const double s3 = 12; + static const double s4 = 16; + static const double s5 = 20; + static const double s6 = 28; + static const double s7 = 40; + static const double s8 = 56; + + /// Standard leading/trailing inset for grouped content. + static const double gutter = 16; +} + +abstract final class AppRadii { + static const double sm = 6; + static const double md = 10; + + /// Inset-grouped cards & large buttons. + static const double lg = 12; + static const double xl = 16; + static const double capsule = 999; +} + +abstract final class AppSizes { + static const double buttonLarge = 50; + static const double buttonMedium = 44; + static const double buttonSmall = 34; + static const double rowMinHeight = 44; + static const double hairline = 0.5; +} + +/// SF Pro text scale (Apple HIG). +abstract final class AppTypography { + static const largeTitle = TextStyle(fontSize: 34, height: 1.2, fontWeight: FontWeight.w700, letterSpacing: 0.37); + static const title1 = TextStyle(fontSize: 28, height: 1.2, fontWeight: FontWeight.w700, letterSpacing: 0.36); + static const title2 = TextStyle(fontSize: 22, height: 1.25, fontWeight: FontWeight.w700, letterSpacing: 0.35); + static const title3 = TextStyle(fontSize: 20, height: 1.25, fontWeight: FontWeight.w600, letterSpacing: 0.38); + static const headline = TextStyle(fontSize: 17, height: 1.3, fontWeight: FontWeight.w600, letterSpacing: -0.41); + static const body = TextStyle(fontSize: 17, height: 1.3, fontWeight: FontWeight.w400, letterSpacing: -0.41); + static const callout = TextStyle(fontSize: 16, height: 1.3, fontWeight: FontWeight.w400, letterSpacing: -0.32); + static const subhead = TextStyle(fontSize: 15, height: 1.3, fontWeight: FontWeight.w400, letterSpacing: -0.24); + static const footnote = TextStyle(fontSize: 13, height: 1.3, fontWeight: FontWeight.w400, letterSpacing: -0.08); + static const caption1 = TextStyle(fontSize: 12, height: 1.3, fontWeight: FontWeight.w400); + static const caption2 = TextStyle(fontSize: 11, height: 1.3, fontWeight: FontWeight.w400, letterSpacing: 0.07); +} diff --git a/mobile/lib/ui/atoms/app_brand_mark.dart b/mobile/lib/ui/atoms/app_brand_mark.dart new file mode 100644 index 0000000..7406750 --- /dev/null +++ b/mobile/lib/ui/atoms/app_brand_mark.dart @@ -0,0 +1,35 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// App glyph: rounded green tile with a ruble, same language as [AppIconBadge]. +class AppBrandMark extends StatelessWidget { + const AppBrandMark({super.key, this.size = 96}); + + final double size; + + @override + Widget build(BuildContext context) { + final radius = size * 0.235; + return Container( + width: size, + height: size, + decoration: BoxDecoration( + color: AppColors.of(context, AppColors.accent), + borderRadius: BorderRadius.circular(radius), + boxShadow: [ + BoxShadow( + color: AppColors.of(context, AppColors.accent).withValues(alpha: 0.28), + blurRadius: size * 0.28, + offset: Offset(0, size * 0.08), + ), + ], + ), + alignment: Alignment.center, + child: Icon( + CupertinoIcons.money_rubl, + size: size * 0.52, + color: const Color(0xFFFFFFFF), + ), + ); + } +} diff --git a/mobile/lib/ui/atoms/app_button.dart b/mobile/lib/ui/atoms/app_button.dart new file mode 100644 index 0000000..85f0111 --- /dev/null +++ b/mobile/lib/ui/atoms/app_button.dart @@ -0,0 +1,105 @@ +import 'package:flutter/cupertino.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// iOS 15+ button styles. +enum AppButtonStyle { filled, tinted, gray, plain, destructive } + +/// Apple control sizes: large 50pt, medium 44pt, small 34pt. +enum AppButtonSize { large, medium, small } + +class AppButton extends StatelessWidget { + const AppButton({ + super.key, + required this.label, + this.onPressed, + this.style = AppButtonStyle.filled, + this.size = AppButtonSize.large, + this.expanded = true, + this.icon, + this.loading = false, + }); + + final String label; + final VoidCallback? onPressed; + final AppButtonStyle style; + final AppButtonSize size; + final bool expanded; + final IconData? icon; + final bool loading; + + double get _height => switch (size) { + AppButtonSize.large => AppSizes.buttonLarge, + AppButtonSize.medium => AppSizes.buttonMedium, + AppButtonSize.small => AppSizes.buttonSmall, + }; + + TextStyle get _textStyle => switch (size) { + AppButtonSize.large => AppTypography.headline, + AppButtonSize.medium => AppTypography.body, + AppButtonSize.small => AppTypography.subhead.copyWith(fontWeight: FontWeight.w600), + }; + + @override + Widget build(BuildContext context) { + final accent = AppColors.of(context, AppColors.accent); + final red = AppColors.of(context, AppColors.systemRed); + + final (Color background, Color foreground) = switch (style) { + AppButtonStyle.filled => (accent, const Color(0xFFFFFFFF)), + AppButtonStyle.tinted => (accent.withValues(alpha: 0.15), accent), + AppButtonStyle.gray => ( + AppColors.of(context, AppColors.systemGray5), + AppColors.of(context, AppColors.label), + ), + AppButtonStyle.plain => (const Color(0x00000000), accent), + AppButtonStyle.destructive => (red.withValues(alpha: 0.15), red), + }; + + final disabled = onPressed == null || loading; + final content = loading + ? CupertinoActivityIndicator( + radius: size == AppButtonSize.small ? 8 : 10, + color: foreground, + ) + : Row( + mainAxisSize: expanded ? MainAxisSize.max : MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + if (icon != null) ...[ + Icon(icon, size: size == AppButtonSize.small ? 16 : 19, color: foreground), + const SizedBox(width: AppSpacing.s2), + ], + Flexible( + child: Text( + label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: GoogleFonts.inter(textStyle: _textStyle, color: foreground), + ), + ), + ], + ); + + return Opacity( + opacity: disabled && !loading ? 0.35 : 1, + child: SizedBox( + height: _height, + width: expanded ? double.infinity : null, + child: CupertinoButton( + onPressed: disabled ? null : onPressed, + color: style == AppButtonStyle.plain ? null : background, + disabledColor: background, + borderRadius: BorderRadius.circular( + size == AppButtonSize.small ? AppRadii.md : AppRadii.lg, + ), + padding: EdgeInsets.symmetric( + horizontal: size == AppButtonSize.small ? AppSpacing.s3 : AppSpacing.s4, + ), + minimumSize: Size.zero, + child: content, + ), + ), + ); + } +} diff --git a/mobile/lib/ui/atoms/app_icon.dart b/mobile/lib/ui/atoms/app_icon.dart new file mode 100644 index 0000000..bf4a628 --- /dev/null +++ b/mobile/lib/ui/atoms/app_icon.dart @@ -0,0 +1,55 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +class AppIcon extends StatelessWidget { + const AppIcon( + this.icon, { + super.key, + this.size = 22, + this.color = AppColors.label, + this.semanticLabel, + }); + + final IconData icon; + final double size; + final Color color; + final String? semanticLabel; + + @override + Widget build(BuildContext context) { + return Icon( + icon, + size: size, + color: AppColors.of(context, color), + semanticLabel: semanticLabel, + ); + } +} + +/// Settings-style rounded square glyph used as a list row leading item. +class AppIconBadge extends StatelessWidget { + const AppIconBadge({ + super.key, + required this.icon, + this.size = 29, + this.color = AppColors.accent, + }); + + final IconData icon; + final double size; + final Color color; + + @override + Widget build(BuildContext context) { + return Container( + width: size, + height: size, + decoration: BoxDecoration( + color: AppColors.of(context, color), + borderRadius: BorderRadius.circular(size * 0.235), + ), + alignment: Alignment.center, + child: Icon(icon, size: size * 0.6, color: const Color(0xFFFFFFFF)), + ); + } +} diff --git a/mobile/lib/ui/atoms/app_text.dart b/mobile/lib/ui/atoms/app_text.dart new file mode 100644 index 0000000..6dede77 --- /dev/null +++ b/mobile/lib/ui/atoms/app_text.dart @@ -0,0 +1,90 @@ +import 'package:flutter/cupertino.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// Semantic text following the iOS type scale. +class AppText extends StatelessWidget { + const AppText( + this.data, { + super.key, + this.style = AppTypography.body, + this.color = AppColors.label, + this.maxLines, + this.overflow, + this.textAlign, + }); + + const AppText.largeTitle(this.data, {super.key, this.color = AppColors.label, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.largeTitle; + + const AppText.title(this.data, {super.key, this.color = AppColors.label, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.title2; + + const AppText.headline(this.data, {super.key, this.color = AppColors.label, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.headline; + + const AppText.body(this.data, {super.key, this.color = AppColors.label, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.body; + + const AppText.callout(this.data, {super.key, this.color = AppColors.secondaryLabel, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.callout; + + const AppText.subhead(this.data, {super.key, this.color = AppColors.secondaryLabel, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.subhead; + + const AppText.footnote(this.data, {super.key, this.color = AppColors.secondaryLabel, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.footnote; + + const AppText.caption(this.data, {super.key, this.color = AppColors.tertiaryLabel, this.maxLines, this.overflow, this.textAlign}) + : style = AppTypography.caption1; + + final String data; + final TextStyle style; + final Color color; + final int? maxLines; + final TextOverflow? overflow; + final TextAlign? textAlign; + + @override + Widget build(BuildContext context) { + return Text( + data, + maxLines: maxLines, + overflow: overflow, + textAlign: textAlign, + style: GoogleFonts.inter( + textStyle: style, + color: AppColors.of(context, color), + ), + ); + } +} + +/// Uppercase grouped-list header, e.g. `НАСТРОЙКИ`. +class AppSectionHeader extends StatelessWidget { + const AppSectionHeader(this.text, {super.key, this.padding}); + + final String text; + final EdgeInsetsGeometry? padding; + + @override + Widget build(BuildContext context) { + return Padding( + padding: padding ?? + const EdgeInsets.fromLTRB( + AppSpacing.gutter, + AppSpacing.s4, + AppSpacing.gutter, + AppSpacing.s2, + ), + child: Text( + text.toUpperCase(), + style: GoogleFonts.inter( + textStyle: AppTypography.footnote, + color: AppColors.of(context, AppColors.secondaryLabel), + letterSpacing: 0.4, + ), + ), + ); + } +} diff --git a/mobile/lib/ui/atoms/app_text_field.dart b/mobile/lib/ui/atoms/app_text_field.dart new file mode 100644 index 0000000..da84f8e --- /dev/null +++ b/mobile/lib/ui/atoms/app_text_field.dart @@ -0,0 +1,96 @@ +import 'package:flutter/cupertino.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; + +/// Rounded iOS text field with optional grouped-style caption and error. +class AppTextField extends StatelessWidget { + const AppTextField({ + super.key, + this.label, + this.placeholder, + this.controller, + this.onChanged, + this.keyboardType, + this.obscureText = false, + this.enabled = true, + this.errorText, + this.prefixIcon, + this.clearable = true, + this.maxLines = 1, + }); + + final String? label; + final String? placeholder; + final TextEditingController? controller; + final ValueChanged? onChanged; + final TextInputType? keyboardType; + final bool obscureText; + final bool enabled; + final String? errorText; + final IconData? prefixIcon; + final bool clearable; + final int maxLines; + + @override + Widget build(BuildContext context) { + final hasError = errorText != null && errorText!.isNotEmpty; + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (label != null) AppSectionHeader(label!, padding: const EdgeInsets.only(bottom: AppSpacing.s2)), + Opacity( + opacity: enabled ? 1 : 0.4, + child: CupertinoTextField( + controller: controller, + onChanged: onChanged, + keyboardType: keyboardType, + obscureText: obscureText, + enabled: enabled, + maxLines: maxLines, + placeholder: placeholder, + clearButtonMode: clearable ? OverlayVisibilityMode.editing : OverlayVisibilityMode.never, + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.s3, + vertical: AppSpacing.s3, + ), + prefix: prefixIcon == null + ? null + : Padding( + padding: const EdgeInsets.only(left: AppSpacing.s3), + child: Icon( + prefixIcon, + size: 20, + color: AppColors.of(context, AppColors.secondaryLabel), + ), + ), + placeholderStyle: GoogleFonts.inter( + textStyle: AppTypography.body, + color: AppColors.of(context, AppColors.tertiaryLabel), + ), + style: GoogleFonts.inter( + textStyle: AppTypography.body, + color: AppColors.of(context, AppColors.label), + ), + decoration: BoxDecoration( + color: AppColors.of(context, AppColors.groupedSurface), + borderRadius: BorderRadius.circular(AppRadii.md), + border: Border.all( + color: hasError + ? AppColors.of(context, AppColors.systemRed) + : AppColors.of(context, AppColors.opaqueSeparator), + width: AppSizes.hairline, + ), + ), + ), + ), + if (hasError) + Padding( + padding: const EdgeInsets.only(top: AppSpacing.s2, left: AppSpacing.s1), + child: AppText.footnote(errorText!, color: AppColors.systemRed), + ), + ], + ); + } +} diff --git a/mobile/lib/ui/feedback/app_progress.dart b/mobile/lib/ui/feedback/app_progress.dart new file mode 100644 index 0000000..118abe2 --- /dev/null +++ b/mobile/lib/ui/feedback/app_progress.dart @@ -0,0 +1,56 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// Native iOS spinner. +class AppSpinner extends StatelessWidget { + const AppSpinner({super.key, this.radius = 12, this.color}); + + final double radius; + final Color? color; + + @override + Widget build(BuildContext context) { + return CupertinoActivityIndicator( + radius: radius, + color: color == null ? null : AppColors.of(context, color!), + ); + } +} + +/// iOS progress bar: 4pt capsule track. +class AppProgressBar extends StatelessWidget { + const AppProgressBar({ + super.key, + required this.value, + this.color = AppColors.accent, + this.height = 4, + }); + + /// 0..1 + final double value; + final Color color; + final double height; + + @override + Widget build(BuildContext context) { + return ClipRRect( + borderRadius: BorderRadius.circular(AppRadii.capsule), + child: SizedBox( + height: height, + child: LayoutBuilder( + builder: (context, constraints) => Stack( + children: [ + Container(color: AppColors.of(context, AppColors.systemGray5)), + AnimatedContainer( + duration: const Duration(milliseconds: 250), + curve: Curves.easeOut, + width: constraints.maxWidth * value.clamp(0.0, 1.0), + color: AppColors.of(context, color), + ), + ], + ), + ), + ), + ); + } +} diff --git a/mobile/lib/ui/feedback/app_skeleton.dart b/mobile/lib/ui/feedback/app_skeleton.dart new file mode 100644 index 0000000..9a96fcb --- /dev/null +++ b/mobile/lib/ui/feedback/app_skeleton.dart @@ -0,0 +1,90 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// Pulsing placeholder block used while content loads. +class AppSkeleton extends StatefulWidget { + const AppSkeleton({ + super.key, + this.width, + this.height = 16, + this.radius = AppRadii.sm, + }); + + const AppSkeleton.circle({super.key, required double size}) + : width = size, + height = size, + radius = AppRadii.capsule; + + final double? width; + final double height; + final double radius; + + @override + State createState() => _AppSkeletonState(); +} + +class _AppSkeletonState extends State with SingleTickerProviderStateMixin { + late final AnimationController _controller = AnimationController( + vsync: this, + duration: const Duration(milliseconds: 1100), + )..repeat(reverse: true); + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return FadeTransition( + opacity: Tween(begin: 0.45, end: 1).animate( + CurvedAnimation(parent: _controller, curve: Curves.easeInOut), + ), + child: Container( + width: widget.width, + height: widget.height, + decoration: BoxDecoration( + color: AppColors.of(context, AppColors.systemGray5), + borderRadius: BorderRadius.circular(widget.radius), + ), + ), + ); + } +} + +/// Skeleton shaped like an [AppListTile] row. +class AppSkeletonRow extends StatelessWidget { + const AppSkeletonRow({super.key, this.hasLeading = true}); + + final bool hasLeading; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.gutter, + vertical: AppSpacing.s3, + ), + child: Row( + children: [ + if (hasLeading) ...[ + const AppSkeleton.circle(size: 29), + const SizedBox(width: AppSpacing.s3), + ], + const Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppSkeleton(width: 140, height: 15), + SizedBox(height: AppSpacing.s2), + AppSkeleton(width: 90, height: 12), + ], + ), + ), + const AppSkeleton(width: 56, height: 15), + ], + ), + ); + } +} diff --git a/mobile/lib/ui/feedback/app_state_views.dart b/mobile/lib/ui/feedback/app_state_views.dart new file mode 100644 index 0000000..495858c --- /dev/null +++ b/mobile/lib/ui/feedback/app_state_views.dart @@ -0,0 +1,87 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_button.dart'; +import 'package:please_pay_me/ui/atoms/app_icon.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; +import 'package:please_pay_me/ui/feedback/app_progress.dart'; + +/// Centered placeholder for empty collections. +class AppEmptyState extends StatelessWidget { + const AppEmptyState({ + super.key, + required this.title, + this.message, + this.icon = CupertinoIcons.tray, + this.actionLabel, + this.onAction, + }); + + final String title; + final String? message; + final IconData icon; + final String? actionLabel; + final VoidCallback? onAction; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.s6, + vertical: AppSpacing.s7, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + AppIcon(icon, size: 44, color: AppColors.tertiaryLabel), + const SizedBox(height: AppSpacing.s3), + AppText.headline(title, textAlign: TextAlign.center), + if (message != null) ...[ + const SizedBox(height: AppSpacing.s1), + AppText.subhead(message!, textAlign: TextAlign.center), + ], + if (actionLabel != null && onAction != null) ...[ + const SizedBox(height: AppSpacing.s4), + AppButton( + label: actionLabel!, + size: AppButtonSize.medium, + style: AppButtonStyle.tinted, + expanded: false, + onPressed: onAction, + ), + ], + ], + ), + ); + } +} + +/// Failure placeholder with a retry affordance. +class AppErrorView extends StatelessWidget { + const AppErrorView({super.key, required this.message, this.onRetry}); + + final String message; + final VoidCallback? onRetry; + + @override + Widget build(BuildContext context) { + return AppEmptyState( + icon: CupertinoIcons.exclamationmark_triangle, + title: 'Не получилось загрузить', + message: message, + actionLabel: onRetry == null ? null : 'Повторить', + onAction: onRetry, + ); + } +} + +class AppLoadingView extends StatelessWidget { + const AppLoadingView({super.key}); + + @override + Widget build(BuildContext context) { + return const Padding( + padding: EdgeInsets.symmetric(vertical: AppSpacing.s7), + child: Center(child: AppSpinner()), + ); + } +} diff --git a/mobile/lib/ui/feedback/app_toast.dart b/mobile/lib/ui/feedback/app_toast.dart new file mode 100644 index 0000000..bed6185 --- /dev/null +++ b/mobile/lib/ui/feedback/app_toast.dart @@ -0,0 +1,77 @@ +import 'dart:ui'; + +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; + +/// iOS has no SnackBar — the platform idiom is a floating blurred capsule +/// (AirPods / Silent-mode style). Kept dismiss-free and auto-hiding. +class AppToast extends StatelessWidget { + const AppToast({ + super.key, + required this.message, + this.icon = CupertinoIcons.check_mark_circled_solid, + this.tint = AppColors.accent, + }); + + final String message; + final IconData? icon; + final Color tint; + + @override + Widget build(BuildContext context) { + return ClipRRect( + borderRadius: BorderRadius.circular(AppRadii.capsule), + child: BackdropFilter( + filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.s4, + vertical: AppSpacing.s3, + ), + decoration: BoxDecoration( + color: AppColors.of(context, AppColors.groupedSurface).withValues(alpha: 0.82), + borderRadius: BorderRadius.circular(AppRadii.capsule), + boxShadow: const [ + BoxShadow(color: Color(0x1F000000), blurRadius: 24, offset: Offset(0, 8)), + ], + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + if (icon != null) ...[ + Icon(icon, size: 20, color: AppColors.of(context, tint)), + const SizedBox(width: AppSpacing.s2), + ], + Flexible(child: AppText.subhead(message, color: AppColors.label)), + ], + ), + ), + ), + ); + } +} + +Future showAppToast( + BuildContext context, { + required String message, + IconData? icon = CupertinoIcons.check_mark_circled_solid, + Duration duration = const Duration(seconds: 2), +}) async { + final overlay = Overlay.of(context, rootOverlay: true); + final entry = OverlayEntry( + builder: (ctx) => Positioned( + left: AppSpacing.s5, + right: AppSpacing.s5, + bottom: MediaQuery.of(ctx).padding.bottom + AppSpacing.s7, + child: SafeArea( + top: false, + child: Center(child: AppToast(message: message, icon: icon)), + ), + ), + ); + + overlay.insert(entry); + await Future.delayed(duration); + entry.remove(); +} diff --git a/mobile/lib/ui/molecules/app_avatar.dart b/mobile/lib/ui/molecules/app_avatar.dart new file mode 100644 index 0000000..f813e1d --- /dev/null +++ b/mobile/lib/ui/molecules/app_avatar.dart @@ -0,0 +1,49 @@ +import 'package:flutter/cupertino.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// Circular avatar — image, initials, or the iOS person placeholder. +class AppAvatar extends StatelessWidget { + const AppAvatar({ + super.key, + this.imageUrl, + this.initials, + this.radius = 22, + this.backgroundColor = AppColors.systemGray5, + }); + + final String? imageUrl; + final String? initials; + final double radius; + final Color backgroundColor; + + @override + Widget build(BuildContext context) { + final size = radius * 2; + final hasImage = imageUrl != null && imageUrl!.isNotEmpty; + + return ClipOval( + child: Container( + width: size, + height: size, + color: AppColors.of(context, backgroundColor), + alignment: Alignment.center, + child: hasImage + ? Image.network(imageUrl!, width: size, height: size, fit: BoxFit.cover) + : initials != null && initials!.isNotEmpty + ? Text( + initials!.toUpperCase(), + style: GoogleFonts.inter( + textStyle: AppTypography.headline.copyWith(fontSize: radius * 0.8), + color: AppColors.of(context, AppColors.secondaryLabel), + ), + ) + : Icon( + CupertinoIcons.person_fill, + size: radius, + color: AppColors.of(context, AppColors.systemGray), + ), + ), + ); + } +} diff --git a/mobile/lib/ui/molecules/app_card.dart b/mobile/lib/ui/molecules/app_card.dart new file mode 100644 index 0000000..8f83c09 --- /dev/null +++ b/mobile/lib/ui/molecules/app_card.dart @@ -0,0 +1,56 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; + +/// Inset-grouped card for free-form content (metrics, summaries). +class AppCard extends StatelessWidget { + const AppCard({ + super.key, + required this.child, + this.title, + this.subtitle, + this.padding = const EdgeInsets.all(AppSpacing.s4), + this.margin = const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + this.onTap, + }); + + final Widget child; + final String? title; + final String? subtitle; + final EdgeInsetsGeometry padding; + final EdgeInsetsGeometry margin; + final VoidCallback? onTap; + + @override + Widget build(BuildContext context) { + final card = Container( + margin: margin, + padding: padding, + decoration: BoxDecoration( + color: AppColors.of(context, AppColors.groupedSurface), + borderRadius: BorderRadius.circular(AppRadii.lg), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (title != null) AppText.headline(title!), + if (subtitle != null) ...[ + const SizedBox(height: 2), + AppText.footnote(subtitle!), + ], + if (title != null || subtitle != null) const SizedBox(height: AppSpacing.s3), + child, + ], + ), + ); + + if (onTap == null) return card; + + return CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: onTap, + child: card, + ); + } +} diff --git a/mobile/lib/ui/molecules/app_chip.dart b/mobile/lib/ui/molecules/app_chip.dart new file mode 100644 index 0000000..fe06e08 --- /dev/null +++ b/mobile/lib/ui/molecules/app_chip.dart @@ -0,0 +1,59 @@ +import 'package:flutter/cupertino.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// Capsule tag / filter pill (iOS has no Material chip — this is the HIG-ish +/// equivalent used in Photos & Mail filters). +class AppChip extends StatelessWidget { + const AppChip({ + super.key, + required this.label, + this.selected = false, + this.icon, + this.onPressed, + }); + + final String label; + final bool selected; + final IconData? icon; + final VoidCallback? onPressed; + + @override + Widget build(BuildContext context) { + final accent = AppColors.of(context, AppColors.accent); + final background = selected ? accent : AppColors.of(context, AppColors.systemGray5); + final foreground = selected ? const Color(0xFFFFFFFF) : AppColors.of(context, AppColors.label); + + return CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: onPressed, + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.s3, + vertical: AppSpacing.s2 - 1, + ), + decoration: BoxDecoration( + color: background, + borderRadius: BorderRadius.circular(AppRadii.capsule), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + if (icon != null) ...[ + Icon(icon, size: 15, color: foreground), + const SizedBox(width: AppSpacing.s1 + 2), + ], + Text( + label, + style: GoogleFonts.inter( + textStyle: AppTypography.subhead.copyWith(fontWeight: FontWeight.w500), + color: foreground, + ), + ), + ], + ), + ), + ); + } +} diff --git a/mobile/lib/ui/molecules/app_list_section.dart b/mobile/lib/ui/molecules/app_list_section.dart new file mode 100644 index 0000000..6366f65 --- /dev/null +++ b/mobile/lib/ui/molecules/app_list_section.dart @@ -0,0 +1,66 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; + +/// Inset-grouped section: rounded surface + hairline separators between rows. +class AppListSection extends StatelessWidget { + const AppListSection({ + super.key, + required this.children, + this.header, + this.footer, + this.separatorIndent = 16, + this.margin = const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + }); + + final List children; + final String? header; + final String? footer; + final double separatorIndent; + final EdgeInsetsGeometry margin; + + @override + Widget build(BuildContext context) { + final rows = []; + for (var i = 0; i < children.length; i++) { + rows.add(children[i]); + if (i < children.length - 1) { + rows.add( + Padding( + padding: EdgeInsets.only(left: separatorIndent), + child: Container( + height: AppSizes.hairline, + color: AppColors.of(context, AppColors.opaqueSeparator), + ), + ), + ); + } + } + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + if (header != null) AppSectionHeader(header!), + Container( + margin: margin, + decoration: BoxDecoration( + color: AppColors.of(context, AppColors.groupedSurface), + borderRadius: BorderRadius.circular(AppRadii.lg), + ), + clipBehavior: Clip.antiAlias, + child: Column(children: rows), + ), + if (footer != null) + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.gutter + 4, + AppSpacing.s2, + AppSpacing.gutter + 4, + 0, + ), + child: AppText.footnote(footer!), + ), + ], + ); + } +} diff --git a/mobile/lib/ui/molecules/app_list_tile.dart b/mobile/lib/ui/molecules/app_list_tile.dart new file mode 100644 index 0000000..1e9e278 --- /dev/null +++ b/mobile/lib/ui/molecules/app_list_tile.dart @@ -0,0 +1,110 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; + +/// Single row of an inset-grouped list (Settings-style). +class AppListTile extends StatefulWidget { + const AppListTile({ + super.key, + required this.title, + this.subtitle, + this.leading, + this.value, + this.trailing, + this.onTap, + this.showChevron = true, + this.destructive = false, + }); + + final String title; + final String? subtitle; + final Widget? leading; + + /// Secondary gray text aligned to the right (iOS `additionalInfo`). + final String? value; + + /// Custom trailing widget — replaces [value] and the chevron. + final Widget? trailing; + + final VoidCallback? onTap; + final bool showChevron; + final bool destructive; + + @override + State createState() => _AppListTileState(); +} + +class _AppListTileState extends State { + bool _pressed = false; + + @override + Widget build(BuildContext context) { + final tappable = widget.onTap != null; + + final row = Container( + color: _pressed + ? AppColors.of(context, AppColors.systemGray5) + : AppColors.of(context, AppColors.groupedSurface), + constraints: const BoxConstraints(minHeight: AppSizes.rowMinHeight), + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.gutter, + vertical: AppSpacing.s2 + 2, + ), + child: Row( + children: [ + if (widget.leading != null) ...[ + widget.leading!, + const SizedBox(width: AppSpacing.s3), + ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + AppText.body( + widget.title, + color: widget.destructive ? AppColors.systemRed : AppColors.label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + if (widget.subtitle != null) ...[ + const SizedBox(height: 2), + AppText.footnote(widget.subtitle!, maxLines: 2, overflow: TextOverflow.ellipsis), + ], + ], + ), + ), + if (widget.trailing != null) + widget.trailing! + else ...[ + if (widget.value != null) + Padding( + padding: const EdgeInsets.only(left: AppSpacing.s2), + child: AppText.body(widget.value!, color: AppColors.secondaryLabel), + ), + if (tappable && widget.showChevron) + Padding( + padding: const EdgeInsets.only(left: AppSpacing.s1), + child: Icon( + CupertinoIcons.chevron_forward, + size: 16, + color: AppColors.of(context, AppColors.tertiaryLabel), + ), + ), + ], + ], + ), + ); + + if (!tappable) return row; + + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: widget.onTap, + onTapDown: (_) => setState(() => _pressed = true), + onTapUp: (_) => setState(() => _pressed = false), + onTapCancel: () => setState(() => _pressed = false), + child: row, + ); + } +} diff --git a/mobile/lib/ui/molecules/app_switch_row.dart b/mobile/lib/ui/molecules/app_switch_row.dart new file mode 100644 index 0000000..349db43 --- /dev/null +++ b/mobile/lib/ui/molecules/app_switch_row.dart @@ -0,0 +1,36 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/molecules/app_list_tile.dart'; + +/// Settings row with a native iOS switch on the trailing edge. +class AppSwitchRow extends StatelessWidget { + const AppSwitchRow({ + super.key, + required this.title, + required this.value, + required this.onChanged, + this.subtitle, + this.leading, + }); + + final String title; + final String? subtitle; + final Widget? leading; + final bool value; + final ValueChanged? onChanged; + + @override + Widget build(BuildContext context) { + return AppListTile( + title: title, + subtitle: subtitle, + leading: leading, + showChevron: false, + trailing: CupertinoSwitch( + value: value, + onChanged: onChanged, + activeTrackColor: AppColors.of(context, AppColors.accent), + ), + ); + } +} diff --git a/mobile/lib/ui/navigation/app_dialog.dart b/mobile/lib/ui/navigation/app_dialog.dart new file mode 100644 index 0000000..b7b745f --- /dev/null +++ b/mobile/lib/ui/navigation/app_dialog.dart @@ -0,0 +1,107 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; + +/// Native iOS alert. +class AppAlert extends StatelessWidget { + const AppAlert({ + super.key, + required this.title, + this.message, + this.confirmLabel = 'OK', + this.cancelLabel, + this.destructive = false, + }); + + final String title; + final String? message; + final String confirmLabel; + final String? cancelLabel; + final bool destructive; + + @override + Widget build(BuildContext context) { + return CupertinoAlertDialog( + title: AppText.headline(title), + content: message == null + ? null + : Padding( + padding: const EdgeInsets.only(top: 6), + child: AppText.subhead(message!, textAlign: TextAlign.center), + ), + actions: [ + if (cancelLabel != null) + CupertinoDialogAction( + onPressed: () => Navigator.of(context).pop(false), + child: Text(cancelLabel!), + ), + CupertinoDialogAction( + isDefaultAction: !destructive, + isDestructiveAction: destructive, + onPressed: () => Navigator.of(context).pop(true), + child: Text(confirmLabel), + ), + ], + ); + } +} + +Future showAppAlert({ + required BuildContext context, + required String title, + String? message, + String confirmLabel = 'OK', + String? cancelLabel, + bool destructive = false, +}) { + return showCupertinoDialog( + context: context, + builder: (_) => AppAlert( + title: title, + message: message, + confirmLabel: confirmLabel, + cancelLabel: cancelLabel, + destructive: destructive, + ), + ); +} + +class AppActionSheetAction { + const AppActionSheetAction({ + required this.label, + this.destructive = false, + this.isDefault = false, + }); + + final String label; + final bool destructive; + final bool isDefault; +} + +Future showAppActionSheet({ + required BuildContext context, + String? title, + String? message, + required List actions, + String cancelLabel = 'Отмена', +}) { + return showCupertinoModalPopup( + context: context, + builder: (ctx) => CupertinoActionSheet( + title: title == null ? null : Text(title), + message: message == null ? null : Text(message), + actions: [ + for (var i = 0; i < actions.length; i++) + CupertinoActionSheetAction( + isDestructiveAction: actions[i].destructive, + isDefaultAction: actions[i].isDefault, + onPressed: () => Navigator.of(ctx).pop(i), + child: Text(actions[i].label), + ), + ], + cancelButton: CupertinoActionSheetAction( + onPressed: () => Navigator.of(ctx).pop(), + child: Text(cancelLabel), + ), + ), + ); +} diff --git a/mobile/lib/ui/navigation/app_nav_bar.dart b/mobile/lib/ui/navigation/app_nav_bar.dart new file mode 100644 index 0000000..e8d5945 --- /dev/null +++ b/mobile/lib/ui/navigation/app_nav_bar.dart @@ -0,0 +1,86 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_text.dart'; + +/// Standard iOS navigation bar (44pt) with optional subtitle line. +class AppNavBar extends StatelessWidget implements ObstructingPreferredSizeWidget { + const AppNavBar({ + super.key, + required this.title, + this.subtitle, + this.leading, + this.trailing, + this.previousPageTitle, + this.transparent = false, + }); + + final String title; + final String? subtitle; + final Widget? leading; + final Widget? trailing; + final String? previousPageTitle; + final bool transparent; + + @override + Size get preferredSize => const Size.fromHeight(44); + + @override + bool shouldFullyObstruct(BuildContext context) => !transparent; + + @override + Widget build(BuildContext context) { + return CupertinoNavigationBar( + leading: leading, + trailing: trailing, + previousPageTitle: previousPageTitle, + backgroundColor: transparent + ? const Color(0x00000000) + : AppColors.of(context, AppColors.barBackground), + border: transparent + ? null + : Border( + bottom: BorderSide( + color: AppColors.of(context, AppColors.separator), + width: AppSizes.hairline, + ), + ), + middle: subtitle == null + ? AppText.headline(title) + : Column( + mainAxisSize: MainAxisSize.min, + children: [ + AppText.headline(title, maxLines: 1, overflow: TextOverflow.ellipsis), + AppText.caption( + subtitle!, + color: AppColors.secondaryLabel, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ], + ), + ); + } +} + +/// Large-title bar for the root of a scrollable screen. +class AppLargeNavBar extends StatelessWidget { + const AppLargeNavBar({super.key, required this.title, this.trailing}); + + final String title; + final Widget? trailing; + + @override + Widget build(BuildContext context) { + return CupertinoSliverNavigationBar( + largeTitle: AppText.largeTitle(title), + trailing: trailing, + backgroundColor: AppColors.of(context, AppColors.barBackground), + border: Border( + bottom: BorderSide( + color: AppColors.of(context, AppColors.separator), + width: AppSizes.hairline, + ), + ), + ); + } +} diff --git a/mobile/lib/ui/navigation/app_pickers.dart b/mobile/lib/ui/navigation/app_pickers.dart new file mode 100644 index 0000000..71dc051 --- /dev/null +++ b/mobile/lib/ui/navigation/app_pickers.dart @@ -0,0 +1,70 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; +import 'package:please_pay_me/ui/atoms/app_button.dart'; + +/// Bottom sheet with a native wheel date picker. +Future showAppDatePicker({ + required BuildContext context, + required DateTime initialDate, + DateTime? minimumDate, + DateTime? maximumDate, + String confirmLabel = 'Готово', +}) { + var selected = initialDate; + + return showCupertinoModalPopup( + context: context, + builder: (ctx) => Container( + height: 320, + padding: const EdgeInsets.only(top: AppSpacing.s2), + color: AppColors.of(ctx, AppColors.groupedSurface), + child: SafeArea( + top: false, + child: Column( + children: [ + Expanded( + child: CupertinoDatePicker( + mode: CupertinoDatePickerMode.date, + initialDateTime: initialDate, + minimumDate: minimumDate, + maximumDate: maximumDate, + onDateTimeChanged: (value) => selected = value, + ), + ), + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.gutter, + AppSpacing.s2, + AppSpacing.gutter, + AppSpacing.s3, + ), + child: AppButton( + label: confirmLabel, + onPressed: () => Navigator.of(ctx).pop( + DateTime(selected.year, selected.month, selected.day), + ), + ), + ), + ], + ), + ), + ), + ); +} + +/// Full-height modal used for create/edit forms. +Future showAppFormSheet({ + required BuildContext context, + required WidgetBuilder builder, +}) { + return showCupertinoModalPopup( + context: context, + builder: (ctx) => Padding( + padding: EdgeInsets.only(top: MediaQuery.of(ctx).padding.top + AppSpacing.s6), + child: ClipRRect( + borderRadius: const BorderRadius.vertical(top: Radius.circular(AppRadii.xl)), + child: Builder(builder: builder), + ), + ), + ); +} diff --git a/mobile/lib/ui/navigation/app_segmented_control.dart b/mobile/lib/ui/navigation/app_segmented_control.dart new file mode 100644 index 0000000..9f2f4d2 --- /dev/null +++ b/mobile/lib/ui/navigation/app_segmented_control.dart @@ -0,0 +1,54 @@ +import 'package:flutter/cupertino.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +/// iOS sliding segmented control — the native alternative to tabs. +class AppSegmentedControl extends StatelessWidget { + const AppSegmentedControl({ + super.key, + required this.labels, + required this.index, + required this.onChanged, + this.padding = const EdgeInsets.symmetric(horizontal: AppSpacing.gutter), + }); + + final List labels; + final int index; + final ValueChanged onChanged; + final EdgeInsetsGeometry padding; + + @override + Widget build(BuildContext context) { + return Padding( + padding: padding, + child: SizedBox( + width: double.infinity, + child: CupertinoSlidingSegmentedControl( + groupValue: index.clamp(0, labels.length - 1), + backgroundColor: AppColors.of(context, AppColors.systemGray5), + thumbColor: AppColors.of(context, AppColors.groupedSurface), + onValueChanged: (value) { + if (value != null) onChanged(value); + }, + children: { + for (var i = 0; i < labels.length; i++) + i: Padding( + padding: const EdgeInsets.symmetric(vertical: 6), + child: Text( + labels[i], + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: GoogleFonts.inter( + textStyle: AppTypography.subhead.copyWith( + fontWeight: i == index ? FontWeight.w600 : FontWeight.w400, + ), + color: AppColors.of(context, AppColors.label), + ), + ), + ), + }, + ), + ), + ); + } +} diff --git a/mobile/lib/ui/navigation/app_tab_bar.dart b/mobile/lib/ui/navigation/app_tab_bar.dart new file mode 100644 index 0000000..ccaa0ef --- /dev/null +++ b/mobile/lib/ui/navigation/app_tab_bar.dart @@ -0,0 +1,38 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/tokens.dart'; + +class AppTabItem { + const AppTabItem({required this.icon, required this.label, this.activeIcon}); + + final IconData icon; + final IconData? activeIcon; + final String label; +} + +/// Bottom tab bar (iOS): 49pt, hairline top border, tint = brand accent. +/// +/// Extends [CupertinoTabBar] so it can be passed to [CupertinoTabScaffold]; +/// dynamic colors are resolved by the base class against the active theme. +class AppTabBar extends CupertinoTabBar { + AppTabBar({ + super.key, + required List items, + required super.currentIndex, + required ValueChanged super.onTap, + }) : super( + items: [ + for (final item in items) + BottomNavigationBarItem( + icon: Icon(item.icon), + activeIcon: item.activeIcon == null ? null : Icon(item.activeIcon), + label: item.label, + ), + ], + activeColor: AppColors.accent, + inactiveColor: AppColors.systemGray, + backgroundColor: AppColors.barBackground, + border: const Border( + top: BorderSide(color: AppColors.separator, width: AppSizes.hairline), + ), + ); +} diff --git a/mobile/lib/ui/ui.dart b/mobile/lib/ui/ui.dart new file mode 100644 index 0000000..8510515 --- /dev/null +++ b/mobile/lib/ui/ui.dart @@ -0,0 +1,20 @@ +export 'atoms/app_brand_mark.dart'; +export 'atoms/app_button.dart'; +export 'atoms/app_icon.dart'; +export 'atoms/app_text.dart'; +export 'atoms/app_text_field.dart'; +export 'feedback/app_progress.dart'; +export 'feedback/app_skeleton.dart'; +export 'feedback/app_state_views.dart'; +export 'feedback/app_toast.dart'; +export 'molecules/app_avatar.dart'; +export 'molecules/app_card.dart'; +export 'molecules/app_chip.dart'; +export 'molecules/app_list_section.dart'; +export 'molecules/app_list_tile.dart'; +export 'molecules/app_switch_row.dart'; +export 'navigation/app_dialog.dart'; +export 'navigation/app_nav_bar.dart'; +export 'navigation/app_pickers.dart'; +export 'navigation/app_segmented_control.dart'; +export 'navigation/app_tab_bar.dart'; diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock new file mode 100644 index 0000000..9211e37 --- /dev/null +++ b/mobile/pubspec.lock @@ -0,0 +1,687 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + archive: + dependency: transitive + description: + name: archive + sha256: "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4" + url: "https://pub.dev" + source: hosted + version: "4.3.0" + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37 + url: "https://pub.dev" + source: hosted + version: "2.13.1" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + url: "https://pub.dev" + source: hosted + version: "1.4.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" + url: "https://pub.dev" + source: hosted + version: "2.0.4" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + url: "https://pub.dev" + source: hosted + version: "0.4.2" + clock: + dependency: transitive + description: + name: clock + sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e + url: "https://pub.dev" + source: hosted + version: "1.1.3" + code_assets: + dependency: transitive + description: + name: code_assets + sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + crypto: + dependency: transitive + description: + name: crypto + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf + url: "https://pub.dev" + source: hosted + version: "3.0.7" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd" + url: "https://pub.dev" + source: hosted + version: "1.0.9" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + ffi: + dependency: transitive + description: + name: ffi + sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7" + url: "https://pub.dev" + source: hosted + version: "0.14.4" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + sha256: ba03d03bcaa2f6cb7bd920e3b5027181db75ab524f8891c8bc3aa603885b8055 + url: "https://pub.dev" + source: hosted + version: "6.3.3" + hooks: + dependency: transitive + description: + name: hooks + sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + http: + dependency: "direct main" + description: + name: http + sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" + url: "https://pub.dev" + source: hosted + version: "1.6.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + image: + dependency: transitive + description: + name: image + sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89 + url: "https://pub.dev" + source: hosted + version: "4.10.1" + intl: + dependency: "direct main" + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" + jni: + dependency: transitive + description: + name: jni + sha256: f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3 + url: "https://pub.dev" + source: hosted + version: "1.0.3" + jni_flutter: + dependency: transitive + description: + name: jni_flutter + sha256: b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351 + url: "https://pub.dev" + source: hosted + version: "1.0.3" + jni_util: + dependency: transitive + description: + name: jni_util + sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80" + url: "https://pub.dev" + source: hosted + version: "4.12.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" + source: hosted + version: "11.0.2" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" + source: hosted + version: "3.0.10" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + lints: + dependency: transitive + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd" + url: "https://pub.dev" + source: hosted + version: "0.12.20" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + url: "https://pub.dev" + source: hosted + version: "0.13.0" + meta: + dependency: transitive + description: + name: meta + sha256: c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d + url: "https://pub.dev" + source: hosted + version: "1.18.3" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + objective_c: + dependency: transitive + description: + name: objective_c + sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e + url: "https://pub.dev" + source: hosted + version: "9.5.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d + url: "https://pub.dev" + source: hosted + version: "3.0.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825 + url: "https://pub.dev" + source: hosted + version: "2.1.6" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" + url: "https://pub.dev" + source: hosted + version: "2.6.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + platform: + dependency: transitive + description: + name: platform + sha256: a36d119c13416516a7b5913fbe8af8531e11633d784c550b2125f76c758524ec + url: "https://pub.dev" + source: hosted + version: "3.2.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + posix: + dependency: transitive + description: + name: posix + sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e + url: "https://pub.dev" + source: hosted + version: "6.5.2" + provider: + dependency: "direct main" + description: + name: provider + sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" + url: "https://pub.dev" + source: hosted + version: "6.1.5+1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + record_use: + dependency: transitive + description: + name: record_use + sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf + url: "https://pub.dev" + source: hosted + version: "2.5.5" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "1e12aafe408aa50da80edfd679a2a6bf63ba7ab37c7fa98286da459a757b3399" + url: "https://pub.dev" + source: hosted + version: "2.4.28" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea" + url: "https://pub.dev" + source: hosted + version: "2.5.7" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" + url: "https://pub.dev" + source: hosted + version: "1.10.2" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490" + url: "https://pub.dev" + source: hosted + version: "1.12.2" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + url: "https://pub.dev" + source: hosted + version: "0.7.12" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8 + url: "https://pub.dev" + source: hosted + version: "6.3.2" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610" + url: "https://pub.dev" + source: hosted + version: "6.3.33" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a" + url: "https://pub.dev" + source: hosted + version: "6.4.2" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: "10f86fef4c2c43563fa6c211ff9cf757adf4d3ab762c56bd430664a947d70cd0" + url: "https://pub.dev" + source: hosted + version: "3.2.3" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201" + url: "https://pub.dev" + source: hosted + version: "3.2.6" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34" + url: "https://pub.dev" + source: hosted + version: "2.4.3" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "6c5ad3f22cd4c38e089b81963b3cd7bb83b111b2df5dce008bb066162f42e429" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "1d774bbdf6b72a0b12122fc1560c9c2d2a67db5a4a4cc2bd8a5c990ab20e3188" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "5f37239c4851efcef929cea7824e76df7f2f0970aef85d66bbc430afa40e72f0" + url: "https://pub.dev" + source: hosted + version: "15.3.0" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + webview_flutter: + dependency: "direct main" + description: + name: webview_flutter + sha256: d53e1ccf5516f25017e3c9d44c39034db352d20fa34fe200674270242c2c5111 + url: "https://pub.dev" + source: hosted + version: "4.14.1" + webview_flutter_android: + dependency: "direct main" + description: + name: webview_flutter_android + sha256: "4de8b3d1ff4ebe1bdb42e68a5e4f809194a3cb0117a8f495f590004f00da3964" + url: "https://pub.dev" + source: hosted + version: "4.14.1" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + sha256: "1221c1b12f5278791042f2ec2841743784cf25c5a644e23d6680e5d718824f04" + url: "https://pub.dev" + source: hosted + version: "2.15.1" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + sha256: fe359c7fac1002124b5b9e2ba3a41906bbb9b2d029ccb4a0067404d8f3704730 + url: "https://pub.dev" + source: hosted + version: "3.26.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea + url: "https://pub.dev" + source: hosted + version: "3.1.4" +sdks: + dart: ">=3.12.0 <4.0.0" + flutter: ">=3.44.0" diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml new file mode 100644 index 0000000..3d9674d --- /dev/null +++ b/mobile/pubspec.yaml @@ -0,0 +1,44 @@ +name: please_pay_me +description: Дожить до ЗП — бюджет от зарплаты до зарплаты +publish_to: "none" +version: 0.1.0+1 + +environment: + sdk: ">=3.5.0 <4.0.0" + +dependencies: + flutter: + sdk: flutter + flutter_localizations: + sdk: flutter + intl: any + cupertino_icons: ^1.0.8 + google_fonts: ^6.2.1 + http: ^1.2.2 + provider: ^6.1.2 + shared_preferences: ^2.3.2 + url_launcher: ^6.3.0 + webview_flutter: ^4.10.0 + webview_flutter_android: ^4.10.0 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + flutter_launcher_icons: ^0.14.4 + +flutter: + uses-material-design: true + assets: + - assets/branding/app_icon.png + +flutter_launcher_icons: + android: true + ios: true + windows: + generate: true + icon_size: 256 + image_path: assets/branding/app_icon.png + adaptive_icon_background: "#12885A" + adaptive_icon_foreground: assets/branding/app_icon.png + min_sdk_android: 21 diff --git a/mobile/run.ps1 b/mobile/run.ps1 new file mode 100644 index 0000000..e942b9a --- /dev/null +++ b/mobile/run.ps1 @@ -0,0 +1,102 @@ +#Requires -Version 5.1 +<# +.SYNOPSIS + Run the Please Pay Me Flutter app. + + Config comes from mobile/.env (PPM_API_BASE_URL, PPM_WEB_URL, PPM_DEMO). + Optional -ApiBaseUrl / -WebUrl override the file for one run. + +.EXAMPLE + .\run.ps1 + .\run.ps1 -Device chrome + .\run.ps1 -Target widgetbook +#> +param( + [ValidateSet("chrome", "windows", "edge")] + [string]$Device = "windows", + + [ValidateSet("app", "widgetbook")] + [string]$Target = "app", + + [string]$ApiBaseUrl = "", + [string]$WebUrl = "", + [switch]$SkipPubGet +) + +$ErrorActionPreference = "Stop" +$MobileRoot = Split-Path -Parent $MyInvocation.MyCommand.Path + +if ($Target -eq "widgetbook") { + & (Join-Path $MobileRoot "widgetbook\run.ps1") -Device $Device -SkipPubGet:$SkipPubGet + exit $LASTEXITCODE +} + +Set-Location $MobileRoot + +function Find-Flutter { + $cmd = Get-Command flutter -ErrorAction SilentlyContinue + if ($cmd) { return $cmd.Source } + + $candidates = @( + "$env:USERPROFILE\flutter\bin\flutter.bat", + "$env:LOCALAPPDATA\flutter\bin\flutter.bat", + "C:\flutter\bin\flutter.bat", + "C:\src\flutter\bin\flutter.bat" + ) + foreach ($path in $candidates) { + if (Test-Path $path) { return $path } + } + return $null +} + +$flutter = Find-Flutter +if (-not $flutter) { + Write-Error "Flutter SDK not found. Add it to PATH, e.g. %USERPROFILE%\flutter\bin" +} + +$envFile = Join-Path $MobileRoot ".env" +$exampleFile = Join-Path $MobileRoot ".env.example" +if (-not (Test-Path $envFile)) { + if (Test-Path $exampleFile) { + Copy-Item $exampleFile $envFile + Write-Host "Created .env from .env.example" -ForegroundColor DarkYellow + } +} + +$defines = @() +if (Test-Path $envFile) { + $defines += "--dart-define-from-file=$envFile" +} + +if ($ApiBaseUrl) { + $defines += "--dart-define=PPM_API_BASE_URL=$ApiBaseUrl" + if (-not $WebUrl) { $WebUrl = $ApiBaseUrl } +} +if ($WebUrl) { + $defines += "--dart-define=PPM_WEB_URL=$WebUrl" +} + +if ($defines.Count -eq 0) { + $defines += "--dart-define=PPM_DEMO=true" +} + +$mode = "demo (in-memory)" +if (Test-Path $envFile) { $mode = $envFile } +if ($ApiBaseUrl) { $mode = $ApiBaseUrl } + +Write-Host "Flutter: $flutter" -ForegroundColor DarkGray +Write-Host "Target: app" -ForegroundColor DarkGray +Write-Host "Device: $Device" -ForegroundColor DarkGray +Write-Host "Config: $mode" -ForegroundColor DarkGray +Write-Host "" + +if (-not $SkipPubGet) { + Write-Host "flutter pub get" -ForegroundColor Cyan + & $flutter pub get + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } +} + +$defineArgs = $defines -join " " +Write-Host "flutter run -d $Device $defineArgs" -ForegroundColor Cyan +& $flutter run -d $Device @defines +exit $LASTEXITCODE diff --git a/mobile/test/auth_test.dart b/mobile/test/auth_test.dart new file mode 100644 index 0000000..aa9dd0e --- /dev/null +++ b/mobile/test/auth_test.dart @@ -0,0 +1,268 @@ +import 'dart:convert'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:http/http.dart' as http; +import 'package:http/testing.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/storage/session_storage.dart'; +import 'package:please_pay_me/features/auth/login_screen.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/features/auth/telegram_login.dart'; +import 'package:please_pay_me/features/auth/yandex_login.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:provider/provider.dart'; + +import 'support/test_setup.dart'; + +void main() { + setUpAll(setUpTestEnvironment); + + group('resolveApiBaseUrl', () { + test('an explicitly configured API address wins', () { + expect( + resolveApiBaseUrl( + cabinetUrl: 'https://cabinet.example.com', + configuredApiBaseUrl: 'https://api.example.com/', + ), + 'https://api.example.com', + ); + }); + + test('falls back to the cabinet origin, dropping the path', () { + expect( + resolveApiBaseUrl(cabinetUrl: 'https://ppm.example.com/cabinet/budgets'), + 'https://ppm.example.com', + ); + }); + + test('keeps a non-default port', () { + expect( + resolveApiBaseUrl(cabinetUrl: 'http://192.168.0.10:8080/'), + 'http://192.168.0.10:8080', + ); + }); + + test('assumes https when the scheme is omitted', () { + expect(resolveApiBaseUrl(cabinetUrl: 'ppm.example.com/'), 'https://ppm.example.com'); + }); + }); + + group('resolveCabinetLoginUri', () { + test('opens /login on the cabinet origin', () { + expect( + resolveCabinetLoginUri('https://ppm.example.com'), + Uri.parse('https://ppm.example.com/login'), + ); + }); + + test('keeps an explicit path', () { + expect( + resolveCabinetLoginUri('https://ppm.example.com/cabinet'), + Uri.parse('https://ppm.example.com/cabinet'), + ); + }); + }); + + group('navigation helpers', () { + test('detects Telegram deep links', () { + expect(isExternalAuthScheme(Uri.parse('tg://resolve?domain=bot')), isTrue); + expect(isExternalAuthScheme(Uri.parse('https://oauth.telegram.org/auth')), isFalse); + }); + + test('detects Telegram OAuth hosts', () { + expect(isTelegramOAuthHost('oauth.telegram.org'), isTrue); + expect(isTelegramOAuthHost('ppm.example.com'), isFalse); + }); + }); + + group('telegram auth bridge', () { + test('probe script reads the key the web cabinet writes', () { + // Must stay in sync with SESSION_KEY in web/src/api.ts. + expect(telegramTokenProbeJs, contains("getItem('ppm_session_jwt')")); + expect(telegramTokenProbeJs, contains('$telegramAuthChannel.postMessage')); + }); + + test('parses the posted payload', () { + expect(parseTelegramAuthMessage(jsonEncode({'token': 'jwt'})), 'jwt'); + }); + + test('ignores empty and malformed payloads', () { + expect(parseTelegramAuthMessage(jsonEncode({'token': ''})), isNull); + expect(parseTelegramAuthMessage('not json'), isNull); + }); + }); + + group('yandex oauth helpers', () { + test('builds the authorize URL', () { + final uri = yandexAuthorizeUri( + clientId: 'abc', + redirectUri: 'https://please-pay-me.ru/', + ); + expect(uri.host, 'oauth.yandex.ru'); + expect(uri.queryParameters['client_id'], 'abc'); + expect(uri.queryParameters['redirect_uri'], 'https://please-pay-me.ru/'); + expect(uri.queryParameters['response_type'], 'code'); + }); + + test('reads a successful cabinet callback on the origin', () { + final callback = parseYandexCallback( + Uri.parse('https://please-pay-me.ru/?code=from-yandex'), + redirectUri: 'https://please-pay-me.ru/', + ); + expect(callback?.code, 'from-yandex'); + expect(callback?.error, isNull); + }); + + test('reads a denied callback and ignores other hosts', () { + expect( + parseYandexCallback( + Uri.parse('https://please-pay-me.ru/?error=access_denied'), + redirectUri: 'https://please-pay-me.ru/', + )?.error, + 'access_denied', + ); + expect( + parseYandexCallback( + Uri.parse('https://oauth.yandex.ru/authorize?code=nope'), + redirectUri: 'https://please-pay-me.ru/', + ), + isNull, + ); + }); + + test('derives the origin slash that Yandex registered', () { + expect( + cabinetYandexRedirectUri('https://please-pay-me.ru/budgets'), + 'https://please-pay-me.ru/', + ); + expect( + cabinetYandexRedirectUri( + 'https://please-pay-me.ru', + configured: 'https://please-pay-me.ru/', + ), + 'https://please-pay-me.ru/', + ); + }); + }); + + group('SessionController.signInWithToken', () { + SessionController controllerWith(http.Client client, SessionStorage storage) { + return SessionController( + config: AppConfig.demo, + storage: storage, + httpClient: client, + ); + } + + test('stores the session after the token is validated', () async { + late Uri requestedUri; + String? authHeader; + + final client = MockClient((request) async { + requestedUri = request.url; + authHeader = request.headers['Authorization']; + return http.Response( + jsonEncode({'user_id': 7, 'username': 'vlad', 'first_name': 'Владимир'}), + 200, + headers: {'content-type': 'application/json'}, + ); + }); + + final storage = InMemorySessionStorage(); + final session = controllerWith(client, storage); + + final ok = await session.signInWithToken( + baseUrl: 'https://ppm.example.com/', + token: 'jwt-token', + ); + + expect(ok, isTrue); + expect(session.status, SessionStatus.signedIn); + expect(session.user?.username, 'vlad'); + expect(requestedUri.toString(), 'https://ppm.example.com/api/me'); + expect(authHeader, 'Bearer jwt-token'); + expect((await storage.readAll())['token'], 'jwt-token'); + }); + + test('a rejected token leaves the user signed out with a message', () async { + final client = MockClient((_) async => http.Response('', 401)); + final session = controllerWith(client, InMemorySessionStorage()); + + final ok = await session.signInWithToken( + baseUrl: 'https://ppm.example.com', + token: 'stale', + ); + + expect(ok, isFalse); + expect(session.status, SessionStatus.signedOut); + expect(session.lastError, isNotNull); + }); + }); + + testWidgets('Yandex login exchanges the code on the API', (tester) async { + String? seenClientId; + String? seenRedirect; + + final client = MockClient((request) async { + if (request.url.path.endsWith('/api/auth/providers')) { + return http.Response( + jsonEncode({ + 'yandex': {'enabled': true, 'client_id': 'ya-client'}, + }), + 200, + headers: {'content-type': 'application/json'}, + ); + } + return http.Response( + jsonEncode({'user_id': 7, 'username': 'ya-user'}), + 200, + headers: {'content-type': 'application/json'}, + ); + }); + + final session = SessionController( + config: const AppConfig( + apiBaseUrl: 'https://ppm.example.com', + webCabinetUrl: 'https://ppm.example.com', + demoMode: false, + ), + storage: InMemorySessionStorage(), + httpClient: client, + ); + + await tester.pumpWidget( + ChangeNotifierProvider.value( + value: session, + child: CupertinoApp( + theme: buildLightTheme(), + home: LoginScreen( + launchTelegramLogin: (_, __) async => null, + launchYandexLogin: (_, {required clientId, required redirectUri}) async { + seenClientId = clientId; + seenRedirect = redirectUri; + return 'jwt-from-yandex'; + }, + ), + ), + ), + ); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 50)); + + await tester.ensureVisible(find.byKey(const Key('legal-offer-check'))); + await tester.tap(find.byKey(const Key('legal-offer-check'))); + await tester.pump(); + await tester.ensureVisible(find.byKey(const Key('legal-consent-check'))); + await tester.tap(find.byKey(const Key('legal-consent-check'))); + await tester.pump(); + await tester.tap(find.text('Войти через Яндекс')); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 300)); + + expect(seenClientId, 'ya-client'); + expect(seenRedirect, 'https://ppm.example.com/'); + expect(session.status, SessionStatus.signedIn); + expect(session.user?.username, 'ya-user'); + }); +} diff --git a/mobile/test/config_test.dart b/mobile/test/config_test.dart new file mode 100644 index 0000000..4c3468a --- /dev/null +++ b/mobile/test/config_test.dart @@ -0,0 +1,68 @@ +import 'dart:io'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/config/env_file.dart'; + +void main() { + group('parseEnvFile', () { + test('reads keys, comments and quoted values', () { + const source = ''' +# comment +PPM_API_BASE_URL=https://please-pay-me.ru/ +PPM_WEB_URL="https://please-pay-me.ru" +PPM_DEMO=false + +EMPTY= +'''; + + final values = parseEnvFile(source); + + expect(values['PPM_API_BASE_URL'], 'https://please-pay-me.ru/'); + expect(values['PPM_WEB_URL'], 'https://please-pay-me.ru'); + expect(values['PPM_DEMO'], 'false'); + expect(values.containsKey('EMPTY'), isTrue); + expect(values['EMPTY'], ''); + }); + }); + + group('AppConfig.fromMap', () { + test('strips a trailing slash and defaults the cabinet URL', () { + final config = AppConfig.fromMap({ + 'PPM_API_BASE_URL': 'https://please-pay-me.ru/', + }); + + expect(config.apiBaseUrl, 'https://please-pay-me.ru'); + expect(config.webCabinetUrl, 'https://please-pay-me.ru'); + expect(config.demoMode, isFalse); + }); + + test('empty map uses the production cabinet', () { + final config = AppConfig.fromMap(const {}); + + expect(config.apiBaseUrl, AppConfig.productionOrigin); + expect(config.webCabinetUrl, AppConfig.productionOrigin); + expect(config.demoMode, isFalse); + }); + + test('PPM_DEMO=true forces demo even when a URL is set', () { + final config = AppConfig.fromMap({ + 'PPM_API_BASE_URL': 'https://please-pay-me.ru', + 'PPM_DEMO': 'true', + }); + + expect(config.demoMode, isTrue); + expect(config.apiBaseUrl, 'https://please-pay-me.ru'); + }); + }); + + test('.env.example stays in sync with the parser', () { + final text = File('.env.example').readAsStringSync(); + final values = parseEnvFile(text); + final config = AppConfig.fromMap(values); + + expect(values.containsKey('PPM_API_BASE_URL'), isTrue); + expect(config.apiBaseUrl, isNotEmpty); + expect(config.demoMode, isFalse); + }); +} diff --git a/mobile/test/controllers_test.dart b/mobile/test/controllers_test.dart new file mode 100644 index 0000000..bebeff5 --- /dev/null +++ b/mobile/test/controllers_test.dart @@ -0,0 +1,188 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/storage/session_storage.dart'; +import 'package:please_pay_me/data/demo/demo_backend.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/features/work/jobs_controller.dart'; + +void main() { + late DemoBackend backend; + + setUp(() => backend = DemoBackend(today: DateTime(2026, 9, 19))); + + group('BudgetsController', () { + test('loads budgets and exposes the selected one', () async { + final controller = BudgetsController( + budgets: backend.budgets, + expenses: backend.expenses, + ); + await controller.load(); + + expect(controller.items, hasLength(2)); + expect(controller.selected?.budget.name, 'До аванса'); + expect(controller.hasBudgets, isTrue); + }); + + test('adding an expense lowers the remaining amount', () async { + final controller = BudgetsController( + budgets: backend.budgets, + expenses: backend.expenses, + ); + await controller.load(); + final before = controller.selected!.remaining; + + final error = await controller.addExpense(amount: 500, note: 'Обед'); + + expect(error, isNull); + expect(controller.selected!.remaining, before - 500); + expect(controller.isMutating, isFalse); + }); + + test('undo removes the newest expense of the selected budget', () async { + final controller = BudgetsController( + budgets: backend.budgets, + expenses: backend.expenses, + ); + await controller.load(); + await controller.addExpense(amount: 777); + final withExtra = controller.selected!.totalSpent; + + await controller.undoLastExpense(); + + expect(controller.selected!.totalSpent, withExtra - 777); + }); + + test('select switches the current envelope', () async { + final controller = BudgetsController( + budgets: backend.budgets, + expenses: backend.expenses, + ); + await controller.load(); + + await controller.select(2); + + expect(controller.selected?.budget.id, 2); + }); + + test('surfaces backend errors without crashing', () async { + final empty = DemoBackend.empty(); + final controller = BudgetsController( + budgets: empty.budgets, + expenses: empty.expenses, + ); + await controller.load(); + + final error = await controller.addExpense(amount: 100); + + expect(error, 'Сначала создайте бюджет'); + expect(controller.hasBudgets, isFalse); + }); + }); + + group('JournalController', () { + test('groups operations by day, newest first', () async { + final controller = JournalController(expenses: backend.expenses); + await controller.load(); + + final groups = controller.groups; + + expect(groups.first.day, DateTime(2026, 9, 19)); + expect(groups.first.items, hasLength(2)); + expect(groups.first.total, 2090); + expect(groups.map((g) => g.day), isNot(contains(DateTime(2026, 8, 30)))); + }); + + test('scope "all" includes other budgets', () async { + final controller = JournalController(expenses: backend.expenses); + await controller.load(); + final currentCount = controller.items.length; + + await controller.setScope(JournalScope.all); + + expect(controller.items.length, greaterThan(currentCount)); + expect(controller.scope, JournalScope.all); + }); + + test('loadMore appends the next page', () async { + final controller = JournalController(expenses: backend.expenses, pageSize: 2); + await controller.load(); + + expect(controller.items, hasLength(2)); + expect(controller.hasMore, isTrue); + + await controller.loadMore(); + + expect(controller.items, hasLength(4)); + expect(controller.hasMore, isFalse); + }); + }); + + group('JobsController', () { + test('nextPay picks the closest payday', () async { + final controller = JobsController(jobs: backend.jobs); + await controller.load(); + + expect(controller.items, hasLength(1)); + expect(controller.nextPay?.date, DateTime(2026, 9, 27)); + }); + }); + + group('SessionController', () { + test('restores a stored session', () async { + final session = SessionController( + config: AppConfig.demo, + storage: InMemorySessionStorage({ + 'token': 'jwt', + 'baseUrl': 'https://ppm.example.com', + 'user': '{"user_id":7,"username":"vlad"}', + }), + ); + + await session.restore(); + + expect(session.status, SessionStatus.signedIn); + expect(session.user?.userId, 7); + expect(session.isDemo, isFalse); + }); + + test('without a stored token the app asks to sign in', () async { + final session = SessionController( + config: AppConfig.demo, + storage: InMemorySessionStorage(), + ); + + await session.restore(); + + expect(session.status, SessionStatus.signedOut); + }); + + test('demo mode serves repositories from the in-memory backend', () async { + final session = SessionController( + config: AppConfig.demo, + storage: InMemorySessionStorage(), + demoBackend: backend, + )..startDemo(); + + expect(session.status, SessionStatus.signedIn); + expect(await session.budgets.list(), hasLength(2)); + expect(session.sessionKey, contains('demo')); + }); + + test('sign out clears the session', () async { + final storage = InMemorySessionStorage({ + 'token': 'jwt', + 'baseUrl': 'https://ppm.example.com', + 'user': '{"user_id":7}', + }); + final session = SessionController(config: AppConfig.demo, storage: storage); + await session.restore(); + + await session.signOut(); + + expect(session.status, SessionStatus.signedOut); + expect(await storage.readAll(), isEmpty); + }); + }); +} diff --git a/mobile/test/formatters_test.dart b/mobile/test/formatters_test.dart new file mode 100644 index 0000000..f96b722 --- /dev/null +++ b/mobile/test/formatters_test.dart @@ -0,0 +1,38 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me/core/format/formatters.dart'; + +import 'support/test_setup.dart'; + +void main() { + setUpAll(setUpTestEnvironment); + + test('money uses Russian grouping and the ruble sign', () { + expect(formatMoney(1234.5), '1 234,50 ₽'); + expect(formatMoney(250, compact: true), '250 ₽'); + }); + + test('expenses are rendered as a deduction', () { + expect(formatSignedMoney(250), '−250,00 ₽'); + expect(formatSignedMoney(-250), '+250,00 ₽'); + }); + + test('plural follows Russian rules', () { + expect(plural(1, 'день', 'дня', 'дней'), '1 день'); + expect(plural(3, 'день', 'дня', 'дней'), '3 дня'); + expect(plural(11, 'день', 'дня', 'дней'), '11 дней'); + expect(plural(21, 'день', 'дня', 'дней'), '21 день'); + }); + + test('relative day switches to a date beyond yesterday', () { + final now = DateTime(2026, 9, 19); + + expect(formatRelativeDay(now, now: now), 'Сегодня'); + expect(formatRelativeDay(DateTime(2026, 9, 18), now: now), 'Вчера'); + expect(formatRelativeDay(DateTime(2026, 9, 12), now: now), '12 сентября'); + }); + + test('days left is humanized', () { + expect(formatDaysLeft(0), 'период завершён'); + expect(formatDaysLeft(5), 'осталось 5 дней'); + }); +} diff --git a/mobile/test/legal_links_test.dart b/mobile/test/legal_links_test.dart new file mode 100644 index 0000000..9f677bf --- /dev/null +++ b/mobile/test/legal_links_test.dart @@ -0,0 +1,19 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/legal/legal_links.dart'; + +void main() { + test('legal URLs point at the cabinet origin', () { + expect( + LegalLinks.resolve('https://please-pay-me.ru/', LegalLinks.privacy), + Uri.parse('https://please-pay-me.ru/legal/privacy'), + ); + }); + + test('empty cabinet falls back to production', () { + expect( + LegalLinks.resolve('', LegalLinks.offer), + Uri.parse('${AppConfig.productionOrigin}/legal/offer'), + ); + }); +} diff --git a/mobile/test/models_test.dart b/mobile/test/models_test.dart new file mode 100644 index 0000000..7cb54dc --- /dev/null +++ b/mobile/test/models_test.dart @@ -0,0 +1,122 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me/data/models/budget.dart'; +import 'package:please_pay_me/data/models/expense.dart'; +import 'package:please_pay_me/data/models/job.dart'; +import 'package:please_pay_me/data/models/json.dart'; + +void main() { + group('json helpers', () { + test('coerce numbers coming as int, double or string', () { + expect(asDouble(10), 10.0); + expect(asDouble(10.5), 10.5); + expect(asDouble('10,5'), 10.5); + expect(asDouble(null, fallback: -1), -1); + expect(asInt('42'), 42); + }); + + test('asDate keeps the calendar day and drops time', () { + expect(asDate('2026-09-19'), DateTime(2026, 9, 19)); + expect(asDate('2026-09-19T23:45:00Z'), DateTime(2026, 9, 19)); + }); + + test('formatIsoDate pads month and day', () { + expect(formatIsoDate(DateTime(2026, 1, 5)), '2026-01-05'); + }); + }); + + group('BudgetStatus', () { + BudgetStatus parse(Map overrides) { + return BudgetStatus.fromJson({ + 'budget': { + 'id': 1, + 'user_id': 7, + 'name': 'До аванса', + 'total_amount': 42000, + 'start_date': '2026-09-13', + 'end_date': '2026-09-27', + 'currency': 'RUB', + 'is_active': true, + }, + 'today': '2026-09-19', + 'days_left': 9, + 'total_spent': 21000, + 'remaining': 21000, + 'daily_limit': 2333.33, + 'spent_today': 1200, + 'remaining_today': 1133.33, + 'is_over_daily': false, + 'is_over_budget': false, + 'is_expired': false, + 'selected': true, + ...overrides, + }); + } + + test('parses nested budget', () { + final status = parse({}); + + expect(status.budget.name, 'До аванса'); + expect(status.budget.endDate, DateTime(2026, 9, 27)); + expect(status.selected, isTrue); + }); + + test('spentProgress is a clamped share of the total', () { + expect(parse({}).spentProgress, closeTo(0.5, 0.001)); + expect(parse({'total_spent': 50000}).spentProgress, 1.0); + }); + + test('dailyProgress falls back to full bar when the limit is zero', () { + expect(parse({'daily_limit': 0, 'spent_today': 500}).dailyProgress, 1.0); + expect(parse({'daily_limit': 0, 'spent_today': 0}).dailyProgress, 0.0); + }); + }); + + group('ExpensesPage', () { + test('reports pagination state', () { + final page = ExpensesPage.fromJson({ + 'page': 1, + 'total_pages': 3, + 'total_count': 55, + 'page_size': 20, + 'total_sum': 12345.5, + 'budget_id': 4, + 'items': [ + {'id': 1, 'budget_id': 4, 'amount': 250, 'note': 'Кофе', 'spent_at': '2026-09-19'}, + {'id': 2, 'budget_id': 4, 'amount': 100.5, 'note': null, 'spent_at': '2026-09-18'}, + ], + }); + + expect(page.hasMore, isTrue); + expect(page.items, hasLength(2)); + expect(page.items.last.note, isNull); + expect(page.totalSum, 12345.5); + }); + }); + + group('Job', () { + test('parses pay days and the weekend policy', () { + final job = Job.fromJson({ + 'id': 1, + 'user_id': 7, + 'name': 'Основная', + 'salary_amount': 180000, + 'currency': 'RUB', + 'pay_days': [5, 20], + 'first_pay_percent': 40, + 'weekend_policy': 'after_weekend', + 'is_active': true, + 'next_pays': [ + {'date': '2026-09-20', 'scheduled_day': 20, 'percent': 60, 'amount': 108000}, + ], + }); + + expect(job.payDays, [5, 20]); + expect(job.weekendPolicy, WeekendPolicy.afterWeekend); + expect(job.nextPay?.amount, 108000); + }); + + test('unknown weekend policy degrades to the default', () { + expect(WeekendPolicy.fromWire('nonsense'), WeekendPolicy.beforeWeekend); + }); + }); +} diff --git a/mobile/test/support/test_setup.dart b/mobile/test/support/test_setup.dart new file mode 100644 index 0000000..830d707 --- /dev/null +++ b/mobile/test/support/test_setup.dart @@ -0,0 +1,10 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:intl/date_symbol_data_local.dart'; + +/// Shared bootstrap: no font downloads, Russian date symbols available. +Future setUpTestEnvironment() async { + TestWidgetsFlutterBinding.ensureInitialized(); + GoogleFonts.config.allowRuntimeFetching = false; + await initializeDateFormatting('ru'); +} diff --git a/mobile/test/theme_controller_test.dart b/mobile/test/theme_controller_test.dart new file mode 100644 index 0000000..88bce21 --- /dev/null +++ b/mobile/test/theme_controller_test.dart @@ -0,0 +1,44 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me/theme/theme.dart'; + +void main() { + group('ThemePreference', () { + test('parse falls back to system', () { + expect(ThemePreference.parse(null), ThemePreference.system); + expect(ThemePreference.parse('nope'), ThemePreference.system); + expect(ThemePreference.parse('light'), ThemePreference.light); + expect(ThemePreference.parse('dark'), ThemePreference.dark); + }); + + test('resolve follows the platform only in system mode', () { + expect(ThemePreference.system.resolve(Brightness.dark), Brightness.dark); + expect(ThemePreference.light.resolve(Brightness.dark), Brightness.light); + expect(ThemePreference.dark.resolve(Brightness.light), Brightness.dark); + }); + }); + + group('systemUiOverlayFor', () { + test('dark paints the Android nav bar transparent black without a scrim', () { + final overlay = systemUiOverlayFor(Brightness.dark); + expect(overlay.systemNavigationBarColor, const Color(0x00000000)); + expect(overlay.systemNavigationBarContrastEnforced, isFalse); + expect(overlay.systemNavigationBarIconBrightness, Brightness.light); + }); + }); + + group('ThemeController', () { + test('restore and setPreference persist independently of session', () async { + final store = MemoryThemeStore('dark'); + final controller = ThemeController(store: store); + + await controller.restore(); + expect(controller.preference, ThemePreference.dark); + + await controller.setPreference(ThemePreference.light); + expect(controller.preference, ThemePreference.light); + expect(store.value, 'light'); + expect(controller.resolve(Brightness.dark), Brightness.light); + }); + }); +} diff --git a/mobile/test/widget_test.dart b/mobile/test/widget_test.dart new file mode 100644 index 0000000..b39afa6 --- /dev/null +++ b/mobile/test/widget_test.dart @@ -0,0 +1,139 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me/app/app.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/storage/session_storage.dart'; +import 'package:please_pay_me/data/demo/demo_backend.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; + +import 'support/test_setup.dart'; + +void main() { + setUpAll(setUpTestEnvironment); + + SessionController demoSession({bool seeded = true}) { + return SessionController( + config: AppConfig.demo, + storage: InMemorySessionStorage(), + demoBackend: seeded ? DemoBackend() : DemoBackend.empty(), + ); + } + + /// Skeletons pulse forever, so `pumpAndSettle` would time out. + Future settle(WidgetTester tester) async { + await tester.pump(); + await tester.pump(const Duration(milliseconds: 400)); + } + + testWidgets('restoring session shows the branded splash', (tester) async { + final session = demoSession(); + + await tester.pumpWidget(PleasePayMeApp(session: session)); + await tester.pump(); + + expect(find.text('Дожить до ЗП'), findsOneWidget); + expect(find.text('Бюджет от зарплаты до зарплаты'), findsOneWidget); + expect(find.byType(CupertinoActivityIndicator), findsOneWidget); + }); + + testWidgets('signed-out app shows the login screen', (tester) async { + final session = demoSession(); + await session.restore(); + + await tester.pumpWidget(PleasePayMeApp(session: session)); + await settle(tester); + + expect(find.text('Дожить до ЗП'), findsOneWidget); + expect(find.text('Войти через Яндекс'), findsOneWidget); + }); + + testWidgets('demo session opens the overview with the current envelope', + (tester) async { + final session = demoSession()..startDemo(); + + await tester.pumpWidget(PleasePayMeApp(session: session)); + await settle(tester); + + expect(find.text('Обзор'), findsWidgets); + expect(find.text('До аванса'), findsOneWidget); + expect(find.text('Остаток бюджета'), findsOneWidget); + + await tester.drag(find.byType(CustomScrollView).first, const Offset(0, -500)); + await settle(tester); + + // Grouped headers are uppercased by `AppSectionHeader`, as in iOS Settings. + expect(find.text('БЛИЖАЙШАЯ ВЫПЛАТА'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('tabs switch between the main sections', (tester) async { + final session = demoSession()..startDemo(); + + await tester.pumpWidget(PleasePayMeApp(session: session)); + await settle(tester); + + for (final tab in ['Журнал', 'Бюджеты', 'Работа', 'Профиль']) { + await tester.tap(find.text(tab).last); + await settle(tester); + expect(tester.takeException(), isNull, reason: 'tab $tab failed to render'); + } + + expect(find.text('Демо'), findsOneWidget); + }); + + testWidgets('profile theme switcher applies dark appearance', (tester) async { + final session = demoSession()..startDemo(); + final theme = ThemeController(store: MemoryThemeStore()); + + await tester.pumpWidget(PleasePayMeApp(session: session, theme: theme)); + await settle(tester); + + await tester.tap(find.text('Профиль').last); + await settle(tester); + + expect(find.text('Системная'), findsOneWidget); + expect(find.text('Светлая'), findsOneWidget); + + await tester.tap(find.text('Тёмная')); + await settle(tester); + + expect(theme.preference, ThemePreference.dark); + expect(theme.resolve(Brightness.light), Brightness.dark); + }); + + testWidgets('empty demo backend renders the empty states', (tester) async { + final session = demoSession(seeded: false)..startDemo(); + + await tester.pumpWidget(PleasePayMeApp(session: session)); + await settle(tester); + + expect(find.text('Бюджета пока нет'), findsOneWidget); + expect(find.text('Создать бюджет'), findsOneWidget); + }); + + testWidgets('recording an expense updates the remaining amount', (tester) async { + final session = demoSession()..startDemo(); + + await tester.pumpWidget(PleasePayMeApp(session: session)); + await settle(tester); + + await tester.tap(find.text('Добавить трату')); + await settle(tester); + expect(find.text('Новая трата'), findsOneWidget); + + await tester.enterText(find.byType(CupertinoTextField).first, '1000'); + await settle(tester); + + await tester.tap(find.text('Записать трату')); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 500)); + + expect(find.text('Новая трата'), findsNothing); + expect(find.text('Трата записана'), findsOneWidget); + + // Let the toast auto-dismiss so no timers outlive the test. + await tester.pump(const Duration(seconds: 3)); + expect(tester.takeException(), isNull); + }); +} diff --git a/mobile/web/favicon.png b/mobile/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/mobile/web/favicon.png differ diff --git a/mobile/web/icons/Icon-192.png b/mobile/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/mobile/web/icons/Icon-192.png differ diff --git a/mobile/web/icons/Icon-512.png b/mobile/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/mobile/web/icons/Icon-512.png differ diff --git a/mobile/web/icons/Icon-maskable-192.png b/mobile/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/mobile/web/icons/Icon-maskable-192.png differ diff --git a/mobile/web/icons/Icon-maskable-512.png b/mobile/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/mobile/web/icons/Icon-maskable-512.png differ diff --git a/mobile/web/index.html b/mobile/web/index.html new file mode 100644 index 0000000..ec71cdd --- /dev/null +++ b/mobile/web/index.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + please_pay_me + + + + + + + diff --git a/mobile/web/manifest.json b/mobile/web/manifest.json new file mode 100644 index 0000000..10de72f --- /dev/null +++ b/mobile/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "please_pay_me", + "short_name": "please_pay_me", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/mobile/widgetbook/.gitignore b/mobile/widgetbook/.gitignore new file mode 100644 index 0000000..79f7eca --- /dev/null +++ b/mobile/widgetbook/.gitignore @@ -0,0 +1,48 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ +/coverage/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release + +# Widget Preview related +.widget_preview/ diff --git a/mobile/widgetbook/.metadata b/mobile/widgetbook/.metadata new file mode 100644 index 0000000..a7644bb --- /dev/null +++ b/mobile/widgetbook/.metadata @@ -0,0 +1,39 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "6a19cca56475dbfba1478ee68d7bd0c2ef891da1" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: android + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: ios + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: web + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + - platform: windows + create_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + base_revision: 6a19cca56475dbfba1478ee68d7bd0c2ef891da1 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/mobile/widgetbook/README.md b/mobile/widgetbook/README.md new file mode 100644 index 0000000..4147cdb --- /dev/null +++ b/mobile/widgetbook/README.md @@ -0,0 +1,96 @@ +# Please Pay Me — Widgetbook + +Portable component catalog for the mobile UI kit. Lives as a **separate package** +under `mobile/widgetbook/` and depends on the app package via path — no changes +required in production `lib/main.dart`. + +## Run + +```powershell +cd mobile\widgetbook +.\run.ps1 # chrome по умолчанию +.\run.ps1 -Device windows +``` + +Или из `mobile/`: + +```powershell +.\run.ps1 -Target widgetbook -Device chrome +``` + +```bash +cd mobile/widgetbook +flutter pub get +flutter run -d chrome +# or +flutter run -d windows +``` + +## Structure + +``` +widgetbook/ +├── lib/ +│ ├── main.dart +│ ├── app.dart # WidgetbookRoot + addons +│ ├── catalog.dart # directory tree (also used by smoke tests) +│ ├── addons/ # theme / locale / device frame +│ ├── knobs/ # shared knob helpers +│ ├── support/preview.dart # iOS grouped-background canvas for use-cases +│ ├── support/demo_scope.dart # real screens on the in-memory DemoBackend +│ └── use_cases/ # Atoms → Molecules → Navigation → Feedback → Screens +└── test/catalog_smoke_test.dart +``` + +## iOS kit + +Компоненты построены на Cupertino и следуют Apple HIG: + +- семантические цвета (`label` / `separator` / `groupedBackground`) объявлены как + `CupertinoDynamicColor`, поэтому light/dark резолвится автоматически; +- типографика — шкала SF Pro (`largeTitle` 34 … `caption2` 11), в качестве + кросс-платформенной замены SF используется Inter; +- списки — inset-grouped секции с hairline-разделителями (0.5pt) и отступом + под leading-бейдж, как в Settings; +- контролы — `CupertinoButton`, `CupertinoTextField`, `CupertinoSwitch`, + `CupertinoSlidingSegmentedControl`, `CupertinoTabBar`, `CupertinoAlertDialog`, + `CupertinoActionSheet`, `CupertinoActivityIndicator`; +- вместо Material SnackBar — `AppToast`: плавающая blur-капсула поверх контента. + +Бренд-тинт остался зелёным (`AppColors.accent`) и подменяет `systemBlue`. + +Use-cases render **real widgets** from `package:please_pay_me/ui/...` and themes from +`package:please_pay_me/theme/...`. + +Addons: + +- **Theme** — Light / Dark (`CupertinoThemeAddon`, `buildLightTheme` / `buildDarkTheme`) +- **Locale** — `ru` / `en` +- **Viewport** — iPhone / Android frames + +## Reuse in another Flutter project + +1. Copy `widgetbook/` folder (or this package). +2. Point `please_pay_me` path dependency to your UI package (or rename dependency). +3. Keep exporting widgets from that package; use-cases only import them. +4. Run `flutter pub get && flutter run`. + +Optional codegen (annotations already in `pubspec.yaml`): + +```bash +dart run build_runner build --delete-conflicting-outputs +``` + +Current catalog is **manual** via `catalog.dart` so it stays easy to copy without +a generator step. + +## Tests + +```bash +cd mobile/widgetbook +flutter test +``` + +Smoke-тесты проверяют, что структура каталога на месте, и **рендерят каждый use-case +в светлой и тёмной теме** внутри `WidgetbookScope` (knobs читают состояние из контекста), +падая на любом исключении при построении. diff --git a/mobile/widgetbook/analysis_options.yaml b/mobile/widgetbook/analysis_options.yaml new file mode 100644 index 0000000..57a08d4 --- /dev/null +++ b/mobile/widgetbook/analysis_options.yaml @@ -0,0 +1,12 @@ +analyzer: + exclude: + - build/** + - android/** + - ios/** + - web/** + - windows/** +include: package:flutter_lints/flutter.yaml + +linter: + rules: + prefer_const_constructors: false diff --git a/mobile/widgetbook/android/.gitignore b/mobile/widgetbook/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/mobile/widgetbook/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/mobile/widgetbook/android/app/build.gradle.kts b/mobile/widgetbook/android/app/build.gradle.kts new file mode 100644 index 0000000..eec042b --- /dev/null +++ b/mobile/widgetbook/android/app/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id("com.android.application") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.example.please_pay_me_widgetbook" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.please_pay_me_widgetbook" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + // Uses the version code from pubspec.yaml. When using split APKs, 1000 * ABI_VERSION + // is added automatically by Flutter. (https://developer.android.com/studio/build/configure-apk-splits#configure-APK-versions) + // You can force using the value of versionCode by specifying the `-P force-version-code-ignoring-abi=true` + // flag during build. + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +flutter { + source = "../.." +} diff --git a/mobile/widgetbook/android/app/src/debug/AndroidManifest.xml b/mobile/widgetbook/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/mobile/widgetbook/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/mobile/widgetbook/android/app/src/main/AndroidManifest.xml b/mobile/widgetbook/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..48753ab --- /dev/null +++ b/mobile/widgetbook/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/widgetbook/android/app/src/main/kotlin/com/example/please_pay_me_widgetbook/MainActivity.kt b/mobile/widgetbook/android/app/src/main/kotlin/com/example/please_pay_me_widgetbook/MainActivity.kt new file mode 100644 index 0000000..d5a40a1 --- /dev/null +++ b/mobile/widgetbook/android/app/src/main/kotlin/com/example/please_pay_me_widgetbook/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.please_pay_me_widgetbook + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/mobile/widgetbook/android/app/src/main/res/drawable-v21/launch_background.xml b/mobile/widgetbook/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/mobile/widgetbook/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/mobile/widgetbook/android/app/src/main/res/drawable/launch_background.xml b/mobile/widgetbook/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/mobile/widgetbook/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/mobile/widgetbook/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/widgetbook/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/mobile/widgetbook/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/mobile/widgetbook/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/widgetbook/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/mobile/widgetbook/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/mobile/widgetbook/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/widgetbook/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/mobile/widgetbook/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/mobile/widgetbook/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/widgetbook/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/mobile/widgetbook/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/mobile/widgetbook/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile/widgetbook/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/mobile/widgetbook/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/mobile/widgetbook/android/app/src/main/res/values-night/styles.xml b/mobile/widgetbook/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/mobile/widgetbook/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/mobile/widgetbook/android/app/src/main/res/values/styles.xml b/mobile/widgetbook/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/mobile/widgetbook/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/mobile/widgetbook/android/app/src/profile/AndroidManifest.xml b/mobile/widgetbook/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/mobile/widgetbook/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/mobile/widgetbook/android/build.gradle.kts b/mobile/widgetbook/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/mobile/widgetbook/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/mobile/widgetbook/android/gradle.properties b/mobile/widgetbook/android/gradle.properties new file mode 100644 index 0000000..e96108c --- /dev/null +++ b/mobile/widgetbook/android/gradle.properties @@ -0,0 +1,6 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +# This newDsl flag was added by the Flutter template +android.newDsl=false +# This builtInKotlin flag was added by the Flutter template +android.builtInKotlin=false diff --git a/mobile/widgetbook/android/gradle/wrapper/gradle-wrapper.properties b/mobile/widgetbook/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a20f2c4 --- /dev/null +++ b/mobile/widgetbook/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip diff --git a/mobile/widgetbook/android/settings.gradle.kts b/mobile/widgetbook/android/settings.gradle.kts new file mode 100644 index 0000000..b28021a --- /dev/null +++ b/mobile/widgetbook/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "9.1.0" apply false + id("org.jetbrains.kotlin.android") version "2.4.0" apply false +} + +include(":app") diff --git a/mobile/widgetbook/ios/.gitignore b/mobile/widgetbook/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/mobile/widgetbook/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/mobile/widgetbook/ios/Flutter/AppFrameworkInfo.plist b/mobile/widgetbook/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..391a902 --- /dev/null +++ b/mobile/widgetbook/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/mobile/widgetbook/ios/Flutter/Debug.xcconfig b/mobile/widgetbook/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/mobile/widgetbook/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/mobile/widgetbook/ios/Flutter/Release.xcconfig b/mobile/widgetbook/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/mobile/widgetbook/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/mobile/widgetbook/ios/Runner.xcodeproj/project.pbxproj b/mobile/widgetbook/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..e018ee9 --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,647 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.pleasePayMeWidgetbook; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.pleasePayMeWidgetbook.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.pleasePayMeWidgetbook.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.pleasePayMeWidgetbook.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.pleasePayMeWidgetbook; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.pleasePayMeWidgetbook; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/mobile/widgetbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mobile/widgetbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..c3fedb2 --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/widgetbook/ios/Runner.xcworkspace/contents.xcworkspacedata b/mobile/widgetbook/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mobile/widgetbook/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/widgetbook/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mobile/widgetbook/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/widgetbook/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/mobile/widgetbook/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/mobile/widgetbook/ios/Runner/AppDelegate.swift b/mobile/widgetbook/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..c30b367 --- /dev/null +++ b/mobile/widgetbook/ios/Runner/AppDelegate.swift @@ -0,0 +1,16 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } +} diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..dc9ada4 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..7353c41 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..6ed2d93 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..4cd7b00 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..fe73094 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..321773c Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..502f463 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..e9f5fea Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..84ac32a Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..8953cba Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..0467bf1 Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/mobile/widgetbook/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/mobile/widgetbook/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mobile/widgetbook/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/mobile/widgetbook/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/widgetbook/ios/Runner/Base.lproj/Main.storyboard b/mobile/widgetbook/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/mobile/widgetbook/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/widgetbook/ios/Runner/Info.plist b/mobile/widgetbook/ios/Runner/Info.plist new file mode 100644 index 0000000..465df30 --- /dev/null +++ b/mobile/widgetbook/ios/Runner/Info.plist @@ -0,0 +1,70 @@ + + + + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Please Pay Me Widgetbook + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + please_pay_me_widgetbook + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/mobile/widgetbook/ios/Runner/Runner-Bridging-Header.h b/mobile/widgetbook/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/mobile/widgetbook/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/mobile/widgetbook/ios/Runner/SceneDelegate.swift b/mobile/widgetbook/ios/Runner/SceneDelegate.swift new file mode 100644 index 0000000..b9ce8ea --- /dev/null +++ b/mobile/widgetbook/ios/Runner/SceneDelegate.swift @@ -0,0 +1,6 @@ +import Flutter +import UIKit + +class SceneDelegate: FlutterSceneDelegate { + +} diff --git a/mobile/widgetbook/ios/RunnerTests/RunnerTests.swift b/mobile/widgetbook/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/mobile/widgetbook/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/mobile/widgetbook/lib/addons/device_frame_addon.dart b/mobile/widgetbook/lib/addons/device_frame_addon.dart new file mode 100644 index 0000000..3ddd8a5 --- /dev/null +++ b/mobile/widgetbook/lib/addons/device_frame_addon.dart @@ -0,0 +1,11 @@ +import 'package:widgetbook/widgetbook.dart'; + +/// Common phone frames for visual QA (ViewportAddon replaces DeviceFrameAddon). +ViewportAddon buildDeviceFrameAddon() { + return ViewportAddon([ + Viewports.none, + IosViewports.iPhone13, + IosViewports.iPhone13Mini, + AndroidViewports.samsungGalaxyS20, + ]); +} diff --git a/mobile/widgetbook/lib/addons/locale_addon.dart b/mobile/widgetbook/lib/addons/locale_addon.dart new file mode 100644 index 0000000..75ae0f9 --- /dev/null +++ b/mobile/widgetbook/lib/addons/locale_addon.dart @@ -0,0 +1,19 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:widgetbook/widgetbook.dart'; + +/// Locale switcher: Russian / English. +LocalizationAddon buildLocaleAddon() { + return LocalizationAddon( + locales: const [ + Locale('ru'), + Locale('en'), + ], + localizationsDelegates: const [ + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + initialLocale: const Locale('ru'), + ); +} diff --git a/mobile/widgetbook/lib/addons/theme_addon.dart b/mobile/widgetbook/lib/addons/theme_addon.dart new file mode 100644 index 0000000..752d834 --- /dev/null +++ b/mobile/widgetbook/lib/addons/theme_addon.dart @@ -0,0 +1,12 @@ +import 'package:please_pay_me/theme/theme.dart'; +import 'package:widgetbook/widgetbook.dart'; + +/// Light / dark Cupertino theme built from the shared product tokens. +CupertinoThemeAddon buildThemeAddon() { + return CupertinoThemeAddon( + themes: [ + WidgetbookTheme(name: 'Light', data: buildLightTheme()), + WidgetbookTheme(name: 'Dark', data: buildDarkTheme()), + ], + ); +} diff --git a/mobile/widgetbook/lib/app.dart b/mobile/widgetbook/lib/app.dart new file mode 100644 index 0000000..c7077c9 --- /dev/null +++ b/mobile/widgetbook/lib/app.dart @@ -0,0 +1,26 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me_widgetbook/addons/device_frame_addon.dart'; +import 'package:please_pay_me_widgetbook/addons/locale_addon.dart'; +import 'package:please_pay_me_widgetbook/addons/theme_addon.dart'; +import 'package:please_pay_me_widgetbook/catalog.dart'; +import 'package:widgetbook/widgetbook.dart'; + +/// Entry Widgetbook application — portable across projects that depend on the +/// same UI package (`please_pay_me`). +class WidgetbookRoot extends StatelessWidget { + const WidgetbookRoot({super.key}); + + @override + Widget build(BuildContext context) { + return Widgetbook.cupertino( + directories: buildCatalogDirectories(), + addons: [ + buildThemeAddon(), + buildLocaleAddon(), + buildDeviceFrameAddon(), + InspectorAddon(), + AlignmentAddon(initialAlignment: Alignment.center), + ], + ); + } +} diff --git a/mobile/widgetbook/lib/catalog.dart b/mobile/widgetbook/lib/catalog.dart new file mode 100644 index 0000000..b0ab3d2 --- /dev/null +++ b/mobile/widgetbook/lib/catalog.dart @@ -0,0 +1,75 @@ +import 'package:please_pay_me_widgetbook/use_cases/atoms/buttons_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/atoms/icons_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/atoms/text_fields_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/atoms/typography_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/feedback/progress_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/feedback/skeletons_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/feedback/toasts_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/molecules/avatars_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/molecules/cards_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/molecules/chips_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/molecules/list_tiles_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/molecules/switches_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/navigation/dialogs_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/navigation/nav_bar_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/navigation/segmented_control_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/navigation/tab_bar_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/screens/app_screens_use_cases.dart'; +import 'package:please_pay_me_widgetbook/use_cases/screens/sheets_use_cases.dart'; +import 'package:widgetbook/widgetbook.dart'; + +/// Single source of directory tree for Widgetbook + smoke tests. +List buildCatalogDirectories() { + return [ + WidgetbookFolder( + name: 'Atoms', + children: [ + buttonsComponent(), + textFieldsComponent(), + typographyComponent(), + iconsComponent(), + ], + ), + WidgetbookFolder( + name: 'Molecules', + children: [ + cardsComponent(), + listTilesComponent(), + switchesComponent(), + chipsComponent(), + avatarsComponent(), + ], + ), + WidgetbookFolder( + name: 'Navigation', + children: [ + navBarComponent(), + tabBarComponent(), + segmentedControlComponent(), + dialogsComponent(), + ], + ), + WidgetbookFolder( + name: 'Feedback', + children: [ + progressComponent(), + skeletonsComponent(), + toastsComponent(), + ], + ), + WidgetbookFolder( + name: 'Screens', + children: [ + overviewScreenComponent(), + journalScreenComponent(), + budgetsScreenComponent(), + workScreenComponent(), + profileScreenComponent(), + splashScreenComponent(), + loginScreenComponent(), + sheetsComponent(), + homeTabsComponent(), + ], + ), + ]; +} diff --git a/mobile/widgetbook/lib/knobs/common_knobs.dart b/mobile/widgetbook/lib/knobs/common_knobs.dart new file mode 100644 index 0000000..3cba30b --- /dev/null +++ b/mobile/widgetbook/lib/knobs/common_knobs.dart @@ -0,0 +1,93 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:widgetbook/widgetbook.dart'; + +String knobText( + BuildContext context, { + required String label, + String initialValue = 'Label', +}) { + return context.knobs.string(label: label, initialValue: initialValue); +} + +bool knobBool( + BuildContext context, { + required String label, + bool initialValue = false, +}) { + return context.knobs.boolean(label: label, initialValue: initialValue); +} + +double knobDouble( + BuildContext context, { + required String label, + double initialValue = 0.5, + double min = 0, + double max = 1, +}) { + return context.knobs.double.slider( + label: label, + initialValue: initialValue, + min: min, + max: max, + ); +} + +int knobInt( + BuildContext context, { + required String label, + int initialValue = 0, + int min = 0, + int max = 10, +}) { + return context.knobs.int.slider( + label: label, + initialValue: initialValue, + min: min, + max: max, + ); +} + +Color knobColor( + BuildContext context, { + required String label, + Color? initialValue, +}) { + return context.knobs.color( + label: label, + initialValue: initialValue ?? AppColors.of(context, AppColors.accent), + ); +} + +/// Dropdown over iOS system tints used by badges and progress bars. +Color knobTint(BuildContext context, {String label = 'Tint'}) { + const options = { + 'accent': AppColors.accent, + 'red': AppColors.systemRed, + 'orange': AppColors.systemOrange, + 'green': AppColors.systemGreen, + 'gray': AppColors.systemGray, + }; + + final key = context.knobs.object.dropdown( + label: label, + options: options.keys.toList(), + initialOption: 'accent', + ); + + return options[key]!; +} + +T knobEnum( + BuildContext context, { + required String label, + required List values, + required T initial, +}) { + return context.knobs.object.dropdown( + label: label, + options: values, + labelBuilder: (value) => value.name, + initialOption: initial, + ); +} diff --git a/mobile/widgetbook/lib/knobs/state_knobs.dart b/mobile/widgetbook/lib/knobs/state_knobs.dart new file mode 100644 index 0000000..3a4f156 --- /dev/null +++ b/mobile/widgetbook/lib/knobs/state_knobs.dart @@ -0,0 +1,46 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:widgetbook/widgetbook.dart'; + +enum UiAsyncState { content, loading, empty, error } + +UiAsyncState knobAsyncState(BuildContext context, {String label = 'State'}) { + return context.knobs.object.dropdown( + label: label, + options: UiAsyncState.values, + labelBuilder: (value) => value.name, + initialOption: UiAsyncState.content, + ); +} + +/// Shared empty / error / loading wrappers for molecules & screens. +Widget wrapAsyncState({ + required BuildContext context, + required UiAsyncState state, + required Widget Function() builder, + String emptyLabel = 'Пока пусто', + String errorLabel = 'Что-то пошло не так', +}) { + return switch (state) { + UiAsyncState.loading => const Padding( + padding: EdgeInsets.all(AppSpacing.s6), + child: Center(child: AppSpinner()), + ), + UiAsyncState.empty => Padding( + padding: const EdgeInsets.all(AppSpacing.s6), + child: Center(child: AppText.subhead(emptyLabel)), + ), + UiAsyncState.error => Padding( + padding: const EdgeInsets.all(AppSpacing.s6), + child: Center( + child: AppText.subhead( + knobText(context, label: 'Error text', initialValue: errorLabel), + color: AppColors.systemRed, + ), + ), + ), + UiAsyncState.content => builder(), + }; +} diff --git a/mobile/widgetbook/lib/main.dart b/mobile/widgetbook/lib/main.dart new file mode 100644 index 0000000..43d4ccc --- /dev/null +++ b/mobile/widgetbook/lib/main.dart @@ -0,0 +1,10 @@ +import 'package:flutter/widgets.dart'; +import 'package:intl/date_symbol_data_local.dart'; +import 'package:please_pay_me_widgetbook/app.dart'; + +Future main() async { + WidgetsFlutterBinding.ensureInitialized(); + await initializeDateFormatting('ru'); + + runApp(const WidgetbookRoot()); +} diff --git a/mobile/widgetbook/lib/support/demo_scope.dart b/mobile/widgetbook/lib/support/demo_scope.dart new file mode 100644 index 0000000..790bc0a --- /dev/null +++ b/mobile/widgetbook/lib/support/demo_scope.dart @@ -0,0 +1,76 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/core/config/app_config.dart'; +import 'package:please_pay_me/core/storage/session_storage.dart'; +import 'package:please_pay_me/data/demo/demo_backend.dart'; +import 'package:please_pay_me/features/auth/session_controller.dart'; +import 'package:please_pay_me/features/budgets/budgets_controller.dart'; +import 'package:please_pay_me/features/journal/journal_controller.dart'; +import 'package:please_pay_me/features/work/jobs_controller.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:provider/provider.dart'; + +/// Wires real app screens to the in-memory [DemoBackend] so the catalog shows +/// production widgets with production state management. +class DemoScope extends StatefulWidget { + const DemoScope({super.key, required this.child, this.seeded = true}); + + final Widget child; + + /// `false` renders the empty states (no budgets / jobs / operations). + final bool seeded; + + @override + State createState() => _DemoScopeState(); +} + +class _DemoScopeState extends State { + late DemoBackend _backend; + late SessionController _session; + + @override + void initState() { + super.initState(); + _build(); + } + + @override + void didUpdateWidget(DemoScope oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.seeded != widget.seeded) _build(); + } + + void _build() { + _backend = widget.seeded ? DemoBackend() : DemoBackend.empty(); + _session = SessionController( + config: AppConfig.demo, + storage: InMemorySessionStorage(), + demoBackend: _backend, + )..startDemo(); + } + + @override + Widget build(BuildContext context) { + return MultiProvider( + key: ValueKey(widget.seeded), + providers: [ + ChangeNotifierProvider.value(value: _session), + ChangeNotifierProvider( + create: (_) => ThemeController(store: MemoryThemeStore()), + ), + ChangeNotifierProvider( + create: (_) => BudgetsController( + budgets: _backend.budgets, + expenses: _backend.expenses, + )..load(), + ), + ChangeNotifierProvider( + create: (_) => JournalController(expenses: _backend.expenses)..load(), + ), + ChangeNotifierProvider( + create: (_) => JobsController(jobs: _backend.jobs)..load(), + ), + ], + child: widget.child, + ); + } +} diff --git a/mobile/widgetbook/lib/support/preview.dart b/mobile/widgetbook/lib/support/preview.dart new file mode 100644 index 0000000..74e2039 --- /dev/null +++ b/mobile/widgetbook/lib/support/preview.dart @@ -0,0 +1,56 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; + +/// Puts a use-case on the iOS grouped background so inset-grouped cards and +/// separators read the way they do inside the app. +class IosPreview extends StatelessWidget { + const IosPreview({ + super.key, + required this.child, + this.padding = const EdgeInsets.symmetric(vertical: AppSpacing.s5), + this.maxWidth = 420, + this.stretch = false, + }); + + /// Preview for controls that should not be stretched (buttons, chips). + const IosPreview.centered({super.key, required this.child}) + : padding = const EdgeInsets.all(AppSpacing.s5), + maxWidth = 420, + stretch = false; + + final Widget child; + final EdgeInsetsGeometry padding; + final double maxWidth; + final bool stretch; + + @override + Widget build(BuildContext context) { + return ColoredBox( + color: AppColors.of(context, AppColors.groupedBackground), + child: Center( + child: SingleChildScrollView( + padding: padding, + child: ConstrainedBox( + constraints: BoxConstraints(maxWidth: maxWidth), + child: Column( + crossAxisAlignment: + stretch ? CrossAxisAlignment.stretch : CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [child], + ), + ), + ), + ), + ); + } +} + +/// Full-screen preview (screens already bring their own scaffold). +class IosScreenPreview extends StatelessWidget { + const IosScreenPreview({super.key, required this.child}); + + final Widget child; + + @override + Widget build(BuildContext context) => child; +} diff --git a/mobile/widgetbook/lib/use_cases/atoms/buttons_use_cases.dart b/mobile/widgetbook/lib/use_cases/atoms/buttons_use_cases.dart new file mode 100644 index 0000000..ae9b58b --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/atoms/buttons_use_cases.dart @@ -0,0 +1,80 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent buttonsComponent() { + return WidgetbookComponent( + name: 'AppButton', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + return IosPreview( + stretch: true, + child: AppButton( + label: knobText(context, label: 'Label', initialValue: 'Сохранить'), + style: knobEnum( + context, + label: 'Style', + values: AppButtonStyle.values, + initial: AppButtonStyle.filled, + ), + size: knobEnum( + context, + label: 'Size', + values: AppButtonSize.values, + initial: AppButtonSize.large, + ), + expanded: knobBool(context, label: 'Expanded', initialValue: true), + loading: knobBool(context, label: 'Loading'), + icon: knobBool(context, label: 'Icon') ? CupertinoIcons.plus : null, + onPressed: + knobBool(context, label: 'Enabled', initialValue: true) ? () {} : null, + ), + ); + }, + ), + WidgetbookUseCase( + name: 'All styles', + builder: (context) { + return IosPreview( + stretch: true, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (final style in AppButtonStyle.values) ...[ + AppButton(label: style.name, style: style, onPressed: () {}), + const SizedBox(height: AppSpacing.s3), + ], + ], + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Sizes', + builder: (context) { + return IosPreview.centered( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + for (final size in AppButtonSize.values) ...[ + AppButton( + label: 'Размер ${size.name}', + size: size, + expanded: false, + onPressed: () {}, + ), + const SizedBox(height: AppSpacing.s3), + ], + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/atoms/icons_use_cases.dart b/mobile/widgetbook/lib/use_cases/atoms/icons_use_cases.dart new file mode 100644 index 0000000..c6adebf --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/atoms/icons_use_cases.dart @@ -0,0 +1,68 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +const _icons = [ + CupertinoIcons.house_fill, + CupertinoIcons.cart_fill, + CupertinoIcons.bag_fill, + CupertinoIcons.money_rubl_circle_fill, + CupertinoIcons.chart_pie_fill, + CupertinoIcons.calendar, + CupertinoIcons.bell_fill, + CupertinoIcons.gear_alt_fill, + CupertinoIcons.person_fill, + CupertinoIcons.creditcard_fill, +]; + +WidgetbookComponent iconsComponent() { + return WidgetbookComponent( + name: 'Icons', + useCases: [ + WidgetbookUseCase( + name: 'Glyphs', + builder: (context) { + final size = knobDouble(context, label: 'Size', initialValue: 24, min: 12, max: 48); + final tint = knobTint(context); + return IosPreview( + child: Wrap( + spacing: AppSpacing.s5, + runSpacing: AppSpacing.s5, + alignment: WrapAlignment.center, + children: [ + for (final icon in _icons) AppIcon(icon, size: size, color: tint), + ], + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Badges', + builder: (context) { + return IosPreview( + child: Wrap( + spacing: AppSpacing.s4, + runSpacing: AppSpacing.s4, + alignment: WrapAlignment.center, + children: [ + for (final (index, icon) in _icons.indexed) + AppIconBadge( + icon: icon, + color: switch (index % 4) { + 0 => AppColors.accent, + 1 => AppColors.systemRed, + 2 => AppColors.systemOrange, + _ => AppColors.systemGray, + }, + ), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/atoms/text_fields_use_cases.dart b/mobile/widgetbook/lib/use_cases/atoms/text_fields_use_cases.dart new file mode 100644 index 0000000..b8bf711 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/atoms/text_fields_use_cases.dart @@ -0,0 +1,62 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent textFieldsComponent() { + return WidgetbookComponent( + name: 'AppTextField', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final error = knobText(context, label: 'Error', initialValue: ''); + return IosPreview( + stretch: true, + padding: const EdgeInsets.all(AppSpacing.s4), + child: AppTextField( + label: knobText(context, label: 'Label', initialValue: 'Сумма'), + placeholder: knobText(context, label: 'Placeholder', initialValue: '0 ₽'), + enabled: knobBool(context, label: 'Enabled', initialValue: true), + obscureText: knobBool(context, label: 'Obscure'), + clearable: knobBool(context, label: 'Clear button', initialValue: true), + prefixIcon: knobBool(context, label: 'Prefix icon') + ? CupertinoIcons.search + : null, + errorText: error.isEmpty ? null : error, + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Form group', + builder: (context) { + return const IosPreview( + stretch: true, + padding: EdgeInsets.all(AppSpacing.s4), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppTextField(label: 'Название', placeholder: 'Продукты'), + SizedBox(height: AppSpacing.s4), + AppTextField( + label: 'Сумма', + placeholder: '0 ₽', + keyboardType: TextInputType.number, + ), + SizedBox(height: AppSpacing.s4), + AppTextField( + label: 'Комментарий', + placeholder: 'Необязательно', + errorText: 'Слишком длинный комментарий', + ), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/atoms/typography_use_cases.dart b/mobile/widgetbook/lib/use_cases/atoms/typography_use_cases.dart new file mode 100644 index 0000000..fbd13c6 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/atoms/typography_use_cases.dart @@ -0,0 +1,63 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent typographyComponent() { + return WidgetbookComponent( + name: 'Typography', + useCases: [ + WidgetbookUseCase( + name: 'iOS scale', + builder: (context) { + final sample = knobText(context, label: 'Sample', initialValue: 'Бюджет на неделю'); + return IosPreview( + stretch: true, + padding: const EdgeInsets.all(AppSpacing.s4), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText.largeTitle(sample), + const SizedBox(height: AppSpacing.s3), + AppText.title(sample), + const SizedBox(height: AppSpacing.s3), + AppText.headline(sample), + const SizedBox(height: AppSpacing.s3), + AppText.body(sample), + const SizedBox(height: AppSpacing.s3), + AppText.callout(sample), + const SizedBox(height: AppSpacing.s3), + AppText.subhead(sample), + const SizedBox(height: AppSpacing.s3), + AppText.footnote(sample), + const SizedBox(height: AppSpacing.s3), + AppText.caption(sample), + ], + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Section header', + builder: (context) { + return IosPreview( + stretch: true, + child: AppListSection( + header: knobText(context, label: 'Header', initialValue: 'Настройки'), + footer: knobText( + context, + label: 'Footer', + initialValue: 'Пояснение под группой, как в iOS Settings.', + ), + children: const [ + AppListTile(title: 'Строка', value: 'Значение'), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/feedback/progress_use_cases.dart b/mobile/widgetbook/lib/use_cases/feedback/progress_use_cases.dart new file mode 100644 index 0000000..6128513 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/feedback/progress_use_cases.dart @@ -0,0 +1,48 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent progressComponent() { + return WidgetbookComponent( + name: 'Progress', + useCases: [ + WidgetbookUseCase( + name: 'Activity indicator', + builder: (context) { + return IosPreview.centered( + child: AppSpinner( + radius: knobDouble(context, label: 'Radius', initialValue: 14, min: 6, max: 28), + color: knobTint(context), + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Progress bar', + builder: (context) { + return IosPreview( + stretch: true, + padding: const EdgeInsets.all(AppSpacing.s4), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppProgressBar( + value: knobDouble(context, label: 'Value', initialValue: 0.42), + color: knobTint(context), + height: knobDouble(context, label: 'Height', initialValue: 4, min: 2, max: 12), + ), + const SizedBox(height: AppSpacing.s4), + const AppProgressBar(value: 0.15, color: AppColors.systemRed), + const SizedBox(height: AppSpacing.s4), + const AppProgressBar(value: 1, color: AppColors.systemGreen), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/feedback/skeletons_use_cases.dart b/mobile/widgetbook/lib/use_cases/feedback/skeletons_use_cases.dart new file mode 100644 index 0000000..1368492 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/feedback/skeletons_use_cases.dart @@ -0,0 +1,38 @@ +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent skeletonsComponent() { + return WidgetbookComponent( + name: 'AppSkeleton', + useCases: [ + WidgetbookUseCase( + name: 'Block', + builder: (context) { + return IosPreview.centered( + child: AppSkeleton( + width: knobDouble(context, label: 'Width', initialValue: 200, min: 40, max: 320), + height: knobDouble(context, label: 'Height', initialValue: 16, min: 8, max: 80), + radius: knobDouble(context, label: 'Radius', initialValue: 6, min: 0, max: 24), + ), + ); + }, + ), + WidgetbookUseCase( + name: 'List loading', + builder: (context) { + final rows = knobInt(context, label: 'Rows', initialValue: 4, min: 1, max: 8); + return IosPreview( + stretch: true, + child: AppListSection( + header: 'Загрузка', + separatorIndent: 60, + children: List.generate(rows, (_) => const AppSkeletonRow()), + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/feedback/toasts_use_cases.dart b/mobile/widgetbook/lib/use_cases/feedback/toasts_use_cases.dart new file mode 100644 index 0000000..b172668 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/feedback/toasts_use_cases.dart @@ -0,0 +1,46 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent toastsComponent() { + return WidgetbookComponent( + name: 'AppToast', + useCases: [ + WidgetbookUseCase( + name: 'Static', + builder: (context) { + return IosPreview.centered( + child: AppToast( + message: knobText(context, label: 'Message', initialValue: 'Трата сохранена'), + tint: knobTint(context), + icon: knobBool(context, label: 'Icon', initialValue: true) + ? CupertinoIcons.check_mark_circled_solid + : null, + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Trigger', + builder: (context) { + return IosPreview( + stretch: true, + child: AppButton( + label: 'Показать toast', + onPressed: () => showAppToast( + context, + message: knobText( + context, + label: 'Message', + initialValue: 'Трата сохранена', + ), + ), + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/molecules/avatars_use_cases.dart b/mobile/widgetbook/lib/use_cases/molecules/avatars_use_cases.dart new file mode 100644 index 0000000..8a1a39b --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/molecules/avatars_use_cases.dart @@ -0,0 +1,48 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent avatarsComponent() { + return WidgetbookComponent( + name: 'AppAvatar', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final initials = knobText(context, label: 'Initials', initialValue: 'ВА'); + return IosPreview.centered( + child: AppAvatar( + initials: knobBool(context, label: 'Use initials', initialValue: true) + ? initials + : null, + radius: knobDouble(context, label: 'Radius', initialValue: 32, min: 12, max: 56), + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Sizes', + builder: (context) { + return const IosPreview.centered( + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + AppAvatar(initials: 'А', radius: 16), + SizedBox(width: AppSpacing.s4), + AppAvatar(initials: 'ВА', radius: 22), + SizedBox(width: AppSpacing.s4), + AppAvatar(radius: 32), + SizedBox(width: AppSpacing.s4), + AppAvatar(initials: 'ППМ', radius: 44), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/molecules/cards_use_cases.dart b/mobile/widgetbook/lib/use_cases/molecules/cards_use_cases.dart new file mode 100644 index 0000000..1a1005d --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/molecules/cards_use_cases.dart @@ -0,0 +1,72 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent cardsComponent() { + return WidgetbookComponent( + name: 'AppCard', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final subtitle = knobText(context, label: 'Subtitle', initialValue: 'До 25 сентября'); + return IosPreview( + stretch: true, + child: AppCard( + title: knobText(context, label: 'Title', initialValue: 'Бюджет'), + subtitle: subtitle.isEmpty ? null : subtitle, + onTap: knobBool(context, label: 'Tappable') ? () {} : null, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText.largeTitle( + knobText(context, label: 'Amount', initialValue: '18 420 ₽'), + ), + const SizedBox(height: AppSpacing.s4), + AppProgressBar( + value: knobDouble(context, label: 'Progress', initialValue: 0.42), + ), + ], + ), + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Metrics row', + builder: (context) { + return const IosPreview( + stretch: true, + child: AppCard( + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText.footnote('Доход'), + AppText.title('64 000 ₽'), + ], + ), + ), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText.footnote('Расход'), + AppText.title('45 580 ₽', color: AppColors.systemRed), + ], + ), + ), + ], + ), + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/molecules/chips_use_cases.dart b/mobile/widgetbook/lib/use_cases/molecules/chips_use_cases.dart new file mode 100644 index 0000000..edc1b17 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/molecules/chips_use_cases.dart @@ -0,0 +1,45 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent chipsComponent() { + return WidgetbookComponent( + name: 'AppChip', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + return IosPreview.centered( + child: AppChip( + label: knobText(context, label: 'Label', initialValue: 'Еда'), + selected: knobBool(context, label: 'Selected'), + icon: knobBool(context, label: 'Icon') ? CupertinoIcons.tag_fill : null, + onPressed: () {}, + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Filter row', + builder: (context) { + final selected = knobInt(context, label: 'Selected index', min: 0, max: 3); + const labels = ['Все', 'Еда', 'Транспорт', 'Подписки']; + return IosPreview.centered( + child: Wrap( + spacing: AppSpacing.s2, + runSpacing: AppSpacing.s2, + alignment: WrapAlignment.center, + children: [ + for (final (index, label) in labels.indexed) + AppChip(label: label, selected: index == selected, onPressed: () {}), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/molecules/list_tiles_use_cases.dart b/mobile/widgetbook/lib/use_cases/molecules/list_tiles_use_cases.dart new file mode 100644 index 0000000..87e6183 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/molecules/list_tiles_use_cases.dart @@ -0,0 +1,80 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/knobs/state_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent listTilesComponent() { + return WidgetbookComponent( + name: 'AppListTile', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final subtitle = knobText(context, label: 'Subtitle', initialValue: 'Супермаркет'); + final value = knobText(context, label: 'Value', initialValue: '−1 840 ₽'); + return IosPreview( + stretch: true, + child: AppListSection( + separatorIndent: 60, + children: [ + AppListTile( + leading: knobBool(context, label: 'Leading badge', initialValue: true) + ? const AppIconBadge(icon: CupertinoIcons.cart_fill) + : null, + title: knobText(context, label: 'Title', initialValue: 'Продукты'), + subtitle: subtitle.isEmpty ? null : subtitle, + value: value.isEmpty ? null : value, + destructive: knobBool(context, label: 'Destructive'), + showChevron: knobBool(context, label: 'Chevron', initialValue: true), + onTap: knobBool(context, label: 'Tappable', initialValue: true) ? () {} : null, + ), + ], + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Grouped section', + builder: (context) { + final state = knobAsyncState(context); + return IosPreview( + stretch: true, + child: AppListSection( + header: 'Сегодня', + footer: 'Свайп по строке открывает действия.', + separatorIndent: 60, + children: [ + wrapAsyncState( + context: context, + state: state, + builder: () => const Column( + children: [ + AppListTile( + leading: AppIconBadge(icon: CupertinoIcons.cart_fill), + title: 'Продукты', + subtitle: 'Супермаркет', + value: '−1 840 ₽', + ), + AppListTile( + leading: AppIconBadge( + icon: CupertinoIcons.car_fill, + color: AppColors.systemOrange, + ), + title: 'Такси', + subtitle: 'Транспорт', + value: '−420 ₽', + ), + ], + ), + ), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/molecules/switches_use_cases.dart b/mobile/widgetbook/lib/use_cases/molecules/switches_use_cases.dart new file mode 100644 index 0000000..5442f62 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/molecules/switches_use_cases.dart @@ -0,0 +1,75 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent switchesComponent() { + return WidgetbookComponent( + name: 'AppSwitchRow', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final subtitle = knobText(context, label: 'Subtitle', initialValue: ''); + return IosPreview( + stretch: true, + child: AppListSection( + separatorIndent: 60, + children: [ + AppSwitchRow( + leading: knobBool(context, label: 'Leading badge', initialValue: true) + ? const AppIconBadge( + icon: CupertinoIcons.bell_fill, + color: AppColors.systemRed, + ) + : null, + title: knobText(context, label: 'Title', initialValue: 'Уведомления'), + subtitle: subtitle.isEmpty ? null : subtitle, + value: knobBool(context, label: 'Value', initialValue: true), + onChanged: knobBool(context, label: 'Enabled', initialValue: true) + ? (_) {} + : null, + ), + ], + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Settings group', + builder: (context) { + return IosPreview( + stretch: true, + child: AppListSection( + header: 'Настройки', + footer: 'Push приходят за час до дедлайна бюджета.', + separatorIndent: 60, + children: [ + AppSwitchRow( + leading: const AppIconBadge( + icon: CupertinoIcons.bell_fill, + color: AppColors.systemRed, + ), + title: 'Уведомления', + value: true, + onChanged: (_) {}, + ), + AppSwitchRow( + leading: const AppIconBadge( + icon: CupertinoIcons.lock_fill, + color: AppColors.systemGray, + ), + title: 'Face ID', + value: false, + onChanged: (_) {}, + ), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/navigation/dialogs_use_cases.dart b/mobile/widgetbook/lib/use_cases/navigation/dialogs_use_cases.dart new file mode 100644 index 0000000..1e9b6b7 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/navigation/dialogs_use_cases.dart @@ -0,0 +1,73 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent dialogsComponent() { + return WidgetbookComponent( + name: 'AppAlert', + useCases: [ + WidgetbookUseCase( + name: 'Alert', + builder: (context) { + final message = knobText( + context, + label: 'Message', + initialValue: 'Операция будет удалена без возможности восстановления.', + ); + return IosPreview.centered( + child: AppAlert( + title: knobText(context, label: 'Title', initialValue: 'Удалить трату?'), + message: message.isEmpty ? null : message, + confirmLabel: knobText(context, label: 'Confirm', initialValue: 'Удалить'), + cancelLabel: knobBool(context, label: 'Cancel button', initialValue: true) + ? 'Отмена' + : null, + destructive: knobBool(context, label: 'Destructive', initialValue: true), + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Triggers', + builder: (context) { + return IosPreview( + stretch: true, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + AppButton( + label: 'Показать alert', + onPressed: () => showAppAlert( + context: context, + title: 'Удалить трату?', + message: 'Действие необратимо.', + confirmLabel: 'Удалить', + cancelLabel: 'Отмена', + destructive: true, + ), + ), + const SizedBox(height: AppSpacing.s3), + AppButton( + label: 'Показать action sheet', + style: AppButtonStyle.gray, + onPressed: () => showAppActionSheet( + context: context, + title: 'Операция', + actions: const [ + AppActionSheetAction(label: 'Редактировать', isDefault: true), + AppActionSheetAction(label: 'Дублировать'), + AppActionSheetAction(label: 'Удалить', destructive: true), + ], + ), + ), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/navigation/nav_bar_use_cases.dart b/mobile/widgetbook/lib/use_cases/navigation/nav_bar_use_cases.dart new file mode 100644 index 0000000..9ee2d55 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/navigation/nav_bar_use_cases.dart @@ -0,0 +1,83 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent navBarComponent() { + return WidgetbookComponent( + name: 'AppNavBar', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final subtitle = knobText(context, label: 'Subtitle', initialValue: 'До 25 сентября'); + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: AppNavBar( + title: knobText(context, label: 'Title', initialValue: 'Бюджет'), + subtitle: subtitle.isEmpty ? null : subtitle, + previousPageTitle: + knobBool(context, label: 'Back button', initialValue: true) ? 'Назад' : null, + transparent: knobBool(context, label: 'Transparent'), + trailing: knobBool(context, label: 'Trailing action', initialValue: true) + ? CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () {}, + child: const AppIcon( + CupertinoIcons.ellipsis_circle, + color: AppColors.accent, + ), + ) + : null, + ), + child: const SafeArea( + child: Padding( + padding: EdgeInsets.all(AppSpacing.s4), + child: AppText.subhead('Контент под навигационной панелью'), + ), + ), + ); + }, + ), + WidgetbookUseCase( + name: 'Large title', + builder: (context) { + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + child: CustomScrollView( + slivers: [ + AppLargeNavBar( + title: knobText(context, label: 'Title', initialValue: 'Журнал'), + trailing: CupertinoButton( + padding: EdgeInsets.zero, + minimumSize: Size.zero, + onPressed: () {}, + child: const AppIcon( + CupertinoIcons.add_circled, + color: AppColors.accent, + ), + ), + ), + SliverToBoxAdapter( + child: AppListSection( + header: 'Сегодня', + separatorIndent: 60, + children: const [ + AppListTile( + leading: AppIconBadge(icon: CupertinoIcons.cart_fill), + title: 'Продукты', + value: '−1 840 ₽', + ), + ], + ), + ), + ], + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/navigation/segmented_control_use_cases.dart b/mobile/widgetbook/lib/use_cases/navigation/segmented_control_use_cases.dart new file mode 100644 index 0000000..43e7c68 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/navigation/segmented_control_use_cases.dart @@ -0,0 +1,93 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:please_pay_me_widgetbook/support/preview.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent segmentedControlComponent() { + return WidgetbookComponent( + name: 'AppSegmentedControl', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final labels = knobText( + context, + label: 'Labels (comma separated)', + initialValue: 'Все,Расходы,Доходы', + ).split(',').where((e) => e.trim().isNotEmpty).toList(); + + final safeLabels = labels.isEmpty ? ['Все'] : labels; + + return IosPreview( + stretch: true, + child: _StatefulSegments( + labels: safeLabels, + initialIndex: knobInt( + context, + label: 'Initial index', + max: safeLabels.length - 1, + ), + ), + ); + }, + ), + WidgetbookUseCase( + name: 'In screen header', + builder: (context) { + return CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: const AppNavBar(title: 'Журнал'), + child: SafeArea( + child: Column( + children: [ + const SizedBox(height: AppSpacing.s4), + const _StatefulSegments(labels: ['Неделя', 'Месяц', 'Год']), + const SizedBox(height: AppSpacing.s5), + AppListSection( + children: const [ + AppListTile(title: 'Итого', value: '45 580 ₽'), + ], + ), + ], + ), + ), + ); + }, + ), + ], + ); +} + +class _StatefulSegments extends StatefulWidget { + const _StatefulSegments({required this.labels, this.initialIndex = 0}); + + final List labels; + final int initialIndex; + + @override + State<_StatefulSegments> createState() => _StatefulSegmentsState(); +} + +class _StatefulSegmentsState extends State<_StatefulSegments> { + late int _index = widget.initialIndex; + + @override + void didUpdateWidget(_StatefulSegments oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.initialIndex != widget.initialIndex || + _index >= widget.labels.length) { + _index = widget.initialIndex.clamp(0, widget.labels.length - 1); + } + } + + @override + Widget build(BuildContext context) { + return AppSegmentedControl( + labels: widget.labels, + index: _index, + onChanged: (i) => setState(() => _index = i), + ); + } +} diff --git a/mobile/widgetbook/lib/use_cases/navigation/tab_bar_use_cases.dart b/mobile/widgetbook/lib/use_cases/navigation/tab_bar_use_cases.dart new file mode 100644 index 0000000..041f0fe --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/navigation/tab_bar_use_cases.dart @@ -0,0 +1,53 @@ +import 'package:flutter/cupertino.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me/ui/ui.dart'; +import 'package:please_pay_me_widgetbook/knobs/common_knobs.dart'; +import 'package:widgetbook/widgetbook.dart'; + +const _items = [ + AppTabItem(icon: CupertinoIcons.list_bullet, label: 'Журнал'), + AppTabItem(icon: CupertinoIcons.chart_pie, label: 'Бюджет'), + AppTabItem( + icon: CupertinoIcons.person, + activeIcon: CupertinoIcons.person_fill, + label: 'Профиль', + ), +]; + +WidgetbookComponent tabBarComponent() { + return WidgetbookComponent( + name: 'AppTabBar', + useCases: [ + WidgetbookUseCase( + name: 'Playground', + builder: (context) { + final index = knobInt(context, label: 'Current index', min: 0, max: 2); + return ColoredBox( + color: AppColors.of(context, AppColors.groupedBackground), + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + AppTabBar(items: _items, currentIndex: index, onTap: (_) {}), + ], + ), + ); + }, + ), + WidgetbookUseCase( + name: 'In scaffold', + builder: (context) { + return CupertinoTabScaffold( + tabBar: AppTabBar(items: _items, currentIndex: 0, onTap: (_) {}), + tabBuilder: (context, index) => CupertinoTabView( + builder: (context) => CupertinoPageScaffold( + backgroundColor: AppColors.of(context, AppColors.groupedBackground), + navigationBar: AppNavBar(title: _items[index].label), + child: Center(child: AppText.body(_items[index].label)), + ), + ), + ); + }, + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/screens/app_screens_use_cases.dart b/mobile/widgetbook/lib/use_cases/screens/app_screens_use_cases.dart new file mode 100644 index 0000000..d7ed05d --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/screens/app_screens_use_cases.dart @@ -0,0 +1,130 @@ +import 'package:please_pay_me/app/home_tabs.dart'; +import 'package:please_pay_me/features/auth/login_screen.dart'; +import 'package:please_pay_me/features/budgets/budgets_screen.dart'; +import 'package:please_pay_me/features/journal/journal_screen.dart'; +import 'package:please_pay_me/features/overview/overview_screen.dart'; +import 'package:please_pay_me/features/profile/profile_screen.dart'; +import 'package:please_pay_me/features/splash/splash_screen.dart'; +import 'package:please_pay_me/features/work/work_screen.dart'; +import 'package:please_pay_me_widgetbook/support/demo_scope.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent overviewScreenComponent() { + return WidgetbookComponent( + name: 'OverviewScreen', + useCases: [ + WidgetbookUseCase( + name: 'С активным бюджетом', + builder: (context) => const DemoScope(child: OverviewScreen()), + ), + WidgetbookUseCase( + name: 'Без бюджетов', + builder: (context) => const DemoScope(seeded: false, child: OverviewScreen()), + ), + ], + ); +} + +WidgetbookComponent journalScreenComponent() { + return WidgetbookComponent( + name: 'JournalScreen', + useCases: [ + WidgetbookUseCase( + name: 'С операциями', + builder: (context) => const DemoScope(child: JournalScreen()), + ), + WidgetbookUseCase( + name: 'Пустой', + builder: (context) => const DemoScope(seeded: false, child: JournalScreen()), + ), + ], + ); +} + +WidgetbookComponent budgetsScreenComponent() { + return WidgetbookComponent( + name: 'BudgetsScreen', + useCases: [ + WidgetbookUseCase( + name: 'Активные и завершённые', + builder: (context) => const DemoScope(child: BudgetsScreen()), + ), + WidgetbookUseCase( + name: 'Пустой', + builder: (context) => const DemoScope(seeded: false, child: BudgetsScreen()), + ), + ], + ); +} + +WidgetbookComponent workScreenComponent() { + return WidgetbookComponent( + name: 'WorkScreen', + useCases: [ + WidgetbookUseCase( + name: 'С работой', + builder: (context) => const DemoScope(child: WorkScreen()), + ), + WidgetbookUseCase( + name: 'Пустой', + builder: (context) => const DemoScope(seeded: false, child: WorkScreen()), + ), + ], + ); +} + +WidgetbookComponent profileScreenComponent() { + return WidgetbookComponent( + name: 'ProfileScreen', + useCases: [ + WidgetbookUseCase( + name: 'Демо-сессия', + builder: (context) => const DemoScope(child: ProfileScreen()), + ), + ], + ); +} + +WidgetbookComponent splashScreenComponent() { + return WidgetbookComponent( + name: 'SplashScreen', + useCases: [ + WidgetbookUseCase( + name: 'Запуск', + builder: (context) => const SplashScreen(), + ), + ], + ); +} + +WidgetbookComponent loginScreenComponent() { + return WidgetbookComponent( + name: 'LoginScreen', + useCases: [ + WidgetbookUseCase( + name: 'Вход через Telegram', + builder: (context) => DemoScope( + // Desktop has no WebView, so the catalog stubs the launcher to show + // the mobile layout. + child: LoginScreen(launchTelegramLogin: (_, __) async => null), + ), + ), + WidgetbookUseCase( + name: 'Вход по токену', + builder: (context) => const DemoScope(child: LoginScreen()), + ), + ], + ); +} + +WidgetbookComponent homeTabsComponent() { + return WidgetbookComponent( + name: 'HomeTabs', + useCases: [ + WidgetbookUseCase( + name: 'Полное приложение', + builder: (context) => const DemoScope(child: HomeTabs()), + ), + ], + ); +} diff --git a/mobile/widgetbook/lib/use_cases/screens/sheets_use_cases.dart b/mobile/widgetbook/lib/use_cases/screens/sheets_use_cases.dart new file mode 100644 index 0000000..84fa1d0 --- /dev/null +++ b/mobile/widgetbook/lib/use_cases/screens/sheets_use_cases.dart @@ -0,0 +1,64 @@ +import 'package:please_pay_me/data/demo/demo_backend.dart'; +import 'package:please_pay_me/features/budgets/budget_form_sheet.dart'; +import 'package:please_pay_me/features/expenses/expense_form_sheet.dart'; +import 'package:please_pay_me/features/work/job_form_sheet.dart'; +import 'package:please_pay_me_widgetbook/support/demo_scope.dart'; +import 'package:widgetbook/widgetbook.dart'; + +WidgetbookComponent sheetsComponent() { + return WidgetbookComponent( + name: 'Формы', + useCases: [ + WidgetbookUseCase( + name: 'Новая трата', + builder: (context) => DemoScope( + child: ExpenseFormSheet( + budgetName: 'До аванса', + remainingToday: 1420, + onSubmit: ({required amount, note, required spentAt}) async => null, + ), + ), + ), + WidgetbookUseCase( + name: 'Новый бюджет', + builder: (context) => DemoScope( + child: BudgetFormSheet( + onSubmit: ({ + required name, + required totalAmount, + required startDate, + required endDate, + required resetExpenses, + }) async => + null, + ), + ), + ), + WidgetbookUseCase( + name: 'Новая работа', + builder: (context) => DemoScope( + child: JobFormSheet( + onSubmit: ({ + required name, + required salaryAmount, + required payDays, + required firstPayPercent, + required weekendPolicy, + }) async => + null, + ), + ), + ), + WidgetbookUseCase( + name: 'Ошибка сохранения', + builder: (context) => DemoScope( + child: ExpenseFormSheet( + budgetName: DemoBackend.user.displayName, + onSubmit: ({required amount, note, required spentAt}) async => + 'Бюджет уже завершён', + ), + ), + ), + ], + ); +} diff --git a/mobile/widgetbook/pubspec.lock b/mobile/widgetbook/pubspec.lock new file mode 100644 index 0000000..414995a --- /dev/null +++ b/mobile/widgetbook/pubspec.lock @@ -0,0 +1,918 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: "1b0e6a07425a3e460666e88bf1c949ccc7bb0116ad562ce94a1eca60fe820725" + url: "https://pub.dev" + source: hosted + version: "103.0.0" + accessibility_tools: + dependency: transitive + description: + name: accessibility_tools + sha256: c29732e423175a51e0a6ace7df1255f5d77812c7c7b7101d8ba0186a43d533aa + url: "https://pub.dev" + source: hosted + version: "2.8.0" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "61c04d0c1bfed555c681ea079519933f071a5a026578ff73c4ff0df2d3462e5e" + url: "https://pub.dev" + source: hosted + version: "13.3.0" + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37 + url: "https://pub.dev" + source: hosted + version: "2.13.1" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + build: + dependency: transitive + description: + name: build + sha256: "8a5c5761af8e31748bba3c82f68925ace40f3225c3eea25be9beb57eca7cd7a8" + url: "https://pub.dev" + source: hosted + version: "4.0.11" + build_config: + dependency: transitive + description: + name: build_config + sha256: d466ed2dc9c6cd1d169948879b84ee061eb5e22c64a7c6089879c6296d272a8d + url: "https://pub.dev" + source: hosted + version: "1.3.3" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: e1d40ef3f7934986d5da2271b1ba07794921ce263e44d622fb6c406d76589e33 + url: "https://pub.dev" + source: hosted + version: "4.1.6" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "894c243f6bc32015fec466ce30a6925bd537a77a426ee5bf481120477eb3de67" + url: "https://pub.dev" + source: hosted + version: "2.16.1" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: f87ea98192116f7093cb214551ce1929caae0681fdba282b3d8b4462adee7bb7 + url: "https://pub.dev" + source: hosted + version: "8.13.0" + characters: + dependency: transitive + description: + name: characters + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + url: "https://pub.dev" + source: hosted + version: "1.4.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" + url: "https://pub.dev" + source: hosted + version: "2.0.4" + clock: + dependency: transitive + description: + name: clock + sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e + url: "https://pub.dev" + source: hosted + version: "1.1.3" + code_assets: + dependency: transitive + description: + name: code_assets + sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: aa5932e94c6c39c2f9ec4e5e06dfdd11a9430a61f6c41b6ba75b28ce0c481baf + url: "https://pub.dev" + source: hosted + version: "4.12.0" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + convert: + dependency: transitive + description: + name: convert + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + crypto: + dependency: transitive + description: + name: crypto + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf + url: "https://pub.dev" + source: hosted + version: "3.0.7" + cupertino_icons: + dependency: transitive + description: + name: cupertino_icons + sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd" + url: "https://pub.dev" + source: hosted + version: "1.0.9" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "82ade9fc4273f29ed673e33166944465225b4f7fc5d4aaef48605cc751c18fc1" + url: "https://pub.dev" + source: hosted + version: "3.1.13" + device_frame_plus: + dependency: transitive + description: + name: device_frame_plus + sha256: ccc94abccd4d9f0a9f19ef239001b3a59896e678ad42601371d7065889f2bf78 + url: "https://pub.dev" + source: hosted + version: "1.5.0" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + ffi: + dependency: transitive + description: + name: ffi + sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + google_fonts: + dependency: "direct dev" + description: + name: google_fonts + sha256: ba03d03bcaa2f6cb7bd920e3b5027181db75ab524f8891c8bc3aa603885b8055 + url: "https://pub.dev" + source: hosted + version: "6.3.3" + graphs: + dependency: transitive + description: + name: graphs + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + hooks: + dependency: transitive + description: + name: hooks + sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + http: + dependency: transitive + description: + name: http + sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" + url: "https://pub.dev" + source: hosted + version: "1.6.0" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 + url: "https://pub.dev" + source: hosted + version: "3.2.2" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + inspector: + dependency: transitive + description: + name: inspector + sha256: "60782d94c8851b0eee3ffdfea9fd43e7c37f919b54cb587e4de9da0e09d491b5" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" + io: + dependency: transitive + description: + name: io + sha256: "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + jni: + dependency: transitive + description: + name: jni + sha256: f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3 + url: "https://pub.dev" + source: hosted + version: "1.0.3" + jni_flutter: + dependency: transitive + description: + name: jni_flutter + sha256: b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351 + url: "https://pub.dev" + source: hosted + version: "1.0.3" + jni_util: + dependency: transitive + description: + name: jni_util + sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80" + url: "https://pub.dev" + source: hosted + version: "4.12.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" + source: hosted + version: "11.0.2" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" + source: hosted + version: "3.0.10" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + lints: + dependency: transitive + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd" + url: "https://pub.dev" + source: hosted + version: "0.12.20" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + url: "https://pub.dev" + source: hosted + version: "0.13.0" + meta: + dependency: transitive + description: + name: meta + sha256: c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d + url: "https://pub.dev" + source: hosted + version: "1.18.3" + mime: + dependency: transitive + description: + name: mime + sha256: bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6 + url: "https://pub.dev" + source: hosted + version: "2.1.0" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + objective_c: + dependency: transitive + description: + name: objective_c + sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e + url: "https://pub.dev" + source: hosted + version: "9.5.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d + url: "https://pub.dev" + source: hosted + version: "3.0.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825 + url: "https://pub.dev" + source: hosted + version: "2.1.6" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" + url: "https://pub.dev" + source: hosted + version: "2.6.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + platform: + dependency: transitive + description: + name: platform + sha256: a36d119c13416516a7b5913fbe8af8531e11633d784c550b2125f76c758524ec + url: "https://pub.dev" + source: hosted + version: "3.2.0" + please_pay_me: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "0.1.0+1" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + pool: + dependency: transitive + description: + name: pool + sha256: "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c" + url: "https://pub.dev" + source: hosted + version: "1.5.3" + provider: + dependency: "direct main" + description: + name: provider + sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" + url: "https://pub.dev" + source: hosted + version: "6.1.5+1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796 + url: "https://pub.dev" + source: hosted + version: "1.6.0" + record_use: + dependency: transitive + description: + name: record_use + sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + resizable_widget: + dependency: transitive + description: + name: resizable_widget + sha256: db2919754b93f386b9b3fb15e9f48f6c9d6d41f00a24397629133c99df86606a + url: "https://pub.dev" + source: hosted + version: "1.0.5" + shared_preferences: + dependency: transitive + description: + name: shared_preferences + sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf + url: "https://pub.dev" + source: hosted + version: "2.5.5" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "1e12aafe408aa50da80edfd679a2a6bf63ba7ab37c7fa98286da459a757b3399" + url: "https://pub.dev" + source: hosted + version: "2.4.28" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea" + url: "https://pub.dev" + source: hosted + version: "2.5.7" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shelf: + dependency: transitive + description: + name: shelf + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 + url: "https://pub.dev" + source: hosted + version: "1.4.2" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: a603f1fb984a7391ae5978d1b92bfaaa08b350dca5c825256f925818f7943bf5 + url: "https://pub.dev" + source: hosted + version: "4.2.4" + source_span: + dependency: transitive + description: + name: source_span + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" + url: "https://pub.dev" + source: hosted + version: "1.10.2" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490" + url: "https://pub.dev" + source: hosted + version: "1.12.2" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: a00e5f18bffc764f923e7dec1038527f7fe7a1791361a7117f0358193f13d53a + url: "https://pub.dev" + source: hosted + version: "2.1.2" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + url: "https://pub.dev" + source: hosted + version: "0.7.12" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + url_launcher: + dependency: transitive + description: + name: url_launcher + sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8 + url: "https://pub.dev" + source: hosted + version: "6.3.2" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610" + url: "https://pub.dev" + source: hosted + version: "6.3.33" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a" + url: "https://pub.dev" + source: hosted + version: "6.4.2" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: "10f86fef4c2c43563fa6c211ff9cf757adf4d3ab762c56bd430664a947d70cd0" + url: "https://pub.dev" + source: hosted + version: "3.2.3" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201" + url: "https://pub.dev" + source: hosted + version: "3.2.6" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34" + url: "https://pub.dev" + source: hosted + version: "2.4.3" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "6c5ad3f22cd4c38e089b81963b3cd7bb83b111b2df5dce008bb066162f42e429" + url: "https://pub.dev" + source: hosted + version: "3.1.6" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "1d774bbdf6b72a0b12122fc1560c9c2d2a67db5a4a4cc2bd8a5c990ab20e3188" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "5f37239c4851efcef929cea7824e76df7f2f0970aef85d66bbc430afa40e72f0" + url: "https://pub.dev" + source: hosted + version: "15.3.0" + watcher: + dependency: transitive + description: + name: watcher + sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635" + url: "https://pub.dev" + source: hosted + version: "1.2.1" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 + url: "https://pub.dev" + source: hosted + version: "3.0.3" + webview_flutter: + dependency: transitive + description: + name: webview_flutter + sha256: d53e1ccf5516f25017e3c9d44c39034db352d20fa34fe200674270242c2c5111 + url: "https://pub.dev" + source: hosted + version: "4.14.1" + webview_flutter_android: + dependency: transitive + description: + name: webview_flutter_android + sha256: "4de8b3d1ff4ebe1bdb42e68a5e4f809194a3cb0117a8f495f590004f00da3964" + url: "https://pub.dev" + source: hosted + version: "4.14.1" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + sha256: "1221c1b12f5278791042f2ec2841743784cf25c5a644e23d6680e5d718824f04" + url: "https://pub.dev" + source: hosted + version: "2.15.1" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + sha256: fe359c7fac1002124b5b9e2ba3a41906bbb9b2d029ccb4a0067404d8f3704730 + url: "https://pub.dev" + source: hosted + version: "3.26.1" + widgetbook: + dependency: "direct main" + description: + name: widgetbook + sha256: "88b10102d294d0bec64ca294c81f15b1a620ce66df950067ff8f89274f1c95e8" + url: "https://pub.dev" + source: hosted + version: "3.25.0" + widgetbook_annotation: + dependency: "direct main" + description: + name: widgetbook_annotation + sha256: ec98130f23579f14e304b6b45516612676ae4e0b0e6bb1debe9dba4ea604ab42 + url: "https://pub.dev" + source: hosted + version: "3.11.0" + widgetbook_generator: + dependency: "direct dev" + description: + name: widgetbook_generator + sha256: "8fd3b4208bb74cbe60cd6fc99b443561b65542658b20d6dd700a2496edbd5647" + url: "https://pub.dev" + source: hosted + version: "3.24.0" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea + url: "https://pub.dev" + source: hosted + version: "3.1.4" +sdks: + dart: ">=3.12.0 <4.0.0" + flutter: ">=3.44.0" diff --git a/mobile/widgetbook/pubspec.yaml b/mobile/widgetbook/pubspec.yaml new file mode 100644 index 0000000..0c26c94 --- /dev/null +++ b/mobile/widgetbook/pubspec.yaml @@ -0,0 +1,31 @@ +name: please_pay_me_widgetbook +description: Portable Widgetbook catalog for Please Pay Me UI kit +publish_to: "none" +version: 0.1.0+1 + +environment: + sdk: ">=3.5.0 <4.0.0" + +dependencies: + flutter: + sdk: flutter + flutter_localizations: + sdk: flutter + intl: any + please_pay_me: + path: ../ + provider: ^6.1.2 + widgetbook: ^3.14.0 + widgetbook_annotation: ^3.5.0 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^5.0.0 + build_runner: ^2.4.13 + # Smoke tests disable runtime font fetching. + google_fonts: ^6.2.1 + widgetbook_generator: ^3.13.0 + +flutter: + uses-material-design: true diff --git a/mobile/widgetbook/run.ps1 b/mobile/widgetbook/run.ps1 new file mode 100644 index 0000000..6e1a072 --- /dev/null +++ b/mobile/widgetbook/run.ps1 @@ -0,0 +1,60 @@ +#Requires -Version 5.1 +<# +.SYNOPSIS + Запуск Widgetbook (каталог UI-компонентов). + +.EXAMPLE + .\run.ps1 + .\run.ps1 -Device windows + .\run.ps1 -Device chrome -SkipPubGet +#> +param( + [ValidateSet("chrome", "windows", "edge")] + [string]$Device = "chrome", + + [switch]$SkipPubGet +) + +$ErrorActionPreference = "Stop" +$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path +Set-Location $ScriptDir + +function Find-Flutter { + $cmd = Get-Command flutter -ErrorAction SilentlyContinue + if ($cmd) { return $cmd.Source } + + $candidates = @( + "$env:USERPROFILE\flutter\bin\flutter.bat", + "$env:LOCALAPPDATA\flutter\bin\flutter.bat", + "C:\flutter\bin\flutter.bat", + "C:\src\flutter\bin\flutter.bat" + ) + foreach ($path in $candidates) { + if (Test-Path $path) { return $path } + } + return $null +} + +$flutter = Find-Flutter +if (-not $flutter) { + Write-Error @" +Flutter не найден в PATH и в стандартных путях. +Установи SDK или добавь в PATH, например: + `$env:Path = `"$env:USERPROFILE\flutter\bin;`$env:Path`" +"@ +} + +Write-Host "Flutter: $flutter" -ForegroundColor DarkGray +Write-Host "Device: $Device" -ForegroundColor DarkGray +Write-Host "Dir: $ScriptDir" -ForegroundColor DarkGray +Write-Host "" + +if (-not $SkipPubGet) { + Write-Host ">> flutter pub get" -ForegroundColor Cyan + & $flutter pub get + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } +} + +Write-Host ">> flutter run -d $Device" -ForegroundColor Cyan +& $flutter run -d $Device +exit $LASTEXITCODE diff --git a/mobile/widgetbook/test/catalog_smoke_test.dart b/mobile/widgetbook/test/catalog_smoke_test.dart new file mode 100644 index 0000000..0e181ec --- /dev/null +++ b/mobile/widgetbook/test/catalog_smoke_test.dart @@ -0,0 +1,89 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:intl/date_symbol_data_local.dart'; +import 'package:please_pay_me/theme/theme.dart'; +import 'package:please_pay_me_widgetbook/catalog.dart'; +import 'package:widgetbook/widgetbook.dart'; + +List _collectUseCases() { + final useCases = []; + + void walk(WidgetbookNode node) { + if (node is WidgetbookUseCase) useCases.add(node); + for (final child in node.children ?? const []) { + walk(child); + } + } + + for (final root in buildCatalogDirectories()) { + walk(root); + } + + return useCases; +} + +/// Knobs read `WidgetbookState` from the context, so use-cases can only be +/// pumped inside a scope. +Widget _host({required CupertinoThemeData theme, required WidgetbookUseCase useCase}) { + return WidgetbookScope( + state: WidgetbookState( + path: useCase.path, + root: WidgetbookRoot(children: buildCatalogDirectories()), + ), + child: CupertinoApp( + theme: theme, + locale: const Locale('ru'), + home: Builder(builder: useCase.builder), + ), + ); +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + // No network access in tests — fall back to the default font instead. + GoogleFonts.config.allowRuntimeFetching = false; + + setUpAll(() => initializeDateFormatting('ru')); + + test('catalog directories are non-empty', () { + expect(buildCatalogDirectories(), isNotEmpty); + }); + + test('every use-case has a name and a builder', () { + final useCases = _collectUseCases(); + + for (final useCase in useCases) { + expect(useCase.name, isNotEmpty); + expect(useCase.builder, isNotNull); + } + + expect(useCases.length, greaterThanOrEqualTo(20)); + }); + + test('expected category folders exist', () { + final names = buildCatalogDirectories().map((n) => n.name).toSet(); + expect( + names, + containsAll({'Atoms', 'Molecules', 'Navigation', 'Feedback', 'Screens'}), + ); + }); + + group('use-cases render', () { + final themes = { + 'Light': buildLightTheme, + 'Dark': buildDarkTheme, + }; + + for (final entry in themes.entries) { + for (final useCase in _collectUseCases()) { + testWidgets('${useCase.path} (${entry.key})', (tester) async { + await tester.pumpWidget(_host(theme: entry.value(), useCase: useCase)); + await tester.pump(const Duration(milliseconds: 300)); + + expect(tester.takeException(), isNull); + }); + } + } + }); +} diff --git a/mobile/widgetbook/test/widget_test.dart b/mobile/widgetbook/test/widget_test.dart new file mode 100644 index 0000000..b2c7438 --- /dev/null +++ b/mobile/widgetbook/test/widget_test.dart @@ -0,0 +1,10 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:please_pay_me_widgetbook/app.dart'; + +void main() { + testWidgets('WidgetbookRoot builds', (WidgetTester tester) async { + await tester.pumpWidget(const WidgetbookRoot()); + await tester.pump(); + expect(find.byType(WidgetbookRoot), findsOneWidget); + }); +} diff --git a/mobile/widgetbook/web/favicon.png b/mobile/widgetbook/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/mobile/widgetbook/web/favicon.png differ diff --git a/mobile/widgetbook/web/icons/Icon-192.png b/mobile/widgetbook/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/mobile/widgetbook/web/icons/Icon-192.png differ diff --git a/mobile/widgetbook/web/icons/Icon-512.png b/mobile/widgetbook/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/mobile/widgetbook/web/icons/Icon-512.png differ diff --git a/mobile/widgetbook/web/icons/Icon-maskable-192.png b/mobile/widgetbook/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/mobile/widgetbook/web/icons/Icon-maskable-192.png differ diff --git a/mobile/widgetbook/web/icons/Icon-maskable-512.png b/mobile/widgetbook/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/mobile/widgetbook/web/icons/Icon-maskable-512.png differ diff --git a/mobile/widgetbook/web/index.html b/mobile/widgetbook/web/index.html new file mode 100644 index 0000000..e5ac571 --- /dev/null +++ b/mobile/widgetbook/web/index.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + please_pay_me_widgetbook + + + + + + + diff --git a/mobile/widgetbook/web/manifest.json b/mobile/widgetbook/web/manifest.json new file mode 100644 index 0000000..5e91df3 --- /dev/null +++ b/mobile/widgetbook/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "please_pay_me_widgetbook", + "short_name": "please_pay_me_widgetbook", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/mobile/widgetbook/windows/.gitignore b/mobile/widgetbook/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/mobile/widgetbook/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/mobile/widgetbook/windows/CMakeLists.txt b/mobile/widgetbook/windows/CMakeLists.txt new file mode 100644 index 0000000..d6714b6 --- /dev/null +++ b/mobile/widgetbook/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(please_pay_me_widgetbook LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "please_pay_me_widgetbook") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/mobile/widgetbook/windows/flutter/CMakeLists.txt b/mobile/widgetbook/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/mobile/widgetbook/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/mobile/widgetbook/windows/flutter/generated_plugin_registrant.cc b/mobile/widgetbook/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..4f78848 --- /dev/null +++ b/mobile/widgetbook/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); +} diff --git a/mobile/widgetbook/windows/flutter/generated_plugin_registrant.h b/mobile/widgetbook/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/mobile/widgetbook/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/mobile/widgetbook/windows/flutter/generated_plugins.cmake b/mobile/widgetbook/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..a962892 --- /dev/null +++ b/mobile/widgetbook/windows/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + url_launcher_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/mobile/widgetbook/windows/runner/CMakeLists.txt b/mobile/widgetbook/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/mobile/widgetbook/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/mobile/widgetbook/windows/runner/Runner.rc b/mobile/widgetbook/windows/runner/Runner.rc new file mode 100644 index 0000000..5fdf920 --- /dev/null +++ b/mobile/widgetbook/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "please_pay_me_widgetbook" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "please_pay_me_widgetbook" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "please_pay_me_widgetbook.exe" "\0" + VALUE "ProductName", "please_pay_me_widgetbook" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/mobile/widgetbook/windows/runner/flutter_window.cpp b/mobile/widgetbook/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/mobile/widgetbook/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/mobile/widgetbook/windows/runner/flutter_window.h b/mobile/widgetbook/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/mobile/widgetbook/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/mobile/widgetbook/windows/runner/main.cpp b/mobile/widgetbook/windows/runner/main.cpp new file mode 100644 index 0000000..7f54b9b --- /dev/null +++ b/mobile/widgetbook/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"please_pay_me_widgetbook", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/mobile/widgetbook/windows/runner/resource.h b/mobile/widgetbook/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/mobile/widgetbook/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/mobile/widgetbook/windows/runner/resources/app_icon.ico b/mobile/widgetbook/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/mobile/widgetbook/windows/runner/resources/app_icon.ico differ diff --git a/mobile/widgetbook/windows/runner/runner.exe.manifest b/mobile/widgetbook/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/mobile/widgetbook/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/mobile/widgetbook/windows/runner/utils.cpp b/mobile/widgetbook/windows/runner/utils.cpp new file mode 100644 index 0000000..3cb7146 --- /dev/null +++ b/mobile/widgetbook/windows/runner/utils.cpp @@ -0,0 +1,69 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include

Страница ушла куда-то

Сервер не отвечает

Страница ушла не до зарплаты

Сервер не отвечает

+ {title} +

{section.heading}

+ Операции · {selectedExpenses.length} +

Контекст дня

Скоро