Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ff2efd84c | ||
|
|
583f60e706 | ||
|
|
f983e3c8c0 | ||
|
|
67c6994311 | ||
|
|
a88a8b5050 | ||
|
|
a039f09ec3 | ||
|
|
c7f507836b | ||
|
|
1395cfd414 | ||
|
|
15bebd6e47 | ||
|
|
295499ca4b | ||
|
|
9a0fd282b7 | ||
|
|
254f0e3d59 | ||
|
|
5a568a3df9 | ||
|
|
d58b512020 | ||
|
|
384c07955c | ||
|
|
ec594595c9 | ||
|
|
586e3fc4db | ||
|
|
61c2d0561c | ||
|
|
dff2cd806d | ||
|
|
6f902740c1 |
@@ -1,7 +1,7 @@
|
||||
# 🌙 Lunaris
|
||||
# 💎 Prisma
|
||||
|
||||
<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 align="center">
|
||||
@@ -10,16 +10,16 @@
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://github.com/RarDog/Lunaris/releases"><img src="https://img.shields.io/badge/Version-3.0.4-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.0.4" /></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/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" />
|
||||
</p>
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Что нового в Lunaris 3.0 (Major Release)
|
||||
## 🚀 Что нового в Prisma 3.0 (Major Release)
|
||||
|
||||
### 🎨 Дизайн 2.0
|
||||
- **Современный визуальный стиль**: Полный переход на squircle-карточки, адаптивную цветовую палитру и улучшенную Material You динамическую тему.
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
### 🐾 Глубокая интеграция Pawchive 2.0
|
||||
- **Мульти-аккаунты**: Поддержка авторизации по логину и паролю, а также прямому вводу `Session Cookie`.
|
||||
- **Двусторонняя синхронизация (Two-Way Sync)**: Автоматическая синхронизация избранного между локальной базой Lunaris и профилем Pawchive. Новые авторы с сервера добавляются в приложение, а локальные авторы выгружаются на сервер в один тап.
|
||||
- **Двусторонняя синхронизация (Two-Way Sync)**: Автоматическая синхронизация избранного между локальной базой Prisma и профилем Pawchive. Новые авторы с сервера добавляются в приложение, а локальные авторы выгружаются на сервер в один тап.
|
||||
- **Моментальная синхронизация**: При нажатии кнопки «В избранное» у любого автора (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/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
|
||||
# Клонирование репозитория
|
||||
git clone https://github.com/RarDog/Lunaris.git
|
||||
cd Lunaris
|
||||
git clone https://github.com/RarDog/Prisma.git
|
||||
cd Prisma
|
||||
|
||||
# Установка зависимостей
|
||||
flutter pub get
|
||||
@@ -155,7 +155,7 @@ lib/
|
||||
## 🔒 Безопасность и конфиденциальность
|
||||
|
||||
- **100% локальное хранение**: Вся история, закладки, локальные авторы и конфигурации хранятся только в вашей локальной базе на устройстве.
|
||||
- **Никакой телеметрии**: Lunaris не собирает аналитику, не отправляет логи и уважает вашу приватность.
|
||||
- **Никакой телеметрии**: Prisma не собирает аналитику, не отправляет логи и уважает вашу приватность.
|
||||
- **Прямое соединение**: Запросы отправляются напрямую к выбранным API без прокси-серверов посредников.
|
||||
|
||||
---
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
|
||||
|
||||
<application
|
||||
android:label="Lunaris"
|
||||
android:label="Prisma"
|
||||
android:name="${applicationName}"
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
<activity
|
||||
|
||||
+4
-4
@@ -1,7 +1,7 @@
|
||||
# ❓ Часто задаваемые вопросы (FAQ)
|
||||
|
||||
### 1. Как обновить приложение?
|
||||
Lunaris проверяет наличие свежих версий автоматически при запуске.
|
||||
Prisma проверяет наличие свежих версий автоматически при запуске.
|
||||
Вы также можете нажать **«Проверить обновления»** в Настройках.
|
||||
Приложение определит архитектуру вашего Android-устройства и скачает оптимальный APK напрямую из репозитория.
|
||||
|
||||
@@ -13,13 +13,13 @@ Lunaris проверяет наличие свежих версий автома
|
||||
---
|
||||
|
||||
### 3. Где сохраняются скачанные файлы?
|
||||
- **На Android**: В стандартную папку `Pictures/Lunaris` или `Download/Lunaris` (в зависимости от настроек системы). Файлы сразу видны в стандартной Галерее телефона.
|
||||
- **На Linux**: В директорию `~/Pictures/Lunaris` или папку загрузок.
|
||||
- **На Android**: В стандартную папку `Pictures/Prisma` или `Download/Prisma` (в зависимости от настроек системы). Файлы сразу видны в стандартной Галерее телефона.
|
||||
- **На Linux**: В директорию `~/Pictures/Prisma` или папку загрузок.
|
||||
|
||||
---
|
||||
|
||||
### 4. Безопасно ли вводить логин и пароль от Pawchive?
|
||||
Абсолютно безопасно. Lunaris не отправляет ваши учетные данные никуда, кроме официального защищенного API Pawchive по HTTPS. Пароли не логируются и сохраняются в зашифрованном системном хранилище. Для дополнительного спокойствия вы можете использовать вход через **Session Cookie**.
|
||||
Абсолютно безопасно. Prisma не отправляет ваши учетные данные никуда, кроме официального защищенного API Pawchive по HTTPS. Пароли не логируются и сохраняются в зашифрованном системном хранилище. Для дополнительного спокойствия вы можете использовать вход через **Session Cookie**.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
### 📥 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 | Для каких устройств |
|
||||
|---|---|
|
||||
@@ -13,27 +13,27 @@
|
||||
| **`app-x86_64-release.apk`** | Эмуляторы Android на ПК (Bluestacks, Android Studio) или планшеты с процессорами Intel/AMD. |
|
||||
|
||||
> [!TIP]
|
||||
> **Умное автообновление:** При проверке обновлений прямо внутри Lunaris приложение **самостоятельно определит архитектуру** вашего процессора и автоматически скачает правильный файл!
|
||||
> **Умное автообновление:** При проверке обновлений прямо внутри Prisma приложение **самостоятельно определит архитектуру** вашего процессора и автоматически скачает правильный файл!
|
||||
|
||||
#### Шаги установки:
|
||||
1. Скачайте нужный `.apk` файл на устройство.
|
||||
2. Откройте файл через менеджер файлов и подтвердите установку («Разрешить установку из этого источника»).
|
||||
3. Запустите **Lunaris**.
|
||||
3. Запустите **Prisma**.
|
||||
|
||||
---
|
||||
|
||||
### 🐧 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. Распакуйте архив в любую удобную папку:
|
||||
```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. Запустите приложение:
|
||||
```bash
|
||||
cd ~/Lunaris
|
||||
cd ~/Prisma
|
||||
./lunaris
|
||||
```
|
||||
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
# 🌙 Добро пожаловать в Lunaris Wiki!
|
||||
# 🌙 Добро пожаловать в Prisma Wiki!
|
||||
|
||||
**Lunaris** — это современный, быстрый и функциональный кроссплатформенный клиент для Booru-борд и архивов независимых авторов (Creator Archives).
|
||||
**Prisma** — это современный, быстрый и функциональный кроссплатформенный клиент для Booru-борд и архивов независимых авторов (Creator Archives).
|
||||
|
||||
Приложение разработано на Flutter для **Android**, **Linux** и **Windows** с акцентом на плавный интерфейс в стиле Pinterest, глубокую кастомизацию, приватность и удобную работу с медиа.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 🎬 Медиаплеер и просмотр
|
||||
|
||||
Экран просмотра в Lunaris оптимизирован для быстрого, плавного и естественного взаимодействия с контентом.
|
||||
Экран просмотра в Prisma оптимизирован для быстрого, плавного и естественного взаимодействия с контентом.
|
||||
|
||||
---
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
## 📐 Определение разрешения медиа (1920×1080 и др.)
|
||||
|
||||
В Lunaris 3.0 внедрено **интеллектуальное ленивое определение разрешения**:
|
||||
В Prisma 3.0 внедрено **интеллектуальное ленивое определение разрешения**:
|
||||
- Для изображений и видео в инфо-панели поста отображаются точные физические размеры (например, `1920 × 1080`, `3840 × 2160`).
|
||||
- Определение происходит динамически через заголовки и потоковый декодер — приложению не требуется скачивать многомегабайтный файл целиком только ради того, чтобы узнать его габариты.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 💾 Офлайн-режим и загрузки
|
||||
|
||||
Lunaris предоставляет полноценный оффлайн-хаб для работы с вашей личной коллекцией без подключения к интернету.
|
||||
Prisma предоставляет полноценный оффлайн-хаб для работы с вашей личной коллекцией без подключения к интернету.
|
||||
|
||||
---
|
||||
|
||||
@@ -26,7 +26,7 @@ Lunaris предоставляет полноценный оффлайн-хаб
|
||||
|
||||
*Пример шаблона:*
|
||||
```text
|
||||
Lunaris/{Provider}/{Artist}/{ID}.{ext}
|
||||
Prisma/{Provider}/{Artist}/{ID}.{ext}
|
||||
```
|
||||
Файлы будут аккуратно раскладываться по папкам авторов и провайдеров, сохраняя порядок в вашей галерее.
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 🐾 Интеграция и синхронизация с Pawchive
|
||||
|
||||
Начиная с версии **Lunaris 3.0**, в приложении реализована глубокая интеграция с личным профилем Pawchive.
|
||||
Начиная с версии **Prisma 3.0**, в приложении реализована глубокая интеграция с личным профилем Pawchive.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 🌐 Провайдеры контента
|
||||
|
||||
Lunaris объединяет два фундаментальных класса источников: классические **Booru-доски** и современные **архивы авторов (Pawchive)**.
|
||||
Prisma объединяет два фундаментальных класса источников: классические **Booru-доски** и современные **архивы авторов (Pawchive)**.
|
||||
|
||||
---
|
||||
|
||||
@@ -17,7 +17,7 @@ Lunaris объединяет два фундаментальных класса
|
||||
- `gumroad` (Gumroad)
|
||||
- `dlsite` (DLsite)
|
||||
- `discord` (Серверы Discord)
|
||||
- **Возможности в Lunaris:**
|
||||
- **Возможности в Prisma:**
|
||||
- Просмотр глобальной ленты свежих постов.
|
||||
- Персональные карточки авторов с аватаром, баннером, анонсами и ссылками на оригинальные профили.
|
||||
- Полноценная авторизация в профиль Pawchive (логин/пароль или Session Cookie).
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 🛡️ Черный список и фильтрация
|
||||
|
||||
Lunaris оснащен многоуровневой системой защиты от нежелательного контента, работающей прямо на устройстве.
|
||||
Prisma оснащен многоуровневой системой защиты от нежелательного контента, работающей прямо на устройстве.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 🔍 Умный поиск и теги
|
||||
|
||||
Поиск в Lunaris спроектирован для мгновенного отклика и максимальной гибкости в построении сложных запросов.
|
||||
Поиск в Prisma спроектирован для мгновенного отклика и максимальной гибкости в построении сложных запросов.
|
||||
|
||||
---
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
Классические Booru-серверы при поиске нескольких тегов (`tag1 tag2`) возвращают только посты, где **присутствуют оба тега одновременно**.
|
||||
|
||||
Lunaris поддерживает специальный оператор **`and`**:
|
||||
Prisma поддерживает специальный оператор **`and`**:
|
||||
```text
|
||||
genshin_impact and honkai_star_rail
|
||||
```
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
### 🌙 Lunaris Wiki
|
||||
### 🌙 Prisma Wiki
|
||||
|
||||
- **[Главная](Home)**
|
||||
- **[Быстрый старт и установка](Getting-Started)**
|
||||
@@ -12,5 +12,5 @@
|
||||
|
||||
---
|
||||
|
||||
**[Скачать Lunaris](https://github.com/RarDog/Lunaris/releases)**
|
||||
**[Репозиторий GitHub](https://github.com/RarDog/Lunaris)**
|
||||
**[Скачать Prisma](https://github.com/RarDog/Prisma/releases)**
|
||||
**[Репозиторий GitHub](https://github.com/RarDog/Prisma)**
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#define MyAppName "Lunaris"
|
||||
#define MyAppName "Prisma"
|
||||
#define MyAppVersion "2.0.1"
|
||||
#define MyAppPublisher "RarDog"
|
||||
#define MyAppExeName "gel_rule_app.exe"
|
||||
@@ -13,7 +13,7 @@ DefaultGroupName={#MyAppName}
|
||||
DisableProgramGroupPage=yes
|
||||
PrivilegesRequired=lowest
|
||||
OutputDir=..\dist
|
||||
OutputBaseFilename=LunarisSetup
|
||||
OutputBaseFilename=PrismaSetup
|
||||
SetupIconFile=..\windows\runner\resources\app_icon.ico
|
||||
Compression=lzma2
|
||||
SolidCompression=yes
|
||||
+2
-2
@@ -40,7 +40,7 @@ class GelRuleApp extends ConsumerWidget {
|
||||
return DynamicColorBuilder(
|
||||
builder: (lightDynamic, darkDynamic) {
|
||||
return MaterialApp.router(
|
||||
title: 'Lunaris',
|
||||
title: 'Prisma',
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: buildTheme(
|
||||
Brightness.light,
|
||||
@@ -97,7 +97,7 @@ class _AppOverlayState extends ConsumerState<_AppOverlay> {
|
||||
await showDialog<void>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text('${strings.appUpdateAvailable}: Lunaris ${info.version}'),
|
||||
title: Text('${strings.appUpdateAvailable}: Prisma ${info.version}'),
|
||||
content: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 520),
|
||||
child: SingleChildScrollView(
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
const appDisplayVersion = '3.0.4';
|
||||
const appBuildNumber = 55;
|
||||
const appDisplayVersion = '3.4.1';
|
||||
const appBuildNumber = 75;
|
||||
const appReleaseChannel = 'Stable';
|
||||
|
||||
+240
-40
@@ -1,5 +1,202 @@
|
||||
const lunarisChangelog = [
|
||||
LunarisChange(
|
||||
const prismaChangelog = [
|
||||
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',
|
||||
title: 'Коррекция позиции кнопки настроек и отображения кнопок JSON и бэкапа',
|
||||
bullets: [
|
||||
'Оптимальная позиция кнопки настроек: парящая стеклянная кнопка опущена прямо к нижней навигационной панели, без избыточного завышения над карточками контента.',
|
||||
'Полная видимость кнопок JSON и бэкапа: добавлен увеличенный нижний отступ прокрутки в настройках, чтобы панель навигации не перекрывала кнопки при скролле до конца.',
|
||||
'Улучшенный дизайн и сетка кнопок экспорта/импорта: кнопки бэкапа и JSON организованы в симметричные аккуратные строки с яркими акцентными бейджами.',
|
||||
],
|
||||
),
|
||||
PrismaChange(
|
||||
version: '3.0.8',
|
||||
title: 'iPhone Liquid Glass — раздел «Настройки» и парящая стеклянная кнопка',
|
||||
bullets: [
|
||||
'Парящая стеклянная кнопка настроек (Liquid Glass Floating Button): круглая сфера из матового стекла с эффектом BackdropFilter blur, зеркальным радиальным градиентом, подсветкой ободка, пружинящей анимацией масштабирования и вращения при нажатии.',
|
||||
'Карточки настроек в стиле Liquid Glass (1:1 iOS): группы настроек переработаны в матовые стеклянные карточки с мягким градиентом, зеркальной рамкой и многослойными тенями глубины.',
|
||||
'Иконки разделов и пунктов в стиле iOS: яркие сквиркл-бейджи с акцентными градиентами, мягким свечением и четкими белыми иконками, как в нативных настройках iPhone.',
|
||||
'Стеклянная быстрая навигация по категориям: зафиксированная панель категорий с размытием фона и тактильным откликом при переключении разделов.',
|
||||
],
|
||||
),
|
||||
PrismaChange(
|
||||
version: '3.0.7',
|
||||
title: 'Liquid Glass Navigation Bar — парящая стеклянная панель и анимированная пилюля',
|
||||
bullets: [
|
||||
'Парящая панель Liquid Glass: нижняя панель навигации преобразована в парящий стеклянный док со скруглением, полупрозрачным градиентом и размытием фона (BackdropFilter blur).',
|
||||
'Плавающая пилюля-индикатор (Liquid Pill): плавный анимированный бегунок перетекает под активную вкладку со сглаженной пружинящей физикой (easeOutBack).',
|
||||
'Микроанимации нажатия и тактильный отклик: иконки мягко сжимаются при тапе и отпружинивают назад с легким тактильным виброоткликом (Haptic Feedback).',
|
||||
'Глубина контента: контент ленты, поиска и галереи плавно просвечивает и размывается под стеклянной панелью при прокрутке.',
|
||||
],
|
||||
),
|
||||
PrismaChange(
|
||||
version: '3.0.6',
|
||||
title: 'Улучшение недавних запросов и отображения тегов',
|
||||
bullets: [
|
||||
'Полная видимость тегов и запросов: сняты тесные ограничения ширины (140px), теги и поисковые запросы теперь отображаются целиком без усечения.',
|
||||
'Устранение дубликатов в истории: автоматическая дедупликация поисковых запросов в базе данных и интерфейсе. Устранены повторяющиеся пары запросов с пустыми счетчиками.',
|
||||
'Исправление заголовка карточки поиска: заголовок «Недавние запросы» и счетчик больше не обрезаются на экранах смартфонов.',
|
||||
'Удобное удаление: увеличенная область нажатия для кнопки удаления (крестика) предотвращает случайные нажатия на сам запрос.',
|
||||
],
|
||||
),
|
||||
PrismaChange(
|
||||
version: '3.0.5',
|
||||
title: 'Интерактивные ссылки на соцсети и авторов в объявлениях и описаниях',
|
||||
bullets: [
|
||||
'Кликабельные ссылки в объявлениях автора и описании постов: все URL в тексте подсвечиваются и открываются во внешнем браузере по клику.',
|
||||
'Красивые бейджи соцсетей (CreatorLinkChips): автоматическое распознавание и стилизация ссылок на YouTube, X (Twitter), Instagram, TikTok, Discord, Patreon, Fanbox, Fantia, Boosty, Pixiv, Twitch, Telegram, Gumroad и другие платформы с фирменными иконками и цветами.',
|
||||
'Корректная очистка пунктуации: знаки препинания в конце URL (!, ?, :, ., ,, ;, >) больше не ломают ссылки.',
|
||||
],
|
||||
),
|
||||
PrismaChange(
|
||||
version: '3.0.0',
|
||||
title: 'Lunaris 3.0 — Глобальное обновление: Дизайн 2.0, Интеграция Pawchive и умная синхронизация',
|
||||
bullets: [
|
||||
@@ -12,7 +209,7 @@ const lunarisChangelog = [
|
||||
'Исправление вёрстки: устранены переносы текста в заголовке окна аккаунтов и карточках пользователей на экранах смартфонов.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.10',
|
||||
title: 'Выгрузка локального избранного в Pawchive и двусторонняя синхронизация',
|
||||
bullets: [
|
||||
@@ -22,7 +219,7 @@ const lunarisChangelog = [
|
||||
'Синхронизация в реальном времени с любых провайдеров: при добавлении автора в избранное в лентах Kemono, Coomer или Pawchive изменение мгновенно передаётся на сервер Pawchive.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.9',
|
||||
title: 'Исправление входа и синхронизации аккаунтов Pawchive',
|
||||
bullets: [
|
||||
@@ -31,7 +228,7 @@ const lunarisChangelog = [
|
||||
'Информативные ошибки: понятные сообщения на русском при неверном пароле или сбое сети вместо сырых исключений Dio.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.8',
|
||||
title: 'ABI-Aware Auto-Update — правильный APK для вашего процессора',
|
||||
bullets: [
|
||||
@@ -41,7 +238,7 @@ const lunarisChangelog = [
|
||||
'Кеш ABI: архитектура определяется один раз за сеанс.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.7',
|
||||
title: 'Lazy Media Dimensions for Pawchive & Unknown-Size Providers',
|
||||
bullets: [
|
||||
@@ -50,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.6',
|
||||
title: 'Pawchive Accounts Integration & Favorites Synchronization',
|
||||
bullets: [
|
||||
@@ -61,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.5',
|
||||
title: 'Fullscreen Video Auto-Rotation & Orientation Controls',
|
||||
bullets: [
|
||||
@@ -70,7 +267,7 @@ const lunarisChangelog = [
|
||||
'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',
|
||||
title: 'OverlayPortal Architecture & Search UI Unblocking',
|
||||
bullets: [
|
||||
@@ -81,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.3',
|
||||
title: 'Tag Suggestions Overlay Fix & Rule34 API Alignment',
|
||||
bullets: [
|
||||
@@ -91,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.2',
|
||||
title: 'Gelbooru DAPI Compliance & Tag Query Optimization',
|
||||
bullets: [
|
||||
@@ -101,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.1',
|
||||
title: 'Cloud Mirrors & Author Announcements Fixes',
|
||||
bullets: [
|
||||
@@ -110,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.3.0',
|
||||
title: 'Artist Cloud Drives & External Video Mirrors',
|
||||
bullets: [
|
||||
@@ -122,7 +319,7 @@ const lunarisChangelog = [
|
||||
'Artist Commentary Card: formatted display of author notes, instructions, and text below post details.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.2.0',
|
||||
title: 'Offline Mode Overhaul & Post Details Screen Redesign',
|
||||
bullets: [
|
||||
@@ -133,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.1.0',
|
||||
title: '4-Tab Major Redesign: Search, Favorites, History & Collections',
|
||||
bullets: [
|
||||
@@ -143,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.15',
|
||||
title: 'Settings 2.0 Layout Fixes & Pinned Quick Navigation',
|
||||
bullets: [
|
||||
@@ -154,7 +351,7 @@ const lunarisChangelog = [
|
||||
'Header text overflow protections: wrapped title texts in Expanded across all settings cards.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.14',
|
||||
title: 'Settings 2.0: Modern Grouped Design & Quick Ergonomics',
|
||||
bullets: [
|
||||
@@ -166,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.13',
|
||||
title: 'Toolbar Section Dividers & Post Card Badge Stacking Fix',
|
||||
bullets: [
|
||||
@@ -176,7 +373,7 @@ const lunarisChangelog = [
|
||||
'Expanded Bottom Gradient: increased bottom cinematic gradient height to 64dp for clean text and badge contrast.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.12',
|
||||
title: 'Feed 2.0: Pinterest Modern Redesign & Sleek Cards',
|
||||
bullets: [
|
||||
@@ -189,7 +386,7 @@ const lunarisChangelog = [
|
||||
'Polished Search Presets: stylish bookmark capsules for quick access to saved search queries.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.11',
|
||||
title: 'Mobile Video Player Redesign & Format Recognition Fix',
|
||||
bullets: [
|
||||
@@ -203,7 +400,7 @@ const lunarisChangelog = [
|
||||
'Sleek Neon Seekbar with live network buffer progress indicator.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.10',
|
||||
title: 'Fix "and" Tag Operator Retention, Suggestion Preceding Drafts & AND Chip Styling',
|
||||
bullets: [
|
||||
@@ -213,7 +410,7 @@ const lunarisChangelog = [
|
||||
'Distinct visual styling for AND separator chips with secondary theme container and alt-route icon.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.9',
|
||||
title: 'Instant Tag Suggestions, Persistent Disk Cache, Expanded History & Match Highlighting',
|
||||
bullets: [
|
||||
@@ -227,7 +424,7 @@ const lunarisChangelog = [
|
||||
'Dedicated Clear Tag Cache actions in Settings and Cache Manager.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.8',
|
||||
title: 'Shared Context Modifiers for Multi-Tag Search & Clean Tag Filtering',
|
||||
bullets: [
|
||||
@@ -236,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.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.7',
|
||||
title: 'Independent Multi-Tag Search Streams, Local "and" Connector, Pawchive in Main Feed & Reverts',
|
||||
bullets: [
|
||||
@@ -247,7 +444,7 @@ const lunarisChangelog = [
|
||||
'Removed external linked accounts bar from artist posts screen.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.6',
|
||||
title: 'Pawchive Deep Integration: Global Posts Feed, Artist Tags, Announcements, Links & Server Media Filter',
|
||||
bullets: [
|
||||
@@ -258,7 +455,7 @@ const lunarisChangelog = [
|
||||
'Server-side media filtering (Photos, Videos, GIFs) querying the entire author archive through the API.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.5',
|
||||
title: '10 QoL Super-Update: AMOLED, Dynamic Colors, Grid switch, Share, Presets, Cache & Backup',
|
||||
bullets: [
|
||||
@@ -273,7 +470,7 @@ const lunarisChangelog = [
|
||||
'Full JSON backup export and import for seamless configuration sync.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.4',
|
||||
title: 'Platform service selection & media type filtering in artist posts',
|
||||
bullets: [
|
||||
@@ -282,7 +479,7 @@ const lunarisChangelog = [
|
||||
'Full-screen post pager respects active media type filters during swiping.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.3',
|
||||
title: 'Infinite artist pagination, favorite artists modal, and card layout polish',
|
||||
bullets: [
|
||||
@@ -292,7 +489,7 @@ const lunarisChangelog = [
|
||||
'Removed mapping truncation in Pawchive provider to deliver all post attachments cleanly.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.2',
|
||||
title: 'Swipeable media pager, favorite artists, performance and Pawchive',
|
||||
bullets: [
|
||||
@@ -304,7 +501,7 @@ const lunarisChangelog = [
|
||||
'In-app update checks and downloads connected directly to RarDog GitHub releases.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.1',
|
||||
title: 'Localization, zoom and favorite downloads',
|
||||
bullets: [
|
||||
@@ -315,7 +512,7 @@ const lunarisChangelog = [
|
||||
'Favorites can optionally auto-download media in the background, with local files tracked separately from favorites.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '2.0.0',
|
||||
title: 'Customization and provider polish',
|
||||
bullets: [
|
||||
@@ -326,7 +523,7 @@ const lunarisChangelog = [
|
||||
'Kemono and Coomer creator search uses the current mbahArip keyword endpoints with public API fallbacks.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '1.1.2',
|
||||
title: 'Experimental tag and Artists update',
|
||||
bullets: [
|
||||
@@ -336,7 +533,7 @@ const lunarisChangelog = [
|
||||
'This is an experimental release for checking the new tag and Artists behavior.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '1.1.1',
|
||||
title: 'Artists and in-app updates',
|
||||
bullets: [
|
||||
@@ -346,7 +543,7 @@ const lunarisChangelog = [
|
||||
'Tag input keeps its scroll position steadier while typing and committing chips.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '1.1.0',
|
||||
title: 'Lunaris rebrand and providers',
|
||||
bullets: [
|
||||
@@ -356,7 +553,7 @@ const lunarisChangelog = [
|
||||
'Video player UI preferences are saved across fullscreen, details and restarts.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '1.0.2',
|
||||
title: 'Provider safety fix',
|
||||
bullets: [
|
||||
@@ -365,7 +562,7 @@ const lunarisChangelog = [
|
||||
'Existing enabled legacy configs are disabled so the main feed is not polluted by known-offline APIs.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '1.0.1',
|
||||
title: 'Mobile polish',
|
||||
bullets: [
|
||||
@@ -374,7 +571,7 @@ const lunarisChangelog = [
|
||||
'Tag chip input no longer jumps while typing.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '1.0.0',
|
||||
title: 'Stable 1.0',
|
||||
bullets: [
|
||||
@@ -384,7 +581,7 @@ const lunarisChangelog = [
|
||||
'Windows portable package is published alongside APK and installer.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
PrismaChange(
|
||||
version: '0.4.3',
|
||||
title: 'Bugfixes',
|
||||
bullets: [
|
||||
@@ -396,8 +593,8 @@ const lunarisChangelog = [
|
||||
),
|
||||
];
|
||||
|
||||
class LunarisChange {
|
||||
const LunarisChange({
|
||||
class PrismaChange {
|
||||
const PrismaChange({
|
||||
required this.version,
|
||||
required this.title,
|
||||
required this.bullets,
|
||||
@@ -407,3 +604,6 @@ class LunarisChange {
|
||||
final String title;
|
||||
final List<String> bullets;
|
||||
}
|
||||
|
||||
const lunarisChangelog = prismaChangelog;
|
||||
typedef LunarisChange = PrismaChange;
|
||||
|
||||
+14
-4
@@ -1,3 +1,5 @@
|
||||
import 'dart:io';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
|
||||
class AppBreakpoints {
|
||||
@@ -6,11 +8,19 @@ class AppBreakpoints {
|
||||
}
|
||||
|
||||
class Responsive {
|
||||
static bool isMobile(BuildContext context) =>
|
||||
MediaQuery.sizeOf(context).width < AppBreakpoints.mobile;
|
||||
static bool isMobile(BuildContext context) {
|
||||
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||
return MediaQuery.sizeOf(context).shortestSide < 600;
|
||||
}
|
||||
return MediaQuery.sizeOf(context).width < AppBreakpoints.mobile;
|
||||
}
|
||||
|
||||
static bool isDesktop(BuildContext context) =>
|
||||
MediaQuery.sizeOf(context).width >= AppBreakpoints.desktop;
|
||||
static bool isDesktop(BuildContext context) {
|
||||
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||
return MediaQuery.sizeOf(context).shortestSide >= 600;
|
||||
}
|
||||
return MediaQuery.sizeOf(context).width >= AppBreakpoints.desktop;
|
||||
}
|
||||
|
||||
static int columnsFor(
|
||||
BuildContext context, {
|
||||
|
||||
@@ -8,6 +8,7 @@ export 'models/artist_tag.dart';
|
||||
export 'models/artist_link.dart';
|
||||
export 'models/artist_announcement.dart';
|
||||
export 'models/cloud_media_link.dart';
|
||||
export 'models/creator_link.dart';
|
||||
export 'models/download_task.dart';
|
||||
export 'models/downloaded_media.dart';
|
||||
export 'models/favorite.dart';
|
||||
|
||||
@@ -224,7 +224,7 @@ final updateServiceProvider = Provider<UpdateService>((ref) {
|
||||
connectTimeout: const Duration(seconds: 12),
|
||||
receiveTimeout: const Duration(seconds: 12),
|
||||
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',
|
||||
},
|
||||
),
|
||||
|
||||
@@ -0,0 +1,332 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
enum CreatorLinkType {
|
||||
youtube,
|
||||
twitter,
|
||||
instagram,
|
||||
tiktok,
|
||||
discord,
|
||||
pixiv,
|
||||
fanbox,
|
||||
patreon,
|
||||
fantia,
|
||||
boosty,
|
||||
twitch,
|
||||
telegram,
|
||||
gumroad,
|
||||
subscribestar,
|
||||
artstation,
|
||||
deviantart,
|
||||
linkhub,
|
||||
other,
|
||||
}
|
||||
|
||||
class CreatorLink {
|
||||
const CreatorLink({
|
||||
required this.url,
|
||||
required this.type,
|
||||
required this.title,
|
||||
this.customLabel,
|
||||
});
|
||||
|
||||
final String url;
|
||||
final CreatorLinkType type;
|
||||
final String title;
|
||||
final String? customLabel;
|
||||
|
||||
String get serviceName {
|
||||
switch (type) {
|
||||
case CreatorLinkType.youtube:
|
||||
return 'YouTube';
|
||||
case CreatorLinkType.twitter:
|
||||
return 'X (Twitter)';
|
||||
case CreatorLinkType.instagram:
|
||||
return 'Instagram';
|
||||
case CreatorLinkType.tiktok:
|
||||
return 'TikTok';
|
||||
case CreatorLinkType.discord:
|
||||
return 'Discord';
|
||||
case CreatorLinkType.pixiv:
|
||||
return 'Pixiv';
|
||||
case CreatorLinkType.fanbox:
|
||||
return 'Fanbox';
|
||||
case CreatorLinkType.patreon:
|
||||
return 'Patreon';
|
||||
case CreatorLinkType.fantia:
|
||||
return 'Fantia';
|
||||
case CreatorLinkType.boosty:
|
||||
return 'Boosty';
|
||||
case CreatorLinkType.twitch:
|
||||
return 'Twitch';
|
||||
case CreatorLinkType.telegram:
|
||||
return 'Telegram';
|
||||
case CreatorLinkType.gumroad:
|
||||
return 'Gumroad';
|
||||
case CreatorLinkType.subscribestar:
|
||||
return 'SubscribeStar';
|
||||
case CreatorLinkType.artstation:
|
||||
return 'ArtStation';
|
||||
case CreatorLinkType.deviantart:
|
||||
return 'DeviantArt';
|
||||
case CreatorLinkType.linkhub:
|
||||
return 'Links Hub';
|
||||
case CreatorLinkType.other:
|
||||
return title.isNotEmpty ? title : 'Web Link';
|
||||
}
|
||||
}
|
||||
|
||||
Color get brandColor {
|
||||
switch (type) {
|
||||
case CreatorLinkType.youtube:
|
||||
return const Color(0xFFFF0000); // YouTube Red
|
||||
case CreatorLinkType.twitter:
|
||||
return const Color(0xFF1D9BF0); // Twitter Blue
|
||||
case CreatorLinkType.instagram:
|
||||
return const Color(0xFFE1306C); // Instagram Gradient Magenta
|
||||
case CreatorLinkType.tiktok:
|
||||
return const Color(0xFF00F2FE); // TikTok Cyan
|
||||
case CreatorLinkType.discord:
|
||||
return const Color(0xFF5865F2); // Discord Blurple
|
||||
case CreatorLinkType.pixiv:
|
||||
return const Color(0xFF0096FA); // Pixiv Blue
|
||||
case CreatorLinkType.fanbox:
|
||||
return const Color(0xFFF1A12F); // Fanbox Orange
|
||||
case CreatorLinkType.patreon:
|
||||
return const Color(0xFFFF424D); // Patreon Coral
|
||||
case CreatorLinkType.fantia:
|
||||
return const Color(0xFFE0245E); // Fantia Pink
|
||||
case CreatorLinkType.boosty:
|
||||
return const Color(0xFFF15A24); // Boosty Orange
|
||||
case CreatorLinkType.twitch:
|
||||
return const Color(0xFF9146FF); // Twitch Purple
|
||||
case CreatorLinkType.telegram:
|
||||
return const Color(0xFF2AABEE); // Telegram Blue
|
||||
case CreatorLinkType.gumroad:
|
||||
return const Color(0xFFFF90E8); // Gumroad Pink
|
||||
case CreatorLinkType.subscribestar:
|
||||
return const Color(0xFF00ADB5); // SubscribeStar Teal
|
||||
case CreatorLinkType.artstation:
|
||||
return const Color(0xFF13AFF0); // ArtStation Blue
|
||||
case CreatorLinkType.deviantart:
|
||||
return const Color(0xFF05CC47); // DeviantArt Green
|
||||
case CreatorLinkType.linkhub:
|
||||
return const Color(0xFF43E660); // Linktree Green
|
||||
case CreatorLinkType.other:
|
||||
return const Color(0xFF5C6BC0); // Indigo
|
||||
}
|
||||
}
|
||||
|
||||
IconData get iconData {
|
||||
switch (type) {
|
||||
case CreatorLinkType.youtube:
|
||||
return Icons.smart_display_rounded;
|
||||
case CreatorLinkType.twitter:
|
||||
return Icons.alternate_email_rounded;
|
||||
case CreatorLinkType.instagram:
|
||||
return Icons.camera_alt_rounded;
|
||||
case CreatorLinkType.tiktok:
|
||||
return Icons.music_note_rounded;
|
||||
case CreatorLinkType.discord:
|
||||
return Icons.forum_rounded;
|
||||
case CreatorLinkType.pixiv:
|
||||
return Icons.palette_rounded;
|
||||
case CreatorLinkType.fanbox:
|
||||
return Icons.favorite_rounded;
|
||||
case CreatorLinkType.patreon:
|
||||
return Icons.volunteer_activism_rounded;
|
||||
case CreatorLinkType.fantia:
|
||||
return Icons.stars_rounded;
|
||||
case CreatorLinkType.boosty:
|
||||
return Icons.rocket_launch_rounded;
|
||||
case CreatorLinkType.twitch:
|
||||
return Icons.live_tv_rounded;
|
||||
case CreatorLinkType.telegram:
|
||||
return Icons.send_rounded;
|
||||
case CreatorLinkType.gumroad:
|
||||
return Icons.shopping_bag_rounded;
|
||||
case CreatorLinkType.subscribestar:
|
||||
return Icons.star_rounded;
|
||||
case CreatorLinkType.artstation:
|
||||
case CreatorLinkType.deviantart:
|
||||
return Icons.brush_rounded;
|
||||
case CreatorLinkType.linkhub:
|
||||
return Icons.link_rounded;
|
||||
case CreatorLinkType.other:
|
||||
return Icons.language_rounded;
|
||||
}
|
||||
}
|
||||
|
||||
static final _urlRegex = RegExp(
|
||||
r'''https?://[^\s<>"{}|\\^`\[\]]+''',
|
||||
caseSensitive: false,
|
||||
);
|
||||
|
||||
static final _htmlLinkRegex = RegExp(
|
||||
r"""<a\s+[^>]*href=["']([^"']+)["'][^>]*>(.*?)</a>""",
|
||||
caseSensitive: false,
|
||||
dotAll: true,
|
||||
);
|
||||
|
||||
static const _cloudDriveHosts = {
|
||||
'drive.google.com',
|
||||
'mega.nz',
|
||||
'mega.co.nz',
|
||||
'dropbox.com',
|
||||
'pixeldrain.com',
|
||||
'mediafire.com',
|
||||
'catbox.moe',
|
||||
'bunkr.',
|
||||
'gofile.io',
|
||||
'terabox.com',
|
||||
'1024tera.com',
|
||||
'dubox.com',
|
||||
};
|
||||
|
||||
/// Extracts all social media, creator profiles and external web links from text.
|
||||
static List<CreatorLink> extractLinks(
|
||||
String? text, {
|
||||
bool excludeCloudDrives = true,
|
||||
}) {
|
||||
if (text == null || text.trim().isEmpty) return const [];
|
||||
final results = <CreatorLink>[];
|
||||
final seenUrls = <String>{};
|
||||
|
||||
void processUrl(String rawUrl, {String? customTitle}) {
|
||||
var url = rawUrl.trim();
|
||||
while (url.isNotEmpty &&
|
||||
(url.endsWith(')') ||
|
||||
url.endsWith('.') ||
|
||||
url.endsWith(',') ||
|
||||
url.endsWith(';') ||
|
||||
url.endsWith('!') ||
|
||||
url.endsWith('?') ||
|
||||
url.endsWith(':') ||
|
||||
url.endsWith('>'))) {
|
||||
url = url.substring(0, url.length - 1);
|
||||
}
|
||||
final uri = Uri.tryParse(url);
|
||||
if (uri == null || !uri.hasScheme || !uri.scheme.startsWith('http')) {
|
||||
return;
|
||||
}
|
||||
if (seenUrls.contains(url)) return;
|
||||
seenUrls.add(url);
|
||||
|
||||
final host = uri.host.toLowerCase();
|
||||
if (excludeCloudDrives) {
|
||||
if (_cloudDriveHosts.any((ch) => host.contains(ch))) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
final (type, defaultTitle) = _classifyHost(uri);
|
||||
results.add(CreatorLink(
|
||||
url: url,
|
||||
type: type,
|
||||
title: (customTitle != null && customTitle.isNotEmpty && customTitle != url)
|
||||
? customTitle
|
||||
: defaultTitle,
|
||||
));
|
||||
}
|
||||
|
||||
// 1. Process HTML anchors
|
||||
if (text.contains('<a ')) {
|
||||
for (final match in _htmlLinkRegex.allMatches(text)) {
|
||||
final href = match.group(1);
|
||||
final rawTitle = match.group(2);
|
||||
final cleanTitle =
|
||||
rawTitle?.replaceAll(RegExp(r'<[^>]*>'), '').trim() ?? '';
|
||||
if (href != null && href.isNotEmpty) {
|
||||
processUrl(href, customTitle: cleanTitle.isNotEmpty ? cleanTitle : null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Process all plain URLs
|
||||
for (final match in _urlRegex.allMatches(text)) {
|
||||
final url = match.group(0);
|
||||
if (url != null) processUrl(url);
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
static (CreatorLinkType, String) _classifyHost(Uri uri) {
|
||||
final host = uri.host.toLowerCase();
|
||||
|
||||
// YouTube
|
||||
if (host.contains('youtube.com') || host.contains('youtu.be')) {
|
||||
return (CreatorLinkType.youtube, 'YouTube');
|
||||
}
|
||||
// X / Twitter
|
||||
if (host.contains('twitter.com') || host.contains('x.com') || host == 't.co') {
|
||||
return (CreatorLinkType.twitter, 'X (Twitter)');
|
||||
}
|
||||
// Instagram
|
||||
if (host.contains('instagram.com') || host.contains('instagr.am')) {
|
||||
return (CreatorLinkType.instagram, 'Instagram');
|
||||
}
|
||||
// TikTok
|
||||
if (host.contains('tiktok.com')) {
|
||||
return (CreatorLinkType.tiktok, 'TikTok');
|
||||
}
|
||||
// Discord
|
||||
if (host.contains('discord.gg') || host.contains('discord.com')) {
|
||||
return (CreatorLinkType.discord, 'Discord');
|
||||
}
|
||||
// Pixiv
|
||||
if (host.contains('pixiv.net')) {
|
||||
return (CreatorLinkType.pixiv, 'Pixiv');
|
||||
}
|
||||
// Fanbox
|
||||
if (host.contains('fanbox.cc')) {
|
||||
return (CreatorLinkType.fanbox, 'Fanbox');
|
||||
}
|
||||
// Patreon
|
||||
if (host.contains('patreon.com')) {
|
||||
return (CreatorLinkType.patreon, 'Patreon');
|
||||
}
|
||||
// Fantia
|
||||
if (host.contains('fantia.jp')) {
|
||||
return (CreatorLinkType.fantia, 'Fantia');
|
||||
}
|
||||
// Boosty
|
||||
if (host.contains('boosty.to')) {
|
||||
return (CreatorLinkType.boosty, 'Boosty');
|
||||
}
|
||||
// Twitch
|
||||
if (host.contains('twitch.tv')) {
|
||||
return (CreatorLinkType.twitch, 'Twitch');
|
||||
}
|
||||
// Telegram
|
||||
if (host.contains('t.me') || host.contains('telegram.me')) {
|
||||
return (CreatorLinkType.telegram, 'Telegram');
|
||||
}
|
||||
// Gumroad
|
||||
if (host.contains('gumroad.com')) {
|
||||
return (CreatorLinkType.gumroad, 'Gumroad');
|
||||
}
|
||||
// SubscribeStar
|
||||
if (host.contains('subscribestar.adult') || host.contains('subscribestar.com')) {
|
||||
return (CreatorLinkType.subscribestar, 'SubscribeStar');
|
||||
}
|
||||
// ArtStation
|
||||
if (host.contains('artstation.com')) {
|
||||
return (CreatorLinkType.artstation, 'ArtStation');
|
||||
}
|
||||
// DeviantArt
|
||||
if (host.contains('deviantart.com')) {
|
||||
return (CreatorLinkType.deviantart, 'DeviantArt');
|
||||
}
|
||||
// Link hubs
|
||||
if (host.contains('linktr.ee') || host.contains('carrd.co') || host.contains('lit.link')) {
|
||||
return (CreatorLinkType.linkhub, 'Links Hub');
|
||||
}
|
||||
|
||||
// Default clean host name
|
||||
var cleanHost = host.replaceFirst(RegExp(r'^www\.'), '');
|
||||
if (cleanHost.length > 25) {
|
||||
cleanHost = cleanHost.substring(0, 25);
|
||||
}
|
||||
return (CreatorLinkType.other, cleanHost.isNotEmpty ? cleanHost : 'Web Link');
|
||||
}
|
||||
}
|
||||
@@ -60,11 +60,21 @@ class Post {
|
||||
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 {
|
||||
return tags.where((tag) {
|
||||
final t = tag.trim();
|
||||
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.contains('"url"') || t.contains('"service"')) return false;
|
||||
if (t.startsWith('http://') || t.startsWith('https://')) return false;
|
||||
|
||||
@@ -46,7 +46,7 @@ class GelbooruProvider
|
||||
Map<String, String> mediaHeaders(Post post) {
|
||||
final host = Uri.tryParse(baseUrl)?.host;
|
||||
return {
|
||||
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser',
|
||||
'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
|
||||
'Accept': '*/*',
|
||||
if (host != null && host.isNotEmpty) 'Referer': '$baseUrl/',
|
||||
};
|
||||
|
||||
@@ -30,7 +30,7 @@ class KemonoProvider
|
||||
receiveTimeout: const Duration(seconds: 20),
|
||||
headers: const {
|
||||
'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
|
||||
Future<List<ArtistAnnouncement>> getArtistAnnouncements(
|
||||
String service, String artistId) async =>
|
||||
const [];
|
||||
String service, String artistId) async {
|
||||
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';
|
||||
|
||||
@@ -385,17 +400,23 @@ class KemonoProvider
|
||||
}
|
||||
|
||||
// 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 firstStreamable =
|
||||
cloudLinks.where((l) => l.isStreamable).firstOrNull;
|
||||
final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null;
|
||||
final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? '';
|
||||
final isTextOnly = cloudLinks.isEmpty;
|
||||
final tags = [
|
||||
query.service,
|
||||
query.artistName,
|
||||
if (title.trim().isNotEmpty) title.trim(),
|
||||
'cloud_mirror',
|
||||
if (!isTextOnly) 'cloud_mirror' else 'text_post',
|
||||
];
|
||||
return [
|
||||
Post(
|
||||
@@ -411,14 +432,19 @@ class KemonoProvider
|
||||
height: 0,
|
||||
source: postSource,
|
||||
createdAt: published,
|
||||
fileType: firstStreamable != null ? 'video' : 'link',
|
||||
fileType: firstStreamable != null
|
||||
? 'video'
|
||||
: (isTextOnly ? 'text' : 'link'),
|
||||
score: 0,
|
||||
tagGroups: {
|
||||
'artist': [query.artistName],
|
||||
'meta': [query.service],
|
||||
if (title.trim().isNotEmpty) 'copyright': [title.trim()],
|
||||
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),
|
||||
headers: const {
|
||||
'Accept': 'application/json',
|
||||
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser',
|
||||
'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
@@ -418,17 +418,23 @@ class PawchiveProvider
|
||||
}
|
||||
|
||||
// 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 firstStreamable =
|
||||
cloudLinks.where((l) => l.isStreamable).firstOrNull;
|
||||
final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null;
|
||||
final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? '';
|
||||
final isTextOnly = cloudLinks.isEmpty;
|
||||
final tags = [
|
||||
query.service,
|
||||
query.artistName,
|
||||
if (title.trim().isNotEmpty) title.trim(),
|
||||
'cloud_mirror',
|
||||
if (!isTextOnly) 'cloud_mirror' else 'text_post',
|
||||
];
|
||||
return [
|
||||
Post(
|
||||
@@ -444,14 +450,19 @@ class PawchiveProvider
|
||||
height: 0,
|
||||
source: postSource,
|
||||
createdAt: published,
|
||||
fileType: firstStreamable != null ? 'video' : 'link',
|
||||
fileType: firstStreamable != null
|
||||
? 'video'
|
||||
: (isTextOnly ? 'text' : 'link'),
|
||||
score: 0,
|
||||
tagGroups: {
|
||||
'artist': [query.artistName],
|
||||
'meta': [query.service],
|
||||
if (title.trim().isNotEmpty) 'copyright': [title.trim()],
|
||||
if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
|
||||
if (cleanDesc.isNotEmpty) 'description': [cleanDesc],
|
||||
if (cleanDesc.isNotEmpty)
|
||||
'description': [cleanDesc]
|
||||
else if (rawContent.trim().isNotEmpty)
|
||||
'description': [rawContent.trim()],
|
||||
},
|
||||
),
|
||||
];
|
||||
|
||||
@@ -169,7 +169,16 @@ class ProviderManager {
|
||||
|
||||
for (final raw in rawTags) {
|
||||
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.toLowerCase() == 'and') {
|
||||
@@ -560,7 +569,7 @@ class ProviderManager {
|
||||
);
|
||||
}
|
||||
return const Success({
|
||||
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser',
|
||||
'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
|
||||
'Accept': '*/*',
|
||||
});
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ class Rule34Provider extends GelbooruProvider {
|
||||
|
||||
@override
|
||||
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': '*/*',
|
||||
'Referer': 'https://rule34.xxx/',
|
||||
};
|
||||
|
||||
@@ -60,7 +60,7 @@ class ProviderRepository {
|
||||
priority: 3,
|
||||
timeoutSeconds: 20,
|
||||
customHeaders: const {
|
||||
'User-Agent': 'Lunaris/2.0.2 Flutter local booru browser',
|
||||
'User-Agent': 'Prisma/2.0.2 Flutter local booru browser',
|
||||
},
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
@@ -74,7 +74,7 @@ class ProviderRepository {
|
||||
priority: 4,
|
||||
timeoutSeconds: 20,
|
||||
customHeaders: const {
|
||||
'User-Agent': 'Lunaris/2.0.2 Flutter local booru browser',
|
||||
'User-Agent': 'Prisma/2.0.2 Flutter local booru browser',
|
||||
},
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
|
||||
@@ -12,6 +12,15 @@ class SearchRepository {
|
||||
|
||||
Future<Result<void>> save(SearchHistory history, {int maxItems = 500}) {
|
||||
return _databaseService.safeWrite((isar) async {
|
||||
final norm = history.query.trim().toLowerCase();
|
||||
// Remove any existing duplicate records with same query
|
||||
final all = await isar.searchHistoryEntitys.where().findAll();
|
||||
for (final item in all) {
|
||||
if (item.query.trim().toLowerCase() == norm) {
|
||||
await isar.searchHistoryEntitys.delete(item.isarId);
|
||||
}
|
||||
}
|
||||
|
||||
await isar.searchHistoryEntitys.put(
|
||||
SearchHistoryEntity()
|
||||
..historyId = history.id
|
||||
@@ -42,13 +51,40 @@ class SearchRepository {
|
||||
return _databaseService.safeRead((isar) async {
|
||||
final items = await isar.searchHistoryEntitys.where().findAll();
|
||||
items.sort((a, b) => b.searchedAt.compareTo(a.searchedAt));
|
||||
final limited = limit == null ? items : items.take(limit);
|
||||
|
||||
final seen = <String>{};
|
||||
final deduplicated = <SearchHistoryEntity>[];
|
||||
for (final item in items) {
|
||||
final key = item.query.trim().toLowerCase();
|
||||
if (key.isEmpty) continue;
|
||||
if (seen.add(key)) {
|
||||
deduplicated.add(item);
|
||||
}
|
||||
}
|
||||
|
||||
final limited = limit == null ? deduplicated : deduplicated.take(limit);
|
||||
return limited.map((entity) => entity.toModel()).toList();
|
||||
});
|
||||
}
|
||||
|
||||
Future<Result<bool>> delete(String historyId) {
|
||||
return _databaseService.safeWrite((isar) async {
|
||||
final target = await isar.searchHistoryEntitys
|
||||
.where()
|
||||
.filter()
|
||||
.historyIdEqualTo(historyId)
|
||||
.findFirst();
|
||||
if (target != null) {
|
||||
final norm = target.query.trim().toLowerCase();
|
||||
final all = await isar.searchHistoryEntitys.where().findAll();
|
||||
for (final item in all) {
|
||||
if (item.query.trim().toLowerCase() == norm ||
|
||||
item.historyId == historyId) {
|
||||
await isar.searchHistoryEntitys.delete(item.isarId);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return await isar.searchHistoryEntitys.deleteByHistoryId(historyId);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -52,13 +52,13 @@ class BackupService {
|
||||
Future<bool> exportBackup() async {
|
||||
final json = await createBackupJson();
|
||||
final fileName =
|
||||
'lunaris_backup_${DateTime.now().millisecondsSinceEpoch}.json';
|
||||
'prisma_backup_${DateTime.now().millisecondsSinceEpoch}.json';
|
||||
|
||||
if (Platform.isAndroid) {
|
||||
final tempDir = await getTemporaryDirectory();
|
||||
final file = File('${tempDir.path}/$fileName');
|
||||
await file.writeAsString(json);
|
||||
await Share.shareXFiles([XFile(file.path)], text: 'Lunaris Backup');
|
||||
await Share.shareXFiles([XFile(file.path)], text: 'Prisma Backup');
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -224,7 +224,7 @@ class DownloadService {
|
||||
return {
|
||||
'User-Agent': lower.contains('realbooru') || lower.contains('paheal')
|
||||
? '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')
|
||||
? 'video/webm,video/mp4,image/avif,image/webp,image/apng,image/*,*/*;q=0.8'
|
||||
: '*/*',
|
||||
|
||||
@@ -94,7 +94,7 @@ class PawchiveSyncService {
|
||||
followRedirects: false,
|
||||
validateStatus: (status) => status != null && status < 500,
|
||||
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',
|
||||
},
|
||||
),
|
||||
@@ -231,7 +231,7 @@ class PawchiveSyncService {
|
||||
headers: {
|
||||
'Cookie': 'session=$cleanCookie',
|
||||
'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,
|
||||
),
|
||||
@@ -509,7 +509,7 @@ class PawchiveSyncService {
|
||||
final options = Options(
|
||||
headers: {
|
||||
'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) =>
|
||||
status != null && (status == 200 || status == 201 || status == 204),
|
||||
|
||||
@@ -21,10 +21,7 @@ class SearchService {
|
||||
TagCacheService? get tagCacheService => _tagCacheService;
|
||||
|
||||
static String sanitizeToken(String raw) {
|
||||
return raw
|
||||
.replaceAll(RegExp(r'^[\(\)]+|[\(\)]+$'), '')
|
||||
.trim()
|
||||
.toLowerCase();
|
||||
return raw.trim().toLowerCase();
|
||||
}
|
||||
|
||||
List<String> parseTags(String query) {
|
||||
|
||||
@@ -39,6 +39,7 @@ class AppSettings {
|
||||
required this.motionRefreshMode,
|
||||
required this.autoBatterySaver60Hz,
|
||||
required this.videoPlayerMuted,
|
||||
this.videoPlayerVolume = 100.0,
|
||||
required this.videoPlayerHalfVolume,
|
||||
required this.videoPlayerLoop,
|
||||
required this.videoPlayerCover,
|
||||
@@ -94,6 +95,7 @@ class AppSettings {
|
||||
final String motionRefreshMode;
|
||||
final bool autoBatterySaver60Hz;
|
||||
final bool videoPlayerMuted;
|
||||
final double videoPlayerVolume;
|
||||
final bool videoPlayerHalfVolume;
|
||||
final bool videoPlayerLoop;
|
||||
final bool videoPlayerCover;
|
||||
@@ -146,6 +148,7 @@ class AppSettings {
|
||||
motionRefreshMode: 'auto',
|
||||
autoBatterySaver60Hz: true,
|
||||
videoPlayerMuted: false,
|
||||
videoPlayerVolume: 100.0,
|
||||
videoPlayerHalfVolume: false,
|
||||
videoPlayerLoop: false,
|
||||
videoPlayerCover: false,
|
||||
@@ -191,6 +194,7 @@ class AppSettings {
|
||||
String? motionRefreshMode,
|
||||
bool? autoBatterySaver60Hz,
|
||||
bool? videoPlayerMuted,
|
||||
double? videoPlayerVolume,
|
||||
bool? videoPlayerHalfVolume,
|
||||
bool? videoPlayerLoop,
|
||||
bool? videoPlayerCover,
|
||||
@@ -252,6 +256,7 @@ class AppSettings {
|
||||
motionRefreshMode: motionRefreshMode ?? this.motionRefreshMode,
|
||||
autoBatterySaver60Hz: autoBatterySaver60Hz ?? this.autoBatterySaver60Hz,
|
||||
videoPlayerMuted: videoPlayerMuted ?? this.videoPlayerMuted,
|
||||
videoPlayerVolume: videoPlayerVolume ?? this.videoPlayerVolume,
|
||||
videoPlayerHalfVolume:
|
||||
videoPlayerHalfVolume ?? this.videoPlayerHalfVolume,
|
||||
videoPlayerLoop: videoPlayerLoop ?? this.videoPlayerLoop,
|
||||
@@ -309,6 +314,7 @@ class AppSettings {
|
||||
'motionRefreshMode': motionRefreshMode,
|
||||
'autoBatterySaver60Hz': autoBatterySaver60Hz,
|
||||
'videoPlayerMuted': videoPlayerMuted,
|
||||
'videoPlayerVolume': videoPlayerVolume,
|
||||
'videoPlayerHalfVolume': videoPlayerHalfVolume,
|
||||
'videoPlayerLoop': videoPlayerLoop,
|
||||
'videoPlayerCover': videoPlayerCover,
|
||||
@@ -392,6 +398,8 @@ class AppSettings {
|
||||
defaults.autoBatterySaver60Hz,
|
||||
videoPlayerMuted:
|
||||
(json['videoPlayerMuted'] as bool?) ?? defaults.videoPlayerMuted,
|
||||
videoPlayerVolume: (json['videoPlayerVolume'] as num?)?.toDouble() ??
|
||||
defaults.videoPlayerVolume,
|
||||
videoPlayerHalfVolume: (json['videoPlayerHalfVolume'] as bool?) ??
|
||||
defaults.videoPlayerHalfVolume,
|
||||
videoPlayerLoop:
|
||||
@@ -601,6 +609,17 @@ class SettingsService {
|
||||
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 {
|
||||
final result = await getSettings();
|
||||
if (result is Error<AppSettings>) return Error(result.failure);
|
||||
@@ -655,7 +674,7 @@ class SettingsService {
|
||||
return Success(
|
||||
const JsonEncoder.withIndent(' ').convert({
|
||||
'app': {
|
||||
'name': 'Lunaris',
|
||||
'name': 'Prisma',
|
||||
'version': appVersion,
|
||||
'build': buildNumber,
|
||||
'generatedAt': DateTime.now().toIso8601String(),
|
||||
|
||||
@@ -25,7 +25,14 @@ class TagCacheService {
|
||||
return _resolvedPath!;
|
||||
}
|
||||
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!;
|
||||
}
|
||||
|
||||
@@ -66,10 +73,11 @@ class TagCacheService {
|
||||
int limit = 16,
|
||||
Iterable<String>? priorityTags,
|
||||
}) {
|
||||
final cleanPrefix = prefix
|
||||
.replaceAll(RegExp(r'^[\(\)]+|[\(\)]+$'), '')
|
||||
.trim()
|
||||
.toLowerCase();
|
||||
var cleanPrefix = prefix.trim().toLowerCase();
|
||||
// If the prefix has an unbalanced opening parenthesis at the start (e.g. '(cat'), strip it
|
||||
if (cleanPrefix.startsWith('(') && !cleanPrefix.contains(')')) {
|
||||
cleanPrefix = cleanPrefix.substring(1).trim();
|
||||
}
|
||||
if (cleanPrefix.isEmpty) return const [];
|
||||
|
||||
final prioritySet = priorityTags
|
||||
|
||||
@@ -18,14 +18,14 @@ class UpdateService {
|
||||
UpdateService(this._dio, this._settingsService);
|
||||
|
||||
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 =
|
||||
'https://gitea.rardogsynapse.online/api/v1/repos/RarDog/Lunaris/releases';
|
||||
'https://gitea.rardogsynapse.online/api/v1/repos/RarDog/Prisma/releases';
|
||||
|
||||
static const githubLatestReleaseUrl =
|
||||
'https://api.github.com/repos/RarDog/Lunaris/releases/latest';
|
||||
'https://api.github.com/repos/RarDog/Prisma/releases/latest';
|
||||
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 releasesUrl = githubReleasesUrl;
|
||||
@@ -111,7 +111,7 @@ class UpdateService {
|
||||
'Authorization': 'token 1c744d6044d756759d7b1f693c94c80cf70d75fa',
|
||||
}
|
||||
: {
|
||||
'User-Agent': 'Lunaris-App',
|
||||
'User-Agent': 'Prisma-App',
|
||||
'Accept': 'application/vnd.github+json',
|
||||
},
|
||||
);
|
||||
@@ -239,10 +239,10 @@ class UpdateService {
|
||||
final fromUrl =
|
||||
parsed?.pathSegments.isEmpty ?? true ? '' : parsed!.pathSegments.last;
|
||||
if (fromUrl.contains('.')) return fromUrl;
|
||||
if (Platform.isAndroid) return 'Lunaris-v${info.version}.apk';
|
||||
if (Platform.isLinux) return 'Lunaris-v${info.version}-linux-x64.tar.gz';
|
||||
if (Platform.isWindows) return 'LunarisSetup-v${info.version}.exe';
|
||||
return 'LunarisPortable-v${info.version}.zip';
|
||||
if (Platform.isAndroid) return 'Prisma-v${info.version}.apk';
|
||||
if (Platform.isLinux) return 'Prisma-v${info.version}-linux-x64.tar.gz';
|
||||
if (Platform.isWindows) return 'PrismaSetup-v${info.version}.exe';
|
||||
return 'PrismaPortable-v${info.version}.zip';
|
||||
}
|
||||
|
||||
static String _versionFromTag(String tag) {
|
||||
|
||||
@@ -40,7 +40,7 @@ class DioClient {
|
||||
receiveTimeout: timeout,
|
||||
sendTimeout: timeout,
|
||||
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',
|
||||
...?headers,
|
||||
},
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
@@ -12,6 +13,7 @@ import '../../../core/utils/result.dart';
|
||||
import '../../../shared/widgets/adaptive_scaffold.dart';
|
||||
import '../../../shared/widgets/empty_view.dart';
|
||||
import '../../../shared/widgets/error_view.dart';
|
||||
import '../../../shared/widgets/formatted_content_text.dart';
|
||||
import '../../../shared/widgets/post_masonry_grid.dart';
|
||||
import '../../favorites/presentation/favorites_controller.dart';
|
||||
import '../../settings/presentation/settings_controller.dart';
|
||||
@@ -190,11 +192,13 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
|
||||
if (_selectedTypes.isEmpty) return true;
|
||||
final isVid = MediaUrlSelector.isVideo(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('gif') && isGif) return true;
|
||||
if (_selectedTypes.contains('photo') && isPhoto) return true;
|
||||
if (_selectedTypes.contains('text') && isText) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -204,86 +208,251 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
showDragHandle: true,
|
||||
backgroundColor: theme.colorScheme.surface,
|
||||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
|
||||
),
|
||||
builder: (ctx) => DraggableScrollableSheet(
|
||||
expand: false,
|
||||
initialChildSize: 0.6,
|
||||
maxChildSize: 0.9,
|
||||
initialChildSize: 0.65,
|
||||
maxChildSize: 0.92,
|
||||
builder: (_, scroll) => Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
|
||||
padding: const EdgeInsets.fromLTRB(20, 4, 16, 12),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(Icons.campaign_rounded, color: theme.colorScheme.primary),
|
||||
const SizedBox(width: 10),
|
||||
Text(
|
||||
'Анонсы автора (${_announcements.length})',
|
||||
style: theme.textTheme.titleMedium?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
Container(
|
||||
width: 44,
|
||||
height: 44,
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.primaryContainer,
|
||||
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(
|
||||
child: ListView.separated(
|
||||
controller: scroll,
|
||||
padding: const EdgeInsets.all(16),
|
||||
itemCount: _announcements.length,
|
||||
separatorBuilder: (_, __) => const Divider(height: 24),
|
||||
itemBuilder: (context, index) {
|
||||
final a = _announcements[index];
|
||||
final cleanContent = CloudLinkExtractor.cleanCommentary(a.content);
|
||||
final detectedLinks = CloudLinkExtractor.extractLinks(content: 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,
|
||||
child: _announcements.isEmpty
|
||||
? Center(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.mark_email_read_outlined,
|
||||
size: 48,
|
||||
color: theme.colorScheme.outline,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
SelectableText(
|
||||
cleanContent.isNotEmpty ? cleanContent : a.content,
|
||||
style: theme.textTheme.bodyMedium?.copyWith(
|
||||
height: 1.45,
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Text(
|
||||
'Нет сообщений или рассылок',
|
||||
style: theme.textTheme.titleSmall?.copyWith(
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (detectedLinks.isNotEmpty) ...[
|
||||
const SizedBox(height: 10),
|
||||
Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 6,
|
||||
children: detectedLinks.map((link) {
|
||||
return ActionChip(
|
||||
avatar: Icon(
|
||||
link.iconData,
|
||||
size: 16,
|
||||
color: link.brandColor,
|
||||
)
|
||||
: ListView.separated(
|
||||
controller: scroll,
|
||||
padding: EdgeInsets.fromLTRB(
|
||||
16,
|
||||
16,
|
||||
16,
|
||||
120 + MediaQuery.paddingOf(context).bottom,
|
||||
),
|
||||
itemCount: _announcements.length,
|
||||
separatorBuilder: (_, __) => const SizedBox(height: 12),
|
||||
itemBuilder: (context, index) {
|
||||
final a = _announcements[index];
|
||||
final cleanContent =
|
||||
CloudLinkExtractor.cleanCommentary(a.content);
|
||||
final detectedCloudLinks =
|
||||
CloudLinkExtractor.extractLinks(content: a.content);
|
||||
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(
|
||||
link.title.isNotEmpty ? link.title : link.serviceName,
|
||||
style: const TextStyle(fontSize: 12),
|
||||
const SizedBox(height: 10),
|
||||
FormattedContentText(
|
||||
text: displayContent,
|
||||
style: theme.textTheme.bodyMedium?.copyWith(
|
||||
height: 1.5,
|
||||
letterSpacing: 0.15,
|
||||
),
|
||||
),
|
||||
onPressed: () => launchUrl(
|
||||
Uri.parse(link.url),
|
||||
mode: LaunchMode.externalApplication,
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
if (creatorLinks.isNotEmpty) ...[
|
||||
const SizedBox(height: 12),
|
||||
CreatorLinkChips(
|
||||
links: creatorLinks,
|
||||
title: 'Ссылки из сообщения',
|
||||
),
|
||||
],
|
||||
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(),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -294,10 +463,14 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
|
||||
Widget _buildMediaTypeFilters() {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
final photoCount = _posts
|
||||
.where((p) => !MediaUrlSelector.isVideo(p) && !MediaUrlSelector.isGif(p))
|
||||
.where((p) =>
|
||||
p.fileType != 'text' &&
|
||||
!MediaUrlSelector.isVideo(p) &&
|
||||
!MediaUrlSelector.isGif(p))
|
||||
.length;
|
||||
final videoCount = _posts.where(MediaUrlSelector.isVideo).length;
|
||||
final gifCount = _posts.where(MediaUrlSelector.isGif).length;
|
||||
final textCount = _posts.where((p) => p.fileType == 'text').length;
|
||||
|
||||
return Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 6, 16, 4),
|
||||
@@ -367,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:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
@@ -176,82 +179,154 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
// Search input bar if active
|
||||
if (_isSearching)
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 8, 16, 4),
|
||||
child: TextField(
|
||||
controller: _searchController,
|
||||
autofocus: true,
|
||||
decoration: InputDecoration(
|
||||
hintText: isRu
|
||||
? 'Поиск по тегам и авторам...'
|
||||
: 'Search by tags and artists...',
|
||||
prefixIcon: const Icon(Icons.search_rounded),
|
||||
suffixIcon: _searchQuery.isNotEmpty
|
||||
? IconButton(
|
||||
icon: const Icon(Icons.clear_rounded),
|
||||
onPressed: () {
|
||||
_searchController.clear();
|
||||
setState(() => _searchQuery = '');
|
||||
},
|
||||
)
|
||||
: null,
|
||||
isDense: true,
|
||||
filled: true,
|
||||
contentPadding: const EdgeInsets.symmetric(
|
||||
horizontal: 16,
|
||||
vertical: 10,
|
||||
),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
borderSide: BorderSide.none,
|
||||
padding: const EdgeInsets.fromLTRB(16, 6, 16, 6),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(18),
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).brightness == Brightness.dark
|
||||
? Theme.of(context).colorScheme.surfaceContainerHigh
|
||||
.withValues(alpha: 0.55)
|
||||
: Colors.white.withValues(alpha: 0.80),
|
||||
borderRadius: BorderRadius.circular(18),
|
||||
border: Border.all(
|
||||
color: Theme.of(context).brightness == Brightness.dark
|
||||
? Colors.white.withValues(alpha: 0.14)
|
||||
: Colors.white.withValues(alpha: 0.85),
|
||||
width: 1.1,
|
||||
),
|
||||
),
|
||||
child: TextField(
|
||||
controller: _searchController,
|
||||
autofocus: true,
|
||||
decoration: InputDecoration(
|
||||
hintText: isRu
|
||||
? 'Поиск по тегам и авторам...'
|
||||
: 'Search by tags and artists...',
|
||||
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: const EdgeInsets.fromLTRB(16, 8, 16, 6),
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
child: SegmentedButton<int>(
|
||||
showSelectedIcon: false,
|
||||
segments: [
|
||||
ButtonSegment(
|
||||
value: 0,
|
||||
icon: const Icon(Icons.favorite_rounded, size: 18),
|
||||
label: Text(
|
||||
'${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,
|
||||
padding: const EdgeInsets.fromLTRB(16, 6, 16, 6),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(
|
||||
alpha: Theme.of(context).brightness == Brightness.dark
|
||||
? 0.20
|
||||
: 0.04,
|
||||
),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
selected: {_tabIndex},
|
||||
onSelectionChanged: (value) {
|
||||
setState(() {
|
||||
_tabIndex = value.first;
|
||||
_selectedArtist = null;
|
||||
});
|
||||
},
|
||||
),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
child: BackdropFilter(
|
||||
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(
|
||||
label: Text(isRu ? 'Все' : 'All'),
|
||||
selected: _mediaFilter == FavoriteMediaType.all,
|
||||
onSelected: (_) => setState(
|
||||
() => _mediaFilter = FavoriteMediaType.all,
|
||||
),
|
||||
onSelected: (_) {
|
||||
HapticFeedback.selectionClick();
|
||||
setState(
|
||||
() => _mediaFilter = FavoriteMediaType.all,
|
||||
);
|
||||
},
|
||||
visualDensity: VisualDensity.compact,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
@@ -275,9 +353,12 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
avatar: const Icon(Icons.videocam_rounded, size: 16),
|
||||
label: Text(isRu ? 'Видео' : 'Videos'),
|
||||
selected: _mediaFilter == FavoriteMediaType.video,
|
||||
onSelected: (_) => setState(
|
||||
() => _mediaFilter = FavoriteMediaType.video,
|
||||
),
|
||||
onSelected: (_) {
|
||||
HapticFeedback.selectionClick();
|
||||
setState(
|
||||
() => _mediaFilter = FavoriteMediaType.video,
|
||||
);
|
||||
},
|
||||
visualDensity: VisualDensity.compact,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
@@ -285,9 +366,12 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
avatar: const Icon(Icons.image_rounded, size: 16),
|
||||
label: Text(isRu ? 'Фото' : 'Images'),
|
||||
selected: _mediaFilter == FavoriteMediaType.image,
|
||||
onSelected: (_) => setState(
|
||||
() => _mediaFilter = FavoriteMediaType.image,
|
||||
),
|
||||
onSelected: (_) {
|
||||
HapticFeedback.selectionClick();
|
||||
setState(
|
||||
() => _mediaFilter = FavoriteMediaType.image,
|
||||
);
|
||||
},
|
||||
visualDensity: VisualDensity.compact,
|
||||
),
|
||||
],
|
||||
@@ -490,31 +574,40 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
}) {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
|
||||
return Container(
|
||||
return _FavoritesLiquidCard(
|
||||
margin: const EdgeInsets.fromLTRB(16, 4, 16, 8),
|
||||
padding: const EdgeInsets.all(14),
|
||||
decoration: BoxDecoration(
|
||||
color: scheme.surfaceContainerHigh,
|
||||
borderRadius: BorderRadius.circular(18),
|
||||
border: Border.all(
|
||||
color: scheme.outlineVariant.withValues(alpha: 0.35),
|
||||
),
|
||||
),
|
||||
glowColor: scheme.primary,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.all(10),
|
||||
width: 40,
|
||||
height: 40,
|
||||
decoration: BoxDecoration(
|
||||
color: scheme.primaryContainer.withValues(alpha: 0.7),
|
||||
gradient: LinearGradient(
|
||||
colors: [
|
||||
scheme.primary,
|
||||
scheme.primary.withValues(alpha: 0.85),
|
||||
],
|
||||
),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: scheme.primary.withValues(alpha: 0.35),
|
||||
blurRadius: 7,
|
||||
offset: const Offset(0, 2.5),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Icon(
|
||||
Icons.offline_pin_rounded,
|
||||
color: scheme.onPrimaryContainer,
|
||||
size: 22,
|
||||
child: const Center(
|
||||
child: Icon(
|
||||
Icons.offline_pin_rounded,
|
||||
color: Colors.white,
|
||||
size: 22,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
@@ -526,6 +619,7 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
'$downloadedCount ${isRu ? 'из' : 'of'} $totalCount ${isRu ? 'офлайн' : 'saved'}',
|
||||
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
@@ -553,21 +647,22 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
if (pendingCount > 0)
|
||||
FilledButton.tonalIcon(
|
||||
onPressed: () async {
|
||||
HapticFeedback.mediumImpact();
|
||||
final dm = ref.read(downloadManagerServiceProvider);
|
||||
for (final p in pendingPosts) {
|
||||
await dm.start(p);
|
||||
}
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
isRu
|
||||
? 'В очередь загрузки добавлено: $pendingCount'
|
||||
: 'Queued $pendingCount downloads',
|
||||
),
|
||||
behavior: SnackBarBehavior.floating,
|
||||
SnackBar(
|
||||
content: Text(
|
||||
isRu
|
||||
? 'В очередь загрузки добавлено: $pendingCount'
|
||||
: 'Queued $pendingCount downloads',
|
||||
),
|
||||
);
|
||||
behavior: SnackBarBehavior.floating,
|
||||
),
|
||||
);
|
||||
},
|
||||
icon: const Icon(Icons.download_rounded, size: 16),
|
||||
label: Text(
|
||||
@@ -594,7 +689,7 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
vertical: 6,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: scheme.secondaryContainer.withValues(alpha: 0.5),
|
||||
color: scheme.primary.withValues(alpha: 0.12),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Row(
|
||||
@@ -610,8 +705,8 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
isRu ? 'Всё готово' : 'Synced',
|
||||
style:
|
||||
Theme.of(context).textTheme.labelSmall?.copyWith(
|
||||
color: scheme.onSecondaryContainer,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: scheme.primary,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -666,27 +761,36 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
ChoiceChip(
|
||||
label: Text(isRu ? 'По дате' : 'Date'),
|
||||
selected: _offlineSort == OfflineSortOption.dateAddedDesc,
|
||||
onSelected: (_) => setState(
|
||||
() => _offlineSort = OfflineSortOption.dateAddedDesc,
|
||||
),
|
||||
onSelected: (_) {
|
||||
HapticFeedback.selectionClick();
|
||||
setState(
|
||||
() => _offlineSort = OfflineSortOption.dateAddedDesc,
|
||||
);
|
||||
},
|
||||
visualDensity: VisualDensity.compact,
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
ChoiceChip(
|
||||
label: Text(isRu ? 'По размеру' : 'Size'),
|
||||
selected: _offlineSort == OfflineSortOption.sizeDesc,
|
||||
onSelected: (_) => setState(
|
||||
() => _offlineSort = OfflineSortOption.sizeDesc,
|
||||
),
|
||||
onSelected: (_) {
|
||||
HapticFeedback.selectionClick();
|
||||
setState(
|
||||
() => _offlineSort = OfflineSortOption.sizeDesc,
|
||||
);
|
||||
},
|
||||
visualDensity: VisualDensity.compact,
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
ChoiceChip(
|
||||
label: Text(isRu ? 'По автору' : 'Artist'),
|
||||
selected: _offlineSort == OfflineSortOption.artist,
|
||||
onSelected: (_) => setState(
|
||||
() => _offlineSort = OfflineSortOption.artist,
|
||||
),
|
||||
onSelected: (_) {
|
||||
HapticFeedback.selectionClick();
|
||||
setState(
|
||||
() => _offlineSort = OfflineSortOption.artist,
|
||||
);
|
||||
},
|
||||
visualDensity: VisualDensity.compact,
|
||||
),
|
||||
],
|
||||
@@ -712,38 +816,50 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
|
||||
return Column(
|
||||
children: [
|
||||
// Artist Header Banner
|
||||
Container(
|
||||
// Artist Header Banner (Liquid Glass)
|
||||
_FavoritesLiquidCard(
|
||||
margin: const EdgeInsets.fromLTRB(16, 4, 16, 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(
|
||||
children: [
|
||||
IconButton(
|
||||
onPressed: () => setState(() => _selectedArtist = null),
|
||||
onPressed: () {
|
||||
HapticFeedback.selectionClick();
|
||||
setState(() => _selectedArtist = null);
|
||||
},
|
||||
icon: const Icon(Icons.arrow_back_rounded),
|
||||
tooltip: isRu ? 'Все авторы' : 'All artists',
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
CircleAvatar(
|
||||
radius: 18,
|
||||
backgroundColor: Theme.of(context).colorScheme.primaryContainer,
|
||||
child: Text(
|
||||
selected.isNotEmpty ? selected[0].toUpperCase() : '?',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Theme.of(context).colorScheme.onPrimaryContainer,
|
||||
Container(
|
||||
width: 38,
|
||||
height: 38,
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
colors: [
|
||||
Theme.of(context).colorScheme.primary,
|
||||
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,
|
||||
style: Theme.of(context).textTheme.titleMedium?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
@@ -776,6 +893,7 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
visualDensity: VisualDensity.compact,
|
||||
),
|
||||
onPressed: () {
|
||||
HapticFeedback.selectionClick();
|
||||
context.push('/search?q=${Uri.encodeComponent('artist:$selected')}');
|
||||
},
|
||||
icon: const Icon(Icons.search_rounded, size: 16),
|
||||
@@ -808,7 +926,9 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
|
||||
}
|
||||
|
||||
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,
|
||||
separatorBuilder: (_, __) => const SizedBox(height: 10),
|
||||
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 {
|
||||
const _ArtistCard({
|
||||
required this.artistName,
|
||||
@@ -881,123 +1078,182 @@ class _ArtistCard extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
|
||||
return Card(
|
||||
elevation: 0,
|
||||
color: scheme.surfaceContainerLow,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
side: BorderSide(
|
||||
color: scheme.outlineVariant.withValues(alpha: 0.3),
|
||||
),
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: isDark
|
||||
? 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: InkWell(
|
||||
onTap: onTap,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(12),
|
||||
child: Row(
|
||||
children: [
|
||||
// Artist Avatar
|
||||
Container(
|
||||
width: 48,
|
||||
height: 48,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
onTap: () {
|
||||
HapticFeedback.selectionClick();
|
||||
onTap();
|
||||
},
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
gradient: LinearGradient(
|
||||
colors: [
|
||||
scheme.primaryContainer,
|
||||
scheme.tertiaryContainer,
|
||||
],
|
||||
begin: Alignment.topLeft,
|
||||
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),
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
artistName.isNotEmpty ? artistName[0].toUpperCase() : '?',
|
||||
style: TextStyle(
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: scheme.onPrimaryContainer,
|
||||
),
|
||||
border: Border.all(
|
||||
color: isDark
|
||||
? Colors.white.withValues(alpha: 0.13)
|
||||
: Colors.white.withValues(alpha: 0.85),
|
||||
width: 1.1,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Artist Name & Count
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
artistName,
|
||||
style: Theme.of(context).textTheme.titleMedium?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
// Artist Squircle Avatar
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 2,
|
||||
),
|
||||
width: 48,
|
||||
height: 48,
|
||||
decoration: BoxDecoration(
|
||||
color: scheme.secondaryContainer.withValues(alpha: 0.5),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
gradient: LinearGradient(
|
||||
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(
|
||||
'$postsCount ${isRu ? 'работ' : 'posts'}',
|
||||
style: Theme.of(context).textTheme.labelSmall?.copyWith(
|
||||
color: scheme.onSecondaryContainer,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// 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,
|
||||
),
|
||||
),
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
artistName.isNotEmpty ? artistName[0].toUpperCase() : '?',
|
||||
style: const TextStyle(
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
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),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -123,14 +123,18 @@ class FeedController extends AsyncNotifier<FeedState> {
|
||||
final settingsRes = await ref.read(settingsServiceProvider).getSettings();
|
||||
final settings =
|
||||
settingsRes is Success<AppSettings> ? settingsRes.data : AppSettings.defaults;
|
||||
await ref
|
||||
.read(searchServiceProvider)
|
||||
.saveSearch(query, 0, maxHistory: settings.searchHistoryLimit);
|
||||
await refresh();
|
||||
final count = state.value?.posts.length ?? 0;
|
||||
await ref
|
||||
.read(searchServiceProvider)
|
||||
.saveSearch(query, count, maxHistory: settings.searchHistoryLimit);
|
||||
try {
|
||||
await refresh();
|
||||
final count = state.value?.posts.length ?? 0;
|
||||
await ref
|
||||
.read(searchServiceProvider)
|
||||
.saveSearch(query, count, maxHistory: settings.searchHistoryLimit);
|
||||
} catch (_) {
|
||||
await ref
|
||||
.read(searchServiceProvider)
|
||||
.saveSearch(query, 0, maxHistory: settings.searchHistoryLimit);
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> updateTagSuggestions(String query) async {
|
||||
|
||||
@@ -374,7 +374,11 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
|
||||
void _submitSearch(String query) {
|
||||
final trimmed = query.trim();
|
||||
if (trimmed.isEmpty) {
|
||||
_clearFilters();
|
||||
if (widget.initialQuery != null) {
|
||||
context.go('/');
|
||||
} else {
|
||||
_applySearchQuery('');
|
||||
}
|
||||
return;
|
||||
}
|
||||
final location = '/?q=${Uri.encodeQueryComponent(trimmed)}';
|
||||
@@ -649,7 +653,7 @@ class _FeedTitle extends StatelessWidget {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
'Lunaris',
|
||||
'Prisma',
|
||||
style: theme.textTheme.titleLarge?.copyWith(
|
||||
fontWeight: FontWeight.w800,
|
||||
),
|
||||
|
||||
@@ -104,7 +104,7 @@ class _FeedToolbarState extends State<FeedToolbar> {
|
||||
},
|
||||
onCleared: () {
|
||||
_query = '';
|
||||
widget.onClearFilters();
|
||||
widget.onSearch('');
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -235,7 +235,7 @@ class _FeedToolbarState extends State<FeedToolbar> {
|
||||
},
|
||||
onCleared: () {
|
||||
_query = '';
|
||||
widget.onClearFilters();
|
||||
widget.onSearch('');
|
||||
},
|
||||
),
|
||||
),
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4,8 +4,10 @@ import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import '../../../../app/app_strings.dart';
|
||||
import '../../../../backend/models/cloud_media_link.dart';
|
||||
import '../../../../backend/models/creator_link.dart';
|
||||
import '../../../../shared/widgets/formatted_content_text.dart';
|
||||
|
||||
class CloudMirrorsCard extends StatelessWidget {
|
||||
class CloudMirrorsCard extends StatefulWidget {
|
||||
const CloudMirrorsCard({
|
||||
super.key,
|
||||
required this.links,
|
||||
@@ -23,9 +25,21 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
final ValueChanged<String>? onDownloadStream;
|
||||
final bool initiallyExpanded;
|
||||
|
||||
@override
|
||||
State<CloudMirrorsCard> createState() => _CloudMirrorsCardState();
|
||||
}
|
||||
|
||||
class _CloudMirrorsCardState extends State<CloudMirrorsCard> {
|
||||
int _selectedTab = 0; // 0: mirrors, 1: commentary
|
||||
|
||||
@override
|
||||
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();
|
||||
}
|
||||
|
||||
@@ -35,6 +49,14 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
.whereType<String>()
|
||||
.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(
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.surfaceContainerLow,
|
||||
@@ -47,20 +69,18 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
child: ExpansionTile(
|
||||
tilePadding: const EdgeInsets.symmetric(horizontal: 14, vertical: 2),
|
||||
childrenPadding: const EdgeInsets.fromLTRB(14, 0, 14, 14),
|
||||
initiallyExpanded: initiallyExpanded,
|
||||
initiallyExpanded: widget.initiallyExpanded,
|
||||
shape: const Border(),
|
||||
collapsedShape: const Border(),
|
||||
leading: Icon(
|
||||
Icons.cloud_sync_rounded,
|
||||
cardIcon,
|
||||
color: theme.colorScheme.primary,
|
||||
),
|
||||
title: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
strings.ru
|
||||
? 'Облачные диски и зеркала (${links.length})'
|
||||
: 'Cloud Mirrors & Drives (${links.length})',
|
||||
cardTitle,
|
||||
style: theme.textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
@@ -75,7 +95,8 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.green.withValues(alpha: 0.15),
|
||||
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(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
@@ -84,7 +105,7 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
size: 13, color: Colors.green),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
strings.ru ? 'Плеер' : 'Stream',
|
||||
widget.strings.ru ? 'Плеер' : 'Stream',
|
||||
style: theme.textTheme.labelSmall?.copyWith(
|
||||
color: Colors.green,
|
||||
fontWeight: FontWeight.bold,
|
||||
@@ -114,7 +135,9 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
Expanded(
|
||||
child: Text.rich(
|
||||
TextSpan(
|
||||
text: strings.ru ? 'Пароль к архиву: ' : 'Archive Password: ',
|
||||
text: widget.strings.ru
|
||||
? 'Пароль к архиву: '
|
||||
: 'Archive Password: ',
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
color: theme.colorScheme.onSurface,
|
||||
),
|
||||
@@ -133,13 +156,15 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
IconButton(
|
||||
icon: const Icon(Icons.copy_rounded, size: 16),
|
||||
visualDensity: VisualDensity.compact,
|
||||
tooltip: strings.ru ? 'Копировать пароль' : 'Copy Password',
|
||||
tooltip: widget.strings.ru
|
||||
? 'Копировать пароль'
|
||||
: 'Copy Password',
|
||||
onPressed: () {
|
||||
Clipboard.setData(ClipboardData(text: detectedPassword));
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
strings.ru
|
||||
widget.strings.ru
|
||||
? 'Пароль скопирован: $detectedPassword'
|
||||
: 'Password copied: $detectedPassword',
|
||||
),
|
||||
@@ -155,50 +180,111 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
const SizedBox(height: 10),
|
||||
],
|
||||
|
||||
// Links list
|
||||
if (links.isNotEmpty) ...[
|
||||
...links.map((link) => _buildLinkTile(context, link, strings)),
|
||||
],
|
||||
|
||||
// Commentary / Description
|
||||
if (commentary != null && commentary!.trim().isNotEmpty) ...[
|
||||
const SizedBox(height: 10),
|
||||
Divider(
|
||||
color: theme.colorScheme.outlineVariant.withValues(alpha: 0.4),
|
||||
height: 1,
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.notes_rounded,
|
||||
size: 16,
|
||||
color: theme.colorScheme.primary,
|
||||
if (hasLinks && hasCommentary) ...[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
child: SegmentedButton<int>(
|
||||
segments: [
|
||||
ButtonSegment(
|
||||
value: 0,
|
||||
icon: const Icon(Icons.cloud_queue_rounded, size: 16),
|
||||
label: Text(
|
||||
widget.strings.ru
|
||||
? 'Зеркала (${links.length})'
|
||||
: 'Mirrors (${links.length})',
|
||||
),
|
||||
),
|
||||
ButtonSegment(
|
||||
value: 1,
|
||||
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),
|
||||
SelectableText(
|
||||
commentary!.trim(),
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
height: 1.45,
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
IndexedStack(
|
||||
index: _selectedTab,
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: links
|
||||
.map((link) => _buildLinkTile(
|
||||
context,
|
||||
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(
|
||||
BuildContext context,
|
||||
CloudMediaLink link,
|
||||
@@ -288,7 +374,7 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
// Play button (if streamable)
|
||||
if (link.isStreamable && onPlayStream != null) ...[
|
||||
if (link.isStreamable && widget.onPlayStream != null) ...[
|
||||
FilledButton.tonalIcon(
|
||||
style: FilledButton.styleFrom(
|
||||
visualDensity: VisualDensity.compact,
|
||||
@@ -298,7 +384,7 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
label: Text(strings.ru ? 'Смотреть' : 'Play'),
|
||||
onPressed: () {
|
||||
final target = link.directStreamUrl ?? link.url;
|
||||
onPlayStream!(target);
|
||||
widget.onPlayStream!(target);
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
@@ -306,12 +392,13 @@ class CloudMirrorsCard extends StatelessWidget {
|
||||
// Download button (if direct streamable and callback exists)
|
||||
if (link.isStreamable &&
|
||||
link.directStreamUrl != null &&
|
||||
onDownloadStream != null) ...[
|
||||
widget.onDownloadStream != null) ...[
|
||||
IconButton.filledTonal(
|
||||
visualDensity: VisualDensity.compact,
|
||||
tooltip: strings.download,
|
||||
icon: const Icon(Icons.download_rounded, size: 16),
|
||||
onPressed: () => onDownloadStream!(link.directStreamUrl!),
|
||||
onPressed: () =>
|
||||
widget.onDownloadStream!(link.directStreamUrl!),
|
||||
),
|
||||
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,
|
||||
});
|
||||
|
||||
static const _collapsedLimit = 36;
|
||||
static const _collapsedLimit = 28;
|
||||
|
||||
final String label;
|
||||
final String group;
|
||||
@@ -320,13 +320,51 @@ class _TagGroupBlock extends StatelessWidget {
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Text(label, style: Theme.of(context).textTheme.labelLarge),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
'${tags.length}',
|
||||
style: Theme.of(context).textTheme.labelMedium?.copyWith(
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
Container(
|
||||
width: 8,
|
||||
height: 8,
|
||||
margin: const EdgeInsets.only(right: 8),
|
||||
decoration: BoxDecoration(
|
||||
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)
|
||||
TagChip(
|
||||
tag: tag,
|
||||
group: group,
|
||||
onTap: () => onTap(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/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
import '../../../backend/backend.dart';
|
||||
import '../../../core/utils/result.dart';
|
||||
import '../../../shared/widgets/adaptive_scaffold.dart';
|
||||
import '../../../shared/widgets/error_view.dart';
|
||||
import 'providers_controller.dart';
|
||||
import 'widgets/provider_health_tile.dart';
|
||||
|
||||
class ProviderCheckScreen extends ConsumerWidget {
|
||||
class ProviderCheckScreen extends ConsumerStatefulWidget {
|
||||
const ProviderCheckScreen({super.key});
|
||||
|
||||
@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 health = ref.watch(providerHealthProvider);
|
||||
final diagnostics = ref.watch(providerDiagnosticsProvider).value ?? {};
|
||||
return AdaptiveScaffold(
|
||||
title: 'Provider Check',
|
||||
actions: [
|
||||
IconButton(
|
||||
tooltip: 'Check all',
|
||||
onPressed: () => _checkAll(ref),
|
||||
icon: const Icon(Icons.playlist_add_check_rounded),
|
||||
final bottomInset = MediaQuery.paddingOf(context).bottom;
|
||||
|
||||
return Scaffold(
|
||||
extendBodyBehindAppBar: true,
|
||||
appBar: PreferredSize(
|
||||
preferredSize: const Size.fromHeight(60),
|
||||
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(
|
||||
loading: () => const Center(child: CircularProgressIndicator()),
|
||||
error: (error, _) => ErrorView(message: error.toString()),
|
||||
data: (items) => ListView.builder(
|
||||
padding: const EdgeInsets.all(16),
|
||||
itemCount: items.length,
|
||||
itemBuilder: (context, index) {
|
||||
final item = items[index];
|
||||
return ProviderHealthTile(
|
||||
config: item,
|
||||
health: health[item.id],
|
||||
diagnostics: diagnostics[item.id],
|
||||
onCheck: () => _checkOne(ref, item.id),
|
||||
);
|
||||
},
|
||||
),
|
||||
data: (items) {
|
||||
int onlineCount = 0;
|
||||
int offlineCount = 0;
|
||||
int pingSum = 0;
|
||||
int pingCount = 0;
|
||||
|
||||
for (final item in items) {
|
||||
final h = health[item.id];
|
||||
if (h != null) {
|
||||
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 {
|
||||
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,
|
||||
};
|
||||
setState(() => _isCheckingAll = true);
|
||||
HapticFeedback.mediumImpact();
|
||||
try {
|
||||
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/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
import '../../../shared/widgets/adaptive_scaffold.dart';
|
||||
import '../../../shared/widgets/confirm_dialog.dart';
|
||||
import '../../../shared/widgets/error_view.dart';
|
||||
import 'providers_controller.dart';
|
||||
@@ -13,50 +14,371 @@ class ProvidersScreen extends ConsumerWidget {
|
||||
|
||||
@override
|
||||
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);
|
||||
return AdaptiveScaffold(
|
||||
title: 'Providers',
|
||||
actions: [
|
||||
IconButton(
|
||||
tooltip: 'Check providers',
|
||||
onPressed: () => context.go('/providers/check'),
|
||||
icon: const Icon(Icons.network_check_rounded),
|
||||
final bottomInset = MediaQuery.paddingOf(context).bottom;
|
||||
|
||||
return Scaffold(
|
||||
extendBodyBehindAppBar: true,
|
||||
appBar: PreferredSize(
|
||||
preferredSize: const Size.fromHeight(60),
|
||||
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(
|
||||
loading: () => const Center(child: CircularProgressIndicator()),
|
||||
error: (error, _) => ErrorView(message: error.toString()),
|
||||
data: (items) => ListView.builder(
|
||||
padding: const EdgeInsets.all(16),
|
||||
itemCount: items.length,
|
||||
itemBuilder: (context, index) {
|
||||
final item = items[index];
|
||||
return ProviderCard(
|
||||
config: item,
|
||||
onToggle: (enabled) => ref
|
||||
.read(providersControllerProvider.notifier)
|
||||
.toggle(item.id, enabled),
|
||||
onEdit: () => context.go('/providers/new', extra: item),
|
||||
onDelete: () async {
|
||||
final ok = await showConfirmDialog(
|
||||
context,
|
||||
title: 'Delete provider',
|
||||
message: 'Remove ${item.name}?',
|
||||
);
|
||||
if (ok) {
|
||||
await ref
|
||||
.read(providersControllerProvider.notifier)
|
||||
.delete(item.id);
|
||||
}
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
data: (items) {
|
||||
final activeCount = items.where((p) => p.enabled).length;
|
||||
|
||||
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: [
|
||||
// Overview Glass 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: 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/services.dart';
|
||||
|
||||
import '../../../../backend/backend.dart';
|
||||
|
||||
@@ -18,27 +19,396 @@ class ProviderCard extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Card(
|
||||
child: ListTile(
|
||||
leading: Switch(value: config.enabled, onChanged: onToggle),
|
||||
title: Text(config.name),
|
||||
subtitle: Text(
|
||||
'${config.apiType} · ${config.baseUrl}\nPriority ${config.priority}'),
|
||||
isThreeLine: true,
|
||||
trailing: Wrap(
|
||||
spacing: 4,
|
||||
children: [
|
||||
IconButton(
|
||||
tooltip: 'Edit',
|
||||
onPressed: onEdit,
|
||||
icon: const Icon(Icons.edit_rounded),
|
||||
final theme = Theme.of(context);
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
|
||||
final (engineColor, engineIcon, engineTitle) = _engineInfo(config.apiType);
|
||||
|
||||
return Container(
|
||||
margin: const EdgeInsets.only(bottom: 14),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(24),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: isDark
|
||||
? Colors.black.withValues(alpha: 0.30)
|
||||
: 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(
|
||||
tooltip: 'Delete',
|
||||
onPressed: onDelete,
|
||||
icon: const Icon(Icons.delete_rounded),
|
||||
border: Border.all(
|
||||
color: isDark
|
||||
? (config.enabled
|
||||
? 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/services.dart';
|
||||
|
||||
import '../../../../backend/backend.dart';
|
||||
import '../../../../shared/widgets/provider_status_badge.dart';
|
||||
|
||||
class ProviderHealthTile extends StatelessWidget {
|
||||
class ProviderHealthTile extends StatefulWidget {
|
||||
const ProviderHealthTile({
|
||||
required this.config,
|
||||
required this.health,
|
||||
@@ -17,59 +18,408 @@ class ProviderHealthTile extends StatelessWidget {
|
||||
final ProviderDiagnostics? diagnostics;
|
||||
final VoidCallback onCheck;
|
||||
|
||||
@override
|
||||
State<ProviderHealthTile> createState() => _ProviderHealthTileState();
|
||||
}
|
||||
|
||||
class _ProviderHealthTileState extends State<ProviderHealthTile> {
|
||||
bool _expanded = 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 config = widget.config;
|
||||
final health = widget.health;
|
||||
final diagnostics = widget.diagnostics;
|
||||
|
||||
final hint = ProviderQualityHint.from(
|
||||
config: config,
|
||||
health: health,
|
||||
diagnostics: diagnostics,
|
||||
isRu: isRu,
|
||||
);
|
||||
return Card(
|
||||
child: ExpansionTile(
|
||||
leading: ProviderStatusBadge(health: health),
|
||||
title: Text(config.name),
|
||||
subtitle: Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 6,
|
||||
crossAxisAlignment: WrapCrossAlignment.center,
|
||||
children: [
|
||||
Chip(
|
||||
avatar: Icon(hint.icon, size: 16),
|
||||
label: Text(hint.label),
|
||||
visualDensity: VisualDensity.compact,
|
||||
backgroundColor: hint.color(context).withValues(alpha: 0.16),
|
||||
side:
|
||||
BorderSide(color: hint.color(context).withValues(alpha: 0.4)),
|
||||
),
|
||||
Text('${config.apiType} | priority ${config.priority}'),
|
||||
],
|
||||
),
|
||||
trailing: IconButton(
|
||||
tooltip: 'Check',
|
||||
onPressed: onCheck,
|
||||
icon: const Icon(Icons.network_check_rounded),
|
||||
),
|
||||
childrenPadding: const EdgeInsets.fromLTRB(16, 0, 16, 14),
|
||||
children: [
|
||||
Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
[
|
||||
'${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'),
|
||||
),
|
||||
|
||||
final status = health?.status ?? ProviderStatus.unknown;
|
||||
final statusColor = switch (status) {
|
||||
ProviderStatus.online => (health != null && health.pingMs > 2500)
|
||||
? const Color(0xFFF59E0B)
|
||||
: const Color(0xFF10B981),
|
||||
ProviderStatus.offline => const Color(0xFFEF4444),
|
||||
ProviderStatus.unknown => const Color(0xFF94A3B8),
|
||||
};
|
||||
|
||||
final hasError = diagnostics?.lastErrorMessage != null ||
|
||||
health?.errorMessage != null;
|
||||
final errorMessage = diagnostics?.lastErrorMessage ?? health?.errorMessage;
|
||||
|
||||
return Container(
|
||||
margin: const EdgeInsets.only(bottom: 14),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: isDark
|
||||
? Colors.black.withValues(alpha: 0.30)
|
||||
: statusColor.withValues(alpha: 0.08),
|
||||
blurRadius: 18,
|
||||
offset: const Offset(0, 6),
|
||||
spreadRadius: -2,
|
||||
),
|
||||
BoxShadow(
|
||||
color: statusColor.withValues(alpha: isDark ? 0.06 : 0.03),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
),
|
||||
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 ProviderHealth? health,
|
||||
required ProviderDiagnostics? diagnostics,
|
||||
required bool isRu,
|
||||
}) {
|
||||
if (!config.enabled) {
|
||||
return ProviderQualityHint._(
|
||||
'Disabled',
|
||||
isRu ? 'Выключен' : 'Disabled',
|
||||
Icons.pause_circle_outline_rounded,
|
||||
(scheme) => scheme.outline,
|
||||
);
|
||||
@@ -98,34 +449,34 @@ class ProviderQualityHint {
|
||||
if (diagnostics?.lastErrorMessage != null ||
|
||||
health?.status == ProviderStatus.offline) {
|
||||
return ProviderQualityHint._(
|
||||
'Search failing',
|
||||
isRu ? 'Ошибка поиска' : 'Search failing',
|
||||
Icons.error_outline_rounded,
|
||||
(scheme) => scheme.error,
|
||||
);
|
||||
}
|
||||
if (diagnostics != null && diagnostics.lastResultCount == 0) {
|
||||
return ProviderQualityHint._(
|
||||
'No recent results',
|
||||
isRu ? 'Нет результатов' : 'No recent results',
|
||||
Icons.search_off_rounded,
|
||||
(scheme) => scheme.tertiary,
|
||||
);
|
||||
}
|
||||
if (health != null && health.pingMs > 2500) {
|
||||
return ProviderQualityHint._(
|
||||
'Slow',
|
||||
isRu ? 'Медленно' : 'Slow',
|
||||
Icons.speed_rounded,
|
||||
(scheme) => scheme.secondary,
|
||||
);
|
||||
}
|
||||
if (health != null || diagnostics != null) {
|
||||
return ProviderQualityHint._(
|
||||
'Healthy',
|
||||
isRu ? 'Стабилен' : 'Healthy',
|
||||
Icons.check_circle_outline_rounded,
|
||||
(scheme) => scheme.primary,
|
||||
);
|
||||
}
|
||||
return ProviderQualityHint._(
|
||||
'Not checked',
|
||||
isRu ? 'Не проверен' : 'Not checked',
|
||||
Icons.help_outline_rounded,
|
||||
(scheme) => scheme.outline,
|
||||
);
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
@@ -47,6 +50,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
||||
final strings = AppStrings(settings.languageCode);
|
||||
final isRu = strings.ru;
|
||||
final theme = Theme.of(context);
|
||||
final bottomInset = MediaQuery.paddingOf(context).bottom;
|
||||
|
||||
return AdaptiveScaffold(
|
||||
title: strings.search,
|
||||
@@ -78,19 +82,12 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 860),
|
||||
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: [
|
||||
// 1. Search Bar with Quick Operators
|
||||
Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.surfaceContainerLow,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: theme.colorScheme.outlineVariant
|
||||
.withValues(alpha: 0.3),
|
||||
),
|
||||
),
|
||||
_SearchLiquidCard(
|
||||
glowColor: theme.colorScheme.primary,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
@@ -171,45 +168,124 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 2. Recent Searches Card
|
||||
_SearchSectionCard(
|
||||
icon: Icons.history_rounded,
|
||||
accentColor: const Color(0xFF6366F1),
|
||||
title: isRu ? 'Недавние запросы' : 'Recent searches',
|
||||
badgeCount: data.recent.length,
|
||||
trailing: data.recent.isEmpty
|
||||
? null
|
||||
: TextButton(
|
||||
onPressed: () => ref
|
||||
.read(searchControllerProvider.notifier)
|
||||
.clearHistory(),
|
||||
child: Text(
|
||||
isRu ? 'Очистить' : 'Clear',
|
||||
style: TextStyle(
|
||||
color: theme.colorScheme.primary,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
_SearchLiquidCard(
|
||||
glowColor: const Color(0xFF6366F1),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
const _SearchIconBadge(
|
||||
icon: Icons.history_rounded,
|
||||
color: Color(0xFF6366F1),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
isRu ? 'Недавние запросы' : 'Recent searches',
|
||||
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),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
child: RecentSearches(
|
||||
items: data.recent,
|
||||
onTap: (query) =>
|
||||
context.go('/?q=${Uri.encodeQueryComponent(query)}'),
|
||||
onDelete: (id) => ref
|
||||
.read(searchControllerProvider.notifier)
|
||||
.deleteHistory(id),
|
||||
if (data.recent.isNotEmpty)
|
||||
TextButton(
|
||||
style: TextButton.styleFrom(
|
||||
visualDensity: VisualDensity.compact,
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10, vertical: 4),
|
||||
minimumSize: Size.zero,
|
||||
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),
|
||||
|
||||
// 3. Explore Popular Categories & Tags
|
||||
_SearchSectionCard(
|
||||
icon: Icons.explore_rounded,
|
||||
accentColor: const Color(0xFF10B981),
|
||||
title: isRu ? 'Популярные категории' : 'Explore categories',
|
||||
_SearchLiquidCard(
|
||||
glowColor: const Color(0xFF10B981),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
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(
|
||||
categoryName: isRu ? 'Тематика' : 'Theme & Ambience',
|
||||
color: const Color(0xFF0EA5E9),
|
||||
@@ -223,7 +299,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
||||
],
|
||||
onTap: (tag) => _onTagTap(tag, data.query),
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
const SizedBox(height: 16),
|
||||
_CategoryTagRow(
|
||||
categoryName:
|
||||
isRu ? 'Персонажи и детали' : 'Characters & Attire',
|
||||
@@ -239,7 +315,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
||||
],
|
||||
onTap: (tag) => _onTagTap(tag, data.query),
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
const SizedBox(height: 16),
|
||||
_CategoryTagRow(
|
||||
categoryName: isRu ? 'Провайдеры' : 'Providers',
|
||||
color: const Color(0xFF8B5CF6),
|
||||
@@ -257,84 +333,78 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 4. Search Tips / Cheat Sheet Card
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.surfaceContainerLow,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: theme.colorScheme.outlineVariant
|
||||
.withValues(alpha: 0.3),
|
||||
),
|
||||
),
|
||||
child: ExpansionTile(
|
||||
shape: const Border(),
|
||||
collapsedShape: const Border(),
|
||||
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,
|
||||
// 4. Search Tips / Cheat Sheet Card (Full Liquid Glass Container)
|
||||
_SearchLiquidCard(
|
||||
padding: EdgeInsets.zero,
|
||||
glowColor: const Color(0xFFF59E0B),
|
||||
child: Theme(
|
||||
data: theme.copyWith(dividerColor: Colors.transparent),
|
||||
child: ExpansionTile(
|
||||
shape: const Border(),
|
||||
collapsedShape: const Border(),
|
||||
tilePadding: const EdgeInsets.symmetric(
|
||||
horizontal: 16, vertical: 4),
|
||||
leading: const _SearchIconBadge(
|
||||
icon: Icons.lightbulb_rounded,
|
||||
color: Color(0xFFF59E0B),
|
||||
),
|
||||
),
|
||||
title: Text(
|
||||
isRu ? 'Шпаргалка по поиску' : 'Search tips & operators',
|
||||
style: theme.textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
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.',
|
||||
),
|
||||
],
|
||||
title: Text(
|
||||
isRu ? 'Шпаргалка по поиску' : 'Search tips & operators',
|
||||
style: theme.textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.w700,
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
),
|
||||
],
|
||||
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),
|
||||
@@ -347,91 +417,117 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
class _SearchSectionCard extends StatelessWidget {
|
||||
const _SearchSectionCard({
|
||||
required this.icon,
|
||||
required this.accentColor,
|
||||
required this.title,
|
||||
class _SearchLiquidCard extends StatelessWidget {
|
||||
const _SearchLiquidCard({
|
||||
required this.child,
|
||||
this.badgeCount,
|
||||
this.trailing,
|
||||
this.padding,
|
||||
this.glowColor,
|
||||
});
|
||||
|
||||
final IconData icon;
|
||||
final Color accentColor;
|
||||
final String title;
|
||||
final Widget child;
|
||||
final int? badgeCount;
|
||||
final Widget? trailing;
|
||||
final EdgeInsetsGeometry? padding;
|
||||
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(
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.surfaceContainerLow,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: theme.colorScheme.outlineVariant.withValues(alpha: 0.3),
|
||||
borderRadius: BorderRadius.circular(24),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
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(
|
||||
children: [
|
||||
Container(
|
||||
width: 32,
|
||||
height: 32,
|
||||
decoration: BoxDecoration(
|
||||
color: accentColor.withValues(alpha: 0.14),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: Icon(icon, size: 18, color: accentColor),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Row(
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
title,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: theme.textTheme.titleMedium?.copyWith(
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (badgeCount != null && badgeCount! > 0) ...[
|
||||
const SizedBox(width: 8),
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8, 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!,
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SearchIconBadge extends StatelessWidget {
|
||||
const _SearchIconBadge({
|
||||
required this.icon,
|
||||
required this.color,
|
||||
});
|
||||
|
||||
final IconData icon;
|
||||
final Color color;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
const size = 34.0;
|
||||
const iconSize = 18.0;
|
||||
return Container(
|
||||
width: size,
|
||||
height: size,
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: [
|
||||
color,
|
||||
color.withValues(alpha: 0.86),
|
||||
],
|
||||
),
|
||||
borderRadius: BorderRadius.circular(size * 0.28),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: color.withValues(alpha: 0.35),
|
||||
blurRadius: 7,
|
||||
offset: const Offset(0, 2.5),
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
child,
|
||||
],
|
||||
),
|
||||
child: Center(
|
||||
child: Icon(icon, size: iconSize, color: Colors.white),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -452,19 +548,33 @@ class _QuickOperatorChip extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
|
||||
return Material(
|
||||
color: color.withValues(alpha: 0.12),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
color: Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
onTap: onTap,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
onTap: () {
|
||||
HapticFeedback.selectionClick();
|
||||
onTap();
|
||||
},
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
color: color.withValues(alpha: isDark ? 0.16 : 0.10),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
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(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
@@ -477,6 +587,7 @@ class _QuickOperatorChip extends StatelessWidget {
|
||||
fontWeight: FontWeight.w700,
|
||||
color: color,
|
||||
fontFamily: 'monospace',
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -503,44 +614,76 @@ class _CategoryTagRow extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
categoryName,
|
||||
style: theme.textTheme.labelLarge?.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 7,
|
||||
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(
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
for (final tag in tags)
|
||||
Material(
|
||||
color: theme.colorScheme.surfaceContainer,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
color: Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
onTap: () => onTap(tag),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
onTap: () {
|
||||
HapticFeedback.selectionClick();
|
||||
onTap(tag);
|
||||
},
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10, vertical: 5),
|
||||
horizontal: 11, vertical: 6),
|
||||
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(
|
||||
color: theme.colorScheme.outlineVariant
|
||||
.withValues(alpha: 0.3),
|
||||
color: isDark
|
||||
? Colors.white.withValues(alpha: 0.10)
|
||||
: theme.colorScheme.outlineVariant
|
||||
.withValues(alpha: 0.35),
|
||||
width: 1.0,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Container(
|
||||
width: 6,
|
||||
height: 6,
|
||||
width: 5,
|
||||
height: 5,
|
||||
decoration: BoxDecoration(
|
||||
color: color,
|
||||
shape: BoxShape.circle,
|
||||
@@ -550,7 +693,8 @@ class _CategoryTagRow extends StatelessWidget {
|
||||
Text(
|
||||
tag,
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
fontWeight: FontWeight.w500,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.1,
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -574,14 +718,23 @@ class _TipRow extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.surfaceContainerHighest,
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
color: isDark
|
||||
? 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(
|
||||
code,
|
||||
@@ -595,10 +748,14 @@ class _TipRow extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
Expanded(
|
||||
child: Text(
|
||||
description,
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(top: 2),
|
||||
child: Text(
|
||||
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/services.dart';
|
||||
|
||||
import '../../../../backend/backend.dart';
|
||||
|
||||
@@ -47,8 +48,44 @@ class _RecentSearchesState extends State<RecentSearches> {
|
||||
);
|
||||
}
|
||||
|
||||
// Deduplicate items by normalized query
|
||||
final seen = <String>{};
|
||||
final uniqueItems = <SearchHistory>[];
|
||||
for (final item in widget.items) {
|
||||
final key = item.query.trim().toLowerCase();
|
||||
if (key.isEmpty) continue;
|
||||
if (seen.add(key)) {
|
||||
uniqueItems.add(item);
|
||||
}
|
||||
}
|
||||
|
||||
if (uniqueItems.isEmpty) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 24, horizontal: 16),
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.history_toggle_off_rounded,
|
||||
size: 40,
|
||||
color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.5),
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Text(
|
||||
'История поиска пуста',
|
||||
style: theme.textTheme.bodyMedium?.copyWith(
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final visibleItems =
|
||||
_expanded ? widget.items : widget.items.take(20).toList();
|
||||
_expanded ? uniqueItems : uniqueItems.take(20).toList();
|
||||
final screenW = MediaQuery.sizeOf(context).width;
|
||||
final maxQueryWidth = (screenW - 200).clamp(180.0, 480.0);
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
@@ -59,38 +96,62 @@ class _RecentSearchesState extends State<RecentSearches> {
|
||||
children: [
|
||||
for (final item in visibleItems)
|
||||
Material(
|
||||
color: theme.colorScheme.surfaceContainer,
|
||||
color: Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
onTap: () => widget.onTap(item.query),
|
||||
onTap: () {
|
||||
HapticFeedback.selectionClick();
|
||||
widget.onTap(item.query);
|
||||
},
|
||||
child: Container(
|
||||
padding:
|
||||
const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||
const EdgeInsets.only(left: 10, right: 6, top: 6, bottom: 6),
|
||||
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),
|
||||
border: Border.all(
|
||||
color: theme.colorScheme.outlineVariant
|
||||
.withValues(alpha: 0.35),
|
||||
color: Theme.of(context).brightness == Brightness.dark
|
||||
? 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(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.history_rounded,
|
||||
size: 14,
|
||||
size: 15,
|
||||
color: theme.colorScheme.primary,
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 140),
|
||||
child: Text(
|
||||
item.query,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: theme.textTheme.bodyMedium?.copyWith(
|
||||
fontWeight: FontWeight.w500,
|
||||
constraints: BoxConstraints(maxWidth: maxQueryWidth),
|
||||
child: Tooltip(
|
||||
message: item.query,
|
||||
waitDuration: const Duration(milliseconds: 600),
|
||||
child: Text(
|
||||
item.query,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: theme.textTheme.bodyMedium?.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -100,14 +161,14 @@ class _RecentSearchesState extends State<RecentSearches> {
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 6, vertical: 2),
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.secondaryContainer,
|
||||
color: theme.colorScheme.primary.withValues(alpha: 0.14),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Text(
|
||||
'${item.resultCount}',
|
||||
style: theme.textTheme.labelSmall?.copyWith(
|
||||
color: theme.colorScheme.onSecondaryContainer,
|
||||
fontSize: 10,
|
||||
color: theme.colorScheme.primary,
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
@@ -115,14 +176,24 @@ class _RecentSearchesState extends State<RecentSearches> {
|
||||
],
|
||||
if (widget.onDelete != null) ...[
|
||||
const SizedBox(width: 4),
|
||||
GestureDetector(
|
||||
onTap: () => widget.onDelete!(item.id),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(2),
|
||||
child: Icon(
|
||||
Icons.close_rounded,
|
||||
size: 14,
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
Material(
|
||||
color: Colors.transparent,
|
||||
shape: const CircleBorder(),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: InkWell(
|
||||
customBorder: const CircleBorder(),
|
||||
onTap: () {
|
||||
HapticFeedback.lightImpact();
|
||||
widget.onDelete!(item.id);
|
||||
},
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(4),
|
||||
child: Icon(
|
||||
Icons.close_rounded,
|
||||
size: 15,
|
||||
color: theme.colorScheme.onSurfaceVariant
|
||||
.withValues(alpha: 0.75),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -134,7 +205,7 @@ class _RecentSearchesState extends State<RecentSearches> {
|
||||
),
|
||||
],
|
||||
),
|
||||
if (widget.items.length > 20) ...[
|
||||
if (uniqueItems.length > 20) ...[
|
||||
const SizedBox(height: 10),
|
||||
Center(
|
||||
child: TextButton.icon(
|
||||
@@ -148,7 +219,7 @@ class _RecentSearchesState extends State<RecentSearches> {
|
||||
label: Text(
|
||||
_expanded
|
||||
? 'Свернуть'
|
||||
: 'Показать все (${widget.items.length})',
|
||||
: 'Показать все (${uniqueItems.length})',
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -23,6 +23,16 @@ class SettingsController extends AsyncNotifier<AppSettings> {
|
||||
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 {
|
||||
await ref.read(cacheServiceProvider).clear();
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,8 @@
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.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(
|
||||
onRefresh: () =>
|
||||
ref.read(viewedControllerProvider.notifier).refresh(),
|
||||
child: ListView(
|
||||
padding: const EdgeInsets.fromLTRB(16, 8, 16, 24),
|
||||
padding: EdgeInsets.fromLTRB(16, 8, 16, 140 + bottomInset),
|
||||
children: [
|
||||
for (final group in groups) ...[
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(4, 16, 4, 10),
|
||||
padding: const EdgeInsets.fromLTRB(2, 16, 2, 10),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.calendar_today_rounded,
|
||||
size: 16,
|
||||
color: Theme.of(context).colorScheme.primary,
|
||||
Container(
|
||||
width: 28,
|
||||
height: 28,
|
||||
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(
|
||||
_localizedGroupLabel(group.label, isRu),
|
||||
style:
|
||||
Theme.of(context).textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
@@ -187,10 +218,24 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
|
||||
vertical: 2,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context)
|
||||
.colorScheme
|
||||
.surfaceContainerHighest,
|
||||
color: Theme.of(context).brightness == Brightness.dark
|
||||
? Theme.of(context)
|
||||
.colorScheme
|
||||
.surfaceContainerHighest
|
||||
.withValues(alpha: 0.5)
|
||||
: Theme.of(context)
|
||||
.colorScheme
|
||||
.primary
|
||||
.withValues(alpha: 0.12),
|
||||
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(
|
||||
'${group.items.length}',
|
||||
@@ -198,7 +243,10 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
|
||||
.textTheme
|
||||
.labelSmall
|
||||
?.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
|
||||
Widget build(BuildContext context) {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final image = MediaUrlSelector.preview(post).firstOrNull;
|
||||
final timeStr =
|
||||
'${viewedAt.hour.toString().padLeft(2, '0')}:${viewedAt.minute.toString().padLeft(2, '0')}';
|
||||
|
||||
return Card(
|
||||
elevation: 0,
|
||||
color: scheme.surfaceContainerLow,
|
||||
margin: const EdgeInsets.only(bottom: 8),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
side: BorderSide(
|
||||
color: scheme.outlineVariant.withValues(alpha: 0.3),
|
||||
),
|
||||
return Container(
|
||||
margin: const EdgeInsets.only(bottom: 10),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(alpha: isDark ? 0.28 : 0.05),
|
||||
blurRadius: 14,
|
||||
offset: const Offset(0, 4),
|
||||
spreadRadius: -2,
|
||||
),
|
||||
],
|
||||
),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: InkWell(
|
||||
onTap: onOpen,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(10),
|
||||
child: Row(
|
||||
children: [
|
||||
// Squircle Thumbnail
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: SizedBox(
|
||||
width: 68,
|
||||
height: 68,
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
image == null
|
||||
? Container(
|
||||
color: scheme.surfaceContainerHighest,
|
||||
child: const Icon(Icons.image_not_supported_rounded),
|
||||
)
|
||||
: 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,
|
||||
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: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
onTap: () {
|
||||
HapticFeedback.selectionClick();
|
||||
onOpen();
|
||||
},
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(10),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
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),
|
||||
],
|
||||
),
|
||||
border: Border.all(
|
||||
color: isDark
|
||||
? Colors.white.withValues(alpha: 0.13)
|
||||
: Colors.white.withValues(alpha: 0.85),
|
||||
width: 1.1,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Post details
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
child: Row(
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Flexible(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 6,
|
||||
vertical: 2,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color:
|
||||
scheme.primaryContainer.withValues(alpha: 0.5),
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
),
|
||||
child: Text(
|
||||
post.providerName,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.labelSmall
|
||||
?.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
color: scheme.onPrimaryContainer,
|
||||
// Squircle Thumbnail
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(13),
|
||||
child: Container(
|
||||
width: 68,
|
||||
height: 68,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: isDark
|
||||
? Colors.white.withValues(alpha: 0.10)
|
||||
: scheme.outlineVariant.withValues(alpha: 0.30),
|
||||
),
|
||||
borderRadius: BorderRadius.circular(13),
|
||||
),
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
image == null
|
||||
? Container(
|
||||
color: scheme.surfaceContainerHighest,
|
||||
child: const Icon(
|
||||
Icons.image_not_supported_rounded),
|
||||
)
|
||||
: 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,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
Text(
|
||||
timeStr,
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.labelSmall
|
||||
?.copyWith(
|
||||
color: scheme.onSurfaceVariant,
|
||||
if (_isVideo)
|
||||
Positioned(
|
||||
right: 4,
|
||||
bottom: 4,
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(3),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black.withValues(alpha: 0.65),
|
||||
borderRadius: BorderRadius.circular(5),
|
||||
),
|
||||
child: const Icon(
|
||||
Icons.play_arrow_rounded,
|
||||
size: 14,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
post.tags.isEmpty ? '#${post.id}' : post.tags.take(4).join(' '),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
if (post.score != 0) ...[
|
||||
const SizedBox(height: 2),
|
||||
Row(
|
||||
const SizedBox(width: 12),
|
||||
// Post details
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.thumb_up_rounded,
|
||||
size: 12,
|
||||
color: scheme.outline,
|
||||
Row(
|
||||
children: [
|
||||
Flexible(
|
||||
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(
|
||||
'${post.score}',
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.labelSmall
|
||||
?.copyWith(
|
||||
color: scheme.outline,
|
||||
post.tags.isEmpty ? '#${post.id}' : post.tags.take(4).join(' '),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
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),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -167,8 +167,10 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
|
||||
void _scrollToEnd() {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (_tagScrollController.hasClients) {
|
||||
final max = _tagScrollController.position.maxScrollExtent;
|
||||
final target = (max - 40).clamp(0.0, max);
|
||||
_tagScrollController.animateTo(
|
||||
_tagScrollController.position.maxScrollExtent,
|
||||
target,
|
||||
duration: const Duration(milliseconds: 200),
|
||||
curve: Curves.easeOut,
|
||||
);
|
||||
@@ -286,8 +288,8 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
|
||||
const SizedBox(width: 6),
|
||||
],
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 120,
|
||||
constraints: BoxConstraints(
|
||||
minWidth: _tags.isEmpty ? 120 : 64,
|
||||
maxWidth: 300,
|
||||
),
|
||||
child: Focus(
|
||||
@@ -567,7 +569,7 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
|
||||
final draft = _controller.text.trim().toLowerCase();
|
||||
if (draft.isEmpty) return '';
|
||||
final raw = draft.split(RegExp(r'\s+')).last;
|
||||
return raw.replaceAll(RegExp(r'^[\(\)]+|[\(\)]+$'), '').trim();
|
||||
return raw.trim();
|
||||
}
|
||||
|
||||
bool get _isEditing => _focusNode.hasFocus || _localDirty;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'dart:ui';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
@@ -9,7 +10,7 @@ import '../../app/responsive.dart';
|
||||
import '../../backend/backend.dart';
|
||||
import '../../core/utils/result.dart';
|
||||
|
||||
class AppShell extends ConsumerWidget {
|
||||
class AppShell extends ConsumerStatefulWidget {
|
||||
const AppShell({required this.child, super.key});
|
||||
|
||||
final Widget child;
|
||||
@@ -32,69 +33,6 @@ class AppShell extends ConsumerWidget {
|
||||
_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(
|
||||
AppSettings settings,
|
||||
bool hasArtists,
|
||||
@@ -105,6 +43,139 @@ class AppShell extends ConsumerWidget {
|
||||
return true;
|
||||
}).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 {
|
||||
@@ -281,29 +352,393 @@ class _MobileShell extends StatelessWidget {
|
||||
? location == '/'
|
||||
: location.startsWith(item.location),
|
||||
);
|
||||
final bottomInset = 76.0 + MediaQuery.paddingOf(context).bottom;
|
||||
|
||||
return Scaffold(
|
||||
body: child,
|
||||
extendBody: true,
|
||||
body: MediaQuery(
|
||||
data: MediaQuery.of(context).copyWith(
|
||||
padding: MediaQuery.of(context).padding.copyWith(
|
||||
bottom: bottomInset,
|
||||
),
|
||||
),
|
||||
child: child,
|
||||
),
|
||||
floatingActionButton: location == '/settings'
|
||||
? null
|
||||
: FloatingActionButton.small(
|
||||
heroTag: 'mobile-settings',
|
||||
tooltip: ru
|
||||
? '\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438'
|
||||
: 'Settings',
|
||||
onPressed: () => context.go('/settings'),
|
||||
child: const Icon(Icons.settings_rounded),
|
||||
: Padding(
|
||||
padding: const EdgeInsets.only(bottom: 0, right: 2),
|
||||
child: _LiquidGlassSettingsButton(
|
||||
ru: ru,
|
||||
onTap: () => context.go('/settings'),
|
||||
),
|
||||
),
|
||||
floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
|
||||
bottomNavigationBar: NavigationBar(
|
||||
bottomNavigationBar: _LiquidGlassBottomBar(
|
||||
selectedIndex: selected < 0 ? 0 : selected,
|
||||
onDestinationSelected: (index) => context.go(items[index].location),
|
||||
destinations: [
|
||||
for (final item in items)
|
||||
NavigationDestination(
|
||||
icon: Icon(item.icon),
|
||||
label: item.mobileLabelFor(ru),
|
||||
items: items,
|
||||
ru: ru,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _LiquidGlassBottomBar extends StatefulWidget {
|
||||
const _LiquidGlassBottomBar({
|
||||
required this.selectedIndex,
|
||||
required this.onDestinationSelected,
|
||||
required this.items,
|
||||
required this.ru,
|
||||
});
|
||||
|
||||
final int selectedIndex;
|
||||
final ValueChanged<int> onDestinationSelected;
|
||||
final List<_Destination> items;
|
||||
final bool ru;
|
||||
|
||||
@override
|
||||
State<_LiquidGlassBottomBar> createState() => _LiquidGlassBottomBarState();
|
||||
}
|
||||
|
||||
class _LiquidGlassBottomBarState extends State<_LiquidGlassBottomBar> {
|
||||
int? _pressedIndex;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
final scheme = theme.colorScheme;
|
||||
final count = widget.items.length;
|
||||
if (count == 0) return const SizedBox.shrink();
|
||||
|
||||
return SafeArea(
|
||||
top: false,
|
||||
left: false,
|
||||
right: false,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(14, 0, 14, 10),
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
final barWidth = constraints.maxWidth;
|
||||
final itemWidth = barWidth / count;
|
||||
final pillWidth = (itemWidth - 6).clamp(36.0, 64.0);
|
||||
final pillLeft =
|
||||
widget.selectedIndex * itemWidth + (itemWidth - pillWidth) / 2;
|
||||
|
||||
return Container(
|
||||
height: 64,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(alpha: isDark ? 0.38 : 0.09),
|
||||
blurRadius: 22,
|
||||
offset: const Offset(0, 8),
|
||||
spreadRadius: -2,
|
||||
),
|
||||
if (isDark)
|
||||
BoxShadow(
|
||||
color: scheme.primary.withValues(alpha: 0.07),
|
||||
blurRadius: 18,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(28),
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: isDark
|
||||
? [
|
||||
scheme.surfaceContainerHigh
|
||||
.withValues(alpha: 0.70),
|
||||
scheme.surface.withValues(alpha: 0.82),
|
||||
]
|
||||
: [
|
||||
Colors.white.withValues(alpha: 0.84),
|
||||
Colors.white.withValues(alpha: 0.68),
|
||||
],
|
||||
),
|
||||
border: Border.all(
|
||||
color: isDark
|
||||
? Colors.white.withValues(alpha: 0.16)
|
||||
: Colors.white.withValues(alpha: 0.75),
|
||||
width: 1.2,
|
||||
),
|
||||
),
|
||||
child: Stack(
|
||||
alignment: Alignment.centerLeft,
|
||||
children: [
|
||||
// Animated sliding liquid pill indicator
|
||||
AnimatedPositioned(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.easeOutBack,
|
||||
left: pillLeft,
|
||||
top: 7,
|
||||
child: Container(
|
||||
width: pillWidth,
|
||||
height: 32,
|
||||
decoration: BoxDecoration(
|
||||
color: scheme.primaryContainer.withValues(
|
||||
alpha: isDark ? 0.75 : 0.88,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
border: Border.all(
|
||||
color: scheme.primary.withValues(
|
||||
alpha: isDark ? 0.35 : 0.22,
|
||||
),
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: scheme.primary.withValues(
|
||||
alpha: isDark ? 0.22 : 0.12,
|
||||
),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Navigation item buttons
|
||||
Row(
|
||||
children: [
|
||||
for (var i = 0; i < count; i++)
|
||||
Expanded(
|
||||
child: _LiquidNavItem(
|
||||
destination: widget.items[i],
|
||||
label: widget.items[i]
|
||||
.mobileLabelFor(widget.ru),
|
||||
isSelected: widget.selectedIndex == i,
|
||||
isPressed: _pressedIndex == i,
|
||||
onTapDown: () =>
|
||||
setState(() => _pressedIndex = i),
|
||||
onTapUp: () =>
|
||||
setState(() => _pressedIndex = null),
|
||||
onTapCancel: () =>
|
||||
setState(() => _pressedIndex = null),
|
||||
onTap: () {
|
||||
HapticFeedback.lightImpact();
|
||||
widget.onDestinationSelected(i);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _LiquidNavItem extends StatelessWidget {
|
||||
const _LiquidNavItem({
|
||||
required this.destination,
|
||||
required this.label,
|
||||
required this.isSelected,
|
||||
required this.isPressed,
|
||||
required this.onTapDown,
|
||||
required this.onTapUp,
|
||||
required this.onTapCancel,
|
||||
required this.onTap,
|
||||
});
|
||||
|
||||
final _Destination destination;
|
||||
final String label;
|
||||
final bool isSelected;
|
||||
final bool isPressed;
|
||||
final VoidCallback onTapDown;
|
||||
final VoidCallback onTapUp;
|
||||
final VoidCallback onTapCancel;
|
||||
final VoidCallback onTap;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final scheme = theme.colorScheme;
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
|
||||
final targetScale = isPressed ? 0.86 : (isSelected ? 1.05 : 1.0);
|
||||
|
||||
return GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTapDown: (_) => onTapDown(),
|
||||
onTapUp: (_) => onTapUp(),
|
||||
onTapCancel: onTapCancel,
|
||||
onTap: onTap,
|
||||
child: Center(
|
||||
child: AnimatedScale(
|
||||
scale: targetScale,
|
||||
duration: const Duration(milliseconds: 180),
|
||||
curve: Curves.easeOutCubic,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 32,
|
||||
child: Center(
|
||||
child: AnimatedSwitcher(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
transitionBuilder: (child, anim) => ScaleTransition(
|
||||
scale: anim,
|
||||
child: child,
|
||||
),
|
||||
child: Icon(
|
||||
destination.icon,
|
||||
key: ValueKey('${destination.id}_$isSelected'),
|
||||
size: isSelected ? 22 : 20,
|
||||
color: isSelected
|
||||
? scheme.onPrimaryContainer
|
||||
: (isDark
|
||||
? scheme.onSurfaceVariant
|
||||
.withValues(alpha: 0.78)
|
||||
: scheme.onSurfaceVariant
|
||||
.withValues(alpha: 0.85)),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
AnimatedDefaultTextStyle(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
style: TextStyle(
|
||||
fontSize: 10.5,
|
||||
fontWeight:
|
||||
isSelected ? FontWeight.w700 : FontWeight.w500,
|
||||
color: isSelected
|
||||
? (isDark ? scheme.primary : scheme.onSurface)
|
||||
: scheme.onSurfaceVariant.withValues(alpha: 0.75),
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
child: Text(label),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _LiquidGlassSettingsButton extends StatefulWidget {
|
||||
const _LiquidGlassSettingsButton({
|
||||
required this.ru,
|
||||
required this.onTap,
|
||||
});
|
||||
|
||||
final bool ru;
|
||||
final VoidCallback onTap;
|
||||
|
||||
@override
|
||||
State<_LiquidGlassSettingsButton> createState() =>
|
||||
_LiquidGlassSettingsButtonState();
|
||||
}
|
||||
|
||||
class _LiquidGlassSettingsButtonState extends State<_LiquidGlassSettingsButton> {
|
||||
bool _pressed = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
final scheme = theme.colorScheme;
|
||||
|
||||
return Tooltip(
|
||||
message: widget.ru ? 'Настройки' : 'Settings',
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTapDown: (_) => setState(() => _pressed = true),
|
||||
onTapUp: (_) => setState(() => _pressed = false),
|
||||
onTapCancel: () => setState(() => _pressed = false),
|
||||
onTap: () {
|
||||
HapticFeedback.mediumImpact();
|
||||
widget.onTap();
|
||||
},
|
||||
child: AnimatedScale(
|
||||
scale: _pressed ? 0.88 : 1.0,
|
||||
duration: const Duration(milliseconds: 160),
|
||||
curve: Curves.easeOutCubic,
|
||||
child: Container(
|
||||
width: 48,
|
||||
height: 48,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(alpha: isDark ? 0.38 : 0.12),
|
||||
blurRadius: 18,
|
||||
offset: const Offset(0, 6),
|
||||
spreadRadius: -1,
|
||||
),
|
||||
BoxShadow(
|
||||
color: scheme.primary.withValues(alpha: isDark ? 0.20 : 0.12),
|
||||
blurRadius: 12,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
child: ClipOval(
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
gradient: RadialGradient(
|
||||
center: const Alignment(-0.3, -0.4),
|
||||
radius: 1.1,
|
||||
colors: isDark
|
||||
? [
|
||||
scheme.surfaceContainerHigh.withValues(alpha: 0.85),
|
||||
scheme.surface.withValues(alpha: 0.75),
|
||||
]
|
||||
: [
|
||||
Colors.white.withValues(alpha: 0.92),
|
||||
Colors.white.withValues(alpha: 0.70),
|
||||
],
|
||||
),
|
||||
border: Border.all(
|
||||
color: isDark
|
||||
? Colors.white.withValues(alpha: 0.24)
|
||||
: Colors.white.withValues(alpha: 0.85),
|
||||
width: 1.4,
|
||||
),
|
||||
),
|
||||
child: Center(
|
||||
child: AnimatedRotation(
|
||||
turns: _pressed ? 0.125 : 0.0,
|
||||
duration: const Duration(milliseconds: 250),
|
||||
curve: Curves.easeOutBack,
|
||||
child: Icon(
|
||||
Icons.settings_rounded,
|
||||
size: 23,
|
||||
color: scheme.primary,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,261 @@
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import '../../backend/models/creator_link.dart';
|
||||
|
||||
class FormattedContentText extends StatefulWidget {
|
||||
const FormattedContentText({
|
||||
super.key,
|
||||
required this.text,
|
||||
this.style,
|
||||
this.linkColor,
|
||||
this.selectable = true,
|
||||
});
|
||||
|
||||
final String text;
|
||||
final TextStyle? style;
|
||||
final Color? linkColor;
|
||||
final bool selectable;
|
||||
|
||||
@override
|
||||
State<FormattedContentText> createState() => _FormattedContentTextState();
|
||||
}
|
||||
|
||||
class _FormattedContentTextState extends State<FormattedContentText> {
|
||||
final List<TapGestureRecognizer> _recognizers = [];
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
for (final r in _recognizers) {
|
||||
r.dispose();
|
||||
}
|
||||
_recognizers.clear();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _clearRecognizers() {
|
||||
for (final r in _recognizers) {
|
||||
r.dispose();
|
||||
}
|
||||
_recognizers.clear();
|
||||
}
|
||||
|
||||
Future<void> _launch(String url) async {
|
||||
final uri = Uri.tryParse(url);
|
||||
if (uri != null) {
|
||||
try {
|
||||
await launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||
} catch (_) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Не удалось открыть ссылку: $url')),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
_clearRecognizers();
|
||||
|
||||
final theme = Theme.of(context);
|
||||
final scheme = theme.colorScheme;
|
||||
final defaultStyle = widget.style ?? theme.textTheme.bodyMedium ?? const TextStyle();
|
||||
final linkStyle = defaultStyle.copyWith(
|
||||
color: widget.linkColor ?? scheme.primary,
|
||||
fontWeight: FontWeight.w600,
|
||||
decoration: TextDecoration.underline,
|
||||
decorationColor: (widget.linkColor ?? scheme.primary).withValues(alpha: 0.45),
|
||||
);
|
||||
|
||||
final text = widget.text;
|
||||
if (text.isEmpty) return const SizedBox.shrink();
|
||||
|
||||
final urlRegex = RegExp(r'''https?://[^\s<>"{}|\\^`\[\]]+''', caseSensitive: false);
|
||||
final spans = <InlineSpan>[];
|
||||
var lastIndex = 0;
|
||||
|
||||
for (final match in urlRegex.allMatches(text)) {
|
||||
if (match.start > lastIndex) {
|
||||
spans.add(TextSpan(
|
||||
text: text.substring(lastIndex, match.start),
|
||||
style: defaultStyle,
|
||||
));
|
||||
}
|
||||
|
||||
var rawUrl = match.group(0)!;
|
||||
var cleanUrl = rawUrl;
|
||||
var trailing = '';
|
||||
while (cleanUrl.isNotEmpty &&
|
||||
(cleanUrl.endsWith(')') ||
|
||||
cleanUrl.endsWith('.') ||
|
||||
cleanUrl.endsWith(',') ||
|
||||
cleanUrl.endsWith(';') ||
|
||||
cleanUrl.endsWith('!') ||
|
||||
cleanUrl.endsWith('?') ||
|
||||
cleanUrl.endsWith(':') ||
|
||||
cleanUrl.endsWith('>'))) {
|
||||
trailing = cleanUrl[cleanUrl.length - 1] + trailing;
|
||||
cleanUrl = cleanUrl.substring(0, cleanUrl.length - 1);
|
||||
}
|
||||
|
||||
final recognizer = TapGestureRecognizer()
|
||||
..onTap = () => _launch(cleanUrl);
|
||||
_recognizers.add(recognizer);
|
||||
|
||||
spans.add(TextSpan(
|
||||
text: cleanUrl,
|
||||
style: linkStyle,
|
||||
recognizer: recognizer,
|
||||
));
|
||||
|
||||
if (trailing.isNotEmpty) {
|
||||
spans.add(TextSpan(
|
||||
text: trailing,
|
||||
style: defaultStyle,
|
||||
));
|
||||
}
|
||||
|
||||
lastIndex = match.end;
|
||||
}
|
||||
|
||||
if (lastIndex < text.length) {
|
||||
spans.add(TextSpan(
|
||||
text: text.substring(lastIndex),
|
||||
style: defaultStyle,
|
||||
));
|
||||
}
|
||||
|
||||
if (widget.selectable) {
|
||||
return SelectableText.rich(
|
||||
TextSpan(children: spans),
|
||||
style: defaultStyle,
|
||||
);
|
||||
}
|
||||
|
||||
return Text.rich(
|
||||
TextSpan(children: spans),
|
||||
style: defaultStyle,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class CreatorLinkChips extends StatelessWidget {
|
||||
const CreatorLinkChips({
|
||||
super.key,
|
||||
required this.links,
|
||||
this.title,
|
||||
});
|
||||
|
||||
final List<CreatorLink> links;
|
||||
final String? title;
|
||||
|
||||
Future<void> _openLink(BuildContext context, String url) async {
|
||||
final uri = Uri.tryParse(url);
|
||||
if (uri != null) {
|
||||
try {
|
||||
await launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||
} catch (_) {
|
||||
if (context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Не удалось открыть ссылку: $url')),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (links.isEmpty) return const SizedBox.shrink();
|
||||
final theme = Theme.of(context);
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (title != null && title!.isNotEmpty) ...[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 6),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.link_rounded,
|
||||
size: 15,
|
||||
color: theme.colorScheme.primary,
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
Text(
|
||||
title!,
|
||||
style: theme.textTheme.labelMedium?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: theme.colorScheme.primary,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 6,
|
||||
children: links.map((link) {
|
||||
final brand = link.brandColor;
|
||||
final labelText = link.title.isNotEmpty ? link.title : link.serviceName;
|
||||
|
||||
return Material(
|
||||
color: brand.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
child: InkWell(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
onTap: () => _openLink(context, link.url),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
border: Border.all(
|
||||
color: brand.withValues(alpha: 0.35),
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
link.iconData,
|
||||
size: 16,
|
||||
color: brand,
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 240),
|
||||
child: Text(
|
||||
labelText,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: theme.colorScheme.onSurface,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Icon(
|
||||
Icons.arrow_outward_rounded,
|
||||
size: 12,
|
||||
color: brand.withValues(alpha: 0.75),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -117,9 +117,14 @@ class _PostCardState extends ConsumerState<PostCard>
|
||||
Widget build(BuildContext context) {
|
||||
final post = _resolvedPost ?? widget.post;
|
||||
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
|
||||
? post.width / post.height
|
||||
: _fallbackAspect(post.fileType);
|
||||
: _fallbackAspect(isTextPost ? 'text' : post.fileType);
|
||||
final mobile = MediaQuery.sizeOf(context).width < 700;
|
||||
final urls = _feedUrls(post, mobile: mobile);
|
||||
final imageUrl = urls.isEmpty ? post.previewUrl : urls.first;
|
||||
@@ -202,6 +207,12 @@ class _PostCardState extends ConsumerState<PostCard>
|
||||
enabled: widget.blurExplicit && sensitive,
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
if (isTextPost) {
|
||||
return _TextPostCardPreview(
|
||||
post: post,
|
||||
hovered: _hovered && !mobile,
|
||||
);
|
||||
}
|
||||
final dpr = MediaQuery.devicePixelRatioOf(context);
|
||||
final cacheWidth =
|
||||
(constraints.maxWidth * dpr).round().clamp(320, 1800);
|
||||
@@ -239,27 +250,28 @@ class _PostCardState extends ConsumerState<PostCard>
|
||||
),
|
||||
),
|
||||
),
|
||||
// Bottom cinematic gradient overlay for badges and favorite
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: 64,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.bottomCenter,
|
||||
end: Alignment.topCenter,
|
||||
colors: [
|
||||
Colors.black.withValues(alpha: 0.72),
|
||||
Colors.transparent,
|
||||
],
|
||||
// Bottom cinematic gradient overlay for badges and favorite (only on media posts)
|
||||
if (!isTextPost)
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: 64,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.bottomCenter,
|
||||
end: Alignment.topCenter,
|
||||
colors: [
|
||||
Colors.black.withValues(alpha: 0.72),
|
||||
Colors.transparent,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (widget.showBadges) ...[
|
||||
Positioned(
|
||||
left: 8,
|
||||
@@ -269,11 +281,14 @@ class _PostCardState extends ConsumerState<PostCard>
|
||||
if (post.fileType.toLowerCase().contains('video') ||
|
||||
post.fileType.toLowerCase().contains('webm') ||
|
||||
post.fileType.toLowerCase().contains('mp4') ||
|
||||
post.fileType.toLowerCase().contains('gif'))
|
||||
post.fileType.toLowerCase().contains('gif') ||
|
||||
isTextPost)
|
||||
Positioned(
|
||||
right: 8,
|
||||
top: 8,
|
||||
child: _MediaBadge(fileType: post.fileType),
|
||||
child: _MediaBadge(
|
||||
fileType: isTextPost ? 'text' : post.fileType,
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
left: 8,
|
||||
@@ -434,6 +449,7 @@ class _PostCardState extends ConsumerState<PostCard>
|
||||
|
||||
double _fallbackAspect(String fileType) {
|
||||
final normalized = fileType.toLowerCase();
|
||||
if (normalized == 'text') return 0.95;
|
||||
if (normalized.contains('video') || normalized.contains('webm')) {
|
||||
return 16 / 9;
|
||||
}
|
||||
@@ -462,7 +478,7 @@ class _PostCardState extends ConsumerState<PostCard>
|
||||
'${post.previewUrl} ${post.sampleUrl} ${post.fileUrl}'
|
||||
.toLowerCase();
|
||||
return {
|
||||
'User-Agent': 'Lunaris/2.0.1 Flutter local booru browser',
|
||||
'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
|
||||
'Accept': '*/*',
|
||||
if (lower.contains('gelbooru')) 'Referer': 'https://gelbooru.com/',
|
||||
if (lower.contains('realbooru'))
|
||||
@@ -596,6 +612,8 @@ class _FeedVideoPreviewState extends State<_FeedVideoPreview> {
|
||||
controller: _controller,
|
||||
fit: BoxFit.cover,
|
||||
controls: null,
|
||||
pauseUponEnteringBackgroundMode: false,
|
||||
resumeUponEnteringForegroundMode: false,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -773,7 +791,7 @@ class _MediaBadge extends StatelessWidget {
|
||||
Icon(_icon(type), size: 13, color: Colors.white),
|
||||
const SizedBox(width: 3.5),
|
||||
Text(
|
||||
type,
|
||||
_label(type),
|
||||
style: const TextStyle(
|
||||
fontSize: 10.5,
|
||||
color: Colors.white,
|
||||
@@ -794,14 +812,159 @@ class _MediaBadge extends StatelessWidget {
|
||||
return 'video';
|
||||
}
|
||||
if (value.contains('gif')) return 'gif';
|
||||
if (value.contains('text')) return 'text';
|
||||
return 'photo';
|
||||
}
|
||||
|
||||
IconData _icon(String type) => switch (type) {
|
||||
'video' => Icons.play_arrow_rounded,
|
||||
'gif' => Icons.gif_box_rounded,
|
||||
'text' => Icons.article_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 {
|
||||
|
||||
@@ -28,6 +28,7 @@ class PostMasonryGrid extends StatelessWidget {
|
||||
this.loading = false,
|
||||
this.controller,
|
||||
this.gridMode = 'masonry',
|
||||
this.padding,
|
||||
super.key,
|
||||
});
|
||||
|
||||
@@ -51,11 +52,19 @@ class PostMasonryGrid extends StatelessWidget {
|
||||
final bool loading;
|
||||
final ScrollController? controller;
|
||||
final String gridMode;
|
||||
final EdgeInsetsGeometry? padding;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext 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;
|
||||
|
||||
Widget buildCard(Post post) {
|
||||
|
||||
@@ -3,22 +3,91 @@ import 'package:flutter/material.dart';
|
||||
import '../../backend/backend.dart';
|
||||
|
||||
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 bool compact;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final isDark = theme.brightness == Brightness.dark;
|
||||
final status = health?.status ?? ProviderStatus.unknown;
|
||||
final color = switch (status) {
|
||||
ProviderStatus.online => Colors.green,
|
||||
ProviderStatus.offline => Colors.red,
|
||||
ProviderStatus.unknown => Colors.grey,
|
||||
|
||||
final (color, labelRu, labelEn) = switch (status) {
|
||||
ProviderStatus.online => (
|
||||
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),
|
||||
label: Text(status.name),
|
||||
visualDensity: VisualDensity.compact,
|
||||
|
||||
final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
|
||||
final label = isRu ? labelRu : labelEn;
|
||||
|
||||
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,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,36 +1,128 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../backend/models/tag_suggestion.dart';
|
||||
|
||||
class TagChip extends StatelessWidget {
|
||||
const TagChip({
|
||||
required this.tag,
|
||||
this.category,
|
||||
this.group,
|
||||
this.onTap,
|
||||
this.onLongPress,
|
||||
super.key,
|
||||
});
|
||||
|
||||
final String tag;
|
||||
final TagCategory? category;
|
||||
final String? group;
|
||||
final VoidCallback? onTap;
|
||||
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
|
||||
Widget build(BuildContext context) {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
final chip = ActionChip(
|
||||
onPressed: onTap,
|
||||
label: Text(tag),
|
||||
labelStyle: TextStyle(
|
||||
color: scheme.onSecondaryContainer,
|
||||
fontWeight: FontWeight.w700,
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final cat = _resolvedCategory;
|
||||
|
||||
final (Color baseColor, Color textColor) = _colorsForCategory(cat, scheme, isDark);
|
||||
|
||||
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(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
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,
|
||||
),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -45,11 +45,11 @@ static void my_application_activate(GApplication* application) {
|
||||
if (use_header_bar) {
|
||||
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
|
||||
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_window_set_titlebar(window, GTK_WIDGET(header_bar));
|
||||
} else {
|
||||
gtk_window_set_title(window, "Lunaris");
|
||||
gtk_window_set_title(window, "Prisma");
|
||||
}
|
||||
|
||||
gtk_window_set_default_size(window, 1280, 720);
|
||||
|
||||
+4
-4
@@ -899,18 +899,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_brightness_android
|
||||
sha256: "2df5e0488a22a73271a43d92dbcd80643df6910cf69690faacaf9929ae9ade3b"
|
||||
sha256: "2008ad8e9527cc968f7a4de1ec58b476d495b3c612a149dbd6550c4f046da147"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.4"
|
||||
version: "2.1.6"
|
||||
screen_brightness_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_brightness_platform_interface
|
||||
sha256: "59d50850d6735d677780fc7359c8e997d0ff6df91c8465161c9e617a7b0a11d8"
|
||||
sha256: "2de60c0ba569b898950029cc1f7e9dd72bda44a22beb5054aac331cb6fce2ff2"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
version: "2.1.2"
|
||||
share_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
||||
+1
-2
@@ -1,7 +1,7 @@
|
||||
name: gel_rule_app
|
||||
description: Local backend/core layer for a Flutter booru browser app.
|
||||
publish_to: "none"
|
||||
version: 3.0.4+55
|
||||
version: 3.4.1+75
|
||||
|
||||
environment:
|
||||
sdk: ">=3.3.0 <4.0.0"
|
||||
@@ -33,7 +33,6 @@ dependencies:
|
||||
media_kit_libs_android_video: ^1.3.8
|
||||
share_plus: ^10.0.0
|
||||
dynamic_color: ^1.7.0
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:gel_rule_app/backend/models/creator_link.dart';
|
||||
|
||||
void main() {
|
||||
group('CreatorLink extractor and classification tests', () {
|
||||
test('extracts and classifies social and creator links accurately', () {
|
||||
const text = '''
|
||||
Check out my latest speedpaint on YouTube: https://youtu.be/dQw4w9WgXcQ
|
||||
Also follow my X account https://x.com/artist_handle and Instagram: https://instagram.com/p/C1234567/!
|
||||
Support me on Patreon: https://www.patreon.com/my_art or Fanbox: https://artist.fanbox.cc
|
||||
Join my Discord: https://discord.gg/invitelink
|
||||
Other links: https://carrd.co/myportfolio and https://example.com/blog.
|
||||
Cloud links like https://drive.google.com/file/d/123/view and https://mega.nz/file/abc should be excluded by default.
|
||||
''';
|
||||
|
||||
final links = CreatorLink.extractLinks(text);
|
||||
|
||||
expect(links.length, 8);
|
||||
|
||||
final yt = links.firstWhere((l) => l.type == CreatorLinkType.youtube);
|
||||
expect(yt.serviceName, 'YouTube');
|
||||
expect(yt.url, 'https://youtu.be/dQw4w9WgXcQ');
|
||||
|
||||
final twitter = links.firstWhere((l) => l.type == CreatorLinkType.twitter);
|
||||
expect(twitter.serviceName, 'X (Twitter)');
|
||||
expect(twitter.url, 'https://x.com/artist_handle');
|
||||
|
||||
final insta = links.firstWhere((l) => l.type == CreatorLinkType.instagram);
|
||||
expect(insta.serviceName, 'Instagram');
|
||||
expect(insta.url, 'https://instagram.com/p/C1234567/');
|
||||
|
||||
final patreon = links.firstWhere((l) => l.type == CreatorLinkType.patreon);
|
||||
expect(patreon.serviceName, 'Patreon');
|
||||
|
||||
final fanbox = links.firstWhere((l) => l.type == CreatorLinkType.fanbox);
|
||||
expect(fanbox.serviceName, 'Fanbox');
|
||||
|
||||
final discord = links.firstWhere((l) => l.type == CreatorLinkType.discord);
|
||||
expect(discord.serviceName, 'Discord');
|
||||
|
||||
final hub = links.firstWhere((l) => l.type == CreatorLinkType.linkhub);
|
||||
expect(hub.serviceName, 'Links Hub');
|
||||
|
||||
final web = links.firstWhere((l) => l.type == CreatorLinkType.other);
|
||||
expect(web.url, 'https://example.com/blog');
|
||||
|
||||
// Verify cloud storage was excluded
|
||||
expect(links.any((l) => l.url.contains('drive.google.com')), isFalse);
|
||||
expect(links.any((l) => l.url.contains('mega.nz')), isFalse);
|
||||
});
|
||||
|
||||
test('handles HTML anchor links with custom titles', () {
|
||||
const html = '''
|
||||
<p>Visit my <a href="https://twitter.com/draws">Twitter Profile</a> and watch on <a href="https://www.youtube.com/channel/123">YouTube Stream</a>!</p>
|
||||
''';
|
||||
|
||||
final links = CreatorLink.extractLinks(html);
|
||||
expect(links.length, 2);
|
||||
|
||||
final tw = links.firstWhere((l) => l.type == CreatorLinkType.twitter);
|
||||
expect(tw.title, 'Twitter Profile');
|
||||
|
||||
final yt = links.firstWhere((l) => l.type == CreatorLinkType.youtube);
|
||||
expect(yt.title, 'YouTube Stream');
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -10,7 +10,7 @@ void main() {
|
||||
late TagCacheService cacheService;
|
||||
|
||||
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';
|
||||
cacheService = TagCacheService(customPath: cacheFilePath);
|
||||
await cacheService.init();
|
||||
|
||||
@@ -13,24 +13,24 @@ void main() {
|
||||
final info = AppUpdateInfo(
|
||||
version: '2.0.2',
|
||||
tagName: 'v2.0.2',
|
||||
name: 'Lunaris 2.0.2',
|
||||
name: 'Prisma 2.0.2',
|
||||
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'),
|
||||
apkUrl: 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/Lunaris.apk',
|
||||
linuxTarGzUrl: 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/linux.tar.gz',
|
||||
apkUrl: 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/Prisma.apk',
|
||||
linuxTarGzUrl: 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/linux.tar.gz',
|
||||
);
|
||||
|
||||
expect(info.hasAssets, isTrue);
|
||||
expect(info.apkUrl, contains('apk'));
|
||||
expect(info.linuxTarGzUrl, contains('linux'));
|
||||
expect(
|
||||
service.assetFileName(info, 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/Lunaris-v2.0.2.apk'),
|
||||
'Lunaris-v2.0.2.apk',
|
||||
service.assetFileName(info, 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/Prisma-v2.0.2.apk'),
|
||||
'Prisma-v2.0.2.apk',
|
||||
);
|
||||
expect(
|
||||
service.assetFileName(info, 'https://github.com/RarDog/Lunaris/releases/download/v2.0.2/unknown-linux'),
|
||||
'Lunaris-v2.0.2-linux-x64.tar.gz',
|
||||
service.assetFileName(info, 'https://github.com/RarDog/Prisma/releases/download/v2.0.2/unknown-linux'),
|
||||
'Prisma-v2.0.2-linux-x64.tar.gz',
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -55,15 +55,21 @@ void main() {
|
||||
expect(find.text('Google Drive'), findsOneWidget);
|
||||
expect(find.text('Google Drive Stream'), findsOneWidget);
|
||||
|
||||
// Verify commentary
|
||||
expect(find.text('Описание от автора'), findsOneWidget);
|
||||
expect(find.text('Special Patreon bonus animation for all patrons.'), findsOneWidget);
|
||||
|
||||
// Verify play button triggers callback
|
||||
// Verify play button triggers callback on mirrors tab
|
||||
final playBtn = find.text('Смотреть');
|
||||
expect(playBtn, findsOneWidget);
|
||||
await tester.tap(playBtn);
|
||||
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 {
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
}
|
||||
@@ -90,12 +90,12 @@ BEGIN
|
||||
BLOCK "040904e4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "com.example" "\0"
|
||||
VALUE "FileDescription", "Lunaris" "\0"
|
||||
VALUE "FileDescription", "Prisma" "\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 "OriginalFilename", "gel_rule_app.exe" "\0"
|
||||
VALUE "ProductName", "Lunaris" "\0"
|
||||
VALUE "ProductName", "Prisma" "\0"
|
||||
VALUE "ProductVersion", VERSION_AS_STRING "\0"
|
||||
END
|
||||
END
|
||||
|
||||
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
|
||||
FlutterWindow window(project);
|
||||
Win32Window::Point origin(10, 10);
|
||||
Win32Window::Size size(1280, 720);
|
||||
if (!window.Create(L"Lunaris", origin, size)) {
|
||||
if (!window.Create(L"Prisma", origin, size)) {
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
window.SetQuitOnClose(true);
|
||||
|
||||
Reference in New Issue
Block a user