Compare commits

..
15 Commits
Author SHA1 Message Date
RarDog 8ff2efd84c feat: полный ребрендинг интерфейса, User-Agent и системных служб в Prisma (v3.4.1)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-05 11:02:09 +03:00
RarDog 583f60e706 feat: ребрендинг в Prisma и улучшенная прокрутка анонсов автора (v3.4.0)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-05 10:55:10 +03:00
RarDog f983e3c8c0 feat: исключение дублирования в текстовых публикациях и вкладки зеркал (v3.3.1)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-05 10:40:14 +03:00
RarDog 67c6994311 feat: redesign artist messages/announcements & native text-only posts (v3.3.0)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-05 10:24:20 +03:00
RarDog a88a8b5050 feat: fix fullscreen video playback retention, orientation layout and clean up UI (v3.2.0)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-05 09:53:10 +03:00
RarDog a039f09ec3 feat: Fullscreen 2.0 with instant handoff, screen brightness gestures, and real-time scrub preview (v3.1.9)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 23:43:46 +03:00
RarDog c7f507836b fix: fullscreen playback state retention and responsive control buttons (v3.1.8)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 23:33:42 +03:00
RarDog 1395cfd414 fix: remove unsafe libmpv setProperty FFI calls causing SIGSEGV crash (v3.1.7)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 23:17:15 +03:00
RarDog 15bebd6e47 fix: fullscreen play-pause button, search clear providers, video volume persistence & codec fallback (v3.1.6)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 23:09:23 +03:00
RarDog 295499ca4b feat: persist video volume, fix fullscreen controls, search providers & comments headroom (v3.1.5)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 22:50:15 +03:00
RarDog 9a0fd282b7 feat(video): optimize video player aspect ratio sizing and seekbar positioning v3.1.4
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 21:50:17 +03:00
RarDog 254f0e3d59 feat: Liquid Glass redesign for providers and network check, and tab back navigation (v3.1.3)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 21:29:25 +03:00
RarDog 5a568a3df9 perf: optimize post tags scrolling performance and eliminate frame drops (v3.1.2)
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 21:11:03 +03:00
RarDog d58b512020 feat: colored tag categories division like e621/gelbooru/rule34 and fix search for tags with parentheses
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 20:56:35 +03:00
RarDog 384c07955c feat(ui): iPhone Liquid Glass redesign for Search, Favorites, and History, fix cheat sheet clearance and update sheet
Build and Release / Build Windows x64 (push) Has been cancelled
2026-09-04 19:06:37 +03:00
66 changed files with 7860 additions and 3318 deletions
+11 -11
View File
@@ -1,7 +1,7 @@
# 🌙 Lunaris # 💎 Prisma
<p align="center"> <p align="center">
<img src="android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="128" height="128" alt="Lunaris Logo" style="border-radius: 28px; box-shadow: 0 10px 30px rgba(0,0,0,0.35);" /> <img src="android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="128" height="128" alt="Prisma Logo" style="border-radius: 28px; box-shadow: 0 10px 30px rgba(0,0,0,0.35);" />
</p> </p>
<p align="center"> <p align="center">
@@ -10,16 +10,16 @@
</p> </p>
<p align="center"> <p align="center">
<a href="https://github.com/RarDog/Lunaris/releases"><img src="https://img.shields.io/badge/Version-3.0.9-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.0.9" /></a> <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.4.1-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.4.1" /></a>
<img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" /> <img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
<img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows-00C853?style=for-the-badge" alt="Platforms" /> <img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows-00C853?style=for-the-badge" alt="Platforms" />
<a href="https://github.com/RarDog/Lunaris/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a> <a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>
<img src="https://img.shields.io/badge/License-MIT-blue?style=for-the-badge" alt="License MIT" /> <img src="https://img.shields.io/badge/License-MIT-blue?style=for-the-badge" alt="License MIT" />
</p> </p>
--- ---
## 🚀 Что нового в Lunaris 3.0 (Major Release) ## 🚀 Что нового в Prisma 3.0 (Major Release)
### 🎨 Дизайн 2.0 ### 🎨 Дизайн 2.0
- **Современный визуальный стиль**: Полный переход на squircle-карточки, адаптивную цветовую палитру и улучшенную Material You динамическую тему. - **Современный визуальный стиль**: Полный переход на squircle-карточки, адаптивную цветовую палитру и улучшенную Material You динамическую тему.
@@ -28,7 +28,7 @@
### 🐾 Глубокая интеграция Pawchive 2.0 ### 🐾 Глубокая интеграция Pawchive 2.0
- **Мульти-аккаунты**: Поддержка авторизации по логину и паролю, а также прямому вводу `Session Cookie`. - **Мульти-аккаунты**: Поддержка авторизации по логину и паролю, а также прямому вводу `Session Cookie`.
- **Двусторонняя синхронизация (Two-Way Sync)**: Автоматическая синхронизация избранного между локальной базой Lunaris и профилем Pawchive. Новые авторы с сервера добавляются в приложение, а локальные авторы выгружаются на сервер в один тап. - **Двусторонняя синхронизация (Two-Way Sync)**: Автоматическая синхронизация избранного между локальной базой Prisma и профилем Pawchive. Новые авторы с сервера добавляются в приложение, а локальные авторы выгружаются на сервер в один тап.
- **Моментальная синхронизация**: При нажатии кнопки «В избранное» у любого автора (Fanbox, Patreon, Fantia, Boosty, Gumroad, DLsite, Discord) статус синхронизируется с сервером на лету. - **Моментальная синхронизация**: При нажатии кнопки «В избранное» у любого автора (Fanbox, Patreon, Fantia, Boosty, Gumroad, DLsite, Discord) статус синхронизируется с сервером на лету.
### 🎬 Умный медиаплеер и определение разрешения ### 🎬 Умный медиаплеер и определение разрешения
@@ -43,7 +43,7 @@
## 📚 Документация и Вики (Руководство пользователя) ## 📚 Документация и Вики (Руководство пользователя)
Подробные иллюстрированные руководства доступны в **[Lunaris Wiki](https://github.com/RarDog/Lunaris/wiki)** и прямо в репозитории: Подробные иллюстрированные руководства доступны в **[Prisma Wiki](https://github.com/RarDog/Prisma/wiki)** и прямо в репозитории:
- 🚀 **[Быстрый старт и установка](docs/wiki/Getting-Started.md)** — выбор правильного APK под процессор, запуск на Linux. - 🚀 **[Быстрый старт и установка](docs/wiki/Getting-Started.md)** — выбор правильного APK под процессор, запуск на Linux.
- 🌐 **[Провайдеры контента](docs/wiki/Providers.md)** — особенности Booru (Gelbooru, Rule34, Realbooru, e621) и архивов Pawchive. - 🌐 **[Провайдеры контента](docs/wiki/Providers.md)** — особенности Booru (Gelbooru, Rule34, Realbooru, e621) и архивов Pawchive.
@@ -81,7 +81,7 @@
## 📥 Загрузка (Скачать сборки) ## 📥 Загрузка (Скачать сборки)
Релизы доступны на странице **[GitHub Releases](https://github.com/RarDog/Lunaris/releases)**. Релизы доступны на странице **[GitHub Releases](https://github.com/RarDog/Prisma/releases)**.
| Платформа | Архитектура | Формат | Описание | | Платформа | Архитектура | Формат | Описание |
|---|---|---|---| |---|---|---|---|
@@ -105,8 +105,8 @@
```bash ```bash
# Клонирование репозитория # Клонирование репозитория
git clone https://github.com/RarDog/Lunaris.git git clone https://github.com/RarDog/Prisma.git
cd Lunaris cd Prisma
# Установка зависимостей # Установка зависимостей
flutter pub get flutter pub get
@@ -155,7 +155,7 @@ lib/
## 🔒 Безопасность и конфиденциальность ## 🔒 Безопасность и конфиденциальность
- **100% локальное хранение**: Вся история, закладки, локальные авторы и конфигурации хранятся только в вашей локальной базе на устройстве. - **100% локальное хранение**: Вся история, закладки, локальные авторы и конфигурации хранятся только в вашей локальной базе на устройстве.
- **Никакой телеметрии**: Lunaris не собирает аналитику, не отправляет логи и уважает вашу приватность. - **Никакой телеметрии**: Prisma не собирает аналитику, не отправляет логи и уважает вашу приватность.
- **Прямое соединение**: Запросы отправляются напрямую к выбранным API без прокси-серверов посредников. - **Прямое соединение**: Запросы отправляются напрямую к выбранным API без прокси-серверов посредников.
--- ---
+1 -1
View File
@@ -3,7 +3,7 @@
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<application <application
android:label="Lunaris" android:label="Prisma"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
+4 -4
View File
@@ -1,7 +1,7 @@
# ❓ Часто задаваемые вопросы (FAQ) # ❓ Часто задаваемые вопросы (FAQ)
### 1. Как обновить приложение? ### 1. Как обновить приложение?
Lunaris проверяет наличие свежих версий автоматически при запуске. Prisma проверяет наличие свежих версий автоматически при запуске.
Вы также можете нажать **«Проверить обновления»** в Настройках. Вы также можете нажать **«Проверить обновления»** в Настройках.
Приложение определит архитектуру вашего Android-устройства и скачает оптимальный APK напрямую из репозитория. Приложение определит архитектуру вашего Android-устройства и скачает оптимальный APK напрямую из репозитория.
@@ -13,13 +13,13 @@ Lunaris проверяет наличие свежих версий автома
--- ---
### 3. Где сохраняются скачанные файлы? ### 3. Где сохраняются скачанные файлы?
- **На Android**: В стандартную папку `Pictures/Lunaris` или `Download/Lunaris` (в зависимости от настроек системы). Файлы сразу видны в стандартной Галерее телефона. - **На Android**: В стандартную папку `Pictures/Prisma` или `Download/Prisma` (в зависимости от настроек системы). Файлы сразу видны в стандартной Галерее телефона.
- **На Linux**: В директорию `~/Pictures/Lunaris` или папку загрузок. - **На Linux**: В директорию `~/Pictures/Prisma` или папку загрузок.
--- ---
### 4. Безопасно ли вводить логин и пароль от Pawchive? ### 4. Безопасно ли вводить логин и пароль от Pawchive?
Абсолютно безопасно. Lunaris не отправляет ваши учетные данные никуда, кроме официального защищенного API Pawchive по HTTPS. Пароли не логируются и сохраняются в зашифрованном системном хранилище. Для дополнительного спокойствия вы можете использовать вход через **Session Cookie**. Абсолютно безопасно. Prisma не отправляет ваши учетные данные никуда, кроме официального защищенного API Pawchive по HTTPS. Пароли не логируются и сохраняются в зашифрованном системном хранилище. Для дополнительного спокойствия вы можете использовать вход через **Session Cookie**.
--- ---
+8 -8
View File
@@ -2,9 +2,9 @@
### 📥 1. Установка на Android ### 📥 1. Установка на Android
Релизы приложения публикуются на странице **[GitHub Releases](https://github.com/RarDog/Lunaris/releases)**. Релизы приложения публикуются на странице **[GitHub Releases](https://github.com/RarDog/Prisma/releases)**.
Начиная с версии **Lunaris 3.0**, APK разделены по архитектуре процессора, чтобы уменьшить размер скачиваемого файла: Начиная с версии **Prisma 3.0**, APK разделены по архитектуре процессора, чтобы уменьшить размер скачиваемого файла:
| Файл APK | Для каких устройств | | Файл APK | Для каких устройств |
|---|---| |---|---|
@@ -13,27 +13,27 @@
| **`app-x86_64-release.apk`** | Эмуляторы Android на ПК (Bluestacks, Android Studio) или планшеты с процессорами Intel/AMD. | | **`app-x86_64-release.apk`** | Эмуляторы Android на ПК (Bluestacks, Android Studio) или планшеты с процессорами Intel/AMD. |
> [!TIP] > [!TIP]
> **Умное автообновление:** При проверке обновлений прямо внутри Lunaris приложение **самостоятельно определит архитектуру** вашего процессора и автоматически скачает правильный файл! > **Умное автообновление:** При проверке обновлений прямо внутри Prisma приложение **самостоятельно определит архитектуру** вашего процессора и автоматически скачает правильный файл!
#### Шаги установки: #### Шаги установки:
1. Скачайте нужный `.apk` файл на устройство. 1. Скачайте нужный `.apk` файл на устройство.
2. Откройте файл через менеджер файлов и подтвердите установку («Разрешить установку из этого источника»). 2. Откройте файл через менеджер файлов и подтвердите установку («Разрешить установку из этого источника»).
3. Запустите **Lunaris**. 3. Запустите **Prisma**.
--- ---
### 🐧 2. Установка на Linux ### 🐧 2. Установка на Linux
Lunaris распространяется для 64-битных Linux в виде готового автономного архива: Prisma распространяется для 64-битных Linux в виде готового автономного архива:
1. Скачайте **`Lunaris-v3.0.0-linux-x64.tar.gz`**. 1. Скачайте **`Prisma-v3.0.0-linux-x64.tar.gz`**.
2. Распакуйте архив в любую удобную папку: 2. Распакуйте архив в любую удобную папку:
```bash ```bash
tar -xzf Lunaris-v3.0.0-linux-x64.tar.gz -C ~/Lunaris tar -xzf Prisma-v3.0.0-linux-x64.tar.gz -C ~/Prisma
``` ```
3. Запустите приложение: 3. Запустите приложение:
```bash ```bash
cd ~/Lunaris cd ~/Prisma
./lunaris ./lunaris
``` ```
+2 -2
View File
@@ -1,6 +1,6 @@
# 🌙 Добро пожаловать в Lunaris Wiki! # 🌙 Добро пожаловать в Prisma Wiki!
**Lunaris** — это современный, быстрый и функциональный кроссплатформенный клиент для Booru-борд и архивов независимых авторов (Creator Archives). **Prisma** — это современный, быстрый и функциональный кроссплатформенный клиент для Booru-борд и архивов независимых авторов (Creator Archives).
Приложение разработано на Flutter для **Android**, **Linux** и **Windows** с акцентом на плавный интерфейс в стиле Pinterest, глубокую кастомизацию, приватность и удобную работу с медиа. Приложение разработано на Flutter для **Android**, **Linux** и **Windows** с акцентом на плавный интерфейс в стиле Pinterest, глубокую кастомизацию, приватность и удобную работу с медиа.
+2 -2
View File
@@ -1,6 +1,6 @@
# 🎬 Медиаплеер и просмотр # 🎬 Медиаплеер и просмотр
Экран просмотра в Lunaris оптимизирован для быстрого, плавного и естественного взаимодействия с контентом. Экран просмотра в Prisma оптимизирован для быстрого, плавного и естественного взаимодействия с контентом.
--- ---
@@ -17,7 +17,7 @@
## 📐 Определение разрешения медиа (1920×1080 и др.) ## 📐 Определение разрешения медиа (1920×1080 и др.)
В Lunaris 3.0 внедрено **интеллектуальное ленивое определение разрешения**: В Prisma 3.0 внедрено **интеллектуальное ленивое определение разрешения**:
- Для изображений и видео в инфо-панели поста отображаются точные физические размеры (например, `1920 × 1080`, `3840 × 2160`). - Для изображений и видео в инфо-панели поста отображаются точные физические размеры (например, `1920 × 1080`, `3840 × 2160`).
- Определение происходит динамически через заголовки и потоковый декодер — приложению не требуется скачивать многомегабайтный файл целиком только ради того, чтобы узнать его габариты. - Определение происходит динамически через заголовки и потоковый декодер — приложению не требуется скачивать многомегабайтный файл целиком только ради того, чтобы узнать его габариты.
+2 -2
View File
@@ -1,6 +1,6 @@
# 💾 Офлайн-режим и загрузки # 💾 Офлайн-режим и загрузки
Lunaris предоставляет полноценный оффлайн-хаб для работы с вашей личной коллекцией без подключения к интернету. Prisma предоставляет полноценный оффлайн-хаб для работы с вашей личной коллекцией без подключения к интернету.
--- ---
@@ -26,7 +26,7 @@ Lunaris предоставляет полноценный оффлайн-хаб
*Пример шаблона:* *Пример шаблона:*
```text ```text
Lunaris/{Provider}/{Artist}/{ID}.{ext} Prisma/{Provider}/{Artist}/{ID}.{ext}
``` ```
Файлы будут аккуратно раскладываться по папкам авторов и провайдеров, сохраняя порядок в вашей галерее. Файлы будут аккуратно раскладываться по папкам авторов и провайдеров, сохраняя порядок в вашей галерее.
+1 -1
View File
@@ -1,6 +1,6 @@
# 🐾 Интеграция и синхронизация с Pawchive # 🐾 Интеграция и синхронизация с Pawchive
Начиная с версии **Lunaris 3.0**, в приложении реализована глубокая интеграция с личным профилем Pawchive. Начиная с версии **Prisma 3.0**, в приложении реализована глубокая интеграция с личным профилем Pawchive.
--- ---
+2 -2
View File
@@ -1,6 +1,6 @@
# 🌐 Провайдеры контента # 🌐 Провайдеры контента
Lunaris объединяет два фундаментальных класса источников: классические **Booru-доски** и современные **архивы авторов (Pawchive)**. Prisma объединяет два фундаментальных класса источников: классические **Booru-доски** и современные **архивы авторов (Pawchive)**.
--- ---
@@ -17,7 +17,7 @@ Lunaris объединяет два фундаментальных класса
- `gumroad` (Gumroad) - `gumroad` (Gumroad)
- `dlsite` (DLsite) - `dlsite` (DLsite)
- `discord` (Серверы Discord) - `discord` (Серверы Discord)
- **Возможности в Lunaris:** - **Возможности в Prisma:**
- Просмотр глобальной ленты свежих постов. - Просмотр глобальной ленты свежих постов.
- Персональные карточки авторов с аватаром, баннером, анонсами и ссылками на оригинальные профили. - Персональные карточки авторов с аватаром, баннером, анонсами и ссылками на оригинальные профили.
- Полноценная авторизация в профиль Pawchive (логин/пароль или Session Cookie). - Полноценная авторизация в профиль Pawchive (логин/пароль или Session Cookie).
+1 -1
View File
@@ -1,6 +1,6 @@
# 🛡️ Черный список и фильтрация # 🛡️ Черный список и фильтрация
Lunaris оснащен многоуровневой системой защиты от нежелательного контента, работающей прямо на устройстве. Prisma оснащен многоуровневой системой защиты от нежелательного контента, работающей прямо на устройстве.
--- ---
+2 -2
View File
@@ -1,6 +1,6 @@
# 🔍 Умный поиск и теги # 🔍 Умный поиск и теги
Поиск в Lunaris спроектирован для мгновенного отклика и максимальной гибкости в построении сложных запросов. Поиск в Prisma спроектирован для мгновенного отклика и максимальной гибкости в построении сложных запросов.
--- ---
@@ -21,7 +21,7 @@
Классические Booru-серверы при поиске нескольких тегов (`tag1 tag2`) возвращают только посты, где **присутствуют оба тега одновременно**. Классические Booru-серверы при поиске нескольких тегов (`tag1 tag2`) возвращают только посты, где **присутствуют оба тега одновременно**.
Lunaris поддерживает специальный оператор **`and`**: Prisma поддерживает специальный оператор **`and`**:
```text ```text
genshin_impact and honkai_star_rail genshin_impact and honkai_star_rail
``` ```
+3 -3
View File
@@ -1,4 +1,4 @@
### 🌙 Lunaris Wiki ### 🌙 Prisma Wiki
- **[Главная](Home)** - **[Главная](Home)**
- **[Быстрый старт и установка](Getting-Started)** - **[Быстрый старт и установка](Getting-Started)**
@@ -12,5 +12,5 @@
--- ---
**[Скачать Lunaris](https://github.com/RarDog/Lunaris/releases)** **[Скачать Prisma](https://github.com/RarDog/Prisma/releases)**
**[Репозиторий GitHub](https://github.com/RarDog/Lunaris)** **[Репозиторий GitHub](https://github.com/RarDog/Prisma)**
@@ -1,4 +1,4 @@
#define MyAppName "Lunaris" #define MyAppName "Prisma"
#define MyAppVersion "2.0.1" #define MyAppVersion "2.0.1"
#define MyAppPublisher "RarDog" #define MyAppPublisher "RarDog"
#define MyAppExeName "gel_rule_app.exe" #define MyAppExeName "gel_rule_app.exe"
@@ -13,7 +13,7 @@ DefaultGroupName={#MyAppName}
DisableProgramGroupPage=yes DisableProgramGroupPage=yes
PrivilegesRequired=lowest PrivilegesRequired=lowest
OutputDir=..\dist OutputDir=..\dist
OutputBaseFilename=LunarisSetup OutputBaseFilename=PrismaSetup
SetupIconFile=..\windows\runner\resources\app_icon.ico SetupIconFile=..\windows\runner\resources\app_icon.ico
Compression=lzma2 Compression=lzma2
SolidCompression=yes SolidCompression=yes
+2 -2
View File
@@ -40,7 +40,7 @@ class GelRuleApp extends ConsumerWidget {
return DynamicColorBuilder( return DynamicColorBuilder(
builder: (lightDynamic, darkDynamic) { builder: (lightDynamic, darkDynamic) {
return MaterialApp.router( return MaterialApp.router(
title: 'Lunaris', title: 'Prisma',
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: buildTheme( theme: buildTheme(
Brightness.light, Brightness.light,
@@ -97,7 +97,7 @@ class _AppOverlayState extends ConsumerState<_AppOverlay> {
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: Text('${strings.appUpdateAvailable}: Lunaris ${info.version}'), title: Text('${strings.appUpdateAvailable}: Prisma ${info.version}'),
content: ConstrainedBox( content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 520), constraints: const BoxConstraints(maxWidth: 520),
child: SingleChildScrollView( child: SingleChildScrollView(
+2 -2
View File
@@ -1,3 +1,3 @@
const appDisplayVersion = '3.0.9'; const appDisplayVersion = '3.4.1';
const appBuildNumber = 60; const appBuildNumber = 75;
const appReleaseChannel = 'Stable'; const appReleaseChannel = 'Stable';
+197 -45
View File
@@ -1,5 +1,154 @@
const lunarisChangelog = [ const prismaChangelog = [
LunarisChange( PrismaChange(
version: '3.4.1',
title: 'Полный ребрендинг интерфейса: заголовок ленты, окно «О приложении» и системные службы',
bullets: [
'Полное обновление названия в интерфейсе: заголовок в шапке ленты заменен на Prisma, обновлен логотип и карточка в диалоге «О приложении».',
'Окна обновлений и чейнджлогов: все диалоги проверки обновлений, чейнджлога и бета-версий теперь используют имя Prisma.',
'Системные службы и User-Agent: сетевой стек, экспорт резервных копий и кэш тегов переведены на Prisma с автоматической миграцией сохраненных данных.',
],
),
PrismaChange(
version: '3.4.0',
title: 'Ребрендинг в Prisma: новое имя, комфортная прокрутка анонсов и обновленные репозитории',
bullets: [
'Ребрендинг в Prisma: приложение официально переименовано в Prisma — обновлены названия окон, манифесты и системные идентификаторы.',
'Улучшенная прокрутка анонсов: в диалоге личных сообщений и рассылок автора добавлен дополнительный нижний отступ, чтобы карточки не перекрывались нижней панелью навигации и системными элементами управления.',
'Синхронизация репозиториев: репозитории на GitHub и Gitea переведены на Prisma, ссылки внутри приложения и служба автообновления переключены на новые адреса.',
],
),
PrismaChange(
version: '3.3.1',
title: 'Улучшенное разделение текстовых постов и облачных зеркал',
bullets: [
'Исключение дублирования в текстовых публикациях: для текстовых постов (без медиа) убрана лишняя плашка «Облачные диски и зеркала», исключая повторный вывод того же текста внизу экрана.',
'Вкладки «Зеркала» и «Описание»: для постов с фото, видео и GIF в блоке облачных дисков теперь доступны удобные переключаемые вкладки, позволяющие отдельно просматривать список ссылок на хранилища и авторское описание.',
'Чистый и нативный вид карточек: если у медиапоста есть только ссылки или только описание, отображается аккуратная монолитная секция с соответствующим заголовком и иконкой без лишних переключателей.',
],
),
PrismaChange(
version: '3.3.0',
title: 'Редизайн личных сообщений и рассылок артиста, нативная поддержка текстовых публикаций',
bullets: [
'Центр сообщений и рассылок автора: полностью переработан диалог по кнопке-рупору на экране артиста — аккуратные карточки сообщений в стиле мессенджера, бейджи сервисов, точное время публикации и кнопка быстрого копирования текста в буфер обмена.',
'Нативная поддержка текстовых постов: публикации без медиафайлов больше не вызывают ошибок и пустых плейсхолдеров — в сетке они отображаются как стильные заметки с заголовком и выдержкой текста.',
'Удобное чтение статей и заметок: при открытии текстового поста отображается комфортный ридер с форматированным текстом, ссылками автора и тегами.',
'Фильтрация по типу контента: на экране автора добавлен фильтр «Текст» с подсчетом количества публикаций наряду с фото, видео и GIF.',
'Поддержка анонсов в Kemono и Coomer: API анонсов и персональных сообщений теперь полноценно работает для всех поддерживаемых провайдеров.',
],
),
PrismaChange(
version: '3.2.0',
title: 'Стабильный полноэкранный режим: сохранение воспроизведения, устранение вылетов плеера и чистый интерфейс',
bullets: [
'Сохранение воспроизведения видео при повороте экрана: исправлена логика адаптивности на смартфонах — альбомная ориентация больше не сбрасывает мобильный интерфейс и не уничтожает запущенный плеер.',
'Защита жизненного цикла Player в фоне: плеер не уничтожается при переходе в полный экран, а кнопки «Пуск/Пауза» и перемотки работают мгновенно и безотказно.',
'Чистый кинематографичный интерфейс: удалены старые дублирующиеся кнопки в правом верхнем углу; кнопка смены ориентации (альбомный/портретный режим) аккуратно интегрирована в верхнюю панель управления.',
'Быстрое скрытие и показ контролов: касание свободной области видео плавно переключает видимость панели управления, а при нажатии на кнопки таймер автоскрытия автоматически обновляется.',
],
),
PrismaChange(
version: '3.1.9',
title: 'Полноэкранный плеер 2.0: мгновенный переход без задержек, жесты яркости и скраббинг с превью',
bullets: [
'Мгновенный переход в полноэкранный режим: убраны промежуточные задержки и наложения текстур, вход и выход происходят без малейших задержек.',
'Двухзонное жестовое управление: левая сторона экрана регулирует яркость подсветки с индикатором солнца, правая сторона — громкость звука.',
'Плавный скраббинг с плавающим таймингом: перемещение по таймлайну видео теперь отображает интерактивную плашку точного времени, а контролы не исчезают во время удержания ползунка.',
'Сброс яркости: при выходе из полноэкранного режима системный уровень яркости экрана аккуратно восстанавливается.',
],
),
PrismaChange(
version: '3.1.8',
title: 'Безупречный полноэкранный плеер: устранение остановки при развертывании и отзывчивые кнопки управления',
bullets: [
'Непрерывное воспроизведение при открытии на весь экран: видео больше не останавливается самопроизвольно при входе в полноэкранный режим или смене ориентации устройства.',
'Корректный статус воспроизведения: устранен сброс кнопки на «Пуск» при переходе в полный экран — видео продолжает воспроизведение без ложных остановок.',
'Мгновенный отклик кнопок «Пуск/Пауза» и перемотки: жесты управления поверхностью (двойной тап, смахивание громкости) перемещены в фоновый слой, исключая перехват и отмену нажатий по кнопкам управления.',
'Синхронизация состояния при сворачивании: плеер точно запоминает состояние паузы/воспроизведения при выходе из полноэкранного режима обратно в пост.',
],
),
PrismaChange(
version: '3.1.7',
title: 'Устранение критического сбоя при открытии видеопоста (SIGSEGV в libmpv)',
bullets: [
'Устранение нативного вылета: полностью удалены небезопасные прямые FFI-вызовы setProperty к mpv, приводившие к немедленному падению приложения на Android при инициализации видео.',
'Безопасная конфигурация декодирования: перевод настроек аппаратного ускорения и фоллбэка кодеков на официальный типобезопасный VideoControllerConfiguration (media_kit_video).',
'Надежный фоллбэк при редких ошибках кодека: при несовместимости аппаратного декодера плеер бесшовно переключается на программный FFmpeg-декодер без риска краша.',
],
),
PrismaChange(
version: '3.1.6',
title: 'Надежный полноэкранный плеер, сохранение провайдеров в поиске, громкость и устранение ошибки кодека',
bullets: [
'Полноэкранный плеер — отзывчивая кнопка Пуск/Пауза: центральная кнопка управления воспроизведением полностью переработана на непроницаемый GestureDetector со сквиркл-откликом, гарантируя мгновенное срабатывание без перехвата внешними жестами.',
'Сохранение источников при нажатии на крестик в поиске: клик по кнопке сброса в строке поиска теперь очищает только поисковый запрос и теги, никогда не сбрасывая выбранные источники до «Все».',
'Безупречное сохранение громкости: громкость видеоплеера корректно инициализируется из настроек, сохраняется при регулировках жестом и переходе между постами, не сбрасываясь на 100% при открытии нового видео и перезапуске приложения.',
'Автоматический fallback для ошибки Could not open codec: видеоплеер получил безопасные профили декодирования и автопереключение на программный лавк-декодер (FFmpeg software fallback) при редких сбоях аппаратного ускорения.',
],
),
PrismaChange(
version: '3.1.5',
title: 'Сохранение громкости видео, исправление полноэкранного плеера, фильтрации и удобства комментариев',
bullets: [
'Сохранение уровня громкости (Persistent Volume): выбранная громкость видеоплеера теперь сохраняется при свайп-регулировке и переключениях между видео и сохраняется даже после перезапуска приложения.',
'Исправление кнопок в полноэкранном режиме: кнопки паузы/воспроизведения и быстрой перемотки на ±10 секунд в центре экрана теперь работают мгновенно и надежно с анимацией визуального отклика (Seek Ripple).',
'Сохранение выбранных источников при очистке тегов: удаление всех тегов в строке поиска больше не сбрасывает выбранные провайдеры до значения «Все», сохраняя ваши активные источники.',
'Плавная строка поиска: при выборе тега из подсказок поле ввода больше не сдвигается слишком далеко в сторону, оставляя тег и курсор в поле зрения.',
'Удобный доступ к комментариям в посте: увеличен отступ снизу в деталях поста и расширена зона клика блока комментариев, позволяя комфортно прокрутить их выше системных жестов навигации.',
],
),
PrismaChange(
version: '3.1.4',
title: 'Оптимизация видеоплеера — адаптивная высота и идеальное прилегание полосы воспроизведения',
bullets: [
'Устранение зазора под видео: контейнер плеера на мобильных устройствах и ПК теперь динамически подстраивается под пропорции видео (aspect ratio) вместо жестко фиксированной высоты 62% экрана, устраняя огромные пустые черные полосы сверху и снизу.',
'Точное позиционирование полосы воспроизведения: исправлен отступ снизу и ложное наложение системных insets на неполноэкранный плеер в карточке поста — ползунок воспроизведения, таймкоды и кнопка фуллскрина теперь аккуратно прилегают к нижнему краю видео без зависания в воздухе.',
'Компактные элементы управления: выровнены буферный трек и слайдер прокрутки, оптимизирован градиент затенения для максимальной видимости и удобства управления.',
],
),
PrismaChange(
version: '3.1.3',
title: 'iPhone Liquid Glass — Источники, Проверка сети и Навигация назад по вкладкам',
bullets: [
'Возврат назад по вкладкам (Tab Back Navigation): реализован стек истории переходов между разделами в AppShell — теперь при нажатии кнопки «Назад» или системного жеста происходит возврат к ранее открытым вкладкам и подразделам вместо случайного закрытия приложения.',
'Liquid Glass редизайн списка источников (Providers): стеклянные карточки провайдеров с красивыми сквиркл-иконками движков (Gelbooru, Rule34, Danbooru, e621, Yande.re, Paheal, Kemono), переключателями активности, инфо-бейджами приоритета и зеркальными кнопками управления.',
'Liquid Glass редизайн редактирования и создания источников (Edit / New Provider): секционные стеклянные карточки с градиентными бейджами, полоса быстрых пресетов для мгновенного заполнения URL и типа API, безопасный ввод API-ключей и наглядные подсказки.',
'Liquid Glass редизайн проверки состояния источников (Provider Check): карточка общих метрик сети (онлайн/офлайн, средний пинг), раскрывающиеся аккордеоны детальной диагностики, живые светодиодные LED-индикаторы статуса и кнопка одновременной проверки всех провайдеров.',
],
),
PrismaChange(
version: '3.1.2',
title: 'Оптимизация производительности: устранение лагов при скролле к тегам',
bullets: [
'Устранение лагов при прокрутке тегов: полностью ликвидирован тяжелый GPU-оверхед BackdropFilter на повторяющихся чипах тегов, вызывавший просадки FPS и микрофризы при скролле постов с десятками и сотнями тегов.',
'Высокопроизводительный стеклянный стиль чипов (TagChip): чипы переведены на эффективные аппаратные альфа-слои и зеркальные контуры без потери премиального неонового Liquid Glass вида и цветных индикаторов категорий.',
'Облегчение контейнеров блока тегов: на мобильных и десктоп экранах контейнеры тегов оптимизированы для мгновенного плавного 120 FPS скроллинга.',
'Интеллектуальный лимит начального отображения: оптимизировано первоначальное количество отображаемых тегов в огромных категориях с удобной кнопкой быстрого раскрытия.',
],
),
PrismaChange(
version: '3.1.1',
title: 'Деление тегов по стилю e621/Gelbooru/Rule34 и исправление поиска тегов со скобками',
bullets: [
'Цветное деление тегов по категориям (e621, Rule34, Gelbooru): теги авторов (Artist) подсвечиваются кораллово-красным, персонажи (Character) — мятно-зелёным, серии/копирайты (Copyright) — пурпурным, виды (Species) — янтарно-оранжевым, мета (Meta) — ледяным голубым, а общие теги (General) — нейтральным стилем.',
'Liquid Glass чипы тегов: компоненты TagChip получили полупрозрачный фон с BackdropFilter размытием, цветной светодиодный индикатор-точку со свечением и зеркальный контур.',
'Индикаторы в заголовках категорий: заголовки блоков тегов дополнены цветными точками категорий со свечением и стильными капсулами счётчиков.',
'Исправление поиска тегов со скобками: исправлена проблема, из-за которой теги с круглыми скобками (например, tyson_(password), touhou_(series)) очищались от скобок при поиске и не находили постов в ленте.',
'Поддержка скобок в подсказках и локальном кэше: автодополнение теперь корректно выдает теги со скобками, фильтруя только внешние скобки группировки and-веток.',
'Liquid Glass оформление блока тегов в детальном просмотре поста на мобильных и десктоп устройствах.',
],
),
PrismaChange(
version: '3.1.0',
title: 'iPhone Liquid Glass — Поиск, Избранное, История и исправление доступности',
bullets: [
'Liquid Glass редизайн разделов «Поиск», «Избранное» и «История»: матовые стеклянные карточки (BackdropFilter blur), полупрозрачные градиенты, зеркальные контуры и сквиркл-бейджи иконок в стиле iOS.',
'Исправление шпаргалки по поиску: увеличен нижний отступ прокрутки во всех списках и сетках до 140px + safe area, благодаря чему блок операторов и шпаргалка по поиску больше не перекрываются парящей навигационной панелью и легко нажимаются.',
'Исправление модального окна проверки обновлений: панель с выбором источников (GitHub и Gitea) открывается через корневой навигатор поверх всей навигации с безопасным отступом снизу, обеспечивая беспрепятственный доступ к обеим кнопкам.',
'Тактильный отклик и стеклянные пилюли: быстрые операторы, категории, недавние запросы, фильтры медиа и переключатели разделов получили матовое оформление и вибрационный отклик Haptic Feedback.',
],
),
PrismaChange(
version: '3.0.9', version: '3.0.9',
title: 'Коррекция позиции кнопки настроек и отображения кнопок JSON и бэкапа', title: 'Коррекция позиции кнопки настроек и отображения кнопок JSON и бэкапа',
bullets: [ bullets: [
@@ -8,7 +157,7 @@ const lunarisChangelog = [
'Улучшенный дизайн и сетка кнопок экспорта/импорта: кнопки бэкапа и JSON организованы в симметричные аккуратные строки с яркими акцентными бейджами.', 'Улучшенный дизайн и сетка кнопок экспорта/импорта: кнопки бэкапа и JSON организованы в симметричные аккуратные строки с яркими акцентными бейджами.',
], ],
), ),
LunarisChange( PrismaChange(
version: '3.0.8', version: '3.0.8',
title: 'iPhone Liquid Glass — раздел «Настройки» и парящая стеклянная кнопка', title: 'iPhone Liquid Glass — раздел «Настройки» и парящая стеклянная кнопка',
bullets: [ bullets: [
@@ -18,7 +167,7 @@ const lunarisChangelog = [
'Стеклянная быстрая навигация по категориям: зафиксированная панель категорий с размытием фона и тактильным откликом при переключении разделов.', 'Стеклянная быстрая навигация по категориям: зафиксированная панель категорий с размытием фона и тактильным откликом при переключении разделов.',
], ],
), ),
LunarisChange( PrismaChange(
version: '3.0.7', version: '3.0.7',
title: 'Liquid Glass Navigation Bar — парящая стеклянная панель и анимированная пилюля', title: 'Liquid Glass Navigation Bar — парящая стеклянная панель и анимированная пилюля',
bullets: [ bullets: [
@@ -28,7 +177,7 @@ const lunarisChangelog = [
'Глубина контента: контент ленты, поиска и галереи плавно просвечивает и размывается под стеклянной панелью при прокрутке.', 'Глубина контента: контент ленты, поиска и галереи плавно просвечивает и размывается под стеклянной панелью при прокрутке.',
], ],
), ),
LunarisChange( PrismaChange(
version: '3.0.6', version: '3.0.6',
title: 'Улучшение недавних запросов и отображения тегов', title: 'Улучшение недавних запросов и отображения тегов',
bullets: [ bullets: [
@@ -38,7 +187,7 @@ const lunarisChangelog = [
'Удобное удаление: увеличенная область нажатия для кнопки удаления (крестика) предотвращает случайные нажатия на сам запрос.', 'Удобное удаление: увеличенная область нажатия для кнопки удаления (крестика) предотвращает случайные нажатия на сам запрос.',
], ],
), ),
LunarisChange( PrismaChange(
version: '3.0.5', version: '3.0.5',
title: 'Интерактивные ссылки на соцсети и авторов в объявлениях и описаниях', title: 'Интерактивные ссылки на соцсети и авторов в объявлениях и описаниях',
bullets: [ bullets: [
@@ -47,7 +196,7 @@ const lunarisChangelog = [
'Корректная очистка пунктуации: знаки препинания в конце URL (!, ?, :, ., ,, ;, >) больше не ломают ссылки.', 'Корректная очистка пунктуации: знаки препинания в конце URL (!, ?, :, ., ,, ;, >) больше не ломают ссылки.',
], ],
), ),
LunarisChange( PrismaChange(
version: '3.0.0', version: '3.0.0',
title: 'Lunaris 3.0 — Глобальное обновление: Дизайн 2.0, Интеграция Pawchive и умная синхронизация', title: 'Lunaris 3.0 — Глобальное обновление: Дизайн 2.0, Интеграция Pawchive и умная синхронизация',
bullets: [ bullets: [
@@ -60,7 +209,7 @@ const lunarisChangelog = [
'Исправление вёрстки: устранены переносы текста в заголовке окна аккаунтов и карточках пользователей на экранах смартфонов.', 'Исправление вёрстки: устранены переносы текста в заголовке окна аккаунтов и карточках пользователей на экранах смартфонов.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.10', version: '2.3.10',
title: 'Выгрузка локального избранного в Pawchive и двусторонняя синхронизация', title: 'Выгрузка локального избранного в Pawchive и двусторонняя синхронизация',
bullets: [ bullets: [
@@ -70,7 +219,7 @@ const lunarisChangelog = [
'Синхронизация в реальном времени с любых провайдеров: при добавлении автора в избранное в лентах Kemono, Coomer или Pawchive изменение мгновенно передаётся на сервер Pawchive.', 'Синхронизация в реальном времени с любых провайдеров: при добавлении автора в избранное в лентах Kemono, Coomer или Pawchive изменение мгновенно передаётся на сервер Pawchive.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.9', version: '2.3.9',
title: 'Исправление входа и синхронизации аккаунтов Pawchive', title: 'Исправление входа и синхронизации аккаунтов Pawchive',
bullets: [ bullets: [
@@ -79,7 +228,7 @@ const lunarisChangelog = [
'Информативные ошибки: понятные сообщения на русском при неверном пароле или сбое сети вместо сырых исключений Dio.', 'Информативные ошибки: понятные сообщения на русском при неверном пароле или сбое сети вместо сырых исключений Dio.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.8', version: '2.3.8',
title: 'ABI-Aware Auto-Update — правильный APK для вашего процессора', title: 'ABI-Aware Auto-Update — правильный APK для вашего процессора',
bullets: [ bullets: [
@@ -89,7 +238,7 @@ const lunarisChangelog = [
'Кеш ABI: архитектура определяется один раз за сеанс.', 'Кеш ABI: архитектура определяется один раз за сеанс.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.7', version: '2.3.7',
title: 'Lazy Media Dimensions for Pawchive & Unknown-Size Providers', title: 'Lazy Media Dimensions for Pawchive & Unknown-Size Providers',
bullets: [ bullets: [
@@ -98,7 +247,7 @@ const lunarisChangelog = [
'Session Cache: resolved image dimensions are cached in memory for the lifetime of the app so repeated visits to the same post do not trigger re-downloads.', 'Session Cache: resolved image dimensions are cached in memory for the lifetime of the app so repeated visits to the same post do not trigger re-downloads.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.6', version: '2.3.6',
title: 'Pawchive Accounts Integration & Favorites Synchronization', title: 'Pawchive Accounts Integration & Favorites Synchronization',
bullets: [ bullets: [
@@ -109,7 +258,7 @@ const lunarisChangelog = [
'Dedicated UI & Quick Access: manage connected accounts, view sync stats, and trigger synchronization from the Artists screen, Favorites modal, and Settings screen.', 'Dedicated UI & Quick Access: manage connected accounts, view sync stats, and trigger synchronization from the Artists screen, Favorites modal, and Settings screen.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.5', version: '2.3.5',
title: 'Fullscreen Video Auto-Rotation & Orientation Controls', title: 'Fullscreen Video Auto-Rotation & Orientation Controls',
bullets: [ bullets: [
@@ -118,7 +267,7 @@ const lunarisChangelog = [
'Clean Orientation Recovery: exiting fullscreen seamlessly restores system navigation bars (Edge-to-Edge) and restores unrestricted device sensor orientations.', 'Clean Orientation Recovery: exiting fullscreen seamlessly restores system navigation bars (Edge-to-Edge) and restores unrestricted device sensor orientations.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.4', version: '2.3.4',
title: 'OverlayPortal Architecture & Search UI Unblocking', title: 'OverlayPortal Architecture & Search UI Unblocking',
bullets: [ bullets: [
@@ -129,7 +278,7 @@ const lunarisChangelog = [
'Non-Blocking Outside Tap: tapping outside the suggestion dropdown smoothly dismisses suggestions while allowing the touch event to pass through directly to the underlying button or post.', 'Non-Blocking Outside Tap: tapping outside the suggestion dropdown smoothly dismisses suggestions while allowing the touch event to pass through directly to the underlying button or post.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.3', version: '2.3.3',
title: 'Tag Suggestions Overlay Fix & Rule34 API Alignment', title: 'Tag Suggestions Overlay Fix & Rule34 API Alignment',
bullets: [ bullets: [
@@ -139,7 +288,7 @@ const lunarisChangelog = [
'Rule34 Authentication & Outage Handling: added detection for "missing authentication", rate limits, and server overload/search down ("success": false) with informative guidance to enter API Key & User ID.', 'Rule34 Authentication & Outage Handling: added detection for "missing authentication", rate limits, and server overload/search down ("success": false) with informative guidance to enter API Key & User ID.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.2', version: '2.3.2',
title: 'Gelbooru DAPI Compliance & Tag Query Optimization', title: 'Gelbooru DAPI Compliance & Tag Query Optimization',
bullets: [ bullets: [
@@ -149,7 +298,7 @@ const lunarisChangelog = [
'Throttling & Auth Guidance: enhanced API credentials helper text and informative error messages with direct instructions to configure API Key & User ID from Gelbooru account options.', 'Throttling & Auth Guidance: enhanced API credentials helper text and informative error messages with direct instructions to configure API Key & User ID from Gelbooru account options.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.1', version: '2.3.1',
title: 'Cloud Mirrors & Author Announcements Fixes', title: 'Cloud Mirrors & Author Announcements Fixes',
bullets: [ bullets: [
@@ -158,7 +307,7 @@ const lunarisChangelog = [
'Author Announcements HTML Cleaning: stripped all raw <p style="">, <strong>, and formatting artifacts from artist announcements, rendering clean readable text and clickable service link chips.', 'Author Announcements HTML Cleaning: stripped all raw <p style="">, <strong>, and formatting artifacts from artist announcements, rendering clean readable text and clickable service link chips.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.3.0', version: '2.3.0',
title: 'Artist Cloud Drives & External Video Mirrors', title: 'Artist Cloud Drives & External Video Mirrors',
bullets: [ bullets: [
@@ -170,7 +319,7 @@ const lunarisChangelog = [
'Artist Commentary Card: formatted display of author notes, instructions, and text below post details.', 'Artist Commentary Card: formatted display of author notes, instructions, and text below post details.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.2.0', version: '2.2.0',
title: 'Offline Mode Overhaul & Post Details Screen Redesign', title: 'Offline Mode Overhaul & Post Details Screen Redesign',
bullets: [ bullets: [
@@ -181,7 +330,7 @@ const lunarisChangelog = [
'Unified Neighbor Strip & Tags Card: post neighbor thumbnail strip now available on both mobile and desktop, alongside modern rounded tag blocks and chat-bubble comments.', 'Unified Neighbor Strip & Tags Card: post neighbor thumbnail strip now available on both mobile and desktop, alongside modern rounded tag blocks and chat-bubble comments.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.1.0', version: '2.1.0',
title: '4-Tab Major Redesign: Search, Favorites, History & Collections', title: '4-Tab Major Redesign: Search, Favorites, History & Collections',
bullets: [ bullets: [
@@ -191,7 +340,7 @@ const lunarisChangelog = [
'Collections Tab Redesign: Pinterest-style collection cards with 2x2 thumbnail mosaic covers and glassmorphism post counters, modernized collection details screen with description banner, and elegant squircle creation dialog.', 'Collections Tab Redesign: Pinterest-style collection cards with 2x2 thumbnail mosaic covers and glassmorphism post counters, modernized collection details screen with description banner, and elegant squircle creation dialog.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.15', version: '2.0.15',
title: 'Settings 2.0 Layout Fixes & Pinned Quick Navigation', title: 'Settings 2.0 Layout Fixes & Pinned Quick Navigation',
bullets: [ bullets: [
@@ -202,7 +351,7 @@ const lunarisChangelog = [
'Header text overflow protections: wrapped title texts in Expanded across all settings cards.', 'Header text overflow protections: wrapped title texts in Expanded across all settings cards.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.14', version: '2.0.14',
title: 'Settings 2.0: Modern Grouped Design & Quick Ergonomics', title: 'Settings 2.0: Modern Grouped Design & Quick Ergonomics',
bullets: [ bullets: [
@@ -214,7 +363,7 @@ const lunarisChangelog = [
'Hero Brand Banner: polished app presentation card in About section with glowing icon, version build badge, update checker, and GitHub repository link.', 'Hero Brand Banner: polished app presentation card in About section with glowing icon, version build badge, update checker, and GitHub repository link.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.13', version: '2.0.13',
title: 'Toolbar Section Dividers & Post Card Badge Stacking Fix', title: 'Toolbar Section Dividers & Post Card Badge Stacking Fix',
bullets: [ bullets: [
@@ -224,7 +373,7 @@ const lunarisChangelog = [
'Expanded Bottom Gradient: increased bottom cinematic gradient height to 64dp for clean text and badge contrast.', 'Expanded Bottom Gradient: increased bottom cinematic gradient height to 64dp for clean text and badge contrast.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.12', version: '2.0.12',
title: 'Feed 2.0: Pinterest Modern Redesign & Sleek Cards', title: 'Feed 2.0: Pinterest Modern Redesign & Sleek Cards',
bullets: [ bullets: [
@@ -237,7 +386,7 @@ const lunarisChangelog = [
'Polished Search Presets: stylish bookmark capsules for quick access to saved search queries.', 'Polished Search Presets: stylish bookmark capsules for quick access to saved search queries.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.11', version: '2.0.11',
title: 'Mobile Video Player Redesign & Format Recognition Fix', title: 'Mobile Video Player Redesign & Format Recognition Fix',
bullets: [ bullets: [
@@ -251,7 +400,7 @@ const lunarisChangelog = [
'Sleek Neon Seekbar with live network buffer progress indicator.', 'Sleek Neon Seekbar with live network buffer progress indicator.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.10', version: '2.0.10',
title: 'Fix "and" Tag Operator Retention, Suggestion Preceding Drafts & AND Chip Styling', title: 'Fix "and" Tag Operator Retention, Suggestion Preceding Drafts & AND Chip Styling',
bullets: [ bullets: [
@@ -261,7 +410,7 @@ const lunarisChangelog = [
'Distinct visual styling for AND separator chips with secondary theme container and alt-route icon.', 'Distinct visual styling for AND separator chips with secondary theme container and alt-route icon.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.9', version: '2.0.9',
title: 'Instant Tag Suggestions, Persistent Disk Cache, Expanded History & Match Highlighting', title: 'Instant Tag Suggestions, Persistent Disk Cache, Expanded History & Match Highlighting',
bullets: [ bullets: [
@@ -275,7 +424,7 @@ const lunarisChangelog = [
'Dedicated Clear Tag Cache actions in Settings and Cache Manager.', 'Dedicated Clear Tag Cache actions in Settings and Cache Manager.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.8', version: '2.0.8',
title: 'Shared Context Modifiers for Multi-Tag Search & Clean Tag Filtering', title: 'Shared Context Modifiers for Multi-Tag Search & Clean Tag Filtering',
bullets: [ bullets: [
@@ -284,7 +433,7 @@ const lunarisChangelog = [
'Resolved "No posts yet" bug by adapting client post validation to multi-tag stream groups and stripping operator keywords from booru queries.', 'Resolved "No posts yet" bug by adapting client post validation to multi-tag stream groups and stripping operator keywords from booru queries.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.7', version: '2.0.7',
title: 'Independent Multi-Tag Search Streams, Local "and" Connector, Pawchive in Main Feed & Reverts', title: 'Independent Multi-Tag Search Streams, Local "and" Connector, Pawchive in Main Feed & Reverts',
bullets: [ bullets: [
@@ -295,7 +444,7 @@ const lunarisChangelog = [
'Removed external linked accounts bar from artist posts screen.', 'Removed external linked accounts bar from artist posts screen.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.6', version: '2.0.6',
title: 'Pawchive Deep Integration: Global Posts Feed, Artist Tags, Announcements, Links & Server Media Filter', title: 'Pawchive Deep Integration: Global Posts Feed, Artist Tags, Announcements, Links & Server Media Filter',
bullets: [ bullets: [
@@ -306,7 +455,7 @@ const lunarisChangelog = [
'Server-side media filtering (Photos, Videos, GIFs) querying the entire author archive through the API.', 'Server-side media filtering (Photos, Videos, GIFs) querying the entire author archive through the API.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.5', version: '2.0.5',
title: '10 QoL Super-Update: AMOLED, Dynamic Colors, Grid switch, Share, Presets, Cache & Backup', title: '10 QoL Super-Update: AMOLED, Dynamic Colors, Grid switch, Share, Presets, Cache & Backup',
bullets: [ bullets: [
@@ -321,7 +470,7 @@ const lunarisChangelog = [
'Full JSON backup export and import for seamless configuration sync.', 'Full JSON backup export and import for seamless configuration sync.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.4', version: '2.0.4',
title: 'Platform service selection & media type filtering in artist posts', title: 'Platform service selection & media type filtering in artist posts',
bullets: [ bullets: [
@@ -330,7 +479,7 @@ const lunarisChangelog = [
'Full-screen post pager respects active media type filters during swiping.', 'Full-screen post pager respects active media type filters during swiping.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.3', version: '2.0.3',
title: 'Infinite artist pagination, favorite artists modal, and card layout polish', title: 'Infinite artist pagination, favorite artists modal, and card layout polish',
bullets: [ bullets: [
@@ -340,7 +489,7 @@ const lunarisChangelog = [
'Removed mapping truncation in Pawchive provider to deliver all post attachments cleanly.', 'Removed mapping truncation in Pawchive provider to deliver all post attachments cleanly.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.2', version: '2.0.2',
title: 'Swipeable media pager, favorite artists, performance and Pawchive', title: 'Swipeable media pager, favorite artists, performance and Pawchive',
bullets: [ bullets: [
@@ -352,7 +501,7 @@ const lunarisChangelog = [
'In-app update checks and downloads connected directly to RarDog GitHub releases.', 'In-app update checks and downloads connected directly to RarDog GitHub releases.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.1', version: '2.0.1',
title: 'Localization, zoom and favorite downloads', title: 'Localization, zoom and favorite downloads',
bullets: [ bullets: [
@@ -363,7 +512,7 @@ const lunarisChangelog = [
'Favorites can optionally auto-download media in the background, with local files tracked separately from favorites.', 'Favorites can optionally auto-download media in the background, with local files tracked separately from favorites.',
], ],
), ),
LunarisChange( PrismaChange(
version: '2.0.0', version: '2.0.0',
title: 'Customization and provider polish', title: 'Customization and provider polish',
bullets: [ bullets: [
@@ -374,7 +523,7 @@ const lunarisChangelog = [
'Kemono and Coomer creator search uses the current mbahArip keyword endpoints with public API fallbacks.', 'Kemono and Coomer creator search uses the current mbahArip keyword endpoints with public API fallbacks.',
], ],
), ),
LunarisChange( PrismaChange(
version: '1.1.2', version: '1.1.2',
title: 'Experimental tag and Artists update', title: 'Experimental tag and Artists update',
bullets: [ bullets: [
@@ -384,7 +533,7 @@ const lunarisChangelog = [
'This is an experimental release for checking the new tag and Artists behavior.', 'This is an experimental release for checking the new tag and Artists behavior.',
], ],
), ),
LunarisChange( PrismaChange(
version: '1.1.1', version: '1.1.1',
title: 'Artists and in-app updates', title: 'Artists and in-app updates',
bullets: [ bullets: [
@@ -394,7 +543,7 @@ const lunarisChangelog = [
'Tag input keeps its scroll position steadier while typing and committing chips.', 'Tag input keeps its scroll position steadier while typing and committing chips.',
], ],
), ),
LunarisChange( PrismaChange(
version: '1.1.0', version: '1.1.0',
title: 'Lunaris rebrand and providers', title: 'Lunaris rebrand and providers',
bullets: [ bullets: [
@@ -404,7 +553,7 @@ const lunarisChangelog = [
'Video player UI preferences are saved across fullscreen, details and restarts.', 'Video player UI preferences are saved across fullscreen, details and restarts.',
], ],
), ),
LunarisChange( PrismaChange(
version: '1.0.2', version: '1.0.2',
title: 'Provider safety fix', title: 'Provider safety fix',
bullets: [ bullets: [
@@ -413,7 +562,7 @@ const lunarisChangelog = [
'Existing enabled legacy configs are disabled so the main feed is not polluted by known-offline APIs.', 'Existing enabled legacy configs are disabled so the main feed is not polluted by known-offline APIs.',
], ],
), ),
LunarisChange( PrismaChange(
version: '1.0.1', version: '1.0.1',
title: 'Mobile polish', title: 'Mobile polish',
bullets: [ bullets: [
@@ -422,7 +571,7 @@ const lunarisChangelog = [
'Tag chip input no longer jumps while typing.', 'Tag chip input no longer jumps while typing.',
], ],
), ),
LunarisChange( PrismaChange(
version: '1.0.0', version: '1.0.0',
title: 'Stable 1.0', title: 'Stable 1.0',
bullets: [ bullets: [
@@ -432,7 +581,7 @@ const lunarisChangelog = [
'Windows portable package is published alongside APK and installer.', 'Windows portable package is published alongside APK and installer.',
], ],
), ),
LunarisChange( PrismaChange(
version: '0.4.3', version: '0.4.3',
title: 'Bugfixes', title: 'Bugfixes',
bullets: [ bullets: [
@@ -444,8 +593,8 @@ const lunarisChangelog = [
), ),
]; ];
class LunarisChange { class PrismaChange {
const LunarisChange({ const PrismaChange({
required this.version, required this.version,
required this.title, required this.title,
required this.bullets, required this.bullets,
@@ -455,3 +604,6 @@ class LunarisChange {
final String title; final String title;
final List<String> bullets; final List<String> bullets;
} }
const lunarisChangelog = prismaChangelog;
typedef LunarisChange = PrismaChange;
+14 -4
View File
@@ -1,3 +1,5 @@
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
class AppBreakpoints { class AppBreakpoints {
@@ -6,11 +8,19 @@ class AppBreakpoints {
} }
class Responsive { class Responsive {
static bool isMobile(BuildContext context) => static bool isMobile(BuildContext context) {
MediaQuery.sizeOf(context).width < AppBreakpoints.mobile; if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
return MediaQuery.sizeOf(context).shortestSide < 600;
}
return MediaQuery.sizeOf(context).width < AppBreakpoints.mobile;
}
static bool isDesktop(BuildContext context) => static bool isDesktop(BuildContext context) {
MediaQuery.sizeOf(context).width >= AppBreakpoints.desktop; if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
return MediaQuery.sizeOf(context).shortestSide >= 600;
}
return MediaQuery.sizeOf(context).width >= AppBreakpoints.desktop;
}
static int columnsFor( static int columnsFor(
BuildContext context, { BuildContext context, {
+1 -1
View File
@@ -224,7 +224,7 @@ final updateServiceProvider = Provider<UpdateService>((ref) {
connectTimeout: const Duration(seconds: 12), connectTimeout: const Duration(seconds: 12),
receiveTimeout: const Duration(seconds: 12), receiveTimeout: const Duration(seconds: 12),
headers: const { headers: const {
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
'Accept': 'application/json', 'Accept': 'application/json',
}, },
), ),
+11 -1
View File
@@ -60,11 +60,21 @@ class Post {
return null; return null;
} }
String? get description => commentary;
String? get title {
final list = tagGroups['copyright'];
if (list != null && list.isNotEmpty) {
return list.first;
}
return null;
}
List<String> get cleanTags { List<String> get cleanTags {
return tags.where((tag) { return tags.where((tag) {
final t = tag.trim(); final t = tag.trim();
if (t.isEmpty) return false; if (t.isEmpty) return false;
if (t == 'cloud_mirror') return false; if (t == 'cloud_mirror' || t == 'text_post') return false;
if (t.startsWith('{') && t.endsWith('}')) return false; if (t.startsWith('{') && t.endsWith('}')) return false;
if (t.contains('"url"') || t.contains('"service"')) return false; if (t.contains('"url"') || t.contains('"service"')) return false;
if (t.startsWith('http://') || t.startsWith('https://')) return false; if (t.startsWith('http://') || t.startsWith('https://')) return false;
+1 -1
View File
@@ -46,7 +46,7 @@ class GelbooruProvider
Map<String, String> mediaHeaders(Post post) { Map<String, String> mediaHeaders(Post post) {
final host = Uri.tryParse(baseUrl)?.host; final host = Uri.tryParse(baseUrl)?.host;
return { return {
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
'Accept': '*/*', 'Accept': '*/*',
if (host != null && host.isNotEmpty) 'Referer': '$baseUrl/', if (host != null && host.isNotEmpty) 'Referer': '$baseUrl/',
}; };
+34 -8
View File
@@ -30,7 +30,7 @@ class KemonoProvider
receiveTimeout: const Duration(seconds: 20), receiveTimeout: const Duration(seconds: 20),
headers: const { headers: const {
'Accept': 'application/json', 'Accept': 'application/json',
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
}, },
), ),
); );
@@ -230,8 +230,23 @@ class KemonoProvider
@override @override
Future<List<ArtistAnnouncement>> getArtistAnnouncements( Future<List<ArtistAnnouncement>> getArtistAnnouncements(
String service, String artistId) async => String service, String artistId) async {
const []; final path = '/api/v1/$service/user/$artistId/announcements';
for (final apiBase in _apiBaseCandidates()) {
try {
final response = await _getFromApiBase<dynamic>(apiBase, path);
final items = response.data;
if (items is List) {
return items
.whereType<Map>()
.map((item) =>
ArtistAnnouncement.fromJson(Map<String, dynamic>.from(item)))
.toList(growable: false);
}
} catch (_) {}
}
return const [];
}
String _creatorPath() => _isCoomer ? '/coomer' : '/kemono'; String _creatorPath() => _isCoomer ? '/coomer' : '/kemono';
@@ -385,17 +400,23 @@ class KemonoProvider
} }
// Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.) // Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.)
if (files.isEmpty && (cloudLinks.isNotEmpty || cleanDesc.isNotEmpty)) { // or text-only posts where author wrote an announcement, status or note
if (files.isEmpty &&
(cloudLinks.isNotEmpty ||
cleanDesc.isNotEmpty ||
rawContent.trim().isNotEmpty ||
title.trim().isNotEmpty)) {
final stableId = '${query.service}:${query.artistId}:$postId:0'; final stableId = '${query.service}:${query.artistId}:$postId:0';
final firstStreamable = final firstStreamable =
cloudLinks.where((l) => l.isStreamable).firstOrNull; cloudLinks.where((l) => l.isStreamable).firstOrNull;
final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null; final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null;
final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? ''; final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? '';
final isTextOnly = cloudLinks.isEmpty;
final tags = [ final tags = [
query.service, query.service,
query.artistName, query.artistName,
if (title.trim().isNotEmpty) title.trim(), if (title.trim().isNotEmpty) title.trim(),
'cloud_mirror', if (!isTextOnly) 'cloud_mirror' else 'text_post',
]; ];
return [ return [
Post( Post(
@@ -411,14 +432,19 @@ class KemonoProvider
height: 0, height: 0,
source: postSource, source: postSource,
createdAt: published, createdAt: published,
fileType: firstStreamable != null ? 'video' : 'link', fileType: firstStreamable != null
? 'video'
: (isTextOnly ? 'text' : 'link'),
score: 0, score: 0,
tagGroups: { tagGroups: {
'artist': [query.artistName], 'artist': [query.artistName],
'meta': [query.service], 'meta': [query.service],
if (title.trim().isNotEmpty) 'copyright': [title.trim()], if (title.trim().isNotEmpty) 'copyright': [title.trim()],
if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson, if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
if (cleanDesc.isNotEmpty) 'description': [cleanDesc], if (cleanDesc.isNotEmpty)
'description': [cleanDesc]
else if (rawContent.trim().isNotEmpty)
'description': [rawContent.trim()],
}, },
), ),
]; ];
@@ -556,7 +582,7 @@ class KemonoProvider
receiveTimeout: const Duration(seconds: 25), receiveTimeout: const Duration(seconds: 25),
headers: const { headers: const {
'Accept': 'application/json', 'Accept': 'application/json',
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
}, },
), ),
); );
+15 -4
View File
@@ -418,17 +418,23 @@ class PawchiveProvider
} }
// Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.) // Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.)
if (files.isEmpty && (cloudLinks.isNotEmpty || cleanDesc.isNotEmpty)) { // or text-only posts where author wrote an announcement, status or note
if (files.isEmpty &&
(cloudLinks.isNotEmpty ||
cleanDesc.isNotEmpty ||
rawContent.trim().isNotEmpty ||
title.trim().isNotEmpty)) {
final stableId = '${query.service}:${query.artistId}:$postId:0'; final stableId = '${query.service}:${query.artistId}:$postId:0';
final firstStreamable = final firstStreamable =
cloudLinks.where((l) => l.isStreamable).firstOrNull; cloudLinks.where((l) => l.isStreamable).firstOrNull;
final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null; final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null;
final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? ''; final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? '';
final isTextOnly = cloudLinks.isEmpty;
final tags = [ final tags = [
query.service, query.service,
query.artistName, query.artistName,
if (title.trim().isNotEmpty) title.trim(), if (title.trim().isNotEmpty) title.trim(),
'cloud_mirror', if (!isTextOnly) 'cloud_mirror' else 'text_post',
]; ];
return [ return [
Post( Post(
@@ -444,14 +450,19 @@ class PawchiveProvider
height: 0, height: 0,
source: postSource, source: postSource,
createdAt: published, createdAt: published,
fileType: firstStreamable != null ? 'video' : 'link', fileType: firstStreamable != null
? 'video'
: (isTextOnly ? 'text' : 'link'),
score: 0, score: 0,
tagGroups: { tagGroups: {
'artist': [query.artistName], 'artist': [query.artistName],
'meta': [query.service], 'meta': [query.service],
if (title.trim().isNotEmpty) 'copyright': [title.trim()], if (title.trim().isNotEmpty) 'copyright': [title.trim()],
if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson, if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
if (cleanDesc.isNotEmpty) 'description': [cleanDesc], if (cleanDesc.isNotEmpty)
'description': [cleanDesc]
else if (rawContent.trim().isNotEmpty)
'description': [rawContent.trim()],
}, },
), ),
]; ];
+11 -2
View File
@@ -169,7 +169,16 @@ class ProviderManager {
for (final raw in rawTags) { for (final raw in rawTags) {
var token = raw.trim(); var token = raw.trim();
token = token.replaceAll(RegExp(r'^[\(\)]+|[\(\)]+$'), '').trim(); if (token.isEmpty) continue;
// Only strip parentheses if they are grouping delimiters (unbalanced in the token, e.g. '(cat' or 'dog)')
// but preserve tags that have internal paired parentheses like 'tyson_(password)'.
if (token.startsWith('(') && !token.contains(')')) {
token = token.substring(1).trim();
}
if (token.endsWith(')') && !token.contains('(')) {
token = token.substring(0, token.length - 1).trim();
}
if (token.isEmpty) continue; if (token.isEmpty) continue;
if (token.toLowerCase() == 'and') { if (token.toLowerCase() == 'and') {
@@ -560,7 +569,7 @@ class ProviderManager {
); );
} }
return const Success({ return const Success({
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
'Accept': '*/*', 'Accept': '*/*',
}); });
} }
+1 -1
View File
@@ -21,7 +21,7 @@ class Rule34Provider extends GelbooruProvider {
@override @override
Map<String, String> mediaHeaders(Post post) => const { Map<String, String> mediaHeaders(Post post) => const {
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
'Accept': '*/*', 'Accept': '*/*',
'Referer': 'https://rule34.xxx/', 'Referer': 'https://rule34.xxx/',
}; };
@@ -60,7 +60,7 @@ class ProviderRepository {
priority: 3, priority: 3,
timeoutSeconds: 20, timeoutSeconds: 20,
customHeaders: const { customHeaders: const {
'User-Agent': 'Lunaris/2.0.2 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.2 Flutter local booru browser',
}, },
createdAt: now, createdAt: now,
updatedAt: now, updatedAt: now,
@@ -74,7 +74,7 @@ class ProviderRepository {
priority: 4, priority: 4,
timeoutSeconds: 20, timeoutSeconds: 20,
customHeaders: const { customHeaders: const {
'User-Agent': 'Lunaris/2.0.2 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.2 Flutter local booru browser',
}, },
createdAt: now, createdAt: now,
updatedAt: now, updatedAt: now,
+2 -2
View File
@@ -52,13 +52,13 @@ class BackupService {
Future<bool> exportBackup() async { Future<bool> exportBackup() async {
final json = await createBackupJson(); final json = await createBackupJson();
final fileName = final fileName =
'lunaris_backup_${DateTime.now().millisecondsSinceEpoch}.json'; 'prisma_backup_${DateTime.now().millisecondsSinceEpoch}.json';
if (Platform.isAndroid) { if (Platform.isAndroid) {
final tempDir = await getTemporaryDirectory(); final tempDir = await getTemporaryDirectory();
final file = File('${tempDir.path}/$fileName'); final file = File('${tempDir.path}/$fileName');
await file.writeAsString(json); await file.writeAsString(json);
await Share.shareXFiles([XFile(file.path)], text: 'Lunaris Backup'); await Share.shareXFiles([XFile(file.path)], text: 'Prisma Backup');
return true; return true;
} }
+1 -1
View File
@@ -224,7 +224,7 @@ class DownloadService {
return { return {
'User-Agent': lower.contains('realbooru') || lower.contains('paheal') 'User-Agent': lower.contains('realbooru') || lower.contains('paheal')
? 'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 Chrome/125 Mobile Safari/537.36' ? 'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 Chrome/125 Mobile Safari/537.36'
: 'Lunaris/2.0.1 Flutter local booru browser', : 'Prisma/2.0.1 Flutter local booru browser',
'Accept': lower.contains('realbooru') || lower.contains('paheal') 'Accept': lower.contains('realbooru') || lower.contains('paheal')
? 'video/webm,video/mp4,image/avif,image/webp,image/apng,image/*,*/*;q=0.8' ? 'video/webm,video/mp4,image/avif,image/webp,image/apng,image/*,*/*;q=0.8'
: '*/*', : '*/*',
@@ -94,7 +94,7 @@ class PawchiveSyncService {
followRedirects: false, followRedirects: false,
validateStatus: (status) => status != null && status < 500, validateStatus: (status) => status != null && status < 500,
headers: const { headers: const {
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
}, },
), ),
@@ -231,7 +231,7 @@ class PawchiveSyncService {
headers: { headers: {
'Cookie': 'session=$cleanCookie', 'Cookie': 'session=$cleanCookie',
'Accept': 'application/json', 'Accept': 'application/json',
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
}, },
validateStatus: (status) => status != null && status < 500, validateStatus: (status) => status != null && status < 500,
), ),
@@ -509,7 +509,7 @@ class PawchiveSyncService {
final options = Options( final options = Options(
headers: { headers: {
'Cookie': 'session=$cleanCookie', 'Cookie': 'session=$cleanCookie',
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
}, },
validateStatus: (status) => validateStatus: (status) =>
status != null && (status == 200 || status == 201 || status == 204), status != null && (status == 200 || status == 201 || status == 204),
+1 -4
View File
@@ -21,10 +21,7 @@ class SearchService {
TagCacheService? get tagCacheService => _tagCacheService; TagCacheService? get tagCacheService => _tagCacheService;
static String sanitizeToken(String raw) { static String sanitizeToken(String raw) {
return raw return raw.trim().toLowerCase();
.replaceAll(RegExp(r'^[\(\)]+|[\(\)]+$'), '')
.trim()
.toLowerCase();
} }
List<String> parseTags(String query) { List<String> parseTags(String query) {
+20 -1
View File
@@ -39,6 +39,7 @@ class AppSettings {
required this.motionRefreshMode, required this.motionRefreshMode,
required this.autoBatterySaver60Hz, required this.autoBatterySaver60Hz,
required this.videoPlayerMuted, required this.videoPlayerMuted,
this.videoPlayerVolume = 100.0,
required this.videoPlayerHalfVolume, required this.videoPlayerHalfVolume,
required this.videoPlayerLoop, required this.videoPlayerLoop,
required this.videoPlayerCover, required this.videoPlayerCover,
@@ -94,6 +95,7 @@ class AppSettings {
final String motionRefreshMode; final String motionRefreshMode;
final bool autoBatterySaver60Hz; final bool autoBatterySaver60Hz;
final bool videoPlayerMuted; final bool videoPlayerMuted;
final double videoPlayerVolume;
final bool videoPlayerHalfVolume; final bool videoPlayerHalfVolume;
final bool videoPlayerLoop; final bool videoPlayerLoop;
final bool videoPlayerCover; final bool videoPlayerCover;
@@ -146,6 +148,7 @@ class AppSettings {
motionRefreshMode: 'auto', motionRefreshMode: 'auto',
autoBatterySaver60Hz: true, autoBatterySaver60Hz: true,
videoPlayerMuted: false, videoPlayerMuted: false,
videoPlayerVolume: 100.0,
videoPlayerHalfVolume: false, videoPlayerHalfVolume: false,
videoPlayerLoop: false, videoPlayerLoop: false,
videoPlayerCover: false, videoPlayerCover: false,
@@ -191,6 +194,7 @@ class AppSettings {
String? motionRefreshMode, String? motionRefreshMode,
bool? autoBatterySaver60Hz, bool? autoBatterySaver60Hz,
bool? videoPlayerMuted, bool? videoPlayerMuted,
double? videoPlayerVolume,
bool? videoPlayerHalfVolume, bool? videoPlayerHalfVolume,
bool? videoPlayerLoop, bool? videoPlayerLoop,
bool? videoPlayerCover, bool? videoPlayerCover,
@@ -252,6 +256,7 @@ class AppSettings {
motionRefreshMode: motionRefreshMode ?? this.motionRefreshMode, motionRefreshMode: motionRefreshMode ?? this.motionRefreshMode,
autoBatterySaver60Hz: autoBatterySaver60Hz ?? this.autoBatterySaver60Hz, autoBatterySaver60Hz: autoBatterySaver60Hz ?? this.autoBatterySaver60Hz,
videoPlayerMuted: videoPlayerMuted ?? this.videoPlayerMuted, videoPlayerMuted: videoPlayerMuted ?? this.videoPlayerMuted,
videoPlayerVolume: videoPlayerVolume ?? this.videoPlayerVolume,
videoPlayerHalfVolume: videoPlayerHalfVolume:
videoPlayerHalfVolume ?? this.videoPlayerHalfVolume, videoPlayerHalfVolume ?? this.videoPlayerHalfVolume,
videoPlayerLoop: videoPlayerLoop ?? this.videoPlayerLoop, videoPlayerLoop: videoPlayerLoop ?? this.videoPlayerLoop,
@@ -309,6 +314,7 @@ class AppSettings {
'motionRefreshMode': motionRefreshMode, 'motionRefreshMode': motionRefreshMode,
'autoBatterySaver60Hz': autoBatterySaver60Hz, 'autoBatterySaver60Hz': autoBatterySaver60Hz,
'videoPlayerMuted': videoPlayerMuted, 'videoPlayerMuted': videoPlayerMuted,
'videoPlayerVolume': videoPlayerVolume,
'videoPlayerHalfVolume': videoPlayerHalfVolume, 'videoPlayerHalfVolume': videoPlayerHalfVolume,
'videoPlayerLoop': videoPlayerLoop, 'videoPlayerLoop': videoPlayerLoop,
'videoPlayerCover': videoPlayerCover, 'videoPlayerCover': videoPlayerCover,
@@ -392,6 +398,8 @@ class AppSettings {
defaults.autoBatterySaver60Hz, defaults.autoBatterySaver60Hz,
videoPlayerMuted: videoPlayerMuted:
(json['videoPlayerMuted'] as bool?) ?? defaults.videoPlayerMuted, (json['videoPlayerMuted'] as bool?) ?? defaults.videoPlayerMuted,
videoPlayerVolume: (json['videoPlayerVolume'] as num?)?.toDouble() ??
defaults.videoPlayerVolume,
videoPlayerHalfVolume: (json['videoPlayerHalfVolume'] as bool?) ?? videoPlayerHalfVolume: (json['videoPlayerHalfVolume'] as bool?) ??
defaults.videoPlayerHalfVolume, defaults.videoPlayerHalfVolume,
videoPlayerLoop: videoPlayerLoop:
@@ -601,6 +609,17 @@ class SettingsService {
return updateSettings(settings.copyWith(videoPlaybackPositions: positions)); return updateSettings(settings.copyWith(videoPlaybackPositions: positions));
} }
Future<Result<void>> setVideoPlayerVolume(double volume) async {
final result = await getSettings();
if (result is Error<AppSettings>) return Error(result.failure);
final settings = (result as Success<AppSettings>).data;
final clamped = volume.clamp(0.0, 100.0);
if ((settings.videoPlayerVolume - clamped).abs() < 0.01) {
return const Success(null);
}
return updateSettings(settings.copyWith(videoPlayerVolume: clamped));
}
Future<Result<void>> appendDiagnosticLog(String message) async { Future<Result<void>> appendDiagnosticLog(String message) async {
final result = await getSettings(); final result = await getSettings();
if (result is Error<AppSettings>) return Error(result.failure); if (result is Error<AppSettings>) return Error(result.failure);
@@ -655,7 +674,7 @@ class SettingsService {
return Success( return Success(
const JsonEncoder.withIndent(' ').convert({ const JsonEncoder.withIndent(' ').convert({
'app': { 'app': {
'name': 'Lunaris', 'name': 'Prisma',
'version': appVersion, 'version': appVersion,
'build': buildNumber, 'build': buildNumber,
'generatedAt': DateTime.now().toIso8601String(), 'generatedAt': DateTime.now().toIso8601String(),
+13 -5
View File
@@ -25,7 +25,14 @@ class TagCacheService {
return _resolvedPath!; return _resolvedPath!;
} }
final dir = await getApplicationDocumentsDirectory(); final dir = await getApplicationDocumentsDirectory();
_resolvedPath = '${dir.path}/lunaris_tag_cache.json'; final newFile = File('${dir.path}/prisma_tag_cache.json');
final oldFile = File('${dir.path}/lunaris_tag_cache.json');
if (!newFile.existsSync() && oldFile.existsSync()) {
try {
oldFile.copySync(newFile.path);
} catch (_) {}
}
_resolvedPath = newFile.path;
return _resolvedPath!; return _resolvedPath!;
} }
@@ -66,10 +73,11 @@ class TagCacheService {
int limit = 16, int limit = 16,
Iterable<String>? priorityTags, Iterable<String>? priorityTags,
}) { }) {
final cleanPrefix = prefix var cleanPrefix = prefix.trim().toLowerCase();
.replaceAll(RegExp(r'^[\(\)]+|[\(\)]+$'), '') // If the prefix has an unbalanced opening parenthesis at the start (e.g. '(cat'), strip it
.trim() if (cleanPrefix.startsWith('(') && !cleanPrefix.contains(')')) {
.toLowerCase(); cleanPrefix = cleanPrefix.substring(1).trim();
}
if (cleanPrefix.isEmpty) return const []; if (cleanPrefix.isEmpty) return const [];
final prioritySet = priorityTags final prioritySet = priorityTags
+9 -9
View File
@@ -18,14 +18,14 @@ class UpdateService {
UpdateService(this._dio, this._settingsService); UpdateService(this._dio, this._settingsService);
static const giteaLatestReleaseUrl = static const giteaLatestReleaseUrl =
'https://gitea.rardogsynapse.online/api/v1/repos/RarDog/Lunaris/releases/latest'; 'https://gitea.rardogsynapse.online/api/v1/repos/RarDog/Prisma/releases/latest';
static const giteaReleasesUrl = static const giteaReleasesUrl =
'https://gitea.rardogsynapse.online/api/v1/repos/RarDog/Lunaris/releases'; 'https://gitea.rardogsynapse.online/api/v1/repos/RarDog/Prisma/releases';
static const githubLatestReleaseUrl = static const githubLatestReleaseUrl =
'https://api.github.com/repos/RarDog/Lunaris/releases/latest'; 'https://api.github.com/repos/RarDog/Prisma/releases/latest';
static const githubReleasesUrl = static const githubReleasesUrl =
'https://api.github.com/repos/RarDog/Lunaris/releases'; 'https://api.github.com/repos/RarDog/Prisma/releases';
static const latestReleaseUrl = githubLatestReleaseUrl; static const latestReleaseUrl = githubLatestReleaseUrl;
static const releasesUrl = githubReleasesUrl; static const releasesUrl = githubReleasesUrl;
@@ -111,7 +111,7 @@ class UpdateService {
'Authorization': 'token 1c744d6044d756759d7b1f693c94c80cf70d75fa', 'Authorization': 'token 1c744d6044d756759d7b1f693c94c80cf70d75fa',
} }
: { : {
'User-Agent': 'Lunaris-App', 'User-Agent': 'Prisma-App',
'Accept': 'application/vnd.github+json', 'Accept': 'application/vnd.github+json',
}, },
); );
@@ -239,10 +239,10 @@ class UpdateService {
final fromUrl = final fromUrl =
parsed?.pathSegments.isEmpty ?? true ? '' : parsed!.pathSegments.last; parsed?.pathSegments.isEmpty ?? true ? '' : parsed!.pathSegments.last;
if (fromUrl.contains('.')) return fromUrl; if (fromUrl.contains('.')) return fromUrl;
if (Platform.isAndroid) return 'Lunaris-v${info.version}.apk'; if (Platform.isAndroid) return 'Prisma-v${info.version}.apk';
if (Platform.isLinux) return 'Lunaris-v${info.version}-linux-x64.tar.gz'; if (Platform.isLinux) return 'Prisma-v${info.version}-linux-x64.tar.gz';
if (Platform.isWindows) return 'LunarisSetup-v${info.version}.exe'; if (Platform.isWindows) return 'PrismaSetup-v${info.version}.exe';
return 'LunarisPortable-v${info.version}.zip'; return 'PrismaPortable-v${info.version}.zip';
} }
static String _versionFromTag(String tag) { static String _versionFromTag(String tag) {
+1 -1
View File
@@ -40,7 +40,7 @@ class DioClient {
receiveTimeout: timeout, receiveTimeout: timeout,
sendTimeout: timeout, sendTimeout: timeout,
headers: { headers: {
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
'Accept': 'application/json, text/xml;q=0.9, */*;q=0.8', 'Accept': 'application/json, text/xml;q=0.9, */*;q=0.8',
...?headers, ...?headers,
}, },
@@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
@@ -191,11 +192,13 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
if (_selectedTypes.isEmpty) return true; if (_selectedTypes.isEmpty) return true;
final isVid = MediaUrlSelector.isVideo(post); final isVid = MediaUrlSelector.isVideo(post);
final isGif = MediaUrlSelector.isGif(post); final isGif = MediaUrlSelector.isGif(post);
final isPhoto = !isVid && !isGif; final isText = post.fileType == 'text';
final isPhoto = !isVid && !isGif && !isText;
if (_selectedTypes.contains('video') && isVid) return true; if (_selectedTypes.contains('video') && isVid) return true;
if (_selectedTypes.contains('gif') && isGif) return true; if (_selectedTypes.contains('gif') && isGif) return true;
if (_selectedTypes.contains('photo') && isPhoto) return true; if (_selectedTypes.contains('photo') && isPhoto) return true;
if (_selectedTypes.contains('text') && isText) return true;
return false; return false;
} }
@@ -205,94 +208,251 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
showDragHandle: true, showDragHandle: true,
backgroundColor: theme.colorScheme.surface,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
),
builder: (ctx) => DraggableScrollableSheet( builder: (ctx) => DraggableScrollableSheet(
expand: false, expand: false,
initialChildSize: 0.6, initialChildSize: 0.65,
maxChildSize: 0.9, maxChildSize: 0.92,
builder: (_, scroll) => Column( builder: (_, scroll) => Column(
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8), padding: const EdgeInsets.fromLTRB(20, 4, 16, 12),
child: Row( child: Row(
children: [ children: [
Icon(Icons.campaign_rounded, color: theme.colorScheme.primary), Container(
const SizedBox(width: 10), width: 44,
Text( height: 44,
'Анонсы автора (${_announcements.length})', decoration: BoxDecoration(
style: theme.textTheme.titleMedium?.copyWith( color: theme.colorScheme.primaryContainer,
fontWeight: FontWeight.bold, borderRadius: BorderRadius.circular(14),
),
child: Icon(
Icons.campaign_rounded,
color: theme.colorScheme.onPrimaryContainer,
size: 24,
),
),
const SizedBox(width: 14),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Личные сообщения и анонсы',
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold,
letterSpacing: -0.2,
),
),
const SizedBox(height: 2),
Text(
'${widget.artistName} • ${widget.service.toUpperCase()}',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
fontWeight: FontWeight.w500,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
],
),
),
Container(
padding:
const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration(
color: theme.colorScheme.secondaryContainer,
borderRadius: BorderRadius.circular(20),
),
child: Text(
'${_announcements.length}',
style: TextStyle(
color: theme.colorScheme.onSecondaryContainer,
fontWeight: FontWeight.bold,
fontSize: 12,
),
), ),
), ),
], ],
), ),
), ),
const Divider(), Divider(
height: 1,
color: theme.colorScheme.outlineVariant.withValues(alpha: 0.4),
),
Expanded( Expanded(
child: ListView.separated( child: _announcements.isEmpty
controller: scroll, ? Center(
padding: const EdgeInsets.all(16), child: Column(
itemCount: _announcements.length, mainAxisSize: MainAxisSize.min,
separatorBuilder: (_, __) => const Divider(height: 24), children: [
itemBuilder: (context, index) { Icon(
final a = _announcements[index]; Icons.mark_email_read_outlined,
final cleanContent = CloudLinkExtractor.cleanCommentary(a.content); size: 48,
final detectedCloudLinks = CloudLinkExtractor.extractLinks(content: a.content); color: theme.colorScheme.outline,
final creatorLinks = CreatorLink.extractLinks(a.content);
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (a.added != null)
Text(
'${a.added!.year}-${a.added!.month.toString().padLeft(2, '0')}-${a.added!.day.toString().padLeft(2, '0')}',
style: TextStyle(
fontSize: 12,
color: theme.colorScheme.primary,
fontWeight: FontWeight.w600,
), ),
), const SizedBox(height: 12),
const SizedBox(height: 6), Text(
FormattedContentText( 'Нет сообщений или рассылок',
text: cleanContent.isNotEmpty ? cleanContent : a.content, style: theme.textTheme.titleSmall?.copyWith(
style: theme.textTheme.bodyMedium?.copyWith( color: theme.colorScheme.onSurfaceVariant,
height: 1.45, fontWeight: FontWeight.w600,
), ),
),
],
), ),
if (creatorLinks.isNotEmpty) ...[ )
const SizedBox(height: 10), : ListView.separated(
CreatorLinkChips( controller: scroll,
links: creatorLinks, padding: EdgeInsets.fromLTRB(
title: 'Ссылки автора', 16,
), 16,
], 16,
if (detectedCloudLinks.isNotEmpty) ...[ 120 + MediaQuery.paddingOf(context).bottom,
const SizedBox(height: 10), ),
Wrap( itemCount: _announcements.length,
spacing: 8, separatorBuilder: (_, __) => const SizedBox(height: 12),
runSpacing: 6, itemBuilder: (context, index) {
children: detectedCloudLinks.map((link) { final a = _announcements[index];
return ActionChip( final cleanContent =
avatar: Icon( CloudLinkExtractor.cleanCommentary(a.content);
link.iconData, final detectedCloudLinks =
size: 16, CloudLinkExtractor.extractLinks(content: a.content);
color: link.brandColor, final creatorLinks =
CreatorLink.extractLinks(a.content);
final displayContent = cleanContent.isNotEmpty
? cleanContent
: a.content;
return Container(
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainer,
borderRadius: BorderRadius.circular(18),
border: Border.all(
color: theme.colorScheme.outlineVariant
.withValues(alpha: 0.45),
),
),
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 3,
),
decoration: BoxDecoration(
color: theme.colorScheme.primary
.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(8),
),
child: Text(
(a.service.isNotEmpty
? a.service
: widget.service)
.toUpperCase(),
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.bold,
color: theme.colorScheme.primary,
letterSpacing: 0.5,
),
),
),
if (a.added != null) ...[
const SizedBox(width: 8),
Icon(
Icons.access_time_rounded,
size: 13,
color: theme.colorScheme.onSurfaceVariant,
),
const SizedBox(width: 4),
Text(
'${a.added!.day.toString().padLeft(2, '0')}.${a.added!.month.toString().padLeft(2, '0')}.${a.added!.year} ${a.added!.hour.toString().padLeft(2, '0')}:${a.added!.minute.toString().padLeft(2, '0')}',
style: TextStyle(
fontSize: 11.5,
color:
theme.colorScheme.onSurfaceVariant,
fontWeight: FontWeight.w500,
),
),
],
const Spacer(),
IconButton(
icon: const Icon(Icons.copy_rounded,
size: 17),
tooltip: 'Скопировать текст',
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints: const BoxConstraints(),
onPressed: () {
Clipboard.setData(
ClipboardData(text: displayContent),
);
ScaffoldMessenger.of(context)
.showSnackBar(
const SnackBar(
content:
Text('Текст сообщения скопирован'),
duration: Duration(seconds: 2),
),
);
},
),
],
), ),
label: Text( const SizedBox(height: 10),
link.title.isNotEmpty ? link.title : link.serviceName, FormattedContentText(
style: const TextStyle(fontSize: 12), text: displayContent,
style: theme.textTheme.bodyMedium?.copyWith(
height: 1.5,
letterSpacing: 0.15,
),
), ),
onPressed: () => launchUrl( if (creatorLinks.isNotEmpty) ...[
Uri.parse(link.url), const SizedBox(height: 12),
mode: LaunchMode.externalApplication, CreatorLinkChips(
), links: creatorLinks,
); title: 'Ссылки из сообщения',
}).toList(), ),
), ],
], if (detectedCloudLinks.isNotEmpty) ...[
], const SizedBox(height: 12),
); Wrap(
}, spacing: 8,
), runSpacing: 6,
children: detectedCloudLinks.map((link) {
return ActionChip(
avatar: Icon(
link.iconData,
size: 16,
color: link.brandColor,
),
label: Text(
link.title.isNotEmpty
? link.title
: link.serviceName,
style: const TextStyle(fontSize: 12),
),
onPressed: () => launchUrl(
Uri.parse(link.url),
mode: LaunchMode.externalApplication,
),
);
}).toList(),
),
],
],
),
);
},
),
), ),
], ],
), ),
@@ -303,10 +463,14 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
Widget _buildMediaTypeFilters() { Widget _buildMediaTypeFilters() {
final scheme = Theme.of(context).colorScheme; final scheme = Theme.of(context).colorScheme;
final photoCount = _posts final photoCount = _posts
.where((p) => !MediaUrlSelector.isVideo(p) && !MediaUrlSelector.isGif(p)) .where((p) =>
p.fileType != 'text' &&
!MediaUrlSelector.isVideo(p) &&
!MediaUrlSelector.isGif(p))
.length; .length;
final videoCount = _posts.where(MediaUrlSelector.isVideo).length; final videoCount = _posts.where(MediaUrlSelector.isVideo).length;
final gifCount = _posts.where(MediaUrlSelector.isGif).length; final gifCount = _posts.where(MediaUrlSelector.isGif).length;
final textCount = _posts.where((p) => p.fileType == 'text').length;
return Padding( return Padding(
padding: const EdgeInsets.fromLTRB(16, 6, 16, 4), padding: const EdgeInsets.fromLTRB(16, 6, 16, 4),
@@ -376,6 +540,27 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
}); });
}, },
), ),
if (textCount > 0) ...[
const SizedBox(width: 8),
FilterChip(
selected: _selectedTypes.contains('text'),
avatar: Icon(Icons.article_outlined,
size: 16,
color: _selectedTypes.contains('text')
? scheme.onPrimaryContainer
: scheme.onSurfaceVariant),
label: Text('Текст ($textCount)'),
onSelected: (selected) {
setState(() {
if (selected) {
_selectedTypes.add('text');
} else {
_selectedTypes.remove('text');
}
});
},
),
],
], ],
), ),
), ),
@@ -1,5 +1,8 @@
import 'dart:ui';
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -176,82 +179,154 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
// Search input bar if active // Search input bar if active
if (_isSearching) if (_isSearching)
Padding( Padding(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 4), padding: const EdgeInsets.fromLTRB(16, 6, 16, 6),
child: TextField( child: ClipRRect(
controller: _searchController, borderRadius: BorderRadius.circular(18),
autofocus: true, child: BackdropFilter(
decoration: InputDecoration( filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
hintText: isRu child: Container(
? 'Поиск по тегам и авторам...' decoration: BoxDecoration(
: 'Search by tags and artists...', color: Theme.of(context).brightness == Brightness.dark
prefixIcon: const Icon(Icons.search_rounded), ? Theme.of(context).colorScheme.surfaceContainerHigh
suffixIcon: _searchQuery.isNotEmpty .withValues(alpha: 0.55)
? IconButton( : Colors.white.withValues(alpha: 0.80),
icon: const Icon(Icons.clear_rounded), borderRadius: BorderRadius.circular(18),
onPressed: () { border: Border.all(
_searchController.clear(); color: Theme.of(context).brightness == Brightness.dark
setState(() => _searchQuery = ''); ? Colors.white.withValues(alpha: 0.14)
}, : Colors.white.withValues(alpha: 0.85),
) width: 1.1,
: null, ),
isDense: true, ),
filled: true, child: TextField(
contentPadding: const EdgeInsets.symmetric( controller: _searchController,
horizontal: 16, autofocus: true,
vertical: 10, decoration: InputDecoration(
), hintText: isRu
border: OutlineInputBorder( ? 'Поиск по тегам и авторам...'
borderRadius: BorderRadius.circular(16), : 'Search by tags and artists...',
borderSide: BorderSide.none, prefixIcon: const Icon(Icons.search_rounded),
suffixIcon: _searchQuery.isNotEmpty
? IconButton(
icon: const Icon(Icons.clear_rounded),
onPressed: () {
HapticFeedback.lightImpact();
_searchController.clear();
setState(() => _searchQuery = '');
},
)
: null,
isDense: true,
filled: false,
contentPadding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 10,
),
border: InputBorder.none,
),
onChanged: (val) =>
setState(() => _searchQuery = val.trim()),
),
), ),
), ),
onChanged: (val) => setState(() => _searchQuery = val.trim()),
), ),
), ),
// Navigation Tabs // Navigation Tabs with Liquid Glass container
Padding( Padding(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 6), padding: const EdgeInsets.fromLTRB(16, 6, 16, 6),
child: SizedBox( child: Container(
width: double.infinity, decoration: BoxDecoration(
child: SegmentedButton<int>( borderRadius: BorderRadius.circular(22),
showSelectedIcon: false, boxShadow: [
segments: [ BoxShadow(
ButtonSegment( color: Colors.black.withValues(
value: 0, alpha: Theme.of(context).brightness == Brightness.dark
icon: const Icon(Icons.favorite_rounded, size: 18), ? 0.20
label: Text( : 0.04,
'${isRu ? 'Все' : 'All'} (${allPosts.length})',
style: const TextStyle(fontSize: 12),
overflow: TextOverflow.ellipsis,
),
),
ButtonSegment(
value: 1,
icon: const Icon(Icons.offline_pin_rounded, size: 18),
label: Text(
'${isRu ? 'Офлайн' : 'Offline'} (${offlinePosts.length})',
style: const TextStyle(fontSize: 12),
overflow: TextOverflow.ellipsis,
),
),
ButtonSegment(
value: 2,
icon: const Icon(Icons.groups_rounded, size: 18),
label: Text(
'${isRu ? 'Авторы' : 'Artists'} (${artistGroups.length})',
style: const TextStyle(fontSize: 12),
overflow: TextOverflow.ellipsis,
), ),
blurRadius: 10,
offset: const Offset(0, 2),
), ),
], ],
selected: {_tabIndex}, ),
onSelectionChanged: (value) { child: ClipRRect(
setState(() { borderRadius: BorderRadius.circular(22),
_tabIndex = value.first; child: BackdropFilter(
_selectedArtist = null; filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
}); child: Container(
}, decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
color: Theme.of(context).brightness == Brightness.dark
? Theme.of(context)
.colorScheme
.surfaceContainerHigh
.withValues(alpha: 0.50)
: Colors.white.withValues(alpha: 0.72),
border: Border.all(
color: Theme.of(context).brightness == Brightness.dark
? Colors.white.withValues(alpha: 0.12)
: Colors.white.withValues(alpha: 0.85),
width: 1.1,
),
),
child: SizedBox(
width: double.infinity,
child: SegmentedButton<int>(
showSelectedIcon: false,
style: ButtonStyle(
visualDensity: VisualDensity.compact,
shape: WidgetStatePropertyAll(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
),
),
segments: [
ButtonSegment(
value: 0,
icon: const Icon(Icons.favorite_rounded, size: 18),
label: Text(
'${isRu ? 'Все' : 'All'} (${allPosts.length})',
style: const TextStyle(
fontSize: 12, fontWeight: FontWeight.w600),
overflow: TextOverflow.ellipsis,
),
),
ButtonSegment(
value: 1,
icon: const Icon(Icons.offline_pin_rounded,
size: 18),
label: Text(
'${isRu ? 'Офлайн' : 'Offline'} (${offlinePosts.length})',
style: const TextStyle(
fontSize: 12, fontWeight: FontWeight.w600),
overflow: TextOverflow.ellipsis,
),
),
ButtonSegment(
value: 2,
icon: const Icon(Icons.groups_rounded, size: 18),
label: Text(
'${isRu ? 'Авторы' : 'Artists'} (${artistGroups.length})',
style: const TextStyle(
fontSize: 12, fontWeight: FontWeight.w600),
overflow: TextOverflow.ellipsis,
),
),
],
selected: {_tabIndex},
onSelectionChanged: (value) {
HapticFeedback.selectionClick();
setState(() {
_tabIndex = value.first;
_selectedArtist = null;
});
},
),
),
),
),
), ),
), ),
), ),
@@ -265,9 +340,12 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
FilterChip( FilterChip(
label: Text(isRu ? 'Все' : 'All'), label: Text(isRu ? 'Все' : 'All'),
selected: _mediaFilter == FavoriteMediaType.all, selected: _mediaFilter == FavoriteMediaType.all,
onSelected: (_) => setState( onSelected: (_) {
() => _mediaFilter = FavoriteMediaType.all, HapticFeedback.selectionClick();
), setState(
() => _mediaFilter = FavoriteMediaType.all,
);
},
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -275,9 +353,12 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
avatar: const Icon(Icons.videocam_rounded, size: 16), avatar: const Icon(Icons.videocam_rounded, size: 16),
label: Text(isRu ? 'Видео' : 'Videos'), label: Text(isRu ? 'Видео' : 'Videos'),
selected: _mediaFilter == FavoriteMediaType.video, selected: _mediaFilter == FavoriteMediaType.video,
onSelected: (_) => setState( onSelected: (_) {
() => _mediaFilter = FavoriteMediaType.video, HapticFeedback.selectionClick();
), setState(
() => _mediaFilter = FavoriteMediaType.video,
);
},
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -285,9 +366,12 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
avatar: const Icon(Icons.image_rounded, size: 16), avatar: const Icon(Icons.image_rounded, size: 16),
label: Text(isRu ? 'Фото' : 'Images'), label: Text(isRu ? 'Фото' : 'Images'),
selected: _mediaFilter == FavoriteMediaType.image, selected: _mediaFilter == FavoriteMediaType.image,
onSelected: (_) => setState( onSelected: (_) {
() => _mediaFilter = FavoriteMediaType.image, HapticFeedback.selectionClick();
), setState(
() => _mediaFilter = FavoriteMediaType.image,
);
},
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
), ),
], ],
@@ -490,31 +574,40 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
}) { }) {
final scheme = Theme.of(context).colorScheme; final scheme = Theme.of(context).colorScheme;
return Container( return _FavoritesLiquidCard(
margin: const EdgeInsets.fromLTRB(16, 4, 16, 8), margin: const EdgeInsets.fromLTRB(16, 4, 16, 8),
padding: const EdgeInsets.all(14), padding: const EdgeInsets.all(14),
decoration: BoxDecoration( glowColor: scheme.primary,
color: scheme.surfaceContainerHigh,
borderRadius: BorderRadius.circular(18),
border: Border.all(
color: scheme.outlineVariant.withValues(alpha: 0.35),
),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
children: [ children: [
Container( Container(
padding: const EdgeInsets.all(10), width: 40,
height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
color: scheme.primaryContainer.withValues(alpha: 0.7), gradient: LinearGradient(
colors: [
scheme.primary,
scheme.primary.withValues(alpha: 0.85),
],
),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: scheme.primary.withValues(alpha: 0.35),
blurRadius: 7,
offset: const Offset(0, 2.5),
),
],
), ),
child: Icon( child: const Center(
Icons.offline_pin_rounded, child: Icon(
color: scheme.onPrimaryContainer, Icons.offline_pin_rounded,
size: 22, color: Colors.white,
size: 22,
),
), ),
), ),
const SizedBox(width: 12), const SizedBox(width: 12),
@@ -526,6 +619,7 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
'$downloadedCount ${isRu ? 'из' : 'of'} $totalCount ${isRu ? 'офлайн' : 'saved'}', '$downloadedCount ${isRu ? 'из' : 'of'} $totalCount ${isRu ? 'офлайн' : 'saved'}',
style: Theme.of(context).textTheme.titleSmall?.copyWith( style: Theme.of(context).textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: -0.2,
), ),
), ),
const SizedBox(height: 2), const SizedBox(height: 2),
@@ -553,21 +647,22 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
if (pendingCount > 0) if (pendingCount > 0)
FilledButton.tonalIcon( FilledButton.tonalIcon(
onPressed: () async { onPressed: () async {
HapticFeedback.mediumImpact();
final dm = ref.read(downloadManagerServiceProvider); final dm = ref.read(downloadManagerServiceProvider);
for (final p in pendingPosts) { for (final p in pendingPosts) {
await dm.start(p); await dm.start(p);
} }
if (!mounted) return; if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text( content: Text(
isRu isRu
? 'В очередь загрузки добавлено: $pendingCount' ? 'В очередь загрузки добавлено: $pendingCount'
: 'Queued $pendingCount downloads', : 'Queued $pendingCount downloads',
),
behavior: SnackBarBehavior.floating,
), ),
); behavior: SnackBarBehavior.floating,
),
);
}, },
icon: const Icon(Icons.download_rounded, size: 16), icon: const Icon(Icons.download_rounded, size: 16),
label: Text( label: Text(
@@ -594,7 +689,7 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
vertical: 6, vertical: 6,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: scheme.secondaryContainer.withValues(alpha: 0.5), color: scheme.primary.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
child: Row( child: Row(
@@ -610,8 +705,8 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
isRu ? 'Всё готово' : 'Synced', isRu ? 'Всё готово' : 'Synced',
style: style:
Theme.of(context).textTheme.labelSmall?.copyWith( Theme.of(context).textTheme.labelSmall?.copyWith(
color: scheme.onSecondaryContainer, color: scheme.primary,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
), ),
), ),
], ],
@@ -666,27 +761,36 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
ChoiceChip( ChoiceChip(
label: Text(isRu ? 'По дате' : 'Date'), label: Text(isRu ? 'По дате' : 'Date'),
selected: _offlineSort == OfflineSortOption.dateAddedDesc, selected: _offlineSort == OfflineSortOption.dateAddedDesc,
onSelected: (_) => setState( onSelected: (_) {
() => _offlineSort = OfflineSortOption.dateAddedDesc, HapticFeedback.selectionClick();
), setState(
() => _offlineSort = OfflineSortOption.dateAddedDesc,
);
},
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
), ),
const SizedBox(width: 6), const SizedBox(width: 6),
ChoiceChip( ChoiceChip(
label: Text(isRu ? 'По размеру' : 'Size'), label: Text(isRu ? 'По размеру' : 'Size'),
selected: _offlineSort == OfflineSortOption.sizeDesc, selected: _offlineSort == OfflineSortOption.sizeDesc,
onSelected: (_) => setState( onSelected: (_) {
() => _offlineSort = OfflineSortOption.sizeDesc, HapticFeedback.selectionClick();
), setState(
() => _offlineSort = OfflineSortOption.sizeDesc,
);
},
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
), ),
const SizedBox(width: 6), const SizedBox(width: 6),
ChoiceChip( ChoiceChip(
label: Text(isRu ? 'По автору' : 'Artist'), label: Text(isRu ? 'По автору' : 'Artist'),
selected: _offlineSort == OfflineSortOption.artist, selected: _offlineSort == OfflineSortOption.artist,
onSelected: (_) => setState( onSelected: (_) {
() => _offlineSort = OfflineSortOption.artist, HapticFeedback.selectionClick();
), setState(
() => _offlineSort = OfflineSortOption.artist,
);
},
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
), ),
], ],
@@ -712,38 +816,50 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
return Column( return Column(
children: [ children: [
// Artist Header Banner // Artist Header Banner (Liquid Glass)
Container( _FavoritesLiquidCard(
margin: const EdgeInsets.fromLTRB(16, 4, 16, 8), margin: const EdgeInsets.fromLTRB(16, 4, 16, 8),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: Theme.of(context)
.colorScheme
.surfaceContainerLow,
borderRadius: BorderRadius.circular(16),
border: Border.all(
color: Theme.of(context)
.colorScheme
.outlineVariant
.withValues(alpha: 0.3),
),
),
child: Row( child: Row(
children: [ children: [
IconButton( IconButton(
onPressed: () => setState(() => _selectedArtist = null), onPressed: () {
HapticFeedback.selectionClick();
setState(() => _selectedArtist = null);
},
icon: const Icon(Icons.arrow_back_rounded), icon: const Icon(Icons.arrow_back_rounded),
tooltip: isRu ? 'Все авторы' : 'All artists', tooltip: isRu ? 'Все авторы' : 'All artists',
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
CircleAvatar( Container(
radius: 18, width: 38,
backgroundColor: Theme.of(context).colorScheme.primaryContainer, height: 38,
child: Text( decoration: BoxDecoration(
selected.isNotEmpty ? selected[0].toUpperCase() : '?', gradient: LinearGradient(
style: TextStyle( colors: [
fontWeight: FontWeight.bold, Theme.of(context).colorScheme.primary,
color: Theme.of(context).colorScheme.onPrimaryContainer, Theme.of(context).colorScheme.tertiary,
],
),
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: Theme.of(context)
.colorScheme
.primary
.withValues(alpha: 0.35),
blurRadius: 6,
offset: const Offset(0, 2),
),
],
),
child: Center(
child: Text(
selected.isNotEmpty ? selected[0].toUpperCase() : '?',
style: const TextStyle(
fontWeight: FontWeight.bold,
color: Colors.white,
),
), ),
), ),
), ),
@@ -756,6 +872,7 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
selected, selected,
style: Theme.of(context).textTheme.titleMedium?.copyWith( style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: -0.2,
), ),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
@@ -776,6 +893,7 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
), ),
onPressed: () { onPressed: () {
HapticFeedback.selectionClick();
context.push('/search?q=${Uri.encodeComponent('artist:$selected')}'); context.push('/search?q=${Uri.encodeComponent('artist:$selected')}');
}, },
icon: const Icon(Icons.search_rounded, size: 16), icon: const Icon(Icons.search_rounded, size: 16),
@@ -808,7 +926,9 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
} }
return ListView.separated( return ListView.separated(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 24), // Extended bottom padding so the last artist cards scroll comfortably above the floating dock
padding: EdgeInsets.fromLTRB(
16, 8, 16, 140 + MediaQuery.paddingOf(context).bottom),
itemCount: entries.length, itemCount: entries.length,
separatorBuilder: (_, __) => const SizedBox(height: 10), separatorBuilder: (_, __) => const SizedBox(height: 10),
itemBuilder: (context, index) { itemBuilder: (context, index) {
@@ -863,6 +983,83 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
} }
} }
class _FavoritesLiquidCard extends StatelessWidget {
const _FavoritesLiquidCard({
required this.child,
this.padding,
this.glowColor,
this.margin,
});
final Widget child;
final EdgeInsetsGeometry? padding;
final EdgeInsetsGeometry? margin;
final Color? glowColor;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
final accent = glowColor ?? theme.colorScheme.primary;
return Container(
margin: margin,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
boxShadow: [
BoxShadow(
color: isDark
? Colors.black.withValues(alpha: 0.30)
: accent.withValues(alpha: 0.07),
blurRadius: 16,
offset: const Offset(0, 5),
spreadRadius: -2,
),
BoxShadow(
color: accent.withValues(alpha: isDark ? 0.05 : 0.02),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(22),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 18, sigmaY: 18),
child: Container(
padding: padding ?? const EdgeInsets.all(16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: isDark
? [
theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.60),
theme.colorScheme.surfaceContainerLow
.withValues(alpha: 0.38),
]
: [
Colors.white.withValues(alpha: 0.88),
Colors.white.withValues(alpha: 0.72),
],
),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.14)
: Colors.white.withValues(alpha: 0.85),
width: 1.2,
),
),
child: child,
),
),
),
);
}
}
class _ArtistCard extends StatelessWidget { class _ArtistCard extends StatelessWidget {
const _ArtistCard({ const _ArtistCard({
required this.artistName, required this.artistName,
@@ -881,123 +1078,182 @@ class _ArtistCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final scheme = Theme.of(context).colorScheme; final scheme = Theme.of(context).colorScheme;
final isDark = Theme.of(context).brightness == Brightness.dark;
return Card( return Container(
elevation: 0, decoration: BoxDecoration(
color: scheme.surfaceContainerLow, borderRadius: BorderRadius.circular(22),
shape: RoundedRectangleBorder( boxShadow: [
borderRadius: BorderRadius.circular(16), BoxShadow(
side: BorderSide( color: isDark
color: scheme.outlineVariant.withValues(alpha: 0.3), ? Colors.black.withValues(alpha: 0.28)
), : scheme.primary.withValues(alpha: 0.06),
blurRadius: 14,
offset: const Offset(0, 4),
spreadRadius: -2,
),
],
), ),
clipBehavior: Clip.antiAlias, child: ClipRRect(
child: InkWell( borderRadius: BorderRadius.circular(22),
onTap: onTap, child: BackdropFilter(
child: Padding( filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
padding: const EdgeInsets.all(12), child: Material(
child: Row( color: Colors.transparent,
children: [ child: InkWell(
// Artist Avatar borderRadius: BorderRadius.circular(22),
Container( onTap: () {
width: 48, HapticFeedback.selectionClick();
height: 48, onTap();
},
child: Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
gradient: LinearGradient( gradient: LinearGradient(
colors: [
scheme.primaryContainer,
scheme.tertiaryContainer,
],
begin: Alignment.topLeft, begin: Alignment.topLeft,
end: Alignment.bottomRight, end: Alignment.bottomRight,
colors: isDark
? [
scheme.surfaceContainerHigh
.withValues(alpha: 0.58),
scheme.surfaceContainerLow
.withValues(alpha: 0.36),
]
: [
Colors.white.withValues(alpha: 0.88),
Colors.white.withValues(alpha: 0.72),
],
), ),
borderRadius: BorderRadius.circular(14), border: Border.all(
), color: isDark
child: Center( ? Colors.white.withValues(alpha: 0.13)
child: Text( : Colors.white.withValues(alpha: 0.85),
artistName.isNotEmpty ? artistName[0].toUpperCase() : '?', width: 1.1,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: scheme.onPrimaryContainer,
),
), ),
), ),
), child: Row(
const SizedBox(width: 12),
// Artist Name & Count
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( // Artist Squircle Avatar
artistName,
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 2),
Container( Container(
padding: const EdgeInsets.symmetric( width: 48,
horizontal: 8, height: 48,
vertical: 2,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: scheme.secondaryContainer.withValues(alpha: 0.5), gradient: LinearGradient(
borderRadius: BorderRadius.circular(8), colors: [
scheme.primary,
scheme.tertiary,
],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
borderRadius: BorderRadius.circular(15),
boxShadow: [
BoxShadow(
color: scheme.primary.withValues(alpha: 0.35),
blurRadius: 8,
offset: const Offset(0, 2.5),
),
],
), ),
child: Text( child: Center(
'$postsCount ${isRu ? 'работ' : 'posts'}', child: Text(
style: Theme.of(context).textTheme.labelSmall?.copyWith( artistName.isNotEmpty ? artistName[0].toUpperCase() : '?',
color: scheme.onSecondaryContainer, style: const TextStyle(
fontWeight: FontWeight.w600, fontSize: 20,
), fontWeight: FontWeight.bold,
), color: Colors.white,
),
],
),
),
// Thumbnails preview
if (previewUrls.isNotEmpty) ...[
const SizedBox(width: 8),
Row(
children: [
for (final url in previewUrls)
Padding(
padding: const EdgeInsets.only(left: 4),
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: SizedBox(
width: 44,
height: 44,
child: CachedNetworkImage(
imageUrl: url,
fit: BoxFit.cover,
placeholder: (_, __) => Container(
color: scheme.surfaceContainerHighest,
),
errorWidget: (_, __, ___) => Container(
color: scheme.surfaceContainerHighest,
child: const Icon(
Icons.image_not_supported_rounded,
size: 16,
),
),
),
), ),
), ),
), ),
),
const SizedBox(width: 12),
// Artist Name & Count
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
artistName,
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold,
letterSpacing: -0.2,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 3),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 2,
),
decoration: BoxDecoration(
color: scheme.primary.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(8),
),
child: Text(
'$postsCount ${isRu ? 'работ' : 'posts'}',
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: scheme.primary,
fontWeight: FontWeight.w700,
),
),
),
],
),
),
// Thumbnails preview
if (previewUrls.isNotEmpty) ...[
const SizedBox(width: 8),
Row(
children: [
for (final url in previewUrls)
Padding(
padding: const EdgeInsets.only(left: 5),
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Container(
width: 44,
height: 44,
decoration: BoxDecoration(
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.10)
: scheme.outlineVariant.withValues(alpha: 0.25),
),
borderRadius: BorderRadius.circular(10),
),
child: CachedNetworkImage(
imageUrl: url,
fit: BoxFit.cover,
placeholder: (_, __) => Container(
color: scheme.surfaceContainerHighest,
),
errorWidget: (_, __, ___) => Container(
color: scheme.surfaceContainerHighest,
child: const Icon(
Icons.image_not_supported_rounded,
size: 16,
),
),
),
),
),
),
],
),
],
const SizedBox(width: 4),
Icon(
Icons.chevron_right_rounded,
size: 20,
color: scheme.onSurfaceVariant.withValues(alpha: 0.5),
),
], ],
), ),
],
const SizedBox(width: 6),
Icon(
Icons.chevron_right_rounded,
color: scheme.onSurfaceVariant.withValues(alpha: 0.6),
), ),
], ),
), ),
), ),
), ),
@@ -374,7 +374,11 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
void _submitSearch(String query) { void _submitSearch(String query) {
final trimmed = query.trim(); final trimmed = query.trim();
if (trimmed.isEmpty) { if (trimmed.isEmpty) {
_clearFilters(); if (widget.initialQuery != null) {
context.go('/');
} else {
_applySearchQuery('');
}
return; return;
} }
final location = '/?q=${Uri.encodeQueryComponent(trimmed)}'; final location = '/?q=${Uri.encodeQueryComponent(trimmed)}';
@@ -649,7 +653,7 @@ class _FeedTitle extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Text(
'Lunaris', 'Prisma',
style: theme.textTheme.titleLarge?.copyWith( style: theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
), ),
@@ -104,7 +104,7 @@ class _FeedToolbarState extends State<FeedToolbar> {
}, },
onCleared: () { onCleared: () {
_query = ''; _query = '';
widget.onClearFilters(); widget.onSearch('');
}, },
), ),
), ),
@@ -235,7 +235,7 @@ class _FeedToolbarState extends State<FeedToolbar> {
}, },
onCleared: () { onCleared: () {
_query = ''; _query = '';
widget.onClearFilters(); widget.onSearch('');
}, },
), ),
), ),
File diff suppressed because it is too large Load Diff
@@ -7,7 +7,7 @@ import '../../../../backend/models/cloud_media_link.dart';
import '../../../../backend/models/creator_link.dart'; import '../../../../backend/models/creator_link.dart';
import '../../../../shared/widgets/formatted_content_text.dart'; import '../../../../shared/widgets/formatted_content_text.dart';
class CloudMirrorsCard extends StatelessWidget { class CloudMirrorsCard extends StatefulWidget {
const CloudMirrorsCard({ const CloudMirrorsCard({
super.key, super.key,
required this.links, required this.links,
@@ -25,9 +25,21 @@ class CloudMirrorsCard extends StatelessWidget {
final ValueChanged<String>? onDownloadStream; final ValueChanged<String>? onDownloadStream;
final bool initiallyExpanded; final bool initiallyExpanded;
@override
State<CloudMirrorsCard> createState() => _CloudMirrorsCardState();
}
class _CloudMirrorsCardState extends State<CloudMirrorsCard> {
int _selectedTab = 0; // 0: mirrors, 1: commentary
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (links.isEmpty && (commentary == null || commentary!.trim().isEmpty)) { final links = widget.links;
final commentary = widget.commentary;
final hasLinks = links.isNotEmpty;
final hasCommentary = commentary != null && commentary.trim().isNotEmpty;
if (!hasLinks && !hasCommentary) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
@@ -37,6 +49,14 @@ class CloudMirrorsCard extends StatelessWidget {
.whereType<String>() .whereType<String>()
.firstWhere((p) => p.isNotEmpty, orElse: () => ''); .firstWhere((p) => p.isNotEmpty, orElse: () => '');
final cardTitle = hasLinks
? (widget.strings.ru
? 'Облачные диски и зеркала (${links.length})'
: 'Cloud Mirrors & Drives (${links.length})')
: (widget.strings.ru ? 'Описание от автора' : 'Artist Commentary');
final cardIcon = hasLinks ? Icons.cloud_sync_rounded : Icons.notes_rounded;
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerLow, color: theme.colorScheme.surfaceContainerLow,
@@ -49,20 +69,18 @@ class CloudMirrorsCard extends StatelessWidget {
child: ExpansionTile( child: ExpansionTile(
tilePadding: const EdgeInsets.symmetric(horizontal: 14, vertical: 2), tilePadding: const EdgeInsets.symmetric(horizontal: 14, vertical: 2),
childrenPadding: const EdgeInsets.fromLTRB(14, 0, 14, 14), childrenPadding: const EdgeInsets.fromLTRB(14, 0, 14, 14),
initiallyExpanded: initiallyExpanded, initiallyExpanded: widget.initiallyExpanded,
shape: const Border(), shape: const Border(),
collapsedShape: const Border(), collapsedShape: const Border(),
leading: Icon( leading: Icon(
Icons.cloud_sync_rounded, cardIcon,
color: theme.colorScheme.primary, color: theme.colorScheme.primary,
), ),
title: Row( title: Row(
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
strings.ru cardTitle,
? 'Облачные диски и зеркала (${links.length})'
: 'Cloud Mirrors & Drives (${links.length})',
style: theme.textTheme.titleSmall?.copyWith( style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -77,7 +95,8 @@ class CloudMirrorsCard extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.green.withValues(alpha: 0.15), color: Colors.green.withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
border: Border.all(color: Colors.green.withValues(alpha: 0.4)), border:
Border.all(color: Colors.green.withValues(alpha: 0.4)),
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -86,7 +105,7 @@ class CloudMirrorsCard extends StatelessWidget {
size: 13, color: Colors.green), size: 13, color: Colors.green),
const SizedBox(width: 4), const SizedBox(width: 4),
Text( Text(
strings.ru ? 'Плеер' : 'Stream', widget.strings.ru ? 'Плеер' : 'Stream',
style: theme.textTheme.labelSmall?.copyWith( style: theme.textTheme.labelSmall?.copyWith(
color: Colors.green, color: Colors.green,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@@ -116,7 +135,9 @@ class CloudMirrorsCard extends StatelessWidget {
Expanded( Expanded(
child: Text.rich( child: Text.rich(
TextSpan( TextSpan(
text: strings.ru ? 'Пароль к архиву: ' : 'Archive Password: ', text: widget.strings.ru
? 'Пароль к архиву: '
: 'Archive Password: ',
style: theme.textTheme.bodySmall?.copyWith( style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurface, color: theme.colorScheme.onSurface,
), ),
@@ -135,13 +156,15 @@ class CloudMirrorsCard extends StatelessWidget {
IconButton( IconButton(
icon: const Icon(Icons.copy_rounded, size: 16), icon: const Icon(Icons.copy_rounded, size: 16),
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
tooltip: strings.ru ? 'Копировать пароль' : 'Copy Password', tooltip: widget.strings.ru
? 'Копировать пароль'
: 'Copy Password',
onPressed: () { onPressed: () {
Clipboard.setData(ClipboardData(text: detectedPassword)); Clipboard.setData(ClipboardData(text: detectedPassword));
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text( content: Text(
strings.ru widget.strings.ru
? 'Пароль скопирован: $detectedPassword' ? 'Пароль скопирован: $detectedPassword'
: 'Password copied: $detectedPassword', : 'Password copied: $detectedPassword',
), ),
@@ -157,63 +180,111 @@ class CloudMirrorsCard extends StatelessWidget {
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
// Links list if (hasLinks && hasCommentary) ...[
if (links.isNotEmpty) ...[ Padding(
...links.map((link) => _buildLinkTile(context, link, strings)), padding: const EdgeInsets.only(bottom: 12),
], child: SizedBox(
width: double.infinity,
// Commentary / Description child: SegmentedButton<int>(
if (commentary != null && commentary!.trim().isNotEmpty) ...[ segments: [
const SizedBox(height: 10), ButtonSegment(
Divider( value: 0,
color: theme.colorScheme.outlineVariant.withValues(alpha: 0.4), icon: const Icon(Icons.cloud_queue_rounded, size: 16),
height: 1, label: Text(
), widget.strings.ru
const SizedBox(height: 10), ? 'Зеркала (${links.length})'
Row( : 'Mirrors (${links.length})',
children: [ ),
Icon( ),
Icons.notes_rounded, ButtonSegment(
size: 16, value: 1,
color: theme.colorScheme.primary, icon: const Icon(Icons.notes_rounded, size: 16),
label: Text(
widget.strings.ru ? 'Описание' : 'Description',
),
),
],
selected: {_selectedTab},
onSelectionChanged: (set) =>
setState(() => _selectedTab = set.first),
), ),
const SizedBox(width: 6),
Text(
strings.ru ? 'Описание от автора' : 'Artist Commentary',
style: theme.textTheme.labelLarge?.copyWith(
fontWeight: FontWeight.bold,
color: theme.colorScheme.primary,
),
),
],
),
const SizedBox(height: 8),
FormattedContentText(
text: commentary!.trim(),
style: theme.textTheme.bodySmall?.copyWith(
height: 1.45,
color: theme.colorScheme.onSurfaceVariant,
), ),
), ),
Builder( IndexedStack(
builder: (context) { index: _selectedTab,
final creatorLinks = CreatorLink.extractLinks(commentary); children: [
if (creatorLinks.isEmpty) return const SizedBox.shrink(); Column(
return Padding( crossAxisAlignment: CrossAxisAlignment.start,
padding: const EdgeInsets.only(top: 10), children: links
child: CreatorLinkChips( .map((link) => _buildLinkTile(
links: creatorLinks, context,
title: strings.ru ? 'Ссылки автора' : 'Author Links', link,
), widget.strings,
); ))
}, .toList(),
),
_buildCommentarySection(context, commentary, theme),
],
), ),
] else if (hasLinks) ...[
...links.map((link) => _buildLinkTile(
context,
link,
widget.strings,
)),
] else if (hasCommentary) ...[
_buildCommentarySection(context, commentary, theme),
], ],
], ],
), ),
); );
} }
Widget _buildCommentarySection(
BuildContext context,
String text,
ThemeData theme,
) {
final creatorLinks = CreatorLink.extractLinks(text);
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(
Icons.notes_rounded,
size: 16,
color: theme.colorScheme.primary,
),
const SizedBox(width: 6),
Text(
widget.strings.ru ? 'Описание от автора' : 'Artist Commentary',
style: theme.textTheme.labelLarge?.copyWith(
fontWeight: FontWeight.bold,
color: theme.colorScheme.primary,
),
),
],
),
const SizedBox(height: 8),
FormattedContentText(
text: text.trim(),
style: theme.textTheme.bodySmall?.copyWith(
height: 1.45,
color: theme.colorScheme.onSurfaceVariant,
),
),
if (creatorLinks.isNotEmpty) ...[
const SizedBox(height: 10),
CreatorLinkChips(
links: creatorLinks,
title: widget.strings.ru ? 'Ссылки автора' : 'Author Links',
),
],
],
);
}
Widget _buildLinkTile( Widget _buildLinkTile(
BuildContext context, BuildContext context,
CloudMediaLink link, CloudMediaLink link,
@@ -303,7 +374,7 @@ class CloudMirrorsCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
// Play button (if streamable) // Play button (if streamable)
if (link.isStreamable && onPlayStream != null) ...[ if (link.isStreamable && widget.onPlayStream != null) ...[
FilledButton.tonalIcon( FilledButton.tonalIcon(
style: FilledButton.styleFrom( style: FilledButton.styleFrom(
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
@@ -313,7 +384,7 @@ class CloudMirrorsCard extends StatelessWidget {
label: Text(strings.ru ? 'Смотреть' : 'Play'), label: Text(strings.ru ? 'Смотреть' : 'Play'),
onPressed: () { onPressed: () {
final target = link.directStreamUrl ?? link.url; final target = link.directStreamUrl ?? link.url;
onPlayStream!(target); widget.onPlayStream!(target);
}, },
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -321,12 +392,13 @@ class CloudMirrorsCard extends StatelessWidget {
// Download button (if direct streamable and callback exists) // Download button (if direct streamable and callback exists)
if (link.isStreamable && if (link.isStreamable &&
link.directStreamUrl != null && link.directStreamUrl != null &&
onDownloadStream != null) ...[ widget.onDownloadStream != null) ...[
IconButton.filledTonal( IconButton.filledTonal(
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
tooltip: strings.download, tooltip: strings.download,
icon: const Icon(Icons.download_rounded, size: 16), icon: const Icon(Icons.download_rounded, size: 16),
onPressed: () => onDownloadStream!(link.directStreamUrl!), onPressed: () =>
widget.onDownloadStream!(link.directStreamUrl!),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
], ],
File diff suppressed because it is too large Load Diff
@@ -298,7 +298,7 @@ class _TagGroupBlock extends StatelessWidget {
required this.onLongPress, required this.onLongPress,
}); });
static const _collapsedLimit = 36; static const _collapsedLimit = 28;
final String label; final String label;
final String group; final String group;
@@ -320,13 +320,51 @@ class _TagGroupBlock extends StatelessWidget {
children: [ children: [
Row( Row(
children: [ children: [
Text(label, style: Theme.of(context).textTheme.labelLarge), Container(
const SizedBox(width: 8), width: 8,
Text( height: 8,
'${tags.length}', margin: const EdgeInsets.only(right: 8),
style: Theme.of(context).textTheme.labelMedium?.copyWith( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.onSurfaceVariant, color: _headerDotColor(group, Theme.of(context)),
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: _headerDotColor(group, Theme.of(context))
.withValues(alpha: 0.55),
blurRadius: 5,
spreadRadius: 1,
), ),
],
),
),
Text(
label,
style: Theme.of(context).textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: -0.1,
),
),
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 1.5),
decoration: BoxDecoration(
color: Theme.of(context).brightness == Brightness.dark
? Colors.white.withValues(alpha: 0.08)
: Colors.black.withValues(alpha: 0.05),
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: Theme.of(context).brightness == Brightness.dark
? Colors.white.withValues(alpha: 0.12)
: Colors.black.withValues(alpha: 0.08),
),
),
child: Text(
'${tags.length}',
style: Theme.of(context).textTheme.labelSmall?.copyWith(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
), ),
], ],
), ),
@@ -338,6 +376,7 @@ class _TagGroupBlock extends StatelessWidget {
for (final tag in visibleTags) for (final tag in visibleTags)
TagChip( TagChip(
tag: tag, tag: tag,
group: group,
onTap: () => onTap(tag), onTap: () => onTap(tag),
onLongPress: () => onLongPress(tag), onLongPress: () => onLongPress(tag),
), ),
@@ -360,4 +399,17 @@ class _TagGroupBlock extends StatelessWidget {
), ),
); );
} }
static Color _headerDotColor(String group, ThemeData theme) {
return switch (group.toLowerCase()) {
'artist' => const Color(0xFFFF4757),
'character' => const Color(0xFF2ED573),
'copyright' => const Color(0xFFA55EEA),
'species' => const Color(0xFFFFA502),
'meta' => const Color(0xFF1E90FF),
_ => theme.colorScheme.primary,
};
}
} }
@@ -1,56 +1,334 @@
import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import '../../../backend/backend.dart'; import '../../../backend/backend.dart';
import '../../../core/utils/result.dart'; import '../../../core/utils/result.dart';
import '../../../shared/widgets/adaptive_scaffold.dart';
import '../../../shared/widgets/error_view.dart'; import '../../../shared/widgets/error_view.dart';
import 'providers_controller.dart'; import 'providers_controller.dart';
import 'widgets/provider_health_tile.dart'; import 'widgets/provider_health_tile.dart';
class ProviderCheckScreen extends ConsumerWidget { class ProviderCheckScreen extends ConsumerStatefulWidget {
const ProviderCheckScreen({super.key}); const ProviderCheckScreen({super.key});
@override @override
Widget build(BuildContext context, WidgetRef ref) { ConsumerState<ProviderCheckScreen> createState() =>
_ProviderCheckScreenState();
}
class _ProviderCheckScreenState extends ConsumerState<ProviderCheckScreen> {
bool _isCheckingAll = false;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
final providers = ref.watch(providersControllerProvider); final providers = ref.watch(providersControllerProvider);
final health = ref.watch(providerHealthProvider); final health = ref.watch(providerHealthProvider);
final diagnostics = ref.watch(providerDiagnosticsProvider).value ?? {}; final diagnostics = ref.watch(providerDiagnosticsProvider).value ?? {};
return AdaptiveScaffold( final bottomInset = MediaQuery.paddingOf(context).bottom;
title: 'Provider Check',
actions: [ return Scaffold(
IconButton( extendBodyBehindAppBar: true,
tooltip: 'Check all', appBar: PreferredSize(
onPressed: () => _checkAll(ref), preferredSize: const Size.fromHeight(60),
icon: const Icon(Icons.playlist_add_check_rounded), child: ClipRRect(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 18, sigmaY: 18),
child: AppBar(
backgroundColor: isDark
? theme.colorScheme.surface.withValues(alpha: 0.75)
: Colors.white.withValues(alpha: 0.85),
surfaceTintColor: Colors.transparent,
elevation: 0,
leading: IconButton(
icon: const Icon(Icons.arrow_back_ios_new_rounded, size: 20),
onPressed: () {
if (Navigator.of(context).canPop()) {
Navigator.of(context).pop();
} else {
context.go('/providers');
}
},
tooltip: isRu ? 'Назад' : 'Back',
),
title: Text(
isRu ? 'Проверка источников' : 'Provider Check',
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
),
),
actions: [
Padding(
padding: const EdgeInsets.only(right: 12),
child: Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(14),
child: InkWell(
borderRadius: BorderRadius.circular(14),
onTap: _isCheckingAll ? null : () => _checkAll(ref),
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 6),
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [Color(0xFF6366F1), Color(0xFF8B5CF6)],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
borderRadius: BorderRadius.circular(14),
boxShadow: [
BoxShadow(
color: const Color(0xFF6366F1)
.withValues(alpha: 0.35),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (_isCheckingAll)
const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
else
const Icon(
Icons.playlist_add_check_rounded,
size: 16,
color: Colors.white,
),
const SizedBox(width: 5),
Text(
isRu ? 'Проверить все' : 'Check All',
style: const TextStyle(
fontSize: 12,
fontWeight: FontWeight.w700,
color: Colors.white,
),
),
],
),
),
),
),
),
],
),
),
), ),
], ),
body: providers.when( body: providers.when(
loading: () => const Center(child: CircularProgressIndicator()), loading: () => const Center(child: CircularProgressIndicator()),
error: (error, _) => ErrorView(message: error.toString()), error: (error, _) => ErrorView(message: error.toString()),
data: (items) => ListView.builder( data: (items) {
padding: const EdgeInsets.all(16), int onlineCount = 0;
itemCount: items.length, int offlineCount = 0;
itemBuilder: (context, index) { int pingSum = 0;
final item = items[index]; int pingCount = 0;
return ProviderHealthTile(
config: item, for (final item in items) {
health: health[item.id], final h = health[item.id];
diagnostics: diagnostics[item.id], if (h != null) {
onCheck: () => _checkOne(ref, item.id), if (h.status == ProviderStatus.online) {
); onlineCount++;
}, pingSum += h.pingMs;
), pingCount++;
} else if (h.status == ProviderStatus.offline) {
offlineCount++;
}
}
}
final avgPing =
pingCount > 0 ? (pingSum / pingCount).round() : null;
return Align(
alignment: Alignment.topCenter,
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 860),
child: ListView(
padding: EdgeInsets.fromLTRB(
16,
MediaQuery.paddingOf(context).top + 68,
16,
140 + bottomInset,
),
children: [
// Status Overview Card
Container(
margin: const EdgeInsets.only(bottom: 16),
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: isDark
? [
theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.65),
theme.colorScheme.surfaceContainerLow
.withValues(alpha: 0.40),
]
: [
Colors.white.withValues(alpha: 0.90),
Colors.white.withValues(alpha: 0.75),
],
),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.14)
: Colors.white.withValues(alpha: 0.85),
width: 1.1,
),
boxShadow: [
BoxShadow(
color: isDark
? Colors.black.withValues(alpha: 0.25)
: const Color(0xFF6366F1).withValues(alpha: 0.08),
blurRadius: 16,
offset: const Offset(0, 4),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Wrap(
alignment: WrapAlignment.spaceBetween,
crossAxisAlignment: WrapCrossAlignment.center,
spacing: 8,
runSpacing: 6,
children: [
Text(
isRu ? 'Состояние сети' : 'Network Health',
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
),
),
if (avgPing != null)
Container(
padding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 3),
decoration: BoxDecoration(
color: const Color(0xFF10B981).withValues(
alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: const Color(0xFF10B981).withValues(
alpha: isDark ? 0.38 : 0.25),
),
),
child: Text(
'${isRu ? 'Средний пинг' : 'Avg ping'}: $avgPing ms',
style: const TextStyle(
fontSize: 11,
fontWeight: FontWeight.w700,
color: Color(0xFF10B981),
fontFamily: 'monospace',
),
),
),
],
),
const SizedBox(height: 12),
Row(
children: [
Expanded(
child: _MetricPill(
label: isRu ? 'Всего' : 'Total',
value: '${items.length}',
color: theme.colorScheme.primary,
isDark: isDark,
),
),
const SizedBox(width: 8),
Expanded(
child: _MetricPill(
label: isRu ? 'Онлайн' : 'Online',
value: '$onlineCount',
color: const Color(0xFF10B981),
isDark: isDark,
),
),
const SizedBox(width: 8),
Expanded(
child: _MetricPill(
label: isRu ? 'Офлайн' : 'Offline',
value: '$offlineCount',
color: const Color(0xFFEF4444),
isDark: isDark,
),
),
],
),
],
),
),
// Health Tiles List
if (items.isEmpty)
Container(
padding: const EdgeInsets.all(32),
decoration: BoxDecoration(
color: isDark
? theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.40)
: Colors.white.withValues(alpha: 0.80),
borderRadius: BorderRadius.circular(24),
),
child: Center(
child: Text(
isRu ? 'Нет источников для проверки' : 'No providers to check',
style: theme.textTheme.bodyMedium,
),
),
)
else
...items.map((item) {
return ProviderHealthTile(
key: ValueKey(item.id),
config: item,
health: health[item.id],
diagnostics: diagnostics[item.id],
onCheck: () => _checkOne(ref, item.id),
);
}),
],
),
),
);
},
), ),
); );
} }
Future<void> _checkAll(WidgetRef ref) async { Future<void> _checkAll(WidgetRef ref) async {
final result = await ref.read(providerCheckServiceProvider).checkAll(); setState(() => _isCheckingAll = true);
if (result is Success<List<ProviderHealth>>) { HapticFeedback.mediumImpact();
ref.read(providerHealthProvider.notifier).state = { try {
for (final item in result.data) item.providerId: item, final result =
}; await ref.read(providerCheckServiceProvider).checkAll();
if (result is Success<List<ProviderHealth>>) {
ref.read(providerHealthProvider.notifier).state = {
for (final item in result.data) item.providerId: item,
};
}
} finally {
if (mounted) setState(() => _isCheckingAll = false);
} }
} }
@@ -65,3 +343,53 @@ class ProviderCheckScreen extends ConsumerWidget {
} }
} }
} }
class _MetricPill extends StatelessWidget {
const _MetricPill({
required this.label,
required this.value,
required this.color,
required this.isDark,
});
final String label;
final String value;
final Color color;
final bool isDark;
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
decoration: BoxDecoration(
color: color.withValues(alpha: isDark ? 0.12 : 0.08),
borderRadius: BorderRadius.circular(14),
border: Border.all(
color: color.withValues(alpha: isDark ? 0.30 : 0.20),
width: 1,
),
),
child: Column(
children: [
Text(
value,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w800,
color: color,
),
),
const SizedBox(height: 1),
Text(
label,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: color.withValues(alpha: 0.85),
),
),
],
),
);
}
}
File diff suppressed because it is too large Load Diff
@@ -1,8 +1,9 @@
import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import '../../../shared/widgets/adaptive_scaffold.dart';
import '../../../shared/widgets/confirm_dialog.dart'; import '../../../shared/widgets/confirm_dialog.dart';
import '../../../shared/widgets/error_view.dart'; import '../../../shared/widgets/error_view.dart';
import 'providers_controller.dart'; import 'providers_controller.dart';
@@ -13,50 +14,371 @@ class ProvidersScreen extends ConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
final providers = ref.watch(providersControllerProvider); final providers = ref.watch(providersControllerProvider);
return AdaptiveScaffold( final bottomInset = MediaQuery.paddingOf(context).bottom;
title: 'Providers',
actions: [ return Scaffold(
IconButton( extendBodyBehindAppBar: true,
tooltip: 'Check providers', appBar: PreferredSize(
onPressed: () => context.go('/providers/check'), preferredSize: const Size.fromHeight(60),
icon: const Icon(Icons.network_check_rounded), child: ClipRRect(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 18, sigmaY: 18),
child: AppBar(
backgroundColor: isDark
? theme.colorScheme.surface.withValues(alpha: 0.72)
: Colors.white.withValues(alpha: 0.82),
surfaceTintColor: Colors.transparent,
elevation: 0,
centerTitle: false,
leading: Navigator.of(context).canPop()
? IconButton(
icon: const Icon(Icons.arrow_back_ios_new_rounded, size: 20),
onPressed: () => context.pop(),
tooltip: isRu ? 'Назад' : 'Back',
)
: null,
title: Row(
mainAxisSize: MainAxisSize.min,
children: [
Container(
width: 30,
height: 30,
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [Color(0xFF6366F1), Color(0xFF8B5CF6)],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
borderRadius: BorderRadius.circular(9),
boxShadow: [
BoxShadow(
color:
const Color(0xFF6366F1).withValues(alpha: 0.35),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: const Center(
child:
Icon(Icons.hub_rounded, size: 16, color: Colors.white),
),
),
const SizedBox(width: 8),
Flexible(
child: Text(
isRu ? 'Провайдеры' : 'Providers',
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
),
overflow: TextOverflow.ellipsis,
),
),
],
),
actions: [
// Provider Check Glass Button
Padding(
padding: const EdgeInsets.only(right: 6),
child: Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(14),
child: InkWell(
borderRadius: BorderRadius.circular(14),
onTap: () {
HapticFeedback.lightImpact();
context.push('/providers/check');
},
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: theme.colorScheme.primary
.withValues(alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(14),
border: Border.all(
color: theme.colorScheme.primary
.withValues(alpha: isDark ? 0.35 : 0.22),
width: 1,
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.network_check_rounded,
size: 16,
color: theme.colorScheme.primary,
),
const SizedBox(width: 5),
Text(
isRu ? 'Проверка' : 'Check',
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w700,
color: theme.colorScheme.primary,
),
),
],
),
),
),
),
),
// Add Provider Accent Button
Padding(
padding: const EdgeInsets.only(right: 12),
child: Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(14),
child: InkWell(
borderRadius: BorderRadius.circular(14),
onTap: () {
HapticFeedback.lightImpact();
context.push('/providers/new');
},
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 6),
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [Color(0xFF6366F1), Color(0xFF8B5CF6)],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
borderRadius: BorderRadius.circular(14),
boxShadow: [
BoxShadow(
color: const Color(0xFF6366F1)
.withValues(alpha: 0.35),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Icons.add_rounded,
size: 16,
color: Colors.white,
),
const SizedBox(width: 4),
Text(
isRu ? 'Создать' : 'Add',
style: const TextStyle(
fontSize: 12,
fontWeight: FontWeight.w700,
color: Colors.white,
),
),
],
),
),
),
),
),
],
),
),
), ),
IconButton( ),
tooltip: 'Add provider',
onPressed: () => context.go('/providers/new'),
icon: const Icon(Icons.add_rounded),
),
],
body: providers.when( body: providers.when(
loading: () => const Center(child: CircularProgressIndicator()), loading: () => const Center(child: CircularProgressIndicator()),
error: (error, _) => ErrorView(message: error.toString()), error: (error, _) => ErrorView(message: error.toString()),
data: (items) => ListView.builder( data: (items) {
padding: const EdgeInsets.all(16), final activeCount = items.where((p) => p.enabled).length;
itemCount: items.length,
itemBuilder: (context, index) { return Align(
final item = items[index]; alignment: Alignment.topCenter,
return ProviderCard( child: ConstrainedBox(
config: item, constraints: const BoxConstraints(maxWidth: 860),
onToggle: (enabled) => ref child: ListView(
.read(providersControllerProvider.notifier) padding: EdgeInsets.fromLTRB(
.toggle(item.id, enabled), 16,
onEdit: () => context.go('/providers/new', extra: item), MediaQuery.paddingOf(context).top + 68,
onDelete: () async { 16,
final ok = await showConfirmDialog( 140 + bottomInset,
context, ),
title: 'Delete provider', children: [
message: 'Remove ${item.name}?', // Overview Glass Card
); Container(
if (ok) { margin: const EdgeInsets.only(bottom: 16),
await ref padding: const EdgeInsets.all(16),
.read(providersControllerProvider.notifier) decoration: BoxDecoration(
.delete(item.id); borderRadius: BorderRadius.circular(22),
} gradient: LinearGradient(
}, begin: Alignment.topLeft,
); end: Alignment.bottomRight,
}, colors: isDark
), ? [
theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.65),
theme.colorScheme.surfaceContainerLow
.withValues(alpha: 0.40),
]
: [
Colors.white.withValues(alpha: 0.90),
Colors.white.withValues(alpha: 0.75),
],
),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.14)
: Colors.white.withValues(alpha: 0.85),
width: 1.1,
),
boxShadow: [
BoxShadow(
color: isDark
? Colors.black.withValues(alpha: 0.25)
: const Color(0xFF6366F1).withValues(alpha: 0.08),
blurRadius: 16,
offset: const Offset(0, 4),
),
],
),
child: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
isRu
? 'Управление источниками'
: 'Provider Management',
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
),
),
const SizedBox(height: 4),
Text(
isRu
? 'Настройте подключение, API ключи и приоритеты booru-сервисов'
: 'Configure connections, API keys and search priorities',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
],
),
),
const SizedBox(width: 12),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: const Color(0xFF10B981)
.withValues(alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: const Color(0xFF10B981)
.withValues(alpha: isDark ? 0.40 : 0.28),
),
),
child: Text(
'$activeCount / ${items.length} ${isRu ? 'вкл' : 'on'}',
style: const TextStyle(
fontSize: 12,
fontWeight: FontWeight.w700,
color: Color(0xFF10B981),
),
),
),
],
),
),
// Empty State
if (items.isEmpty)
Container(
padding: const EdgeInsets.all(32),
decoration: BoxDecoration(
color: isDark
? theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.40)
: Colors.white.withValues(alpha: 0.80),
borderRadius: BorderRadius.circular(24),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.10)
: Colors.white,
),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.cloud_off_rounded,
size: 48,
color: theme.colorScheme.onSurfaceVariant
.withValues(alpha: 0.5),
),
const SizedBox(height: 12),
Text(
isRu
? 'Нет настроенных источников'
: 'No providers configured',
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 6),
Text(
isRu
? 'Нажмите «Создать», чтобы добавить новый booru-провайдер'
: 'Tap "Add" to set up a new booru provider',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
textAlign: TextAlign.center,
),
],
),
)
else
// List of Provider Cards
...items.map((item) {
return ProviderCard(
key: ValueKey(item.id),
config: item,
onToggle: (enabled) => ref
.read(providersControllerProvider.notifier)
.toggle(item.id, enabled),
onEdit: () => context.push(
'/providers/new',
extra: item,
),
onDelete: () async {
final ok = await showConfirmDialog(
context,
title: isRu ? 'Удалить источник' : 'Delete provider',
message: isRu
? 'Вы действительно хотите удалить ${item.name}?'
: 'Remove ${item.name}?',
);
if (ok) {
await ref
.read(providersControllerProvider.notifier)
.delete(item.id);
}
},
);
}),
],
),
),
);
},
), ),
); );
} }
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../../../backend/backend.dart'; import '../../../../backend/backend.dart';
@@ -18,27 +19,396 @@ class ProviderCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Card( final theme = Theme.of(context);
child: ListTile( final isDark = theme.brightness == Brightness.dark;
leading: Switch(value: config.enabled, onChanged: onToggle), final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
title: Text(config.name), final (engineColor, engineIcon, engineTitle) = _engineInfo(config.apiType);
subtitle: Text(
'${config.apiType} · ${config.baseUrl}\nPriority ${config.priority}'), return Container(
isThreeLine: true, margin: const EdgeInsets.only(bottom: 14),
trailing: Wrap( decoration: BoxDecoration(
spacing: 4, borderRadius: BorderRadius.circular(24),
children: [ boxShadow: [
IconButton( BoxShadow(
tooltip: 'Edit', color: isDark
onPressed: onEdit, ? Colors.black.withValues(alpha: 0.30)
icon: const Icon(Icons.edit_rounded), : engineColor.withValues(alpha: 0.08),
blurRadius: 18,
offset: const Offset(0, 6),
spreadRadius: -2,
),
BoxShadow(
color: engineColor.withValues(alpha: isDark ? 0.05 : 0.03),
blurRadius: 10,
offset: const Offset(0, 2),
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(24),
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: isDark
? [
theme.colorScheme.surfaceContainerHigh
.withValues(alpha: config.enabled ? 0.65 : 0.35),
theme.colorScheme.surfaceContainerLow
.withValues(alpha: config.enabled ? 0.45 : 0.20),
]
: [
Colors.white
.withValues(alpha: config.enabled ? 0.90 : 0.60),
Colors.white
.withValues(alpha: config.enabled ? 0.75 : 0.45),
],
), ),
IconButton( border: Border.all(
tooltip: 'Delete', color: isDark
onPressed: onDelete, ? (config.enabled
icon: const Icon(Icons.delete_rounded), ? engineColor.withValues(alpha: 0.28)
: Colors.white.withValues(alpha: 0.08))
: (config.enabled
? Colors.white.withValues(alpha: 0.90)
: Colors.white.withValues(alpha: 0.50)),
width: 1.2,
), ),
], ),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Row 1: Icon squircle + Name & details + Switch
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
// Engine Icon Squircle Badge
Container(
width: 44,
height: 44,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: config.enabled
? [
engineColor,
engineColor.withValues(alpha: 0.80),
]
: [
Colors.grey.shade600,
Colors.grey.shade700,
],
),
borderRadius: BorderRadius.circular(14),
boxShadow: [
if (config.enabled)
BoxShadow(
color: engineColor.withValues(alpha: 0.38),
blurRadius: 10,
offset: const Offset(0, 3),
),
],
),
child: Center(
child: Icon(
engineIcon,
size: 22,
color: Colors.white,
),
),
),
const SizedBox(width: 14),
// Name & Sub-details
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Flexible(
child: Text(
config.name,
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
color: config.enabled
? theme.colorScheme.onSurface
: theme.colorScheme.onSurface
.withValues(alpha: 0.6),
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
),
const SizedBox(height: 5),
Wrap(
spacing: 6,
runSpacing: 4,
children: [
// Engine badge
_GlassPill(
label: engineTitle,
color: engineColor,
isDark: isDark,
),
// Priority badge
_GlassPill(
label: '${isRu ? 'Приоритет' : 'Priority'} ${config.priority}',
color: theme.colorScheme.primary,
isDark: isDark,
),
],
),
],
),
),
// Switch
Transform.scale(
scale: 0.9,
child: Switch.adaptive(
value: config.enabled,
onChanged: (val) {
HapticFeedback.selectionClick();
onToggle(val);
},
activeThumbColor: engineColor,
activeTrackColor: engineColor.withValues(alpha: 0.45),
),
),
],
),
const SizedBox(height: 12),
// Row 2: Base URL glass chip
Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: isDark
? Colors.black.withValues(alpha: 0.20)
: theme.colorScheme.surfaceContainerHighest
.withValues(alpha: 0.40),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.06)
: Colors.black.withValues(alpha: 0.05),
),
),
child: Row(
children: [
Icon(
Icons.link_rounded,
size: 14,
color: theme.colorScheme.onSurfaceVariant
.withValues(alpha: 0.8),
),
const SizedBox(width: 6),
Expanded(
child: Text(
config.baseUrl,
style: TextStyle(
fontSize: 12,
fontFamily: 'monospace',
color: theme.colorScheme.onSurfaceVariant,
letterSpacing: -0.1,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
),
),
const SizedBox(height: 12),
// Row 3: Action Buttons (Edit & Delete)
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
// Edit Action Button
_GlassActionButton(
icon: Icons.edit_rounded,
label: isRu ? 'Изменить' : 'Edit',
color: theme.colorScheme.primary,
isDark: isDark,
onTap: () {
HapticFeedback.lightImpact();
onEdit();
},
),
const SizedBox(width: 8),
// Delete Action Button
_GlassActionButton(
icon: Icons.delete_outline_rounded,
label: isRu ? 'Удалить' : 'Delete',
color: const Color(0xFFEF4444),
isDark: isDark,
onTap: () {
HapticFeedback.lightImpact();
onDelete();
},
),
],
),
],
),
),
),
);
}
static (Color, IconData, String) _engineInfo(String apiType) {
return switch (apiType.toLowerCase()) {
'gelbooru' => (
const Color(0xFF10B981),
Icons.image_search_rounded,
'Gelbooru',
),
'rule34' => (
const Color(0xFF84CC16),
Icons.photo_library_rounded,
'Rule34',
),
'paheal' => (
const Color(0xFFF97316),
Icons.filter_hdr_rounded,
'Paheal HTML',
),
'realbooru_html' => (
const Color(0xFFEAB308),
Icons.camera_alt_rounded,
'Realbooru HTML',
),
'danbooru' => (
const Color(0xFF3B82F6),
Icons.auto_awesome_rounded,
'Danbooru',
),
'moebooru' => (
const Color(0xFF8B5CF6),
Icons.face_retouching_natural_rounded,
'Moebooru',
),
'e621' => (
const Color(0xFFF59E0B),
Icons.pets_rounded,
'e621 / e926',
),
'kemono' => (
const Color(0xFFEC4899),
Icons.palette_rounded,
'Kemono',
),
'coomer' => (
const Color(0xFF06B6D4),
Icons.collections_rounded,
'Coomer',
),
_ => (
const Color(0xFF6366F1),
Icons.hub_rounded,
apiType.isEmpty ? 'Custom' : apiType,
),
};
}
}
class _GlassPill extends StatelessWidget {
const _GlassPill({
required this.label,
required this.color,
required this.isDark,
});
final String label;
final Color color;
final bool isDark;
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
decoration: BoxDecoration(
color: color.withValues(alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: color.withValues(alpha: isDark ? 0.35 : 0.25),
width: 1,
),
),
child: Text(
label,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w700,
color: color,
letterSpacing: -0.2,
),
),
);
}
}
class _GlassActionButton extends StatelessWidget {
const _GlassActionButton({
required this.icon,
required this.label,
required this.color,
required this.isDark,
required this.onTap,
});
final IconData icon;
final String label;
final Color color;
final bool isDark;
final VoidCallback onTap;
@override
Widget build(BuildContext context) {
return Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(12),
child: InkWell(
borderRadius: BorderRadius.circular(12),
onTap: onTap,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
decoration: BoxDecoration(
color: color.withValues(alpha: isDark ? 0.14 : 0.08),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: color.withValues(alpha: isDark ? 0.32 : 0.22),
width: 1,
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 14, color: color),
const SizedBox(width: 5),
Text(
label,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: color,
letterSpacing: -0.1,
),
),
],
),
), ),
), ),
); );
@@ -1,9 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../../../backend/backend.dart'; import '../../../../backend/backend.dart';
import '../../../../shared/widgets/provider_status_badge.dart'; import '../../../../shared/widgets/provider_status_badge.dart';
class ProviderHealthTile extends StatelessWidget { class ProviderHealthTile extends StatefulWidget {
const ProviderHealthTile({ const ProviderHealthTile({
required this.config, required this.config,
required this.health, required this.health,
@@ -17,59 +18,408 @@ class ProviderHealthTile extends StatelessWidget {
final ProviderDiagnostics? diagnostics; final ProviderDiagnostics? diagnostics;
final VoidCallback onCheck; final VoidCallback onCheck;
@override
State<ProviderHealthTile> createState() => _ProviderHealthTileState();
}
class _ProviderHealthTileState extends State<ProviderHealthTile> {
bool _expanded = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
final config = widget.config;
final health = widget.health;
final diagnostics = widget.diagnostics;
final hint = ProviderQualityHint.from( final hint = ProviderQualityHint.from(
config: config, config: config,
health: health, health: health,
diagnostics: diagnostics, diagnostics: diagnostics,
isRu: isRu,
); );
return Card(
child: ExpansionTile( final status = health?.status ?? ProviderStatus.unknown;
leading: ProviderStatusBadge(health: health), final statusColor = switch (status) {
title: Text(config.name), ProviderStatus.online => (health != null && health.pingMs > 2500)
subtitle: Wrap( ? const Color(0xFFF59E0B)
spacing: 8, : const Color(0xFF10B981),
runSpacing: 6, ProviderStatus.offline => const Color(0xFFEF4444),
crossAxisAlignment: WrapCrossAlignment.center, ProviderStatus.unknown => const Color(0xFF94A3B8),
children: [ };
Chip(
avatar: Icon(hint.icon, size: 16), final hasError = diagnostics?.lastErrorMessage != null ||
label: Text(hint.label), health?.errorMessage != null;
visualDensity: VisualDensity.compact, final errorMessage = diagnostics?.lastErrorMessage ?? health?.errorMessage;
backgroundColor: hint.color(context).withValues(alpha: 0.16),
side: return Container(
BorderSide(color: hint.color(context).withValues(alpha: 0.4)), margin: const EdgeInsets.only(bottom: 14),
), decoration: BoxDecoration(
Text('${config.apiType} | priority ${config.priority}'), borderRadius: BorderRadius.circular(22),
], boxShadow: [
), BoxShadow(
trailing: IconButton( color: isDark
tooltip: 'Check', ? Colors.black.withValues(alpha: 0.30)
onPressed: onCheck, : statusColor.withValues(alpha: 0.08),
icon: const Icon(Icons.network_check_rounded), blurRadius: 18,
), offset: const Offset(0, 6),
childrenPadding: const EdgeInsets.fromLTRB(16, 0, 16, 14), spreadRadius: -2,
children: [ ),
Align( BoxShadow(
alignment: Alignment.centerLeft, color: statusColor.withValues(alpha: isDark ? 0.06 : 0.03),
child: Text( blurRadius: 10,
[ offset: const Offset(0, 2),
'${config.enabled ? 'Enabled' : 'Disabled'} | ${config.baseUrl}',
if (health != null) 'Ping ${health!.pingMs} ms',
if (health?.apiVersion != null) 'API ${health!.apiVersion}',
if (health?.lastCheckedAt != null)
'Checked ${health!.lastCheckedAt}',
if (diagnostics != null)
'Last search: ${diagnostics!.lastResultCount} posts at ${diagnostics!.lastSearchAt}',
if (diagnostics?.lastErrorMessage != null)
diagnostics!.lastErrorMessage!,
if (health?.errorMessage != null) health!.errorMessage!,
].join('\n'),
),
), ),
], ],
), ),
child: ClipRRect(
borderRadius: BorderRadius.circular(22),
child: AnimatedContainer(
duration: const Duration(milliseconds: 250),
curve: Curves.easeOutCubic,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: isDark
? [
theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.65),
theme.colorScheme.surfaceContainerLow
.withValues(alpha: 0.40),
]
: [
Colors.white.withValues(alpha: 0.92),
Colors.white.withValues(alpha: 0.78),
],
),
border: Border.all(
color: isDark
? statusColor.withValues(alpha: 0.30)
: Colors.white.withValues(alpha: 0.90),
width: 1.2,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Header Tile
InkWell(
onTap: () {
HapticFeedback.selectionClick();
setState(() => _expanded = !_expanded);
},
borderRadius: BorderRadius.circular(22),
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
children: [
// Status Badge with glowing LED
ProviderStatusBadge(health: health),
const SizedBox(width: 12),
// Name & Badges
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
config.name,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 5),
Wrap(
spacing: 6,
runSpacing: 4,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
// Ping chip if available
if (health != null)
Container(
padding: const EdgeInsets.symmetric(
horizontal: 7, vertical: 2.5),
decoration: BoxDecoration(
color: statusColor.withValues(
alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: statusColor.withValues(
alpha: isDark ? 0.38 : 0.25),
width: 1,
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.bolt_rounded,
size: 12,
color: statusColor,
),
const SizedBox(width: 3),
Text(
'${health.pingMs} ms',
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w700,
color: statusColor,
fontFamily: 'monospace',
),
),
],
),
),
// Quality Hint Chip
Container(
padding: const EdgeInsets.symmetric(
horizontal: 7, vertical: 2.5),
decoration: BoxDecoration(
color: hint.color(context).withValues(
alpha: isDark ? 0.14 : 0.08),
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: hint.color(context).withValues(
alpha: isDark ? 0.32 : 0.20),
width: 1,
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
hint.icon,
size: 12,
color: hint.color(context),
),
const SizedBox(width: 4),
Text(
hint.label,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: hint.color(context),
letterSpacing: -0.1,
),
),
],
),
),
],
),
],
),
),
// Check Button
IconButton(
tooltip: isRu ? 'Проверить' : 'Check',
onPressed: () {
HapticFeedback.lightImpact();
widget.onCheck();
},
icon: Container(
width: 34,
height: 34,
decoration: BoxDecoration(
color: theme.colorScheme.primary
.withValues(alpha: isDark ? 0.18 : 0.10),
shape: BoxShape.circle,
border: Border.all(
color: theme.colorScheme.primary
.withValues(alpha: isDark ? 0.40 : 0.25),
),
),
child: Center(
child: Icon(
Icons.refresh_rounded,
size: 18,
color: theme.colorScheme.primary,
),
),
),
),
// Expand Chevron
Icon(
_expanded
? Icons.keyboard_arrow_up_rounded
: Icons.keyboard_arrow_down_rounded,
size: 20,
color: theme.colorScheme.onSurfaceVariant,
),
],
),
),
),
// Expanded Diagnostics Section
if (_expanded) ...[
Divider(
height: 1,
thickness: 1,
color: isDark
? Colors.white.withValues(alpha: 0.08)
: Colors.black.withValues(alpha: 0.05),
),
Padding(
padding: const EdgeInsets.fromLTRB(16, 14, 16, 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Diagnostic row 1: URL & Enabled
_DiagItem(
icon: Icons.link_rounded,
label: isRu ? 'Сервер' : 'Endpoint',
value: '${config.baseUrl} (${config.enabled ? (isRu ? 'Активен' : 'Enabled') : (isRu ? 'Выключен' : 'Disabled')})',
isMonospace: true,
),
const SizedBox(height: 8),
// Diagnostic row 2: API Type & Priority
_DiagItem(
icon: Icons.hub_outlined,
label: isRu ? 'Движок и приоритет' : 'Engine & Priority',
value: '${config.apiType} · ${isRu ? 'приоритет' : 'priority'} ${config.priority}',
),
const SizedBox(height: 8),
// Diagnostic row 3: API Version
if (health?.apiVersion != null) ...[
_DiagItem(
icon: Icons.info_outline_rounded,
label: isRu ? 'Версия API' : 'API Version',
value: health!.apiVersion!,
),
const SizedBox(height: 8),
],
// Diagnostic row 4: Last Checked Time
if (health?.lastCheckedAt != null) ...[
_DiagItem(
icon: Icons.schedule_rounded,
label: isRu ? 'Проверено' : 'Last Checked',
value: health!.lastCheckedAt.toString().split('.').first,
isMonospace: true,
),
const SizedBox(height: 8),
],
// Diagnostic row 5: Last Search
if (diagnostics != null) ...[
_DiagItem(
icon: Icons.search_rounded,
label: isRu ? 'Последний поиск' : 'Last Search',
value: isRu
? '${diagnostics.lastResultCount} постов получено в ${diagnostics.lastSearchAt.toString().split('.').first}'
: '${diagnostics.lastResultCount} posts retrieved at ${diagnostics.lastSearchAt.toString().split('.').first}',
),
const SizedBox(height: 8),
],
// Error Box (if any)
if (hasError && errorMessage != null) ...[
const SizedBox(height: 4),
Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: const Color(0xFFEF4444)
.withValues(alpha: isDark ? 0.16 : 0.08),
borderRadius: BorderRadius.circular(14),
border: Border.all(
color: const Color(0xFFEF4444)
.withValues(alpha: isDark ? 0.38 : 0.25),
),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Icon(
Icons.error_outline_rounded,
size: 16,
color: Color(0xFFEF4444),
),
const SizedBox(width: 8),
Expanded(
child: Text(
errorMessage,
style: const TextStyle(
fontSize: 12,
fontFamily: 'monospace',
color: Color(0xFFEF4444),
height: 1.35,
),
),
),
],
),
),
],
],
),
),
],
],
),
),
),
);
}
}
class _DiagItem extends StatelessWidget {
const _DiagItem({
required this.icon,
required this.label,
required this.value,
this.isMonospace = false,
});
final IconData icon;
final String label;
final String value;
final bool isMonospace;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(
icon,
size: 15,
color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.7),
),
const SizedBox(width: 8),
Text(
'$label: ',
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: theme.colorScheme.onSurfaceVariant,
),
),
Expanded(
child: Text(
value,
style: TextStyle(
fontSize: 12,
fontFamily: isMonospace ? 'monospace' : null,
color: theme.colorScheme.onSurface,
),
),
),
],
); );
} }
} }
@@ -87,10 +437,11 @@ class ProviderQualityHint {
required ContentProviderConfig config, required ContentProviderConfig config,
required ProviderHealth? health, required ProviderHealth? health,
required ProviderDiagnostics? diagnostics, required ProviderDiagnostics? diagnostics,
required bool isRu,
}) { }) {
if (!config.enabled) { if (!config.enabled) {
return ProviderQualityHint._( return ProviderQualityHint._(
'Disabled', isRu ? 'Выключен' : 'Disabled',
Icons.pause_circle_outline_rounded, Icons.pause_circle_outline_rounded,
(scheme) => scheme.outline, (scheme) => scheme.outline,
); );
@@ -98,34 +449,34 @@ class ProviderQualityHint {
if (diagnostics?.lastErrorMessage != null || if (diagnostics?.lastErrorMessage != null ||
health?.status == ProviderStatus.offline) { health?.status == ProviderStatus.offline) {
return ProviderQualityHint._( return ProviderQualityHint._(
'Search failing', isRu ? 'Ошибка поиска' : 'Search failing',
Icons.error_outline_rounded, Icons.error_outline_rounded,
(scheme) => scheme.error, (scheme) => scheme.error,
); );
} }
if (diagnostics != null && diagnostics.lastResultCount == 0) { if (diagnostics != null && diagnostics.lastResultCount == 0) {
return ProviderQualityHint._( return ProviderQualityHint._(
'No recent results', isRu ? 'Нет результатов' : 'No recent results',
Icons.search_off_rounded, Icons.search_off_rounded,
(scheme) => scheme.tertiary, (scheme) => scheme.tertiary,
); );
} }
if (health != null && health.pingMs > 2500) { if (health != null && health.pingMs > 2500) {
return ProviderQualityHint._( return ProviderQualityHint._(
'Slow', isRu ? 'Медленно' : 'Slow',
Icons.speed_rounded, Icons.speed_rounded,
(scheme) => scheme.secondary, (scheme) => scheme.secondary,
); );
} }
if (health != null || diagnostics != null) { if (health != null || diagnostics != null) {
return ProviderQualityHint._( return ProviderQualityHint._(
'Healthy', isRu ? 'Стабилен' : 'Healthy',
Icons.check_circle_outline_rounded, Icons.check_circle_outline_rounded,
(scheme) => scheme.primary, (scheme) => scheme.primary,
); );
} }
return ProviderQualityHint._( return ProviderQualityHint._(
'Not checked', isRu ? 'Не проверен' : 'Not checked',
Icons.help_outline_rounded, Icons.help_outline_rounded,
(scheme) => scheme.outline, (scheme) => scheme.outline,
); );
@@ -1,4 +1,7 @@
import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -47,6 +50,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
final strings = AppStrings(settings.languageCode); final strings = AppStrings(settings.languageCode);
final isRu = strings.ru; final isRu = strings.ru;
final theme = Theme.of(context); final theme = Theme.of(context);
final bottomInset = MediaQuery.paddingOf(context).bottom;
return AdaptiveScaffold( return AdaptiveScaffold(
title: strings.search, title: strings.search,
@@ -78,19 +82,12 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
child: ConstrainedBox( child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 860), constraints: const BoxConstraints(maxWidth: 860),
child: ListView( child: ListView(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14), // Extended bottom padding so the cheat sheet card is never obscured by the floating dock
padding: EdgeInsets.fromLTRB(16, 14, 16, 140 + bottomInset),
children: [ children: [
// 1. Search Bar with Quick Operators // 1. Search Bar with Quick Operators
Container( _SearchLiquidCard(
padding: const EdgeInsets.all(16), glowColor: theme.colorScheme.primary,
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerLow,
borderRadius: BorderRadius.circular(20),
border: Border.all(
color: theme.colorScheme.outlineVariant
.withValues(alpha: 0.3),
),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
@@ -171,56 +168,124 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
const SizedBox(height: 16), const SizedBox(height: 16),
// 2. Recent Searches Card // 2. Recent Searches Card
_SearchSectionCard( _SearchLiquidCard(
icon: Icons.history_rounded, glowColor: const Color(0xFF6366F1),
accentColor: const Color(0xFF6366F1), child: Column(
title: isRu ? 'Недавние запросы' : 'Recent searches', crossAxisAlignment: CrossAxisAlignment.start,
badgeCount: data.recent children: [
.map((e) => e.query.trim().toLowerCase()) Row(
.where((q) => q.isNotEmpty) children: [
.toSet() const _SearchIconBadge(
.length, icon: Icons.history_rounded,
trailing: data.recent.isEmpty color: Color(0xFF6366F1),
? null
: TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 4),
minimumSize: Size.zero,
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
), ),
onPressed: () => ref const SizedBox(width: 12),
.read(searchControllerProvider.notifier) Expanded(
.clearHistory(), child: Row(
child: Text( mainAxisSize: MainAxisSize.min,
isRu ? 'Очистить' : 'Clear', children: [
style: TextStyle( Flexible(
color: theme.colorScheme.primary, child: Text(
fontSize: 13, isRu ? 'Недавние запросы' : 'Recent searches',
fontWeight: FontWeight.w600, maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
fontSize: 15,
letterSpacing: -0.2,
),
),
),
if (data.recent.isNotEmpty) ...[
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 7, vertical: 2),
decoration: BoxDecoration(
color: const Color(0xFF6366F1)
.withValues(alpha: 0.16),
borderRadius: BorderRadius.circular(10),
),
child: Text(
'${data.recent.map((e) => e.query.trim().toLowerCase()).where((q) => q.isNotEmpty).toSet().length}',
style: theme.textTheme.labelSmall?.copyWith(
fontWeight: FontWeight.bold,
color: const Color(0xFF6366F1),
),
),
),
],
],
), ),
), ),
), if (data.recent.isNotEmpty)
child: RecentSearches( TextButton(
items: data.recent, style: TextButton.styleFrom(
onTap: (query) => visualDensity: VisualDensity.compact,
context.go('/?q=${Uri.encodeQueryComponent(query)}'), padding: const EdgeInsets.symmetric(
onDelete: (id) => ref horizontal: 10, vertical: 4),
.read(searchControllerProvider.notifier) minimumSize: Size.zero,
.deleteHistory(id), tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed: () {
HapticFeedback.selectionClick();
ref
.read(searchControllerProvider.notifier)
.clearHistory();
},
child: Text(
isRu ? 'Очистить' : 'Clear',
style: TextStyle(
color: theme.colorScheme.primary,
fontSize: 13,
fontWeight: FontWeight.w600,
),
),
),
],
),
const SizedBox(height: 14),
RecentSearches(
items: data.recent,
onTap: (query) =>
context.go('/?q=${Uri.encodeQueryComponent(query)}'),
onDelete: (id) => ref
.read(searchControllerProvider.notifier)
.deleteHistory(id),
),
],
), ),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
// 3. Explore Popular Categories & Tags // 3. Explore Popular Categories & Tags
_SearchSectionCard( _SearchLiquidCard(
icon: Icons.explore_rounded, glowColor: const Color(0xFF10B981),
accentColor: const Color(0xFF10B981),
title: isRu ? 'Популярные категории' : 'Explore categories',
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row(
children: [
const _SearchIconBadge(
icon: Icons.explore_rounded,
color: Color(0xFF10B981),
),
const SizedBox(width: 12),
Expanded(
child: Text(
isRu ? 'Популярные категории' : 'Explore categories',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
fontSize: 15,
letterSpacing: -0.2,
),
),
),
],
),
const SizedBox(height: 16),
_CategoryTagRow( _CategoryTagRow(
categoryName: isRu ? 'Тематика' : 'Theme & Ambience', categoryName: isRu ? 'Тематика' : 'Theme & Ambience',
color: const Color(0xFF0EA5E9), color: const Color(0xFF0EA5E9),
@@ -234,7 +299,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
], ],
onTap: (tag) => _onTagTap(tag, data.query), onTap: (tag) => _onTagTap(tag, data.query),
), ),
const SizedBox(height: 14), const SizedBox(height: 16),
_CategoryTagRow( _CategoryTagRow(
categoryName: categoryName:
isRu ? 'Персонажи и детали' : 'Characters & Attire', isRu ? 'Персонажи и детали' : 'Characters & Attire',
@@ -250,7 +315,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
], ],
onTap: (tag) => _onTagTap(tag, data.query), onTap: (tag) => _onTagTap(tag, data.query),
), ),
const SizedBox(height: 14), const SizedBox(height: 16),
_CategoryTagRow( _CategoryTagRow(
categoryName: isRu ? 'Провайдеры' : 'Providers', categoryName: isRu ? 'Провайдеры' : 'Providers',
color: const Color(0xFF8B5CF6), color: const Color(0xFF8B5CF6),
@@ -268,84 +333,78 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
// 4. Search Tips / Cheat Sheet Card // 4. Search Tips / Cheat Sheet Card (Full Liquid Glass Container)
Container( _SearchLiquidCard(
decoration: BoxDecoration( padding: EdgeInsets.zero,
color: theme.colorScheme.surfaceContainerLow, glowColor: const Color(0xFFF59E0B),
borderRadius: BorderRadius.circular(20), child: Theme(
border: Border.all( data: theme.copyWith(dividerColor: Colors.transparent),
color: theme.colorScheme.outlineVariant child: ExpansionTile(
.withValues(alpha: 0.3), shape: const Border(),
), collapsedShape: const Border(),
), tilePadding: const EdgeInsets.symmetric(
child: ExpansionTile( horizontal: 16, vertical: 4),
shape: const Border(), leading: const _SearchIconBadge(
collapsedShape: const Border(), icon: Icons.lightbulb_rounded,
leading: Container(
width: 32,
height: 32,
decoration: BoxDecoration(
color: const Color(0xFFF59E0B).withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(10),
),
child: const Icon(
Icons.lightbulb_outline_rounded,
size: 18,
color: Color(0xFFF59E0B), color: Color(0xFFF59E0B),
), ),
), title: Text(
title: Text( isRu ? 'Шпаргалка по поиску' : 'Search tips & operators',
isRu ? 'Шпаргалка по поиску' : 'Search tips & operators', style: theme.textTheme.titleSmall?.copyWith(
style: theme.textTheme.titleSmall?.copyWith( fontWeight: FontWeight.w700,
fontWeight: FontWeight.w700, letterSpacing: -0.2,
),
),
initiallyExpanded: _showTips,
onExpansionChanged: (exp) => setState(() => _showTips = exp),
children: [
Padding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_TipRow(
code: 'tag_a and tag_b',
description: isRu
? 'Независимый опрос обоих тегов с чередованием постов в ленте.'
: 'Interleaves results from both queries independently.',
),
const SizedBox(height: 8),
_TipRow(
code: 'type:video / type:gif',
description: isRu
? 'Показывает только видео или анимированные GIF.'
: 'Filters results to only videos or animated GIFs.',
),
const SizedBox(height: 8),
_TipRow(
code: 'rating:safe / rating:explicit',
description: isRu
? 'Фильтр по возрастному рейтингу медиа.'
: 'Filter by age rating classification.',
),
const SizedBox(height: 8),
_TipRow(
code: 'score:>50 / score:>100',
description: isRu
? 'Посты с оценкой пользователей выше указанной.'
: 'Posts with community score greater than threshold.',
),
const SizedBox(height: 8),
_TipRow(
code: 'provider:gelbooru',
description: isRu
? 'Поиск исключительно в указанном источнике.'
: 'Search specifically on the given booru provider.',
),
],
), ),
), ),
], initiallyExpanded: _showTips,
onExpansionChanged: (exp) {
HapticFeedback.selectionClick();
setState(() => _showTips = exp);
},
children: [
Padding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_TipRow(
code: 'tag_a and tag_b',
description: isRu
? 'Независимый опрос обоих тегов с чередованием постов в ленте.'
: 'Interleaves results from both queries independently.',
),
const SizedBox(height: 8),
_TipRow(
code: 'type:video / type:gif',
description: isRu
? 'Показывает только видео или анимированные GIF.'
: 'Filters results to only videos or animated GIFs.',
),
const SizedBox(height: 8),
_TipRow(
code: 'rating:safe / rating:explicit',
description: isRu
? 'Фильтр по возрастному рейтингу медиа.'
: 'Filter by age rating classification.',
),
const SizedBox(height: 8),
_TipRow(
code: 'score:>50 / score:>100',
description: isRu
? 'Посты с оценкой пользователей выше указанной.'
: 'Posts with community score greater than threshold.',
),
const SizedBox(height: 8),
_TipRow(
code: 'provider:gelbooru',
description: isRu
? 'Поиск исключительно в указанном источнике.'
: 'Search specifically on the given booru provider.',
),
],
),
),
],
),
), ),
), ),
const SizedBox(height: 24), const SizedBox(height: 24),
@@ -358,93 +417,117 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
} }
} }
class _SearchSectionCard extends StatelessWidget { class _SearchLiquidCard extends StatelessWidget {
const _SearchSectionCard({ const _SearchLiquidCard({
required this.icon,
required this.accentColor,
required this.title,
required this.child, required this.child,
this.badgeCount, this.padding,
this.trailing, this.glowColor,
}); });
final IconData icon;
final Color accentColor;
final String title;
final Widget child; final Widget child;
final int? badgeCount; final EdgeInsetsGeometry? padding;
final Widget? trailing; final Color? glowColor;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
final accent = glowColor ?? theme.colorScheme.primary;
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerLow, borderRadius: BorderRadius.circular(24),
borderRadius: BorderRadius.circular(20), boxShadow: [
border: Border.all( BoxShadow(
color: theme.colorScheme.outlineVariant.withValues(alpha: 0.3), color: isDark
? Colors.black.withValues(alpha: 0.35)
: accent.withValues(alpha: 0.08),
blurRadius: 18,
offset: const Offset(0, 6),
spreadRadius: -2,
),
BoxShadow(
color: accent.withValues(alpha: isDark ? 0.06 : 0.03),
blurRadius: 10,
offset: const Offset(0, 2),
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(24),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 18, sigmaY: 18),
child: Container(
padding: padding ?? const EdgeInsets.all(16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: isDark
? [
theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.60),
theme.colorScheme.surfaceContainerLow
.withValues(alpha: 0.38),
]
: [
Colors.white.withValues(alpha: 0.88),
Colors.white.withValues(alpha: 0.72),
],
),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.14)
: Colors.white.withValues(alpha: 0.85),
width: 1.2,
),
),
child: child,
),
), ),
), ),
padding: const EdgeInsets.all(16), );
child: Column( }
crossAxisAlignment: CrossAxisAlignment.start, }
children: [
Row( class _SearchIconBadge extends StatelessWidget {
children: [ const _SearchIconBadge({
Container( required this.icon,
width: 32, required this.color,
height: 32, });
decoration: BoxDecoration(
color: accentColor.withValues(alpha: 0.14), final IconData icon;
borderRadius: BorderRadius.circular(10), final Color color;
),
child: Icon(icon, size: 18, color: accentColor), @override
), Widget build(BuildContext context) {
const SizedBox(width: 10), const size = 34.0;
Expanded( const iconSize = 18.0;
child: Row( return Container(
mainAxisSize: MainAxisSize.min, width: size,
children: [ height: size,
Flexible( decoration: BoxDecoration(
child: Text( gradient: LinearGradient(
title, begin: Alignment.topLeft,
maxLines: 1, end: Alignment.bottomRight,
overflow: TextOverflow.ellipsis, colors: [
style: theme.textTheme.titleMedium?.copyWith( color,
fontWeight: FontWeight.w700, color.withValues(alpha: 0.86),
fontSize: 15, ],
), ),
), borderRadius: BorderRadius.circular(size * 0.28),
), boxShadow: [
if (badgeCount != null && badgeCount! > 0) ...[ BoxShadow(
const SizedBox(width: 8), color: color.withValues(alpha: 0.35),
Container( blurRadius: 7,
padding: const EdgeInsets.symmetric( offset: const Offset(0, 2.5),
horizontal: 7, vertical: 2),
decoration: BoxDecoration(
color: accentColor.withValues(alpha: 0.15),
borderRadius: BorderRadius.circular(10),
),
child: Text(
'$badgeCount',
style: theme.textTheme.labelSmall?.copyWith(
fontWeight: FontWeight.bold,
color: accentColor,
),
),
),
],
],
),
),
if (trailing != null) trailing!,
],
), ),
const SizedBox(height: 14),
child,
], ],
), ),
child: Center(
child: Icon(icon, size: iconSize, color: Colors.white),
),
); );
} }
} }
@@ -465,19 +548,33 @@ class _QuickOperatorChip extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
return Material( return Material(
color: color.withValues(alpha: 0.12), color: Colors.transparent,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(14),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(14),
onTap: onTap, onTap: () {
HapticFeedback.selectionClick();
onTap();
},
child: Container( child: Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), color: color.withValues(alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(14),
border: Border.all( border: Border.all(
color: color.withValues(alpha: 0.35), color: color.withValues(alpha: isDark ? 0.40 : 0.32),
width: 1.1,
), ),
boxShadow: [
BoxShadow(
color: color.withValues(alpha: isDark ? 0.14 : 0.06),
blurRadius: 6,
offset: const Offset(0, 1.5),
),
],
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -490,6 +587,7 @@ class _QuickOperatorChip extends StatelessWidget {
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: color, color: color,
fontFamily: 'monospace', fontFamily: 'monospace',
letterSpacing: -0.2,
), ),
), ),
], ],
@@ -516,44 +614,76 @@ class _CategoryTagRow extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Row(
categoryName, children: [
style: theme.textTheme.labelLarge?.copyWith( Container(
fontWeight: FontWeight.w600, width: 7,
color: theme.colorScheme.onSurfaceVariant, height: 7,
), decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: color.withValues(alpha: 0.6),
blurRadius: 4,
),
],
),
),
const SizedBox(width: 8),
Text(
categoryName,
style: theme.textTheme.labelLarge?.copyWith(
fontWeight: FontWeight.w700,
color: theme.colorScheme.onSurface,
letterSpacing: -0.2,
),
),
],
), ),
const SizedBox(height: 8), const SizedBox(height: 10),
Wrap( Wrap(
spacing: 8, spacing: 8,
runSpacing: 8, runSpacing: 8,
children: [ children: [
for (final tag in tags) for (final tag in tags)
Material( Material(
color: theme.colorScheme.surfaceContainer, color: Colors.transparent,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(14),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(14),
onTap: () => onTap(tag), onTap: () {
HapticFeedback.selectionClick();
onTap(tag);
},
child: Container( child: Container(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 5), horizontal: 11, vertical: 6),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), color: isDark
? theme.colorScheme.surfaceContainerHighest
.withValues(alpha: 0.45)
: Colors.white.withValues(alpha: 0.60),
borderRadius: BorderRadius.circular(14),
border: Border.all( border: Border.all(
color: theme.colorScheme.outlineVariant color: isDark
.withValues(alpha: 0.3), ? Colors.white.withValues(alpha: 0.10)
: theme.colorScheme.outlineVariant
.withValues(alpha: 0.35),
width: 1.0,
), ),
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Container( Container(
width: 6, width: 5,
height: 6, height: 5,
decoration: BoxDecoration( decoration: BoxDecoration(
color: color, color: color,
shape: BoxShape.circle, shape: BoxShape.circle,
@@ -563,7 +693,8 @@ class _CategoryTagRow extends StatelessWidget {
Text( Text(
tag, tag,
style: theme.textTheme.bodySmall?.copyWith( style: theme.textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w600,
letterSpacing: -0.1,
), ),
), ),
], ],
@@ -587,14 +718,23 @@ class _TipRow extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest, color: isDark
borderRadius: BorderRadius.circular(6), ? theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.6)
: theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.8),
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.08)
: theme.colorScheme.outlineVariant.withValues(alpha: 0.25),
),
), ),
child: Text( child: Text(
code, code,
@@ -608,10 +748,14 @@ class _TipRow extends StatelessWidget {
), ),
const SizedBox(width: 10), const SizedBox(width: 10),
Expanded( Expanded(
child: Text( child: Padding(
description, padding: const EdgeInsets.only(top: 2),
style: theme.textTheme.bodySmall?.copyWith( child: Text(
color: theme.colorScheme.onSurfaceVariant, description,
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
height: 1.35,
),
), ),
), ),
), ),
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../../../backend/backend.dart'; import '../../../../backend/backend.dart';
@@ -95,20 +96,40 @@ class _RecentSearchesState extends State<RecentSearches> {
children: [ children: [
for (final item in visibleItems) for (final item in visibleItems)
Material( Material(
color: theme.colorScheme.surfaceContainer, color: Colors.transparent,
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
onTap: () => widget.onTap(item.query), onTap: () {
HapticFeedback.selectionClick();
widget.onTap(item.query);
},
child: Container( child: Container(
padding: padding:
const EdgeInsets.only(left: 10, right: 6, top: 6, bottom: 6), const EdgeInsets.only(left: 10, right: 6, top: 6, bottom: 6),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).brightness == Brightness.dark
? theme.colorScheme.surfaceContainerHighest
.withValues(alpha: 0.45)
: Colors.white.withValues(alpha: 0.65),
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
border: Border.all( border: Border.all(
color: theme.colorScheme.outlineVariant color: Theme.of(context).brightness == Brightness.dark
.withValues(alpha: 0.35), ? Colors.white.withValues(alpha: 0.12)
: theme.colorScheme.outlineVariant
.withValues(alpha: 0.35),
width: 1.0,
), ),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(
alpha: Theme.of(context).brightness == Brightness.dark
? 0.15
: 0.04),
blurRadius: 6,
offset: const Offset(0, 1.5),
),
],
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -140,7 +161,7 @@ class _RecentSearchesState extends State<RecentSearches> {
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 6, vertical: 2), horizontal: 6, vertical: 2),
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.colorScheme.primary.withValues(alpha: 0.12), color: theme.colorScheme.primary.withValues(alpha: 0.14),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
child: Text( child: Text(
@@ -161,7 +182,10 @@ class _RecentSearchesState extends State<RecentSearches> {
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: InkWell( child: InkWell(
customBorder: const CircleBorder(), customBorder: const CircleBorder(),
onTap: () => widget.onDelete!(item.id), onTap: () {
HapticFeedback.lightImpact();
widget.onDelete!(item.id);
},
child: Padding( child: Padding(
padding: const EdgeInsets.all(4), padding: const EdgeInsets.all(4),
child: Icon( child: Icon(
@@ -23,6 +23,16 @@ class SettingsController extends AsyncNotifier<AppSettings> {
ref.invalidate(appSettingsProvider); ref.invalidate(appSettingsProvider);
} }
Future<void> setVideoPlayerVolume(double volume) async {
final current = state.value ?? AppSettings.defaults;
final clamped = volume.clamp(0.0, 100.0);
if ((current.videoPlayerVolume - clamped).abs() < 0.01) return;
final updated = current.copyWith(videoPlayerVolume: clamped);
state = AsyncData(updated);
await ref.read(settingsServiceProvider).setVideoPlayerVolume(clamped);
ref.invalidate(appSettingsProvider);
}
Future<void> clearCache() async { Future<void> clearCache() async {
await ref.read(cacheServiceProvider).clear(); await ref.read(cacheServiceProvider).clear();
} }
@@ -403,7 +403,7 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
? 'Beta и экспериментальные обновления' ? 'Beta и экспериментальные обновления'
: 'Receive beta & experimental updates', : 'Receive beta & experimental updates',
subtitle: isRu subtitle: isRu
? 'Проверка и уведомление о prerelease сборках Lunaris' ? 'Проверка и уведомление о prerelease сборках Prisma'
: 'Include prerelease builds when checking for updates', : 'Include prerelease builds when checking for updates',
value: settings.allowExperimentalUpdates, value: settings.allowExperimentalUpdates,
onChanged: (val) => _update( onChanged: (val) => _update(
@@ -976,191 +976,275 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
final isRu = settings.languageCode == 'ru'; final isRu = settings.languageCode == 'ru';
final theme = Theme.of(context); final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
final selectedSource = await showModalBottomSheet<UpdateSource>( final selectedSource = await showModalBottomSheet<UpdateSource>(
context: context, context: context,
useRootNavigator: true,
isScrollControlled: true,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
builder: (sheetContext) { builder: (sheetContext) {
return Container( return ClipRRect(
decoration: BoxDecoration( borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),
color: theme.colorScheme.surface, child: BackdropFilter(
borderRadius: const BorderRadius.vertical(top: Radius.circular(28)), filter: ImageFilter.blur(sigmaX: 24, sigmaY: 24),
), child: Container(
padding: const EdgeInsets.fromLTRB(20, 12, 20, 28), decoration: BoxDecoration(
child: Column( color: isDark
mainAxisSize: MainAxisSize.min, ? theme.colorScheme.surface.withValues(alpha: 0.88)
crossAxisAlignment: CrossAxisAlignment.stretch, : Colors.white.withValues(alpha: 0.94),
children: [ borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),
Center( border: Border(
child: Container( top: BorderSide(
width: 36, color: isDark
height: 4, ? Colors.white.withValues(alpha: 0.18)
margin: const EdgeInsets.only(bottom: 16), : Colors.white.withValues(alpha: 0.85),
decoration: BoxDecoration( width: 1.2,
color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.3),
borderRadius: BorderRadius.circular(2),
), ),
), ),
), ),
Text( child: SafeArea(
isRu ? 'Источник обновлений' : 'Update Source', top: false,
style: theme.textTheme.titleMedium?.copyWith( child: Padding(
fontWeight: FontWeight.bold, padding: EdgeInsets.fromLTRB(
), 20,
textAlign: TextAlign.center, 14,
), 20,
const SizedBox(height: 6), 24 + MediaQuery.paddingOf(sheetContext).bottom,
Text( ),
isRu child: Column(
? 'Выберите сервер для загрузки обновлений' mainAxisSize: MainAxisSize.min,
: 'Choose a server to download updates from', crossAxisAlignment: CrossAxisAlignment.stretch,
style: theme.textTheme.bodySmall?.copyWith( children: [
color: theme.colorScheme.onSurfaceVariant, Center(
), child: Container(
textAlign: TextAlign.center, width: 38,
), height: 4.5,
const SizedBox(height: 20), margin: const EdgeInsets.only(bottom: 16),
// Option 1: GitHub (Recommended for speed)
Material(
color: theme.colorScheme.primaryContainer.withValues(alpha: 0.35),
borderRadius: BorderRadius.circular(16),
child: InkWell(
borderRadius: BorderRadius.circular(16),
onTap: () => Navigator.pop(sheetContext, UpdateSource.github),
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
children: [
Container(
width: 44,
height: 44,
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.colorScheme.primary.withValues(alpha: 0.15), color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.35),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(3),
),
child: Icon(
Icons.bolt_rounded,
color: theme.colorScheme.primary,
size: 24,
), ),
), ),
const SizedBox(width: 14), ),
Expanded( Text(
child: Column( isRu ? 'Источник обновлений' : 'Update Source',
crossAxisAlignment: CrossAxisAlignment.start, style: theme.textTheme.titleMedium?.copyWith(
children: [ fontWeight: FontWeight.w800,
Row( letterSpacing: -0.3,
children: [
Text(
'GitHub',
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
),
),
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
decoration: BoxDecoration(
color: Colors.green.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(6),
),
child: Text(
isRu ? 'Рекомендуется для скорости' : 'Recommended for speed',
style: const TextStyle(
fontSize: 10,
fontWeight: FontWeight.bold,
color: Colors.green,
),
),
),
],
),
const SizedBox(height: 3),
Text(
isRu
? 'Прямая быстрая загрузка без ограничений'
: 'Direct fast download without limits',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
],
),
), ),
Icon( textAlign: TextAlign.center,
Icons.arrow_forward_ios_rounded, ),
size: 14, const SizedBox(height: 6),
Text(
isRu
? 'Выберите сервер для быстрой загрузки новой версии'
: 'Choose a server to download updates from',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant, color: theme.colorScheme.onSurfaceVariant,
), ),
], textAlign: TextAlign.center,
), ),
), const SizedBox(height: 20),
),
),
const SizedBox(height: 12),
// Option 2: Gitea (Muted / neutral grey) // Option 1: GitHub (Recommended for speed)
Material( Material(
color: theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.25), color: isDark
borderRadius: BorderRadius.circular(16), ? theme.colorScheme.primaryContainer.withValues(alpha: 0.35)
child: InkWell( : theme.colorScheme.primary.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(18),
onTap: () => Navigator.pop(sheetContext, UpdateSource.gitea), child: InkWell(
child: Padding( borderRadius: BorderRadius.circular(18),
padding: const EdgeInsets.all(16), onTap: () {
child: Row( HapticFeedback.selectionClick();
children: [ Navigator.pop(sheetContext, UpdateSource.github);
Container( },
width: 44, child: Container(
height: 44, padding: const EdgeInsets.all(16),
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.colorScheme.onSurface.withValues(alpha: 0.08), borderRadius: BorderRadius.circular(18),
borderRadius: BorderRadius.circular(12), border: Border.all(
), color: isDark
child: Icon( ? Colors.white.withValues(alpha: 0.15)
Icons.dns_rounded, : theme.colorScheme.primary.withValues(alpha: 0.35),
color: theme.colorScheme.onSurfaceVariant, width: 1.2,
size: 22, ),
), ),
), child: Row(
const SizedBox(width: 14), children: [
Expanded( Container(
child: Column( width: 44,
crossAxisAlignment: CrossAxisAlignment.start, height: 44,
children: [ decoration: BoxDecoration(
Text( gradient: const LinearGradient(
'Gitea', colors: [Color(0xFF6366F1), Color(0xFF4F46E5)],
style: theme.textTheme.titleSmall?.copyWith( begin: Alignment.topLeft,
fontWeight: FontWeight.w600, end: Alignment.bottomRight,
),
borderRadius: BorderRadius.circular(13),
boxShadow: [
BoxShadow(
color: const Color(0xFF6366F1).withValues(alpha: 0.40),
blurRadius: 10,
offset: const Offset(0, 3),
),
],
),
child: const Center(
child: Icon(
Icons.bolt_rounded,
color: Colors.white,
size: 24,
),
),
),
const SizedBox(width: 14),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
'GitHub',
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
),
),
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 7,
vertical: 2.5,
),
decoration: BoxDecoration(
color: Colors.green.withValues(alpha: 0.20),
borderRadius: BorderRadius.circular(6),
),
child: Text(
isRu ? 'Рекомендуется' : 'Recommended',
style: const TextStyle(
fontSize: 10.5,
fontWeight: FontWeight.w700,
color: Colors.green,
),
),
),
],
),
const SizedBox(height: 3),
Text(
isRu
? 'Прямая быстрая загрузка релизов без задержек'
: 'Direct fast download without limits',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
],
),
),
Icon(
Icons.arrow_forward_ios_rounded,
size: 15,
color: theme.colorScheme.onSurfaceVariant, color: theme.colorScheme.onSurfaceVariant,
), ),
), ],
const SizedBox(height: 3), ),
Text(
isRu
? 'Сервер релизов'
: 'Release server',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.7),
),
),
],
), ),
), ),
Icon( ),
Icons.arrow_forward_ios_rounded, const SizedBox(height: 12),
size: 14,
color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.5), // Option 2: Gitea
Material(
color: isDark
? theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.35)
: theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.40),
borderRadius: BorderRadius.circular(18),
child: InkWell(
borderRadius: BorderRadius.circular(18),
onTap: () {
HapticFeedback.selectionClick();
Navigator.pop(sheetContext, UpdateSource.gitea);
},
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(18),
border: Border.all(
color: isDark
? Colors.white.withValues(alpha: 0.12)
: theme.colorScheme.outlineVariant.withValues(alpha: 0.35),
width: 1.2,
),
),
child: Row(
children: [
Container(
width: 44,
height: 44,
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [Color(0xFF0EA5E9), Color(0xFF0284C7)],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
borderRadius: BorderRadius.circular(13),
boxShadow: [
BoxShadow(
color: const Color(0xFF0EA5E9).withValues(alpha: 0.35),
blurRadius: 10,
offset: const Offset(0, 3),
),
],
),
child: const Center(
child: Icon(
Icons.dns_rounded,
color: Colors.white,
size: 22,
),
),
),
const SizedBox(width: 14),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Gitea (Synapse)',
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700,
),
),
const SizedBox(height: 3),
Text(
isRu
? 'Альтернативный независимый сервер релизов'
: 'Alternative independent release mirror',
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
],
),
),
Icon(
Icons.arrow_forward_ios_rounded,
size: 15,
color: theme.colorScheme.onSurfaceVariant,
),
],
),
),
), ),
], ),
), ],
), ),
), ),
), ),
], ),
), ),
); );
}, },
@@ -1194,7 +1278,7 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
messenger.showSnackBar( messenger.showSnackBar(
SnackBar( SnackBar(
content: Text( content: Text(
isRu ? 'У вас установлена последняя версия Lunaris' : 'Lunaris is up to date', isRu ? 'У вас установлена последняя версия Prisma' : 'Prisma is up to date',
), ),
), ),
); );
@@ -1211,7 +1295,7 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: Text('Lunaris ${info.version} is available'), title: Text('Prisma ${info.version} is available'),
content: ConstrainedBox( content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 520), constraints: const BoxConstraints(maxWidth: 520),
child: SingleChildScrollView( child: SingleChildScrollView(
@@ -1272,7 +1356,7 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
return showDialog<void>( return showDialog<void>(
context: context, context: context,
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: const Text('Lunaris changelog'), title: const Text('Prisma changelog'),
content: ConstrainedBox( content: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 560), constraints: const BoxConstraints(maxWidth: 560),
child: SingleChildScrollView( child: SingleChildScrollView(
@@ -1280,7 +1364,7 @@ class _SettingsContentState extends ConsumerState<_SettingsContent> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
for (final change in lunarisChangelog) ...[ for (final change in prismaChangelog) ...[
Text( Text(
'${change.version} - ${change.title}', '${change.version} - ${change.title}',
style: Theme.of(context).textTheme.titleMedium, style: Theme.of(context).textTheme.titleMedium,
@@ -2257,7 +2341,7 @@ class _ColorSwatches extends StatelessWidget {
final ValueChanged<int> onChanged; final ValueChanged<int> onChanged;
static const colors = <(int, String)>[ static const colors = <(int, String)>[
(0xFFE84D8A, 'Lunaris pink'), (0xFFE84D8A, 'Prisma pink'),
(0xFF8B5CF6, 'Violet'), (0xFF8B5CF6, 'Violet'),
(0xFF3B82F6, 'Azure'), (0xFF3B82F6, 'Azure'),
(0xFF0EA5E9, 'Sky'), (0xFF0EA5E9, 'Sky'),
@@ -2481,7 +2565,7 @@ class _HeroBrandBanner extends StatelessWidget {
), ),
const SizedBox(height: 14), const SizedBox(height: 14),
Text( Text(
'Lunaris', 'Prisma',
style: theme.textTheme.headlineSmall?.copyWith( style: theme.textTheme.headlineSmall?.copyWith(
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
letterSpacing: -0.5, letterSpacing: -0.5,
@@ -2535,7 +2619,7 @@ class _HeroBrandBanner extends StatelessWidget {
OutlinedButton.icon( OutlinedButton.icon(
onPressed: () async { onPressed: () async {
final url = Uri.parse( final url = Uri.parse(
'https://github.com/RarDog/Lunaris', 'https://github.com/RarDog/Prisma',
); );
await launchUrl(url, mode: LaunchMode.externalApplication); await launchUrl(url, mode: LaunchMode.externalApplication);
}, },
@@ -1,5 +1,8 @@
import 'dart:ui';
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -156,28 +159,56 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
); );
} }
final bottomInset = MediaQuery.paddingOf(context).bottom;
return RefreshIndicator( return RefreshIndicator(
onRefresh: () => onRefresh: () =>
ref.read(viewedControllerProvider.notifier).refresh(), ref.read(viewedControllerProvider.notifier).refresh(),
child: ListView( child: ListView(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 24), padding: EdgeInsets.fromLTRB(16, 8, 16, 140 + bottomInset),
children: [ children: [
for (final group in groups) ...[ for (final group in groups) ...[
Padding( Padding(
padding: const EdgeInsets.fromLTRB(4, 16, 4, 10), padding: const EdgeInsets.fromLTRB(2, 16, 2, 10),
child: Row( child: Row(
children: [ children: [
Icon( Container(
Icons.calendar_today_rounded, width: 28,
size: 16, height: 28,
color: Theme.of(context).colorScheme.primary, decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
Theme.of(context).colorScheme.primary,
Theme.of(context).colorScheme.primary.withValues(alpha: 0.82),
],
),
borderRadius: BorderRadius.circular(9),
boxShadow: [
BoxShadow(
color: Theme.of(context)
.colorScheme
.primary
.withValues(alpha: 0.32),
blurRadius: 6,
offset: const Offset(0, 2),
),
],
),
child: const Center(
child: Icon(
Icons.calendar_today_rounded,
size: 14,
color: Colors.white,
),
),
), ),
const SizedBox(width: 8), const SizedBox(width: 10),
Text( Text(
_localizedGroupLabel(group.label, isRu), _localizedGroupLabel(group.label, isRu),
style: style:
Theme.of(context).textTheme.titleSmall?.copyWith( Theme.of(context).textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: -0.2,
), ),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -187,10 +218,24 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
vertical: 2, vertical: 2,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context) color: Theme.of(context).brightness == Brightness.dark
.colorScheme ? Theme.of(context)
.surfaceContainerHighest, .colorScheme
.surfaceContainerHighest
.withValues(alpha: 0.5)
: Theme.of(context)
.colorScheme
.primary
.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
border: Border.all(
color: Theme.of(context).brightness == Brightness.dark
? Colors.white.withValues(alpha: 0.08)
: Theme.of(context)
.colorScheme
.primary
.withValues(alpha: 0.20),
),
), ),
child: Text( child: Text(
'${group.items.length}', '${group.items.length}',
@@ -198,7 +243,10 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
.textTheme .textTheme
.labelSmall .labelSmall
?.copyWith( ?.copyWith(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
color: Theme.of(context).brightness == Brightness.dark
? Theme.of(context).colorScheme.onSurfaceVariant
: Theme.of(context).colorScheme.primary,
), ),
), ),
), ),
@@ -299,184 +347,251 @@ class _ViewedPostTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final scheme = Theme.of(context).colorScheme; final scheme = Theme.of(context).colorScheme;
final isDark = Theme.of(context).brightness == Brightness.dark;
final image = MediaUrlSelector.preview(post).firstOrNull; final image = MediaUrlSelector.preview(post).firstOrNull;
final timeStr = final timeStr =
'${viewedAt.hour.toString().padLeft(2, '0')}:${viewedAt.minute.toString().padLeft(2, '0')}'; '${viewedAt.hour.toString().padLeft(2, '0')}:${viewedAt.minute.toString().padLeft(2, '0')}';
return Card( return Container(
elevation: 0, margin: const EdgeInsets.only(bottom: 10),
color: scheme.surfaceContainerLow, decoration: BoxDecoration(
margin: const EdgeInsets.only(bottom: 8), borderRadius: BorderRadius.circular(20),
shape: RoundedRectangleBorder( boxShadow: [
borderRadius: BorderRadius.circular(16), BoxShadow(
side: BorderSide( color: Colors.black.withValues(alpha: isDark ? 0.28 : 0.05),
color: scheme.outlineVariant.withValues(alpha: 0.3), blurRadius: 14,
), offset: const Offset(0, 4),
spreadRadius: -2,
),
],
), ),
clipBehavior: Clip.antiAlias, child: ClipRRect(
child: InkWell( borderRadius: BorderRadius.circular(20),
onTap: onOpen, child: BackdropFilter(
child: Padding( filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
padding: const EdgeInsets.all(10), child: Material(
child: Row( color: Colors.transparent,
children: [ child: InkWell(
// Squircle Thumbnail borderRadius: BorderRadius.circular(20),
ClipRRect( onTap: () {
borderRadius: BorderRadius.circular(12), HapticFeedback.selectionClick();
child: SizedBox( onOpen();
width: 68, },
height: 68, child: Container(
child: Stack( padding: const EdgeInsets.all(10),
fit: StackFit.expand, decoration: BoxDecoration(
children: [ borderRadius: BorderRadius.circular(20),
image == null gradient: LinearGradient(
? Container( begin: Alignment.topLeft,
color: scheme.surfaceContainerHighest, end: Alignment.bottomRight,
child: const Icon(Icons.image_not_supported_rounded), colors: isDark
) ? [
: CachedNetworkImage( scheme.surfaceContainerHigh
imageUrl: image, .withValues(alpha: 0.58),
fit: BoxFit.cover, scheme.surfaceContainerLow
placeholder: (_, __) => Container( .withValues(alpha: 0.36),
color: scheme.surfaceContainerHighest, ]
), : [
errorWidget: (_, __, ___) => Container( Colors.white.withValues(alpha: 0.88),
color: scheme.surfaceContainerHighest, Colors.white.withValues(alpha: 0.72),
child: const Icon( ],
Icons.broken_image_rounded, ),
size: 20, border: Border.all(
), color: isDark
), ? Colors.white.withValues(alpha: 0.13)
), : Colors.white.withValues(alpha: 0.85),
if (_isVideo) width: 1.1,
Positioned(
right: 4,
bottom: 4,
child: Container(
padding: const EdgeInsets.all(3),
decoration: BoxDecoration(
color: Colors.black.withValues(alpha: 0.65),
borderRadius: BorderRadius.circular(4),
),
child: const Icon(
Icons.play_arrow_rounded,
size: 14,
color: Colors.white,
),
),
),
],
), ),
), ),
), child: Row(
const SizedBox(width: 12),
// Post details
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( // Squircle Thumbnail
children: [ ClipRRect(
Flexible( borderRadius: BorderRadius.circular(13),
child: Container( child: Container(
padding: const EdgeInsets.symmetric( width: 68,
horizontal: 6, height: 68,
vertical: 2, decoration: BoxDecoration(
), border: Border.all(
decoration: BoxDecoration( color: isDark
color: ? Colors.white.withValues(alpha: 0.10)
scheme.primaryContainer.withValues(alpha: 0.5), : scheme.outlineVariant.withValues(alpha: 0.30),
borderRadius: BorderRadius.circular(6), ),
), borderRadius: BorderRadius.circular(13),
child: Text( ),
post.providerName, child: Stack(
maxLines: 1, fit: StackFit.expand,
overflow: TextOverflow.ellipsis, children: [
style: Theme.of(context) image == null
.textTheme ? Container(
.labelSmall color: scheme.surfaceContainerHighest,
?.copyWith( child: const Icon(
fontWeight: FontWeight.w600, Icons.image_not_supported_rounded),
color: scheme.onPrimaryContainer, )
: CachedNetworkImage(
imageUrl: image,
fit: BoxFit.cover,
placeholder: (_, __) => Container(
color: scheme.surfaceContainerHighest,
),
errorWidget: (_, __, ___) => Container(
color: scheme.surfaceContainerHighest,
child: const Icon(
Icons.broken_image_rounded,
size: 20,
),
),
), ),
), if (_isVideo)
), Positioned(
), right: 4,
const SizedBox(width: 6), bottom: 4,
Text( child: Container(
timeStr, padding: const EdgeInsets.all(3),
style: Theme.of(context) decoration: BoxDecoration(
.textTheme color: Colors.black.withValues(alpha: 0.65),
.labelSmall borderRadius: BorderRadius.circular(5),
?.copyWith( ),
color: scheme.onSurfaceVariant, child: const Icon(
Icons.play_arrow_rounded,
size: 14,
color: Colors.white,
),
),
), ),
],
), ),
], ),
), ),
const SizedBox(height: 4), const SizedBox(width: 12),
Text( // Post details
post.tags.isEmpty ? '#${post.id}' : post.tags.take(4).join(' '), Expanded(
maxLines: 1, child: Column(
overflow: TextOverflow.ellipsis, crossAxisAlignment: CrossAxisAlignment.start,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w500,
),
),
if (post.score != 0) ...[
const SizedBox(height: 2),
Row(
children: [ children: [
Icon( Row(
Icons.thumb_up_rounded, children: [
size: 12, Flexible(
color: scheme.outline, child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 7,
vertical: 2,
),
decoration: BoxDecoration(
color: scheme.primary
.withValues(alpha: isDark ? 0.20 : 0.12),
borderRadius: BorderRadius.circular(6),
border: Border.all(
color: scheme.primary.withValues(
alpha: isDark ? 0.30 : 0.20),
),
),
child: Text(
post.providerName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context)
.textTheme
.labelSmall
?.copyWith(
fontWeight: FontWeight.w700,
color: scheme.primary,
),
),
),
),
const SizedBox(width: 6),
Text(
timeStr,
style: Theme.of(context)
.textTheme
.labelSmall
?.copyWith(
color: scheme.onSurfaceVariant,
fontWeight: FontWeight.w500,
),
),
],
), ),
const SizedBox(width: 4), const SizedBox(height: 4),
Text( Text(
'${post.score}', post.tags.isEmpty ? '#${post.id}' : post.tags.take(4).join(' '),
style: Theme.of(context) maxLines: 1,
.textTheme overflow: TextOverflow.ellipsis,
.labelSmall style: Theme.of(context).textTheme.bodyMedium?.copyWith(
?.copyWith( fontWeight: FontWeight.w600,
color: scheme.outline, letterSpacing: -0.1,
), ),
), ),
if (post.score != 0) ...[
const SizedBox(height: 2),
Row(
children: [
Icon(
Icons.thumb_up_rounded,
size: 12,
color: scheme.outline,
),
const SizedBox(width: 4),
Text(
'${post.score}',
style: Theme.of(context)
.textTheme
.labelSmall
?.copyWith(
color: scheme.outline,
fontWeight: FontWeight.w600,
),
),
],
),
],
], ],
), ),
], ),
// Action buttons
IconButton(
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints:
const BoxConstraints(minWidth: 36, minHeight: 36),
tooltip: isFavorite
? (isRu ? 'В избранном' : 'In favorites')
: (isRu ? 'В избранное' : 'Add to favorites'),
onPressed: () {
HapticFeedback.selectionClick();
onFavorite();
},
icon: Icon(
isFavorite
? Icons.favorite_rounded
: Icons.favorite_border_rounded,
color: isFavorite
? Colors.redAccent
: scheme.onSurfaceVariant,
),
),
IconButton(
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints:
const BoxConstraints(minWidth: 36, minHeight: 36),
tooltip:
isRu ? 'Удалить из истории' : 'Delete from history',
onPressed: () {
HapticFeedback.lightImpact();
onDelete();
},
icon: Icon(
Icons.close_rounded,
size: 20,
color: scheme.onSurfaceVariant.withValues(alpha: 0.6),
),
),
], ],
), ),
), ),
// Action buttons ),
IconButton(
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
tooltip: isFavorite
? (isRu ? 'В избранном' : 'In favorites')
: (isRu ? 'В избранное' : 'Add to favorites'),
onPressed: onFavorite,
icon: Icon(
isFavorite
? Icons.favorite_rounded
: Icons.favorite_border_rounded,
color: isFavorite ? Colors.redAccent : scheme.onSurfaceVariant,
),
),
IconButton(
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
tooltip: isRu ? 'Удалить из истории' : 'Delete from history',
onPressed: onDelete,
icon: Icon(
Icons.close_rounded,
size: 20,
color: scheme.onSurfaceVariant.withValues(alpha: 0.6),
),
),
],
), ),
), ),
), ),
+6 -4
View File
@@ -167,8 +167,10 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
void _scrollToEnd() { void _scrollToEnd() {
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
if (_tagScrollController.hasClients) { if (_tagScrollController.hasClients) {
final max = _tagScrollController.position.maxScrollExtent;
final target = (max - 40).clamp(0.0, max);
_tagScrollController.animateTo( _tagScrollController.animateTo(
_tagScrollController.position.maxScrollExtent, target,
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
curve: Curves.easeOut, curve: Curves.easeOut,
); );
@@ -286,8 +288,8 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
const SizedBox(width: 6), const SizedBox(width: 6),
], ],
ConstrainedBox( ConstrainedBox(
constraints: const BoxConstraints( constraints: BoxConstraints(
minWidth: 120, minWidth: _tags.isEmpty ? 120 : 64,
maxWidth: 300, maxWidth: 300,
), ),
child: Focus( child: Focus(
@@ -567,7 +569,7 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
final draft = _controller.text.trim().toLowerCase(); final draft = _controller.text.trim().toLowerCase();
if (draft.isEmpty) return ''; if (draft.isEmpty) return '';
final raw = draft.split(RegExp(r'\s+')).last; final raw = draft.split(RegExp(r'\s+')).last;
return raw.replaceAll(RegExp(r'^[\(\)]+|[\(\)]+$'), '').trim(); return raw.trim();
} }
bool get _isEditing => _focusNode.hasFocus || _localDirty; bool get _isEditing => _focusNode.hasFocus || _localDirty;
+134 -64
View File
@@ -10,7 +10,7 @@ import '../../app/responsive.dart';
import '../../backend/backend.dart'; import '../../backend/backend.dart';
import '../../core/utils/result.dart'; import '../../core/utils/result.dart';
class AppShell extends ConsumerWidget { class AppShell extends ConsumerStatefulWidget {
const AppShell({required this.child, super.key}); const AppShell({required this.child, super.key});
final Widget child; final Widget child;
@@ -33,69 +33,6 @@ class AppShell extends ConsumerWidget {
_Destination('settings', 'Settings', Icons.settings_rounded, '/settings'), _Destination('settings', 'Settings', Icons.settings_rounded, '/settings'),
]; ];
@override
Widget build(BuildContext context, WidgetRef ref) {
final settings =
ref.watch(appSettingsProvider).value ?? AppSettings.defaults;
final artistConfigs =
ref.watch(_enabledArtistConfigsProvider).value ?? const [];
final destinations =
_visibleDestinations(settings, artistConfigs.isNotEmpty);
final ru = settings.languageCode == 'ru';
return Shortcuts(
shortcuts: {
LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyF):
const _NavigateIntent('/search'),
LogicalKeySet(LogicalKeyboardKey.escape): const _BackIntent(),
LogicalKeySet(LogicalKeyboardKey.digit1): const _NavigateIntent('/'),
LogicalKeySet(LogicalKeyboardKey.digit2):
const _NavigateIntent('/search'),
LogicalKeySet(LogicalKeyboardKey.digit3):
const _NavigateIntent('/favorites'),
LogicalKeySet(LogicalKeyboardKey.digit4):
const _NavigateIntent('/viewed'),
LogicalKeySet(LogicalKeyboardKey.digit5):
const _NavigateIntent('/collections'),
LogicalKeySet(LogicalKeyboardKey.digit6):
const _NavigateIntent('/artists'),
LogicalKeySet(LogicalKeyboardKey.digit7):
const _NavigateIntent('/providers'),
LogicalKeySet(LogicalKeyboardKey.digit8):
const _NavigateIntent('/settings'),
},
child: Actions(
actions: {
_NavigateIntent: CallbackAction<_NavigateIntent>(
onInvoke: (intent) {
context.go(intent.location);
return null;
},
),
_BackIntent: CallbackAction<_BackIntent>(
onInvoke: (_) {
if (Navigator.of(context).canPop()) Navigator.of(context).pop();
return null;
},
),
},
child: Focus(
autofocus: true,
child: Responsive.isDesktop(context)
? _DesktopShell(
destinations: destinations,
ru: ru,
child: child,
)
: _MobileShell(
destinations: destinations,
ru: ru,
child: child,
),
),
),
);
}
static List<_Destination> _visibleDestinations( static List<_Destination> _visibleDestinations(
AppSettings settings, AppSettings settings,
bool hasArtists, bool hasArtists,
@@ -106,6 +43,139 @@ class AppShell extends ConsumerWidget {
return true; return true;
}).toList(growable: false); }).toList(growable: false);
} }
@override
ConsumerState<AppShell> createState() => _AppShellState();
}
class _AppShellState extends ConsumerState<AppShell> {
final List<String> _tabHistory = [];
String? _currentPath;
bool _isBackNavigating = false;
@override
void didChangeDependencies() {
super.didChangeDependencies();
final path = GoRouterState.of(context).uri.path;
if (_isBackNavigating) {
_isBackNavigating = false;
_currentPath = path;
return;
}
if (_currentPath != null && _currentPath != path) {
if (path == '/') {
_tabHistory.clear();
} else {
_tabHistory.remove(_currentPath);
_tabHistory.add(_currentPath!);
if (_tabHistory.length > 25) {
_tabHistory.removeAt(0);
}
}
}
_currentPath = path;
}
bool _handleBack() {
if (Navigator.of(context).canPop()) {
Navigator.of(context).pop();
return true;
}
final currentPath = GoRouterState.of(context).uri.path;
while (_tabHistory.isNotEmpty && _tabHistory.last == currentPath) {
_tabHistory.removeLast();
}
if (_tabHistory.isNotEmpty) {
final previous = _tabHistory.removeLast();
_isBackNavigating = true;
context.go(previous);
return true;
}
if (currentPath != '/') {
_isBackNavigating = true;
context.go('/');
return true;
}
return false;
}
@override
Widget build(BuildContext context) {
final settings =
ref.watch(appSettingsProvider).value ?? AppSettings.defaults;
final artistConfigs =
ref.watch(_enabledArtistConfigsProvider).value ?? const [];
final destinations =
AppShell._visibleDestinations(settings, artistConfigs.isNotEmpty);
final ru = settings.languageCode == 'ru';
return PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, _) {
if (didPop) return;
final handled = _handleBack();
if (!handled) {
SystemNavigator.pop();
}
},
child: Shortcuts(
shortcuts: {
LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyF):
const _NavigateIntent('/search'),
LogicalKeySet(LogicalKeyboardKey.escape): const _BackIntent(),
LogicalKeySet(LogicalKeyboardKey.digit1): const _NavigateIntent('/'),
LogicalKeySet(LogicalKeyboardKey.digit2):
const _NavigateIntent('/search'),
LogicalKeySet(LogicalKeyboardKey.digit3):
const _NavigateIntent('/favorites'),
LogicalKeySet(LogicalKeyboardKey.digit4):
const _NavigateIntent('/viewed'),
LogicalKeySet(LogicalKeyboardKey.digit5):
const _NavigateIntent('/collections'),
LogicalKeySet(LogicalKeyboardKey.digit6):
const _NavigateIntent('/artists'),
LogicalKeySet(LogicalKeyboardKey.digit7):
const _NavigateIntent('/providers'),
LogicalKeySet(LogicalKeyboardKey.digit8):
const _NavigateIntent('/settings'),
},
child: Actions(
actions: {
_NavigateIntent: CallbackAction<_NavigateIntent>(
onInvoke: (intent) {
context.go(intent.location);
return null;
},
),
_BackIntent: CallbackAction<_BackIntent>(
onInvoke: (_) {
_handleBack();
return null;
},
),
},
child: Focus(
autofocus: true,
child: Responsive.isDesktop(context)
? _DesktopShell(
destinations: destinations,
ru: ru,
child: widget.child,
)
: _MobileShell(
destinations: destinations,
ru: ru,
child: widget.child,
),
),
),
),
);
}
} }
class _DesktopShell extends StatefulWidget { class _DesktopShell extends StatefulWidget {
+185 -22
View File
@@ -117,9 +117,14 @@ class _PostCardState extends ConsumerState<PostCard>
Widget build(BuildContext context) { Widget build(BuildContext context) {
final post = _resolvedPost ?? widget.post; final post = _resolvedPost ?? widget.post;
final sensitive = _isSensitive(post.rating); final sensitive = _isSensitive(post.rating);
final isTextPost = post.fileType == 'text' ||
(post.previewUrl.trim().isEmpty &&
post.sampleUrl.trim().isEmpty &&
post.fileUrl.trim().isEmpty &&
!MediaUrlSelector.isVideo(post));
final aspect = post.width > 0 && post.height > 0 final aspect = post.width > 0 && post.height > 0
? post.width / post.height ? post.width / post.height
: _fallbackAspect(post.fileType); : _fallbackAspect(isTextPost ? 'text' : post.fileType);
final mobile = MediaQuery.sizeOf(context).width < 700; final mobile = MediaQuery.sizeOf(context).width < 700;
final urls = _feedUrls(post, mobile: mobile); final urls = _feedUrls(post, mobile: mobile);
final imageUrl = urls.isEmpty ? post.previewUrl : urls.first; final imageUrl = urls.isEmpty ? post.previewUrl : urls.first;
@@ -202,6 +207,12 @@ class _PostCardState extends ConsumerState<PostCard>
enabled: widget.blurExplicit && sensitive, enabled: widget.blurExplicit && sensitive,
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
if (isTextPost) {
return _TextPostCardPreview(
post: post,
hovered: _hovered && !mobile,
);
}
final dpr = MediaQuery.devicePixelRatioOf(context); final dpr = MediaQuery.devicePixelRatioOf(context);
final cacheWidth = final cacheWidth =
(constraints.maxWidth * dpr).round().clamp(320, 1800); (constraints.maxWidth * dpr).round().clamp(320, 1800);
@@ -239,27 +250,28 @@ class _PostCardState extends ConsumerState<PostCard>
), ),
), ),
), ),
// Bottom cinematic gradient overlay for badges and favorite // Bottom cinematic gradient overlay for badges and favorite (only on media posts)
Positioned( if (!isTextPost)
left: 0, Positioned(
right: 0, left: 0,
bottom: 0, right: 0,
height: 64, bottom: 0,
child: IgnorePointer( height: 64,
child: DecoratedBox( child: IgnorePointer(
decoration: BoxDecoration( child: DecoratedBox(
gradient: LinearGradient( decoration: BoxDecoration(
begin: Alignment.bottomCenter, gradient: LinearGradient(
end: Alignment.topCenter, begin: Alignment.bottomCenter,
colors: [ end: Alignment.topCenter,
Colors.black.withValues(alpha: 0.72), colors: [
Colors.transparent, Colors.black.withValues(alpha: 0.72),
], Colors.transparent,
],
),
), ),
), ),
), ),
), ),
),
if (widget.showBadges) ...[ if (widget.showBadges) ...[
Positioned( Positioned(
left: 8, left: 8,
@@ -269,11 +281,14 @@ class _PostCardState extends ConsumerState<PostCard>
if (post.fileType.toLowerCase().contains('video') || if (post.fileType.toLowerCase().contains('video') ||
post.fileType.toLowerCase().contains('webm') || post.fileType.toLowerCase().contains('webm') ||
post.fileType.toLowerCase().contains('mp4') || post.fileType.toLowerCase().contains('mp4') ||
post.fileType.toLowerCase().contains('gif')) post.fileType.toLowerCase().contains('gif') ||
isTextPost)
Positioned( Positioned(
right: 8, right: 8,
top: 8, top: 8,
child: _MediaBadge(fileType: post.fileType), child: _MediaBadge(
fileType: isTextPost ? 'text' : post.fileType,
),
), ),
Positioned( Positioned(
left: 8, left: 8,
@@ -434,6 +449,7 @@ class _PostCardState extends ConsumerState<PostCard>
double _fallbackAspect(String fileType) { double _fallbackAspect(String fileType) {
final normalized = fileType.toLowerCase(); final normalized = fileType.toLowerCase();
if (normalized == 'text') return 0.95;
if (normalized.contains('video') || normalized.contains('webm')) { if (normalized.contains('video') || normalized.contains('webm')) {
return 16 / 9; return 16 / 9;
} }
@@ -462,7 +478,7 @@ class _PostCardState extends ConsumerState<PostCard>
'${post.previewUrl} ${post.sampleUrl} ${post.fileUrl}' '${post.previewUrl} ${post.sampleUrl} ${post.fileUrl}'
.toLowerCase(); .toLowerCase();
return { return {
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser', 'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
'Accept': '*/*', 'Accept': '*/*',
if (lower.contains('gelbooru')) 'Referer': 'https://gelbooru.com/', if (lower.contains('gelbooru')) 'Referer': 'https://gelbooru.com/',
if (lower.contains('realbooru')) if (lower.contains('realbooru'))
@@ -596,6 +612,8 @@ class _FeedVideoPreviewState extends State<_FeedVideoPreview> {
controller: _controller, controller: _controller,
fit: BoxFit.cover, fit: BoxFit.cover,
controls: null, controls: null,
pauseUponEnteringBackgroundMode: false,
resumeUponEnteringForegroundMode: false,
), ),
), ),
), ),
@@ -773,7 +791,7 @@ class _MediaBadge extends StatelessWidget {
Icon(_icon(type), size: 13, color: Colors.white), Icon(_icon(type), size: 13, color: Colors.white),
const SizedBox(width: 3.5), const SizedBox(width: 3.5),
Text( Text(
type, _label(type),
style: const TextStyle( style: const TextStyle(
fontSize: 10.5, fontSize: 10.5,
color: Colors.white, color: Colors.white,
@@ -794,14 +812,159 @@ class _MediaBadge extends StatelessWidget {
return 'video'; return 'video';
} }
if (value.contains('gif')) return 'gif'; if (value.contains('gif')) return 'gif';
if (value.contains('text')) return 'text';
return 'photo'; return 'photo';
} }
IconData _icon(String type) => switch (type) { IconData _icon(String type) => switch (type) {
'video' => Icons.play_arrow_rounded, 'video' => Icons.play_arrow_rounded,
'gif' => Icons.gif_box_rounded, 'gif' => Icons.gif_box_rounded,
'text' => Icons.article_rounded,
_ => Icons.image_rounded, _ => Icons.image_rounded,
}; };
String _label(String type) => switch (type) {
'video' => 'VIDEO',
'gif' => 'GIF',
'text' => 'ТЕКСТ',
_ => 'PHOTO',
};
}
class _TextPostCardPreview extends StatelessWidget {
const _TextPostCardPreview({
required this.post,
required this.hovered,
});
final Post post;
final bool hovered;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final title = (post.title ?? '').trim();
final cleanContent =
CloudLinkExtractor.cleanCommentary(post.description ?? '');
final hasTitle = title.isNotEmpty;
final snippet = cleanContent.isNotEmpty
? cleanContent
: (hasTitle ? '' : 'Текстовая публикация автора без вложений');
final cloudCount = post.cloudLinks.length;
return Container(
padding: const EdgeInsets.fromLTRB(14, 14, 14, 14),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
theme.colorScheme.surfaceContainerHigh,
theme.colorScheme.surfaceContainer,
],
),
border: Border.all(
color: hovered
? theme.colorScheme.primary.withValues(alpha: 0.5)
: theme.colorScheme.outlineVariant.withValues(alpha: 0.35),
width: 1,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
padding: const EdgeInsets.all(5),
decoration: BoxDecoration(
color: theme.colorScheme.primary.withValues(alpha: 0.14),
shape: BoxShape.circle,
),
child: Icon(
Icons.notes_rounded,
size: 15,
color: theme.colorScheme.primary,
),
),
const SizedBox(width: 8),
Expanded(
child: Text(
'${post.createdAt.day.toString().padLeft(2, '0')}.${post.createdAt.month.toString().padLeft(2, '0')}.${post.createdAt.year}',
style: TextStyle(
fontSize: 11,
color: theme.colorScheme.onSurfaceVariant,
fontWeight: FontWeight.w500,
),
),
),
],
),
const SizedBox(height: 10),
if (hasTitle) ...[
Text(
title,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
height: 1.25,
),
),
const SizedBox(height: 6),
],
if (snippet.isNotEmpty)
Expanded(
child: Text(
snippet,
maxLines: hasTitle ? 5 : 7,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
height: 1.42,
),
),
)
else
const Spacer(),
if (cloudCount > 0) ...[
const SizedBox(height: 6),
Row(
children: [
Container(
padding:
const EdgeInsets.symmetric(horizontal: 7, vertical: 3),
decoration: BoxDecoration(
color: theme.colorScheme.primaryContainer,
borderRadius: BorderRadius.circular(6),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.cloud_download_outlined,
size: 12,
color: theme.colorScheme.onPrimaryContainer,
),
const SizedBox(width: 4),
Text(
'Вложения ($cloudCount)',
style: TextStyle(
fontSize: 10,
fontWeight: FontWeight.bold,
color: theme.colorScheme.onPrimaryContainer,
),
),
],
),
),
],
),
],
],
),
);
}
} }
class _SeenBadge extends StatelessWidget { class _SeenBadge extends StatelessWidget {
+10 -1
View File
@@ -28,6 +28,7 @@ class PostMasonryGrid extends StatelessWidget {
this.loading = false, this.loading = false,
this.controller, this.controller,
this.gridMode = 'masonry', this.gridMode = 'masonry',
this.padding,
super.key, super.key,
}); });
@@ -51,11 +52,19 @@ class PostMasonryGrid extends StatelessWidget {
final bool loading; final bool loading;
final ScrollController? controller; final ScrollController? controller;
final String gridMode; final String gridMode;
final EdgeInsetsGeometry? padding;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final mobile = Responsive.isMobile(context); final mobile = Responsive.isMobile(context);
final pad = EdgeInsets.all(mobile ? 8 : 16); final bottomInset = MediaQuery.paddingOf(context).bottom;
final pad = padding ??
EdgeInsets.fromLTRB(
mobile ? 8 : 16,
mobile ? 8 : 16,
mobile ? 8 : 16,
(mobile ? 8 : 16) + (mobile ? (120.0 + bottomInset) : 0.0),
);
final spacing = mobile ? 8.0 : 12.0; final spacing = mobile ? 8.0 : 12.0;
Widget buildCard(Post post) { Widget buildCard(Post post) {
+78 -9
View File
@@ -3,22 +3,91 @@ import 'package:flutter/material.dart';
import '../../backend/backend.dart'; import '../../backend/backend.dart';
class ProviderStatusBadge extends StatelessWidget { class ProviderStatusBadge extends StatelessWidget {
const ProviderStatusBadge({required this.health, super.key}); const ProviderStatusBadge({
required this.health,
this.compact = false,
super.key,
});
final ProviderHealth? health; final ProviderHealth? health;
final bool compact;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
final status = health?.status ?? ProviderStatus.unknown; final status = health?.status ?? ProviderStatus.unknown;
final color = switch (status) {
ProviderStatus.online => Colors.green, final (color, labelRu, labelEn) = switch (status) {
ProviderStatus.offline => Colors.red, ProviderStatus.online => (
ProviderStatus.unknown => Colors.grey, const Color(0xFF10B981), // Emerald
'Онлайн',
'Online',
),
ProviderStatus.offline => (
const Color(0xFFEF4444), // Crimson Red
'Офлайн',
'Offline',
),
ProviderStatus.unknown => (
const Color(0xFF94A3B8), // Slate
'Не проверен',
'Unknown',
),
}; };
return Chip(
avatar: Icon(Icons.circle, color: color, size: 10), final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
label: Text(status.name), final label = isRu ? labelRu : labelEn;
visualDensity: VisualDensity.compact,
return Container(
padding: EdgeInsets.symmetric(
horizontal: compact ? 8 : 10,
vertical: compact ? 3 : 5,
),
decoration: BoxDecoration(
color: color.withValues(alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(14),
border: Border.all(
color: color.withValues(alpha: isDark ? 0.45 : 0.32),
width: 1.1,
),
boxShadow: [
BoxShadow(
color: color.withValues(alpha: isDark ? 0.18 : 0.08),
blurRadius: 6,
offset: const Offset(0, 1.5),
),
],
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Container(
width: 7,
height: 7,
decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: color.withValues(alpha: 0.8),
blurRadius: 5,
spreadRadius: 0.5,
),
],
),
),
const SizedBox(width: 6),
Text(
label,
style: theme.textTheme.labelSmall?.copyWith(
color: color,
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
),
),
],
),
); );
} }
} }
+103 -11
View File
@@ -1,36 +1,128 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../backend/models/tag_suggestion.dart';
class TagChip extends StatelessWidget { class TagChip extends StatelessWidget {
const TagChip({ const TagChip({
required this.tag, required this.tag,
this.category,
this.group,
this.onTap, this.onTap,
this.onLongPress, this.onLongPress,
super.key, super.key,
}); });
final String tag; final String tag;
final TagCategory? category;
final String? group;
final VoidCallback? onTap; final VoidCallback? onTap;
final VoidCallback? onLongPress; final VoidCallback? onLongPress;
TagCategory get _resolvedCategory {
if (category != null) return category!;
final g = (group ?? '').toLowerCase();
return switch (g) {
'artist' => TagCategory.artist,
'character' => TagCategory.character,
'copyright' => TagCategory.copyright,
'species' => TagCategory.species,
'meta' => TagCategory.meta,
'general' => TagCategory.general,
_ => tagCategoryFromString(g),
};
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final scheme = Theme.of(context).colorScheme; final scheme = Theme.of(context).colorScheme;
final chip = ActionChip( final isDark = Theme.of(context).brightness == Brightness.dark;
onPressed: onTap, final cat = _resolvedCategory;
label: Text(tag),
labelStyle: TextStyle( final (Color baseColor, Color textColor) = _colorsForCategory(cat, scheme, isDark);
color: scheme.onSecondaryContainer,
fontWeight: FontWeight.w700, final chipWidget = Container(
decoration: BoxDecoration(
color: baseColor.withValues(alpha: isDark ? 0.16 : 0.10),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: baseColor.withValues(alpha: isDark ? 0.40 : 0.28),
width: 1.0,
),
),
child: Material(
color: Colors.transparent,
child: InkWell(
borderRadius: BorderRadius.circular(10),
onTap: onTap,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Container(
width: 6,
height: 6,
margin: const EdgeInsets.only(right: 6),
decoration: BoxDecoration(
color: baseColor,
shape: BoxShape.circle,
),
),
Text(
tag,
style: TextStyle(
color: textColor,
fontWeight: FontWeight.w700,
fontSize: 13,
letterSpacing: -0.1,
),
),
],
),
),
),
), ),
backgroundColor: scheme.secondaryContainer.withValues(alpha: 0.62),
side: BorderSide(color: scheme.outlineVariant.withValues(alpha: 0.65)),
visualDensity: VisualDensity.compact,
); );
if (onLongPress == null) return chip;
if (onLongPress == null) return chipWidget;
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onLongPress: onLongPress, onLongPress: onLongPress,
child: chip, child: chipWidget,
); );
} }
static (Color, Color) _colorsForCategory(
TagCategory cat,
ColorScheme scheme,
bool isDark,
) {
return switch (cat) {
TagCategory.artist => (
const Color(0xFFFF4757), // e621 / Gelbooru red/coral
isDark ? const Color(0xFFFF6B81) : const Color(0xFFD63031),
),
TagCategory.character => (
const Color(0xFF2ED573), // Vibrant character green
isDark ? const Color(0xFF7BED9F) : const Color(0xFF10AC84),
),
TagCategory.copyright => (
const Color(0xFFA55EEA), // Classic anime series purple
isDark ? const Color(0xFFD980FA) : const Color(0xFF8854D0),
),
TagCategory.species => (
const Color(0xFFFFA502), // e621 species amber/orange
isDark ? const Color(0xFFFFC048) : const Color(0xFFE67E22),
),
TagCategory.meta => (
const Color(0xFF1E90FF), // Meta / format cyan / ice blue
isDark ? const Color(0xFF70A1FF) : const Color(0xFF0984E3),
),
TagCategory.general || TagCategory.unknown => (
isDark ? scheme.primary : scheme.primary,
isDark ? scheme.onSurface : scheme.onSurface,
),
};
}
} }
+2 -2
View File
@@ -45,11 +45,11 @@ static void my_application_activate(GApplication* application) {
if (use_header_bar) { if (use_header_bar) {
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
gtk_widget_show(GTK_WIDGET(header_bar)); gtk_widget_show(GTK_WIDGET(header_bar));
gtk_header_bar_set_title(header_bar, "Lunaris"); gtk_header_bar_set_title(header_bar, "Prisma");
gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_header_bar_set_show_close_button(header_bar, TRUE);
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
} else { } else {
gtk_window_set_title(window, "Lunaris"); gtk_window_set_title(window, "Prisma");
} }
gtk_window_set_default_size(window, 1280, 720); gtk_window_set_default_size(window, 1280, 720);
+4 -4
View File
@@ -899,18 +899,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: screen_brightness_android name: screen_brightness_android
sha256: "2df5e0488a22a73271a43d92dbcd80643df6910cf69690faacaf9929ae9ade3b" sha256: "2008ad8e9527cc968f7a4de1ec58b476d495b3c612a149dbd6550c4f046da147"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.4" version: "2.1.6"
screen_brightness_platform_interface: screen_brightness_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: screen_brightness_platform_interface name: screen_brightness_platform_interface
sha256: "59d50850d6735d677780fc7359c8e997d0ff6df91c8465161c9e617a7b0a11d8" sha256: "2de60c0ba569b898950029cc1f7e9dd72bda44a22beb5054aac331cb6fce2ff2"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.1" version: "2.1.2"
share_plus: share_plus:
dependency: "direct main" dependency: "direct main"
description: description:
+1 -2
View File
@@ -1,7 +1,7 @@
name: gel_rule_app name: gel_rule_app
description: Local backend/core layer for a Flutter booru browser app. description: Local backend/core layer for a Flutter booru browser app.
publish_to: "none" publish_to: "none"
version: 3.0.9+60 version: 3.4.1+75
environment: environment:
sdk: ">=3.3.0 <4.0.0" sdk: ">=3.3.0 <4.0.0"
@@ -33,7 +33,6 @@ dependencies:
media_kit_libs_android_video: ^1.3.8 media_kit_libs_android_video: ^1.3.8
share_plus: ^10.0.0 share_plus: ^10.0.0
dynamic_color: ^1.7.0 dynamic_color: ^1.7.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
+1 -1
View File
@@ -10,7 +10,7 @@ void main() {
late TagCacheService cacheService; late TagCacheService cacheService;
setUp(() async { setUp(() async {
tempDir = await Directory.systemTemp.createTemp('lunaris_test_tag_cache'); tempDir = await Directory.systemTemp.createTemp('prisma_test_tag_cache');
cacheFilePath = '${tempDir.path}/test_tags.json'; cacheFilePath = '${tempDir.path}/test_tags.json';
cacheService = TagCacheService(customPath: cacheFilePath); cacheService = TagCacheService(customPath: cacheFilePath);
await cacheService.init(); await cacheService.init();
+8 -8
View File
@@ -13,24 +13,24 @@ void main() {
final info = AppUpdateInfo( final info = AppUpdateInfo(
version: '2.0.2', version: '2.0.2',
tagName: 'v2.0.2', tagName: 'v2.0.2',
name: 'Lunaris 2.0.2', name: 'Prisma 2.0.2',
body: 'Release notes', body: 'Release notes',
htmlUrl: 'https://github.com/RarDog/Lunaris/releases/tag/v2.0.2', htmlUrl: 'https://github.com/RarDog/Prisma/releases/tag/v2.0.2',
publishedAt: DateTime.parse('2026-09-03T18:00:00Z'), publishedAt: DateTime.parse('2026-09-03T18:00:00Z'),
apkUrl: 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/Lunaris.apk', apkUrl: 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/Prisma.apk',
linuxTarGzUrl: 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/linux.tar.gz', linuxTarGzUrl: 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/linux.tar.gz',
); );
expect(info.hasAssets, isTrue); expect(info.hasAssets, isTrue);
expect(info.apkUrl, contains('apk')); expect(info.apkUrl, contains('apk'));
expect(info.linuxTarGzUrl, contains('linux')); expect(info.linuxTarGzUrl, contains('linux'));
expect( expect(
service.assetFileName(info, 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/Lunaris-v2.0.2.apk'), service.assetFileName(info, 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/Prisma-v2.0.2.apk'),
'Lunaris-v2.0.2.apk', 'Prisma-v2.0.2.apk',
); );
expect( expect(
service.assetFileName(info, 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/unknown-linux'), service.assetFileName(info, 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/unknown-linux'),
'Lunaris-v2.0.2-linux-x64.tar.gz', 'Prisma-v2.0.2-linux-x64.tar.gz',
); );
}); });
} }
+11 -5
View File
@@ -55,15 +55,21 @@ void main() {
expect(find.text('Google Drive'), findsOneWidget); expect(find.text('Google Drive'), findsOneWidget);
expect(find.text('Google Drive Stream'), findsOneWidget); expect(find.text('Google Drive Stream'), findsOneWidget);
// Verify commentary // Verify play button triggers callback on mirrors tab
expect(find.text('Описание от автора'), findsOneWidget);
expect(find.text('Special Patreon bonus animation for all patrons.'), findsOneWidget);
// Verify play button triggers callback
final playBtn = find.text('Смотреть'); final playBtn = find.text('Смотреть');
expect(playBtn, findsOneWidget); expect(playBtn, findsOneWidget);
await tester.tap(playBtn); await tester.tap(playBtn);
expect(playedStream, 'https://drive.google.com/uc?export=download&id=123'); expect(playedStream, 'https://drive.google.com/uc?export=download&id=123');
// Switch to description tab and verify commentary
final descTab = find.text('Описание');
expect(descTab, findsOneWidget);
await tester.tap(descTab);
await tester.pumpAndSettle();
// Verify commentary
expect(find.text('Описание от автора'), findsOneWidget);
expect(find.text('Special Patreon bonus animation for all patrons.'), findsOneWidget);
}); });
testWidgets('CloudMirrorsCard renders nothing if no links and no commentary', (tester) async { testWidgets('CloudMirrorsCard renders nothing if no links and no commentary', (tester) async {
+155
View File
@@ -0,0 +1,155 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:gel_rule_app/backend/backend.dart';
import 'package:gel_rule_app/features/providers/presentation/provider_check_screen.dart';
import 'package:gel_rule_app/features/providers/presentation/provider_form_screen.dart';
import 'package:gel_rule_app/features/providers/presentation/providers_controller.dart';
import 'package:gel_rule_app/features/providers/presentation/providers_screen.dart';
ContentProviderConfig _sampleConfig({
required String id,
required String name,
String apiType = 'gelbooru',
String baseUrl = 'https://gelbooru.com',
bool enabled = true,
int priority = 10,
}) {
return ContentProviderConfig(
id: id,
name: name,
baseUrl: baseUrl,
apiType: apiType,
enabled: enabled,
priority: priority,
timeoutSeconds: 20,
customHeaders: const {},
createdAt: DateTime(2025, 1, 1),
updatedAt: DateTime(2025, 1, 1),
);
}
class _FakeProvidersController extends ProvidersController {
_FakeProvidersController(this._items);
final List<ContentProviderConfig> _items;
@override
Future<List<ContentProviderConfig>> build() async => _items;
}
void main() {
setUp(() {
TestWidgetsFlutterBinding.ensureInitialized();
});
testWidgets('ProvidersScreen renders overview card, provider cards, and actions',
(tester) async {
tester.view.physicalSize = const Size(390, 844);
tester.view.devicePixelRatio = 1.0;
addTearDown(() {
tester.view.resetPhysicalSize();
tester.view.resetDevicePixelRatio();
});
final sampleProviders = [
_sampleConfig(id: 'gelbooru', name: 'Gelbooru', apiType: 'gelbooru'),
_sampleConfig(
id: 'rule34',
name: 'Rule34',
apiType: 'rule34',
baseUrl: 'https://api.rule34.xxx'),
];
await tester.pumpWidget(
ProviderScope(
overrides: [
providersControllerProvider.overrideWith(
() => _FakeProvidersController(sampleProviders),
),
],
child: const MaterialApp(
home: ProvidersScreen(),
),
),
);
await tester.pumpAndSettle();
expect(find.text('Gelbooru'), findsWidgets);
expect(find.text('Rule34'), findsWidgets);
expect(find.byType(Switch), findsNWidgets(2));
expect(find.byIcon(Icons.network_check_rounded), findsWidgets);
expect(find.byIcon(Icons.add_rounded), findsOneWidget);
});
testWidgets('ProviderFormScreen renders presets, sections, and input fields',
(tester) async {
tester.view.physicalSize = const Size(400, 1600);
tester.view.devicePixelRatio = 1.0;
addTearDown(() {
tester.view.resetPhysicalSize();
tester.view.resetDevicePixelRatio();
});
await tester.pumpWidget(
const ProviderScope(
child: MaterialApp(
home: ProviderFormScreen(),
),
),
);
await tester.pumpAndSettle();
// Check presets are visible
expect(find.text('Danbooru'), findsOneWidget);
expect(find.text('e621'), findsOneWidget);
expect(find.byIcon(Icons.check_rounded), findsOneWidget);
});
testWidgets('ProviderCheckScreen renders metrics and health tiles',
(tester) async {
tester.view.physicalSize = const Size(390, 844);
tester.view.devicePixelRatio = 1.0;
addTearDown(() {
tester.view.resetPhysicalSize();
tester.view.resetDevicePixelRatio();
});
final sampleProviders = [
_sampleConfig(id: 'gelbooru', name: 'Gelbooru', apiType: 'gelbooru'),
];
await tester.pumpWidget(
ProviderScope(
overrides: [
providersControllerProvider.overrideWith(
() => _FakeProvidersController(sampleProviders),
),
providerDiagnosticsProvider.overrideWith(
(ref) async => const {},
),
providerHealthProvider.overrideWith(
(ref) => {
'gelbooru': ProviderHealth(
providerId: 'gelbooru',
status: ProviderStatus.online,
pingMs: 85,
apiVersion: '0.2.5',
lastCheckedAt: DateTime(2026, 1, 1),
),
},
),
],
child: const MaterialApp(
home: ProviderCheckScreen(),
),
),
);
await tester.pumpAndSettle();
expect(find.text('Gelbooru'), findsOneWidget);
expect(find.text('85 ms'), findsOneWidget);
});
}
+3 -3
View File
@@ -90,12 +90,12 @@ BEGIN
BLOCK "040904e4" BLOCK "040904e4"
BEGIN BEGIN
VALUE "CompanyName", "com.example" "\0" VALUE "CompanyName", "com.example" "\0"
VALUE "FileDescription", "Lunaris" "\0" VALUE "FileDescription", "Prisma" "\0"
VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "FileVersion", VERSION_AS_STRING "\0"
VALUE "InternalName", "Lunaris" "\0" VALUE "InternalName", "Prisma" "\0"
VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0" VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0"
VALUE "OriginalFilename", "gel_rule_app.exe" "\0" VALUE "OriginalFilename", "gel_rule_app.exe" "\0"
VALUE "ProductName", "Lunaris" "\0" VALUE "ProductName", "Prisma" "\0"
VALUE "ProductVersion", VERSION_AS_STRING "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0"
END END
END END
+1 -1
View File
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
FlutterWindow window(project); FlutterWindow window(project);
Win32Window::Point origin(10, 10); Win32Window::Point origin(10, 10);
Win32Window::Size size(1280, 720); Win32Window::Size size(1280, 720);
if (!window.Create(L"Lunaris", origin, size)) { if (!window.Create(L"Prisma", origin, size)) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
window.SetQuitOnClose(true); window.SetQuitOnClose(true);