RarDog/Prisma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 67 Wiki Activity

feat: Pawchive account support and favorites synchronization (v2.3.6)

Browse Source
This commit is contained in:
RarDog
2026-09-04 14:17:09 +03:00
parent 10b02b2d6f
commit d4e52ff429
12 changed files with 1819 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/artists/presentation/artist_posts_screen.dart
+72
View File
@@ -1,3 +1,5 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
@@ -12,6 +14,7 @@ import '../../../shared/widgets/empty_view.dart';
import '../../../shared/widgets/error_view.dart';
import '../../../shared/widgets/post_masonry_grid.dart';
import '../../favorites/presentation/favorites_controller.dart';
import '../../settings/presentation/settings_controller.dart';
final artistPostsProvider =
FutureProvider.family<List<Post>, ArtistWorkQuery>((ref, query) async {
@@ -401,6 +404,54 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
);
}
Future<void> _toggleArtistFavorite(
AppSettings settings,
bool isCurrentlyFav,
) async {
final current = List<String>.from(settings.favoriteArtists);
final artistKey =
'${widget.providerId}:${widget.service}:${widget.artistId}';
if (isCurrentlyFav) {
current.removeWhere((e) {
try {
return FavoriteArtistItem.fromJson(
jsonDecode(e) as Map<String, dynamic>)
.key ==
artistKey;
} catch (_) {
return false;
}
});
} else {
final avatarUrl = widget.providerId == 'pawchive'
? 'https://pawchive.pw/icons/${widget.service}/${widget.artistId}'
: null;
final item = FavoriteArtistItem(
id: widget.artistId,
service: widget.service,
providerId: widget.providerId,
name: widget.artistName,
avatarUrl: avatarUrl,
);
current.insert(0, jsonEncode(item.toJson()));
}
await ref.read(settingsControllerProvider.notifier).saveSettings(
settings.copyWith(favoriteArtists: current),
);
if (widget.providerId == 'pawchive') {
final activeAcc = settings.activePawchiveAccount;
if (activeAcc != null) {
unawaited(ref.read(pawchiveSyncServiceProvider).toggleRemoteFavorite(
account: activeAcc,
service: widget.service,
artistId: widget.artistId,
isFavorite: !isCurrentlyFav,
));
}
}
}
@override
Widget build(BuildContext context) {
final settings =
@@ -408,12 +459,33 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
final favoriteKeys = ref.watch(favoriteKeysProvider).value ?? <String>{};
final viewedKeys = ref.watch(viewedKeysProvider).value ?? <String>{};
final artistKey =
'${widget.providerId}:${widget.service}:${widget.artistId}';
final isArtistFavorite = settings.favoriteArtists.any((e) {
try {
return FavoriteArtistItem.fromJson(
jsonDecode(e) as Map<String, dynamic>)
.key ==
artistKey;
} catch (_) {
return false;
}
});
final displayedPosts =
_posts.where(_matchesTypeFilter).toList(growable: false);
return AdaptiveScaffold(
title: widget.artistName,
actions: [
IconButton(
tooltip: isArtistFavorite ? 'В избранном' : 'В избранное',
icon: Icon(
isArtistFavorite ? Icons.star_rounded : Icons.star_outline_rounded,
color: isArtistFavorite ? Colors.amber : null,
),
onPressed: () => _toggleArtistFavorite(settings, isArtistFavorite),
),
if (_announcements.isNotEmpty)
IconButton(
tooltip: 'Анонсы автора',
lib/features/artists/presentation/artists_screen.dart
+126 -60
View File
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
@@ -13,6 +14,7 @@ import '../../../shared/widgets/empty_view.dart';
import '../../../shared/widgets/error_view.dart';
import '../../settings/presentation/settings_controller.dart';
import 'artist_posts_screen.dart';
import 'widgets/pawchive_accounts_sheet.dart';
final artistProviderConfigsProvider =
FutureProvider<List<ContentProviderConfig>>((ref) async {
@@ -49,7 +51,7 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
ArtistProfile artist,
) async {
final current = List<String>.from(settings.favoriteArtists);
final item = _FavoriteArtistItem(
final item = FavoriteArtistItem(
id: artist.id,
service: artist.service,
providerId: artist.providerId,
@@ -60,13 +62,14 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
final index = current.indexWhere((e) {
try {
final parsed =
_FavoriteArtistItem.fromJson(jsonDecode(e) as Map<String, dynamic>);
FavoriteArtistItem.fromJson(jsonDecode(e) as Map<String, dynamic>);
return parsed.key == key;
} catch (_) {
return false;
}
});
if (index >= 0) {
final isAdding = index < 0;
if (!isAdding) {
current.removeAt(index);
} else {
current.insert(0, jsonEncode(item.toJson()));
@@ -74,6 +77,19 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
await ref.read(settingsControllerProvider.notifier).saveSettings(
settings.copyWith(favoriteArtists: current),
);
// Sync with active Pawchive account if artist belongs to Pawchive
if (artist.providerId == 'pawchive') {
final activeAcc = settings.activePawchiveAccount;
if (activeAcc != null) {
unawaited(ref.read(pawchiveSyncServiceProvider).toggleRemoteFavorite(
account: activeAcc,
service: artist.service,
artistId: artist.id,
isFavorite: isAdding,
));
}
}
}
@override
@@ -99,19 +115,29 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
final favoriteItems = settings.favoriteArtists
.map((e) {
try {
return _FavoriteArtistItem.fromJson(
return FavoriteArtistItem.fromJson(
jsonDecode(e) as Map<String, dynamic>);
} catch (_) {
return null;
}
})
.whereType<_FavoriteArtistItem>()
.whereType<FavoriteArtistItem>()
.toList();
final favoriteKeys = favoriteItems.map((e) => e.key).toSet();
return AdaptiveScaffold(
title: 'Artists',
actions: [
IconButton(
tooltip: 'Синхронизация Pawchive',
icon: Badge(
isLabelVisible: settings.parsedPawchiveAccounts.isNotEmpty,
backgroundColor: Colors.green,
smallSize: 8,
child: const Icon(Icons.cloud_sync_rounded),
),
onPressed: () => PawchiveAccountsSheet.show(context),
),
IconButton(
tooltip: 'Любимые авторы',
icon: Badge(
@@ -318,7 +344,7 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
void _showFavoriteArtistsModal(
BuildContext context,
AppSettings settings,
List<_FavoriteArtistItem> favorites,
List<FavoriteArtistItem> favorites,
) {
showModalBottomSheet<void>(
context: context,
@@ -341,7 +367,7 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
final updated = List<String>.from(settings.favoriteArtists)
..removeWhere((e) {
try {
return _FavoriteArtistItem.fromJson(
return FavoriteArtistItem.fromJson(
jsonDecode(e) as Map<String, dynamic>)
.key ==
fav.key;
@@ -352,6 +378,18 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
await ref
.read(settingsControllerProvider.notifier)
.saveSettings(settings.copyWith(favoriteArtists: updated));
if (fav.providerId == 'pawchive') {
final activeAcc = settings.activePawchiveAccount;
if (activeAcc != null) {
unawaited(ref.read(pawchiveSyncServiceProvider).toggleRemoteFavorite(
account: activeAcc,
service: fav.service,
artistId: fav.id,
isFavorite: false,
));
}
}
setState(() {});
},
);
@@ -570,49 +608,6 @@ class _ArtistCard extends StatelessWidget {
}
}
class _FavoriteArtistItem {
const _FavoriteArtistItem({
required this.id,
required this.service,
required this.providerId,
required this.name,
this.avatarUrl,
});
const _FavoriteArtistItem.empty()
: id = '',
service = '',
providerId = '',
name = '',
avatarUrl = null;
final String id;
final String service;
final String providerId;
final String name;
final String? avatarUrl;
bool get isEmpty => id.isEmpty;
String get key => '$providerId:$service:$id';
Map<String, dynamic> toJson() => {
'id': id,
'service': service,
'providerId': providerId,
'name': name,
'avatarUrl': avatarUrl,
};
factory _FavoriteArtistItem.fromJson(Map<String, dynamic> json) =>
_FavoriteArtistItem(
id: (json['id'] ?? '').toString(),
service: (json['service'] ?? '').toString(),
providerId: (json['providerId'] ?? '').toString(),
name: (json['name'] ?? '').toString(),
avatarUrl: json['avatarUrl'] as String?,
);
}
class _FavoriteArtistsModal extends StatefulWidget {
const _FavoriteArtistsModal({
required this.favorites,
@@ -622,11 +617,11 @@ class _FavoriteArtistsModal extends StatefulWidget {
required this.onRemoveFavorite,
});
final List<_FavoriteArtistItem> favorites;
final List<FavoriteArtistItem> favorites;
final String? initialSelectedKey;
final ValueChanged<_FavoriteArtistItem> onSelect;
final ValueChanged<_FavoriteArtistItem> onOpenArtist;
final ValueChanged<_FavoriteArtistItem> onRemoveFavorite;
final ValueChanged<FavoriteArtistItem> onSelect;
final ValueChanged<FavoriteArtistItem> onOpenArtist;
final ValueChanged<FavoriteArtistItem> onRemoveFavorite;
@override
State<_FavoriteArtistsModal> createState() => _FavoriteArtistsModalState();
@@ -648,7 +643,7 @@ class _FavoriteArtistsModalState extends State<_FavoriteArtistsModal> {
(e) => e.key == _selectedKey,
orElse: () => widget.favorites.isNotEmpty
? widget.favorites.first
: const _FavoriteArtistItem.empty(),
: const FavoriteArtistItem.empty(),
);
return DraggableScrollableSheet(
@@ -716,6 +711,77 @@ class _FavoriteArtistsModalState extends State<_FavoriteArtistsModal> {
),
),
const Divider(height: 1),
Consumer(
builder: (context, ref, _) {
final settings =
ref.watch(appSettingsProvider).value ?? AppSettings.defaults;
final activeAcc = settings.activePawchiveAccount;
final accounts = settings.parsedPawchiveAccounts;
return Container(
margin: const EdgeInsets.fromLTRB(16, 8, 16, 6),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: scheme.surfaceContainerHigh,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: activeAcc != null
? scheme.primary.withValues(alpha: 0.35)
: scheme.outlineVariant.withValues(alpha: 0.25),
),
),
child: Row(
children: [
Icon(
Icons.cloud_sync_rounded,
size: 20,
color: activeAcc != null
? scheme.primary
: scheme.onSurfaceVariant,
),
const SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
activeAcc != null
? 'Pawchive: @${activeAcc.username}'
: 'Pawchive не подключён',
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 12,
),
),
Text(
activeAcc != null
? '${activeAcc.syncedArtistsCount} авторов в облаке'
: 'Синхронизируйте избранное с сервером',
style: TextStyle(
color: scheme.onSurfaceVariant,
fontSize: 11,
),
),
],
),
),
FilledButton.tonal(
style: FilledButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 4,
),
visualDensity: VisualDensity.compact,
),
onPressed: () => PawchiveAccountsSheet.show(context),
child: Text(accounts.isEmpty ? 'Войти' : 'Аккаунты'),
),
],
),
);
},
),
if (widget.favorites.isEmpty)
Padding(
padding: const EdgeInsets.fromLTRB(24, 36, 24, 40),
@@ -792,11 +858,11 @@ class _FavoriteArtistsSection extends ConsumerWidget {
required this.onRemoveFavorite,
});
final List<_FavoriteArtistItem> favorites;
final List<FavoriteArtistItem> favorites;
final String? selectedKey;
final ValueChanged<_FavoriteArtistItem> onSelect;
final ValueChanged<_FavoriteArtistItem> onOpenArtist;
final ValueChanged<_FavoriteArtistItem> onRemoveFavorite;
final ValueChanged<FavoriteArtistItem> onSelect;
final ValueChanged<FavoriteArtistItem> onOpenArtist;
final ValueChanged<FavoriteArtistItem> onRemoveFavorite;
@override
Widget build(BuildContext context, WidgetRef ref) {
@@ -986,7 +1052,7 @@ class _FavoriteArtistsSection extends ConsumerWidget {
class _FavoriteArtistMediaStrip extends ConsumerWidget {
const _FavoriteArtistMediaStrip({required this.artist});
final _FavoriteArtistItem artist;
final FavoriteArtistItem artist;
@override
Widget build(BuildContext context, WidgetRef ref) {
lib/features/artists/presentation/widgets/pawchive_accounts_sheet.dart
+746
View File
@@ -0,0 +1,746 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../../app/app.dart';
import '../../../../backend/backend.dart';
import '../../../settings/presentation/settings_controller.dart';
class PawchiveAccountsSheet extends ConsumerStatefulWidget {
const PawchiveAccountsSheet({super.key});
static Future<void> show(BuildContext context) {
return showModalBottomSheet(
context: context,
isScrollControlled: true,
backgroundColor: Colors.transparent,
builder: (_) => const PawchiveAccountsSheet(),
);
}
@override
ConsumerState<PawchiveAccountsSheet> createState() =>
_PawchiveAccountsSheetState();
}
class _PawchiveAccountsSheetState extends ConsumerState<PawchiveAccountsSheet>
with SingleTickerProviderStateMixin {
late final TabController _addTabController;
final _usernameController = TextEditingController();
final _passwordController = TextEditingController();
final _cookieController = TextEditingController();
bool _isAdding = false;
bool _obscurePassword = true;
String? _syncingAccountId;
bool _syncingAll = false;
String? _errorMessage;
@override
void initState() {
super.initState();
_addTabController = TabController(length: 2, vsync: this);
}
@override
void dispose() {
_addTabController.dispose();
_usernameController.dispose();
_passwordController.dispose();
_cookieController.dispose();
super.dispose();
}
Future<void> _handleLoginCredentials() async {
final username = _usernameController.text.trim();
final password = _passwordController.text.trim();
if (username.isEmpty || password.isEmpty) {
setState(() => _errorMessage = 'Введите логин и пароль');
return;
}
setState(() {
_isAdding = true;
_errorMessage = null;
});
try {
final syncService = ref.read(pawchiveSyncServiceProvider);
final account = await syncService.loginWithCredentials(
username: username,
password: password,
);
final settings =
ref.read(appSettingsProvider).value ?? AppSettings.defaults;
final existingAccounts = settings.parsedPawchiveAccounts.where((a) => a.id != account.id).toList();
// Set as active
final updatedList = [
account.copyWith(isActive: true),
...existingAccounts.map((a) => a.copyWith(isActive: false)),
];
var newSettings = settings.copyWith(
pawchiveAccounts:
updatedList.map((a) => jsonEncode(a.toJson())).toList(),
);
// Perform initial sync
final syncResult = await syncService.syncAccountFavorites(
account: account,
settings: newSettings,
);
if (syncResult.isSuccess) {
newSettings = syncResult.updatedSettings;
}
await ref
.read(settingsControllerProvider.notifier)
.saveSettings(newSettings);
_usernameController.clear();
_passwordController.clear();
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
'Аккаунт @${account.username} добавлен! Синхронизировано ${account.syncedArtistsCount} авторов.',
),
backgroundColor: Colors.green.shade700,
),
);
}
} catch (e) {
if (mounted) {
setState(() => _errorMessage = e.toString().replaceFirst('Exception: ', '').replaceFirst('StateError: ', ''));
}
} finally {
if (mounted) {
setState(() => _isAdding = false);
}
}
}
Future<void> _handleLoginCookie() async {
final cookie = _cookieController.text.trim();
final username = _usernameController.text.trim();
if (cookie.isEmpty) {
setState(() => _errorMessage = 'Введите сессионную куку');
return;
}
setState(() {
_isAdding = true;
_errorMessage = null;
});
try {
final syncService = ref.read(pawchiveSyncServiceProvider);
final account = await syncService.loginWithSession(
sessionCookie: cookie,
username: username.isEmpty ? 'Pawchive User' : username,
);
final settings =
ref.read(appSettingsProvider).value ?? AppSettings.defaults;
final existingAccounts = settings.parsedPawchiveAccounts.where((a) => a.id != account.id).toList();
final updatedList = [
account.copyWith(isActive: true),
...existingAccounts.map((a) => a.copyWith(isActive: false)),
];
var newSettings = settings.copyWith(
pawchiveAccounts:
updatedList.map((a) => jsonEncode(a.toJson())).toList(),
);
final syncResult = await syncService.syncAccountFavorites(
account: account,
settings: newSettings,
);
if (syncResult.isSuccess) {
newSettings = syncResult.updatedSettings;
}
await ref
.read(settingsControllerProvider.notifier)
.saveSettings(newSettings);
_cookieController.clear();
_usernameController.clear();
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
'Кука сохранена! Синхронизировано ${account.syncedArtistsCount} авторов.',
),
backgroundColor: Colors.green.shade700,
),
);
}
} catch (e) {
if (mounted) {
setState(() => _errorMessage = e.toString().replaceFirst('Exception: ', '').replaceFirst('StateError: ', ''));
}
} finally {
if (mounted) {
setState(() => _isAdding = false);
}
}
}
Future<void> _syncSingleAccount(PawchiveAccount account) async {
setState(() => _syncingAccountId = account.id);
try {
final syncService = ref.read(pawchiveSyncServiceProvider);
final settings =
ref.read(appSettingsProvider).value ?? AppSettings.defaults;
final result = await syncService.syncAccountFavorites(
account: account,
settings: settings,
);
if (result.isSuccess) {
await ref
.read(settingsControllerProvider.notifier)
.saveSettings(result.updatedSettings);
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
'Синхронизировано: ${result.totalSyncedCount} авторов (+${result.newlyAddedToLocal} новых)',
),
),
);
}
} else {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Ошибка синхронизации: ${result.errorMessage}'),
backgroundColor: Colors.red.shade700,
),
);
}
}
} finally {
if (mounted) {
setState(() => _syncingAccountId = null);
}
}
}
Future<void> _syncAllAccounts() async {
setState(() => _syncingAll = true);
try {
final syncService = ref.read(pawchiveSyncServiceProvider);
final settings =
ref.read(appSettingsProvider).value ?? AppSettings.defaults;
final result = await syncService.syncAllAccounts(settings: settings);
if (result.isSuccess) {
await ref
.read(settingsControllerProvider.notifier)
.saveSettings(result.updatedSettings);
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
'Все аккаунты синхронизированы! Всего: ${result.totalSyncedCount} (+${result.newlyAddedToLocal} новых)',
),
backgroundColor: Colors.green.shade700,
),
);
}
} else {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Ошибка синхронизации: ${result.errorMessage}'),
backgroundColor: Colors.red.shade700,
),
);
}
}
} finally {
if (mounted) {
setState(() => _syncingAll = false);
}
}
}
Future<void> _setActiveAccount(PawchiveAccount target) async {
final settings =
ref.read(appSettingsProvider).value ?? AppSettings.defaults;
final updatedList = settings.parsedPawchiveAccounts.map((a) {
return a.copyWith(isActive: a.id == target.id);
}).toList();
await ref.read(settingsControllerProvider.notifier).saveSettings(
settings.copyWith(
pawchiveAccounts:
updatedList.map((a) => jsonEncode(a.toJson())).toList(),
),
);
}
Future<void> _removeAccount(PawchiveAccount target) async {
final confirmed = await showDialog<bool>(
context: context,
builder: (ctx) => AlertDialog(
title: const Text('Удалить аккаунт Pawchive?'),
content: Text(
'Вы уверены, что хотите удалить аккаунт @${target.username}? Локальные авторы останутся в приложении.',
),
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx, false),
child: const Text('Отмена'),
),
FilledButton(
onPressed: () => Navigator.pop(ctx, true),
style: FilledButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.error,
),
child: const Text('Удалить'),
),
],
),
);
if (confirmed != true) return;
final settings =
ref.read(appSettingsProvider).value ?? AppSettings.defaults;
final filtered =
settings.parsedPawchiveAccounts.where((a) => a.id != target.id).toList();
// If active was removed, make first remaining active
if (filtered.isNotEmpty && !filtered.any((a) => a.isActive)) {
filtered[0] = filtered[0].copyWith(isActive: true);
}
await ref.read(settingsControllerProvider.notifier).saveSettings(
settings.copyWith(
pawchiveAccounts:
filtered.map((a) => jsonEncode(a.toJson())).toList(),
),
);
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final scheme = theme.colorScheme;
final settings =
ref.watch(appSettingsProvider).value ?? AppSettings.defaults;
final accounts = settings.parsedPawchiveAccounts;
final keyboardPadding = MediaQuery.of(context).viewInsets.bottom;
return DraggableScrollableSheet(
initialChildSize: accounts.isEmpty ? 0.8 : 0.75,
minChildSize: 0.4,
maxChildSize: 0.95,
builder: (context, scrollController) {
return Container(
decoration: BoxDecoration(
color: scheme.surface,
borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.35),
blurRadius: 18,
offset: const Offset(0, -2),
),
],
),
child: Column(
children: [
// Drag handle
Center(
child: Container(
margin: const EdgeInsets.only(top: 10, bottom: 6),
width: 44,
height: 5,
decoration: BoxDecoration(
color: scheme.onSurfaceVariant.withValues(alpha: 0.3),
borderRadius: BorderRadius.circular(10),
),
),
),
// Header
Padding(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
child: Row(
children: [
Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: scheme.primaryContainer,
borderRadius: BorderRadius.circular(12),
),
child: Icon(
Icons.cloud_sync_rounded,
color: scheme.onPrimaryContainer,
size: 22,
),
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Аккаунты Pawchive',
style: theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.bold,
),
),
Text(
'Синхронизация авторов и избранного',
style: theme.textTheme.bodySmall?.copyWith(
color: scheme.onSurfaceVariant,
),
),
],
),
),
if (accounts.isNotEmpty)
FilledButton.tonalIcon(
onPressed: _syncingAll ? null : _syncAllAccounts,
icon: _syncingAll
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.sync_rounded, size: 18),
label: const Text('Синхронизировать'),
),
],
),
),
const Divider(height: 1),
// Body
Expanded(
child: ListView(
controller: scrollController,
padding: EdgeInsets.fromLTRB(16, 12, 16, 16 + keyboardPadding),
children: [
// Connected accounts section
if (accounts.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.only(bottom: 8, left: 4),
child: Text(
'ПОДКЛЮЧЁННЫЕ АККАУНТЫ (${accounts.length})',
style: theme.textTheme.labelSmall?.copyWith(
color: scheme.primary,
fontWeight: FontWeight.bold,
letterSpacing: 0.8,
),
),
),
...accounts.map((acc) => _buildAccountCard(acc, scheme, theme)),
const SizedBox(height: 16),
],
// Add account section
Padding(
padding: const EdgeInsets.only(bottom: 8, left: 4),
child: Text(
accounts.isEmpty ? 'ДОБАВИТЬ АККАУНТ' : 'ДОБАВИТЬ ЕЩЁ АККАУНТ',
style: theme.textTheme.labelSmall?.copyWith(
color: scheme.primary,
fontWeight: FontWeight.bold,
letterSpacing: 0.8,
),
),
),
Card(
elevation: 0,
color: scheme.surfaceContainerHigh,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
side: BorderSide(
color: scheme.outlineVariant.withValues(alpha: 0.4),
),
),
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TabBar(
controller: _addTabController,
tabs: const [
Tab(text: 'Логин и пароль'),
Tab(text: 'Session Cookie'),
],
),
const SizedBox(height: 16),
if (_errorMessage != null) ...[
Container(
padding: const EdgeInsets.all(10),
decoration: BoxDecoration(
color: scheme.errorContainer,
borderRadius: BorderRadius.circular(8),
),
child: Row(
children: [
Icon(
Icons.error_outline_rounded,
size: 18,
color: scheme.onErrorContainer,
),
const SizedBox(width: 8),
Expanded(
child: Text(
_errorMessage!,
style: TextStyle(
color: scheme.onErrorContainer,
fontSize: 13,
),
),
),
],
),
),
const SizedBox(height: 12),
],
SizedBox(
height: 190,
child: TabBarView(
controller: _addTabController,
children: [
// Tab 1: Username & Password
Column(
children: [
TextField(
controller: _usernameController,
decoration: const InputDecoration(
labelText: 'Имя пользователя',
prefixIcon: Icon(Icons.person_outline_rounded),
isDense: true,
),
),
const SizedBox(height: 12),
TextField(
controller: _passwordController,
obscureText: _obscurePassword,
decoration: InputDecoration(
labelText: 'Пароль',
prefixIcon: const Icon(Icons.lock_outline_rounded),
isDense: true,
suffixIcon: IconButton(
icon: Icon(
_obscurePassword
? Icons.visibility_outlined
: Icons.visibility_off_outlined,
),
onPressed: () => setState(
() => _obscurePassword = !_obscurePassword,
),
),
),
),
const Spacer(),
FilledButton.icon(
onPressed: _isAdding ? null : _handleLoginCredentials,
icon: _isAdding
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: const Icon(Icons.login_rounded),
label: const Text('Войти и синхронизировать'),
),
],
),
// Tab 2: Session Cookie
Column(
children: [
TextField(
controller: _usernameController,
decoration: const InputDecoration(
labelText: 'Никнейм (необязательно)',
prefixIcon: Icon(Icons.badge_outlined),
isDense: true,
),
),
const SizedBox(height: 12),
TextField(
controller: _cookieController,
maxLines: 2,
decoration: const InputDecoration(
labelText: 'Сессионная кука',
hintText: 'session=ey... или значение куки',
prefixIcon: Icon(Icons.cookie_outlined),
isDense: true,
),
),
const Spacer(),
FilledButton.icon(
onPressed: _isAdding ? null : _handleLoginCookie,
icon: _isAdding
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: const Icon(Icons.check_circle_outline_rounded),
label: const Text('Сохранить куку'),
),
],
),
],
),
),
],
),
),
),
],
),
),
],
),
);
},
);
}
Widget _buildAccountCard(PawchiveAccount acc, ColorScheme scheme, ThemeData theme) {
final isSyncing = _syncingAccountId == acc.id;
return Card(
margin: const EdgeInsets.only(bottom: 8),
elevation: 0,
color: acc.isActive
? scheme.primaryContainer.withValues(alpha: 0.35)
: scheme.surfaceContainerHigh,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16),
side: BorderSide(
color: acc.isActive
? scheme.primary.withValues(alpha: 0.6)
: scheme.outlineVariant.withValues(alpha: 0.3),
width: acc.isActive ? 1.5 : 1,
),
),
child: ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
leading: CircleAvatar(
backgroundColor: acc.isActive ? scheme.primary : scheme.surfaceContainerHighest,
foregroundColor: acc.isActive ? scheme.onPrimary : scheme.onSurfaceVariant,
child: Text(
acc.username.isNotEmpty ? acc.username[0].toUpperCase() : 'P',
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
title: Row(
children: [
Expanded(
child: Text(
acc.username,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
if (acc.isActive)
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
decoration: BoxDecoration(
color: scheme.primary,
borderRadius: BorderRadius.circular(10),
),
child: Text(
'Активен',
style: TextStyle(
color: scheme.onPrimary,
fontSize: 11,
fontWeight: FontWeight.bold,
),
),
),
],
),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 2),
Text(
'Авторов: ${acc.syncedArtistsCount} • ${acc.lastSyncedAt != null ? _formatDate(acc.lastSyncedAt!) : "не синхр."}',
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12),
),
],
),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
icon: isSyncing
? const SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.sync_rounded),
tooltip: 'Синхронизировать этот аккаунт',
onPressed: isSyncing ? null : () => _syncSingleAccount(acc),
),
PopupMenuButton<String>(
icon: const Icon(Icons.more_vert_rounded),
onSelected: (val) {
if (val == 'active') {
_setActiveAccount(acc);
} else if (val == 'delete') {
_removeAccount(acc);
}
},
itemBuilder: (ctx) => [
if (!acc.isActive)
const PopupMenuItem(
value: 'active',
child: Row(
children: [
Icon(Icons.check_circle_outline_rounded, size: 20),
SizedBox(width: 8),
Text('Сделать активным'),
],
),
),
const PopupMenuItem(
value: 'delete',
child: Row(
children: [
Icon(Icons.delete_outline_rounded, color: Colors.red, size: 20),
SizedBox(width: 8),
Text('Удалить аккаунт', style: TextStyle(color: Colors.red)),
],
),
),
],
),
],
),
),
);
}
String _formatDate(DateTime dt) {
final now = DateTime.now();
if (now.difference(dt).inMinutes < 1) return 'только что';
if (now.difference(dt).inHours < 1) return '${now.difference(dt).inMinutes} мин назад';
return '${dt.day.toString().padLeft(2, '0')}.${dt.month.toString().padLeft(2, '0')} ${dt.hour.toString().padLeft(2, '0')}:${dt.minute.toString().padLeft(2, '0')}';
}
}