Compare commits

...
4 Commits
Author SHA1 Message Date
RarDog 8ad36e2f6b fix: eliminate video player blue screen on desktop with software rendering default and decoder toggle (v3.6.4)
Build and Release / Build Windows x64 (push) Has been cancelled
Build and Release / Build macOS (push) Has been cancelled
2026-09-05 18:48:33 +03:00
RarDog 4aedde9b3f feat: desktop horizontal mouse-wheel scroll & fix PC video player blue screen (v3.6.3)
Build and Release / Build Windows x64 (push) Has been cancelled
Build and Release / Build macOS (push) Has been cancelled
2026-09-05 18:32:45 +03:00
RarDog 5b2c8eb53e fix(perf): memory optimization, prevent OOM on mobile, and completely disable mouse wheel zoom
Build and Release / Build Windows x64 (push) Has been cancelled
Build and Release / Build macOS (push) Has been cancelled
2026-09-05 18:09:58 +03:00
RarDog d7d9cad423 fix(desktop): smooth sidebar hover animation without text jitter and remove mouse wheel zoom
Build and Release / Build Windows x64 (push) Has been cancelled
Build and Release / Build macOS (push) Has been cancelled
2026-09-05 17:58:49 +03:00
14 changed files with 1101 additions and 683 deletions
+2 -1
View File
@@ -5,7 +5,8 @@
<application <application
android:label="Prisma" android:label="Prisma"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher"
android:largeHeap="true">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true" android:exported="true"
+38
View File
@@ -1,4 +1,42 @@
const prismaChangelog = [ const prismaChangelog = [
PrismaChange(
version: '3.6.4',
title: 'Полное исправление воспроизведения видео на ПК (устранение синего экрана)',
bullets: [
'Программный рендеринг (S/W) по умолчанию для ПК: на десктопных платформах отключен проблемный OpenGL FBO мост аппаратного ускорения, вызывавший синий экран из-за отсутствия или конфликтов драйверов VAAPI/VDPAU в Linux/AppImage.',
'Переключатель декодера H/W / S/W в плеере: на верхней панели управления видеоплеером добавлена кнопка быстрого переключения между аппаратным (H/W) и программным (S/W) декодированием на лету.',
'Отображение постера-превью: под видеоплеером теперь отображается превью-постер на время буферизации, исключая появление пустых областей.',
'Безопасное превью в ленте: предпросмотр видео в карточках постов на ПК также переведен на надежный программный рендерер.',
],
),
PrismaChange(
version: '3.6.3',
title: 'Горизонтальный скролл колесиком мыши на ПК и исправление синего экрана в видеоплеере',
bullets: [
'Горизонтальная прокрутка колесиком мыши в настройках: верхняя панель категорий настроек теперь плавно прокручивается колесиком мыши строго при наведении курсора.',
'Горизонтальная прокрутка колесиком мыши в авторах: полоса любимых авторов и лента их медиа теперь поддерживают быструю прокрутку колесиком мыши при наведении курсора.',
'Устранение «синего экрана» в видеоплеере на ПК: исправлена нативная инициализация MediaKit перед запуском Flutter-движка и настроен оптимальный режим аппаратного ускорения для десктопных платформ.',
],
),
PrismaChange(
version: '3.6.2',
title: 'Комплексная оптимизация памяти на телефоне и ПК, полное отключение зума колесиком',
bullets: [
'Полное отключение масштабирования колесиком мыши: перехвачен внутренний обработчик PointerScrollEvent в интерактивном вьюере, что навсегда исключило нежелательный зум при прокрутке.',
'Предотвращение вылетов на смартфонах (OOM): включен флаг android:largeHeap="true", расширяющий доступный лимит оперативной памяти процесса до 512–1024 МБ.',
'Ограничение аппетита кэша изображений: глобальный ImageCache в Flutter ограничен безопасным лимитом в 180 МБ и 120 изображений (вместо неограниченного роста до 1 ГБ+), неактивные растры своевременно выгружаются сборщиком мусора.',
'Оптимизация декодирования тяжелых артов: полноразмерные изображения с экстремальным разрешением (до 10K+) теперь безопасно декодируются с ограничением memCacheWidth под экран устройства, снижая расход RAM на 80–90%.',
'Оптимизация сетки и миниатюр: карточки ленты изолированы в RepaintBoundary для гладкого 120 FPS скролла без паразитных перерисовок, а всем каруселям, аватаркам и мозаикам заданы строгие границы кэширования.',
],
),
PrismaChange(
version: '3.6.1',
title: 'Плавная боковая панель без лагов и отключение зума колесиком',
bullets: [
'Устранение лагов боковой панели: полностью переработана анимация наведения на боковую панель на ПК. Убран тяжелый шейдерный блюр при изменении ширины и зафиксирована верстка элементов — текст больше не сжимается, не дергается и раскрывается на 120 FPS максимально плавно.',
'Отключение зума фото по колесику мыши: исключено случайное и резкое масштабирование изображений при прокрутке колесиком мыши. Масштабирование фото доступно через горячие клавиши (+, -, 0, F) или двойной клик.',
],
),
PrismaChange( PrismaChange(
version: '3.6.0', version: '3.6.0',
title: 'Редизайн интерфейса для ПК и система горячих клавиш (хоткеи)', title: 'Редизайн интерфейса для ПК и система горячих клавиш (хоткеи)',
@@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:ui'; import 'dart:ui';
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -1328,7 +1329,7 @@ class _FavoriteArtistsModalState extends State<_FavoriteArtistsModal> {
} }
} }
class _FavoriteArtistsSection extends ConsumerWidget { class _FavoriteArtistsSection extends StatefulWidget {
const _FavoriteArtistsSection({ const _FavoriteArtistsSection({
required this.favorites, required this.favorites,
required this.selectedKey, required this.selectedKey,
@@ -1344,8 +1345,23 @@ class _FavoriteArtistsSection extends ConsumerWidget {
final ValueChanged<FavoriteArtistItem> onRemoveFavorite; final ValueChanged<FavoriteArtistItem> onRemoveFavorite;
@override @override
Widget build(BuildContext context, WidgetRef ref) { State<_FavoriteArtistsSection> createState() =>
if (favorites.isEmpty) { _FavoriteArtistsSectionState();
}
class _FavoriteArtistsSectionState extends State<_FavoriteArtistsSection> {
final ScrollController _scrollController = ScrollController();
bool _isHovered = false;
@override
void dispose() {
_scrollController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
if (widget.favorites.isEmpty) {
return Padding( return Padding(
padding: const EdgeInsets.fromLTRB(16, 4, 16, 8), padding: const EdgeInsets.fromLTRB(16, 4, 16, 8),
child: _ArtistsLiquidCard( child: _ArtistsLiquidCard(
@@ -1368,9 +1384,9 @@ class _FavoriteArtistsSection extends ConsumerWidget {
); );
} }
final selected = favorites.firstWhere( final selected = widget.favorites.firstWhere(
(f) => f.key == selectedKey, (f) => f.key == widget.selectedKey,
orElse: () => favorites.first, orElse: () => widget.favorites.first,
); );
return Padding( return Padding(
@@ -1385,14 +1401,14 @@ class _FavoriteArtistsSection extends ConsumerWidget {
const Icon(Icons.star_rounded, color: Colors.amber, size: 20), const Icon(Icons.star_rounded, color: Colors.amber, size: 20),
const SizedBox(width: 6), const SizedBox(width: 6),
Text( Text(
'Любимые авторы (${favorites.length})', 'Любимые авторы (${widget.favorites.length})',
style: Theme.of(context).textTheme.titleSmall?.copyWith( style: Theme.of(context).textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
const Spacer(), const Spacer(),
TextButton( TextButton(
onPressed: () => onOpenArtist(selected), onPressed: () => widget.onOpenArtist(selected),
style: TextButton.styleFrom( style: TextButton.styleFrom(
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
padding: const EdgeInsets.symmetric(horizontal: 8), padding: const EdgeInsets.symmetric(horizontal: 8),
@@ -1409,21 +1425,42 @@ class _FavoriteArtistsSection extends ConsumerWidget {
], ],
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
SizedBox( MouseRegion(
onEnter: (_) => _isHovered = true,
onExit: (_) => _isHovered = false,
child: Listener(
onPointerSignal: (event) {
if (!_isHovered ||
event is! PointerScrollEvent ||
!_scrollController.hasClients) {
return;
}
final delta = event.scrollDelta.dy != 0
? event.scrollDelta.dy
: event.scrollDelta.dx;
if (delta == 0) return;
final target = (_scrollController.offset + delta * 1.5).clamp(
0.0,
_scrollController.position.maxScrollExtent,
);
_scrollController.jumpTo(target);
},
child: SizedBox(
height: 88, height: 88,
child: ListView.separated( child: ListView.separated(
controller: _scrollController,
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4), padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: favorites.length, itemCount: widget.favorites.length,
separatorBuilder: (_, __) => const SizedBox(width: 10), separatorBuilder: (_, __) => const SizedBox(width: 10),
itemBuilder: (context, index) { itemBuilder: (context, index) {
final fav = favorites[index]; final fav = widget.favorites[index];
final isSelected = fav.key == selected.key; final isSelected = fav.key == selected.key;
final sColor = _serviceColor(fav.service); final sColor = _serviceColor(fav.service);
return InkWell( return InkWell(
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
onTap: () => onSelect(fav), onTap: () => widget.onSelect(fav),
child: AnimatedContainer( child: AnimatedContainer(
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
@@ -1474,6 +1511,8 @@ class _FavoriteArtistsSection extends ConsumerWidget {
fav.avatarUrl!.isNotEmpty fav.avatarUrl!.isNotEmpty
? CachedNetworkImage( ? CachedNetworkImage(
imageUrl: fav.avatarUrl!, imageUrl: fav.avatarUrl!,
memCacheWidth: 120,
memCacheHeight: 120,
fit: BoxFit.cover, fit: BoxFit.cover,
placeholder: (_, __) => const Icon( placeholder: (_, __) => const Icon(
Icons.person_rounded, Icons.person_rounded,
@@ -1516,6 +1555,8 @@ class _FavoriteArtistsSection extends ConsumerWidget {
}, },
), ),
), ),
),
),
const SizedBox(height: 6), const SizedBox(height: 6),
_FavoriteArtistMediaStrip(artist: selected), _FavoriteArtistMediaStrip(artist: selected),
], ],
@@ -1525,18 +1566,34 @@ class _FavoriteArtistsSection extends ConsumerWidget {
} }
} }
class _FavoriteArtistMediaStrip extends ConsumerWidget { class _FavoriteArtistMediaStrip extends ConsumerStatefulWidget {
const _FavoriteArtistMediaStrip({required this.artist}); const _FavoriteArtistMediaStrip({required this.artist});
final FavoriteArtistItem artist; final FavoriteArtistItem artist;
@override @override
Widget build(BuildContext context, WidgetRef ref) { ConsumerState<_FavoriteArtistMediaStrip> createState() =>
_FavoriteArtistMediaStripState();
}
class _FavoriteArtistMediaStripState
extends ConsumerState<_FavoriteArtistMediaStrip> {
final ScrollController _scrollController = ScrollController();
bool _isHovered = false;
@override
void dispose() {
_scrollController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final query = ArtistWorkQuery( final query = ArtistWorkQuery(
providerId: artist.providerId, providerId: widget.artist.providerId,
service: artist.service, service: widget.artist.service,
artistId: artist.id, artistId: widget.artist.id,
artistName: artist.name, artistName: widget.artist.name,
); );
final asyncPosts = ref.watch(artistPostsProvider(query)); final asyncPosts = ref.watch(artistPostsProvider(query));
@@ -1564,9 +1621,30 @@ class _FavoriteArtistMediaStrip extends ConsumerWidget {
), ),
); );
} }
return SizedBox( return MouseRegion(
onEnter: (_) => _isHovered = true,
onExit: (_) => _isHovered = false,
child: Listener(
onPointerSignal: (event) {
if (!_isHovered ||
event is! PointerScrollEvent ||
!_scrollController.hasClients) {
return;
}
final delta = event.scrollDelta.dy != 0
? event.scrollDelta.dy
: event.scrollDelta.dx;
if (delta == 0) return;
final target = (_scrollController.offset + delta * 1.5).clamp(
0.0,
_scrollController.position.maxScrollExtent,
);
_scrollController.jumpTo(target);
},
child: SizedBox(
height: 96, height: 96,
child: ListView.separated( child: ListView.separated(
controller: _scrollController,
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: posts.length.clamp(0, 15), itemCount: posts.length.clamp(0, 15),
separatorBuilder: (_, __) => const SizedBox(width: 8), separatorBuilder: (_, __) => const SizedBox(width: 8),
@@ -1599,6 +1677,8 @@ class _FavoriteArtistMediaStrip extends ConsumerWidget {
imageUrl: post.previewUrl.isNotEmpty imageUrl: post.previewUrl.isNotEmpty
? post.previewUrl ? post.previewUrl
: post.sampleUrl, : post.sampleUrl,
memCacheWidth: 200,
memCacheHeight: 200,
fit: BoxFit.cover, fit: BoxFit.cover,
placeholder: (_, __) => ColoredBox( placeholder: (_, __) => ColoredBox(
color: Theme.of(context) color: Theme.of(context)
@@ -1635,6 +1715,8 @@ class _FavoriteArtistMediaStrip extends ConsumerWidget {
); );
}, },
), ),
),
),
); );
}, },
), ),
@@ -1706,6 +1788,8 @@ class _ArtistAvatar extends StatelessWidget {
? fallback ? fallback
: CachedNetworkImage( : CachedNetworkImage(
imageUrl: artist.avatarUrl!, imageUrl: artist.avatarUrl!,
memCacheWidth: 140,
memCacheHeight: 140,
fit: BoxFit.cover, fit: BoxFit.cover,
placeholder: (_, __) => fallback, placeholder: (_, __) => fallback,
errorWidget: (_, __, ___) => fallback, errorWidget: (_, __, ___) => fallback,
@@ -314,6 +314,8 @@ class _CollectionCard extends ConsumerWidget {
if (urls.length == 1) { if (urls.length == 1) {
return CachedNetworkImage( return CachedNetworkImage(
imageUrl: urls[0], imageUrl: urls[0],
memCacheWidth: 260,
memCacheHeight: 260,
fit: BoxFit.cover, fit: BoxFit.cover,
placeholder: (_, __) => Container(color: scheme.surfaceContainerHighest), placeholder: (_, __) => Container(color: scheme.surfaceContainerHighest),
errorWidget: (_, __, ___) => Container( errorWidget: (_, __, ___) => Container(
@@ -333,6 +335,8 @@ class _CollectionCard extends ConsumerWidget {
if (i < urls.length) if (i < urls.length)
CachedNetworkImage( CachedNetworkImage(
imageUrl: urls[i], imageUrl: urls[i],
memCacheWidth: 200,
memCacheHeight: 200,
fit: BoxFit.cover, fit: BoxFit.cover,
placeholder: (_, __) => placeholder: (_, __) =>
Container(color: scheme.surfaceContainerHighest), Container(color: scheme.surfaceContainerHighest),
@@ -1225,6 +1225,8 @@ class _ArtistCard extends StatelessWidget {
), ),
child: CachedNetworkImage( child: CachedNetworkImage(
imageUrl: url, imageUrl: url,
memCacheWidth: 128,
memCacheHeight: 128,
fit: BoxFit.cover, fit: BoxFit.cover,
placeholder: (_, __) => Container( placeholder: (_, __) => Container(
color: scheme.surfaceContainerHighest, color: scheme.surfaceContainerHighest,
@@ -1155,6 +1155,8 @@ class _NeighborStrip extends StatelessWidget {
imageUrl: post.previewUrl.isNotEmpty imageUrl: post.previewUrl.isNotEmpty
? post.previewUrl ? post.previewUrl
: post.sampleUrl, : post.sampleUrl,
memCacheWidth: 160,
memCacheHeight: 160,
fit: BoxFit.cover, fit: BoxFit.cover,
errorWidget: (_, __, ___) => errorWidget: (_, __, ___) =>
const Center(child: Icon(Icons.broken_image_rounded)), const Center(child: Icon(Icons.broken_image_rounded)),
@@ -78,6 +78,8 @@ class _PostMediaViewerState extends State<PostMediaViewer>
String? _videoError; String? _videoError;
bool _retriedFormatError = false; bool _retriedFormatError = false;
bool _softwareDecodingFallback = false; bool _softwareDecodingFallback = false;
late bool _useSoftwareDecoding =
Platform.isLinux || Platform.isWindows || Platform.isMacOS;
Timer? _hideTimer; Timer? _hideTimer;
StreamSubscription<String>? _errorSubscription; StreamSubscription<String>? _errorSubscription;
StreamSubscription<Duration>? _positionSubscription; StreamSubscription<Duration>? _positionSubscription;
@@ -109,6 +111,8 @@ class _PostMediaViewerState extends State<PostMediaViewer>
_videoError = null; _videoError = null;
_retriedFormatError = false; _retriedFormatError = false;
_softwareDecodingFallback = false; _softwareDecodingFallback = false;
_useSoftwareDecoding =
Platform.isLinux || Platform.isWindows || Platform.isMacOS;
_imageUrls = _buildImageUrls(widget.post); _imageUrls = _buildImageUrls(widget.post);
_videoUrls = _buildVideoUrls(widget.post); _videoUrls = _buildVideoUrls(widget.post);
if (_isPlayableMedia(widget.post) && _videoUrls.isNotEmpty) { if (_isPlayableMedia(widget.post) && _videoUrls.isNotEmpty) {
@@ -226,6 +230,11 @@ class _PostMediaViewerState extends State<PostMediaViewer>
aspectRatio: widget.post.width > 0 && widget.post.height > 0 aspectRatio: widget.post.width > 0 && widget.post.height > 0
? widget.post.width / widget.post.height ? widget.post.width / widget.post.height
: 16 / 9, : 16 / 9,
previewUrl: widget.post.previewUrl.isNotEmpty
? widget.post.previewUrl
: widget.post.sampleUrl,
isSoftwareDecoding: _useSoftwareDecoding,
onToggleDecoder: _toggleDecoderMode,
controlsVisible: _controlsVisible, controlsVisible: _controlsVisible,
coverVideo: _coverVideo, coverVideo: _coverVideo,
muted: _muted, muted: _muted,
@@ -317,10 +326,16 @@ class _PostMediaViewerState extends State<PostMediaViewer>
), ),
); );
} else { } else {
final mq = MediaQuery.maybeOf(context);
final dpr = mq?.devicePixelRatio ?? 1.5;
final screenWidth = mq?.size.width ?? 1280;
final maxCacheWidth =
(screenWidth * dpr * 1.5).round().clamp(1080, 2560);
image = CachedNetworkImage( image = CachedNetworkImage(
key: ValueKey(url), key: ValueKey(url),
imageUrl: url, imageUrl: url,
httpHeaders: headers, httpHeaders: headers,
memCacheWidth: maxCacheWidth,
fit: BoxFit.contain, fit: BoxFit.contain,
placeholder: (context, url) => placeholder: (context, url) =>
const Center(child: CircularProgressIndicator()), const Center(child: CircularProgressIndicator()),
@@ -438,11 +453,12 @@ class _PostMediaViewerState extends State<PostMediaViewer>
void _initializeVideo() { void _initializeVideo() {
MediaKit.ensureInitialized(); MediaKit.ensureInitialized();
_player = Player(); _player = Player();
final bool enableHw = !_useSoftwareDecoding && !_softwareDecodingFallback;
_controller = VideoController( _controller = VideoController(
_player!, _player!,
configuration: VideoControllerConfiguration( configuration: VideoControllerConfiguration(
enableHardwareAcceleration: !_softwareDecodingFallback, enableHardwareAcceleration: enableHw,
hwdec: _softwareDecodingFallback ? 'no' : 'auto-safe', hwdec: enableHw ? (Platform.isAndroid ? 'auto-safe' : 'auto') : 'no',
), ),
); );
_applyVolume(); _applyVolume();
@@ -517,6 +533,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
lower.contains('failed to recognize file format'))) { lower.contains('failed to recognize file format'))) {
_retriedFormatError = true; _retriedFormatError = true;
_softwareDecodingFallback = true; _softwareDecodingFallback = true;
_useSoftwareDecoding = true;
_disposeVideo(); _disposeVideo();
await Future<void>.delayed(const Duration(milliseconds: 250)); await Future<void>.delayed(const Duration(milliseconds: 250));
if (mounted) { if (mounted) {
@@ -534,6 +551,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
_videoIndex = 0; _videoIndex = 0;
_retriedFormatError = false; _retriedFormatError = false;
_softwareDecodingFallback = true; _softwareDecodingFallback = true;
_useSoftwareDecoding = true;
_disposeVideo(); _disposeVideo();
await Future<void>.delayed(const Duration(milliseconds: 150)); await Future<void>.delayed(const Duration(milliseconds: 150));
if (mounted) { if (mounted) {
@@ -541,6 +559,26 @@ class _PostMediaViewerState extends State<PostMediaViewer>
} }
} }
void _toggleDecoderMode() {
setState(() {
_useSoftwareDecoding = !_useSoftwareDecoding;
_softwareDecodingFallback = false;
_retriedFormatError = false;
});
_disposeVideo();
_initializeVideo();
ScaffoldMessenger.maybeOf(context)?.showSnackBar(
SnackBar(
content: Text(
_useSoftwareDecoding
? 'Включено программное декодирование (S/W)'
: 'Включено аппаратное декодирование (H/W)',
),
duration: const Duration(seconds: 2),
),
);
}
void _disposeVideo() { void _disposeVideo() {
_hideTimer?.cancel(); _hideTimer?.cancel();
_errorSubscription?.cancel(); _errorSubscription?.cancel();
@@ -682,6 +720,11 @@ class _PostMediaViewerState extends State<PostMediaViewer>
halfVolume: _halfVolume, halfVolume: _halfVolume,
coverVideo: _coverVideo, coverVideo: _coverVideo,
initialVolume: _currentVolume, initialVolume: _currentVolume,
previewUrl: widget.post.previewUrl.isNotEmpty
? widget.post.previewUrl
: widget.post.sampleUrl,
isSoftwareDecoding: _useSoftwareDecoding,
onToggleDecoder: _toggleDecoderMode,
errorMessage: _videoError, errorMessage: _videoError,
onRetry: _retryVideo, onRetry: _retryVideo,
onChanged: (snapshot) { onChanged: (snapshot) {
@@ -878,6 +921,9 @@ class _FullscreenVideoPage extends StatefulWidget {
required this.halfVolume, required this.halfVolume,
required this.coverVideo, required this.coverVideo,
this.initialVolume = 100.0, this.initialVolume = 100.0,
this.previewUrl,
required this.isSoftwareDecoding,
required this.onToggleDecoder,
required this.errorMessage, required this.errorMessage,
required this.onRetry, required this.onRetry,
required this.onChanged, required this.onChanged,
@@ -892,6 +938,9 @@ class _FullscreenVideoPage extends StatefulWidget {
final bool halfVolume; final bool halfVolume;
final bool coverVideo; final bool coverVideo;
final double initialVolume; final double initialVolume;
final String? previewUrl;
final bool isSoftwareDecoding;
final VoidCallback onToggleDecoder;
final String? errorMessage; final String? errorMessage;
final VoidCallback onRetry; final VoidCallback onRetry;
final ValueChanged<VideoPlaybackSnapshot> onChanged; final ValueChanged<VideoPlaybackSnapshot> onChanged;
@@ -1016,6 +1065,9 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
player: widget.player, player: widget.player,
controller: widget.controller, controller: widget.controller,
aspectRatio: widget.aspectRatio, aspectRatio: widget.aspectRatio,
previewUrl: widget.previewUrl,
isSoftwareDecoding: widget.isSoftwareDecoding,
onToggleDecoder: widget.onToggleDecoder,
controlsVisible: _controlsVisible, controlsVisible: _controlsVisible,
coverVideo: _coverVideo, coverVideo: _coverVideo,
muted: _muted, muted: _muted,
@@ -1567,6 +1619,9 @@ class _VideoSurface extends StatefulWidget {
required this.player, required this.player,
required this.controller, required this.controller,
required this.aspectRatio, required this.aspectRatio,
this.previewUrl,
required this.isSoftwareDecoding,
required this.onToggleDecoder,
required this.controlsVisible, required this.controlsVisible,
required this.coverVideo, required this.coverVideo,
required this.muted, required this.muted,
@@ -1591,6 +1646,9 @@ class _VideoSurface extends StatefulWidget {
final Player player; final Player player;
final VideoController controller; final VideoController controller;
final double aspectRatio; final double aspectRatio;
final String? previewUrl;
final bool isSoftwareDecoding;
final VoidCallback onToggleDecoder;
final bool controlsVisible; final bool controlsVisible;
final bool coverVideo; final bool coverVideo;
final bool muted; final bool muted;
@@ -1749,16 +1807,23 @@ class _VideoSurfaceState extends State<_VideoSurface> {
return Stack( return Stack(
fit: StackFit.expand, fit: StackFit.expand,
children: [ children: [
ColoredBox( if (widget.previewUrl != null && widget.previewUrl!.isNotEmpty)
color: Colors.black, Positioned.fill(
child: Video( child: CachedNetworkImage(
imageUrl: widget.previewUrl!,
fit: widget.coverVideo ? BoxFit.cover : BoxFit.contain,
memCacheWidth: 1920,
memCacheHeight: 1080,
),
),
Video(
controller: widget.controller, controller: widget.controller,
fit: widget.coverVideo ? BoxFit.cover : BoxFit.contain, fit: widget.coverVideo ? BoxFit.cover : BoxFit.contain,
fill: Colors.transparent,
controls: null, controls: null,
pauseUponEnteringBackgroundMode: false, pauseUponEnteringBackgroundMode: false,
resumeUponEnteringForegroundMode: false, resumeUponEnteringForegroundMode: false,
), ),
),
if (_currentBrightness < 0.99) if (_currentBrightness < 0.99)
Positioned.fill( Positioned.fill(
child: IgnorePointer( child: IgnorePointer(
@@ -1836,6 +1901,8 @@ class _VideoSurfaceState extends State<_VideoSurface> {
fullscreen: widget.fullscreen, fullscreen: widget.fullscreen,
isLocked: _isLocked, isLocked: _isLocked,
isLandscape: widget.isLandscape, isLandscape: widget.isLandscape,
isSoftwareDecoding: widget.isSoftwareDecoding,
onToggleDecoder: widget.onToggleDecoder,
onToggleOrientation: widget.onToggleOrientation, onToggleOrientation: widget.onToggleOrientation,
onToggleLock: () => setState(() => _isLocked = !_isLocked), onToggleLock: () => setState(() => _isLocked = !_isLocked),
onToggleFit: widget.onToggleFit, onToggleFit: widget.onToggleFit,
@@ -2190,29 +2257,6 @@ class _ZoomableImageState extends State<_ZoomableImage> {
) )
: widget.child; : widget.child;
return Listener( return Listener(
onPointerSignal: (signal) {
if (signal is PointerScrollEvent) {
final scaleDelta = signal.scrollDelta.dy < 0 ? 1.15 : 0.85;
final currentScale = _controller.value.getMaxScaleOnAxis();
final newScale = (currentScale * scaleDelta).clamp(1.0, 6.0);
if (newScale <= 1.02) {
_controller.value = Matrix4.identity();
if (mounted) setState(() => _zoomed = false);
_setLocked(false);
} else {
final focalPoint = signal.localPosition;
_controller.value = Matrix4.identity()
..translateByDouble(
-focalPoint.dx * (newScale - 1),
-focalPoint.dy * (newScale - 1),
0,
1)
..scaleByDouble(newScale, newScale, 1, 1);
if (mounted) setState(() => _zoomed = true);
_setLocked(true);
}
}
},
onPointerDown: (_) { onPointerDown: (_) {
_pointerCount++; _pointerCount++;
if (_pointerCount >= 2 || _zoomed) { if (_pointerCount >= 2 || _zoomed) {
@@ -2229,6 +2273,7 @@ class _ZoomableImageState extends State<_ZoomableImage> {
transformationController: _controller, transformationController: _controller,
minScale: 1, minScale: 1,
maxScale: 6, maxScale: 6,
scaleFactor: 1000000.0,
boundaryMargin: const EdgeInsets.all(160), boundaryMargin: const EdgeInsets.all(160),
panEnabled: _zoomed, panEnabled: _zoomed,
scaleEnabled: true, scaleEnabled: true,
@@ -2245,9 +2290,17 @@ class _ZoomableImageState extends State<_ZoomableImage> {
if (mounted) setState(() => _zoomed = nextZoomed); if (mounted) setState(() => _zoomed = nextZoomed);
_setLocked(nextZoomed || _pointerCount >= 2); _setLocked(nextZoomed || _pointerCount >= 2);
}, },
child: Listener(
onPointerSignal: (event) {
if (event is PointerScrollEvent) {
GestureBinding.instance.pointerSignalResolver
.register(event, (_) {});
}
},
child: child, child: child,
), ),
), ),
),
); );
}, },
), ),
@@ -2661,6 +2714,8 @@ class _VideoControls extends StatefulWidget {
required this.fullscreen, required this.fullscreen,
required this.isLocked, required this.isLocked,
this.isLandscape, this.isLandscape,
required this.isSoftwareDecoding,
required this.onToggleDecoder,
this.onToggleOrientation, this.onToggleOrientation,
required this.onToggleLock, required this.onToggleLock,
required this.onToggleFit, required this.onToggleFit,
@@ -2680,6 +2735,8 @@ class _VideoControls extends StatefulWidget {
final bool fullscreen; final bool fullscreen;
final bool isLocked; final bool isLocked;
final bool? isLandscape; final bool? isLandscape;
final bool isSoftwareDecoding;
final VoidCallback onToggleDecoder;
final VoidCallback? onToggleOrientation; final VoidCallback? onToggleOrientation;
final VoidCallback onToggleLock; final VoidCallback onToggleLock;
final VoidCallback onToggleFit; final VoidCallback onToggleFit;
@@ -2779,6 +2836,17 @@ class _VideoControlsState extends State<_VideoControls> {
onPressed: widget.onToggleLock, onPressed: widget.onToggleLock,
), ),
const Spacer(), const Spacer(),
_RoundControlButton(
tooltip: widget.isSoftwareDecoding
? 'Декодер: S/W (программный). Нажмите для переключения на H/W'
: 'Декодер: H/W (аппаратный). Нажмите для переключения на S/W',
selected: !widget.isSoftwareDecoding,
icon: widget.isSoftwareDecoding
? Icons.memory_rounded
: Icons.speed_rounded,
onPressed: widget.onToggleDecoder,
),
const SizedBox(width: 8),
_SpeedBadgeButton( _SpeedBadgeButton(
currentRate: currentRate, currentRate: currentRate,
onSelected: (newRate) => widget.player.setRate(newRate), onSelected: (newRate) => widget.player.setRate(newRate),
@@ -1,6 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart' hide appBuildNumber; import 'package:flutter/services.dart' hide appBuildNumber;
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -1439,7 +1440,7 @@ class _SettingsIconBadge extends StatelessWidget {
} }
} }
class _CategoryQuickNav extends StatelessWidget { class _CategoryQuickNav extends StatefulWidget {
const _CategoryQuickNav({ const _CategoryQuickNav({
required this.categories, required this.categories,
required this.onSelect, required this.onSelect,
@@ -1449,20 +1450,55 @@ class _CategoryQuickNav extends StatelessWidget {
categories; categories;
final ValueChanged<GlobalKey> onSelect; final ValueChanged<GlobalKey> onSelect;
@override
State<_CategoryQuickNav> createState() => _CategoryQuickNavState();
}
class _CategoryQuickNavState extends State<_CategoryQuickNav> {
final ScrollController _scrollController = ScrollController();
bool _isHovered = false;
@override
void dispose() {
_scrollController.dispose();
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark; final isDark = theme.brightness == Brightness.dark;
return SizedBox( return MouseRegion(
onEnter: (_) => _isHovered = true,
onExit: (_) => _isHovered = false,
child: Listener(
onPointerSignal: (event) {
if (!_isHovered ||
event is! PointerScrollEvent ||
!_scrollController.hasClients) {
return;
}
final delta = event.scrollDelta.dy != 0
? event.scrollDelta.dy
: event.scrollDelta.dx;
if (delta == 0) return;
final target = (_scrollController.offset + delta * 1.5).clamp(
0.0,
_scrollController.position.maxScrollExtent,
);
_scrollController.jumpTo(target);
},
child: SizedBox(
height: 44, height: 44,
child: ListView.separated( child: ListView.separated(
controller: _scrollController,
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 16),
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: categories.length, itemCount: widget.categories.length,
separatorBuilder: (_, __) => const SizedBox(width: 8), separatorBuilder: (_, __) => const SizedBox(width: 8),
itemBuilder: (context, index) { itemBuilder: (context, index) {
final cat = categories[index]; final cat = widget.categories[index];
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22), borderRadius: BorderRadius.circular(22),
@@ -1482,16 +1518,18 @@ class _CategoryQuickNav extends StatelessWidget {
filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16), filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
child: Material( child: Material(
color: isDark color: isDark
? theme.colorScheme.surfaceContainerHigh.withValues(alpha: 0.60) ? theme.colorScheme.surfaceContainerHigh
.withValues(alpha: 0.60)
: Colors.white.withValues(alpha: 0.82), : Colors.white.withValues(alpha: 0.82),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(22), borderRadius: BorderRadius.circular(22),
onTap: () { onTap: () {
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
onSelect(cat.key); widget.onSelect(cat.key);
}, },
child: Container( child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 7), padding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 7),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22), borderRadius: BorderRadius.circular(22),
border: Border.all( border: Border.all(
@@ -1526,7 +1564,8 @@ class _CategoryQuickNav extends StatelessWidget {
], ],
), ),
child: Center( child: Center(
child: Icon(cat.icon, size: 14, color: Colors.white), child: Icon(cat.icon,
size: 14, color: Colors.white),
), ),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -1547,6 +1586,8 @@ class _CategoryQuickNav extends StatelessWidget {
); );
}, },
), ),
),
),
); );
} }
} }
@@ -427,6 +427,8 @@ class _ViewedPostTile extends StatelessWidget {
) )
: CachedNetworkImage( : CachedNetworkImage(
imageUrl: image, imageUrl: image,
memCacheWidth: 320,
memCacheHeight: 320,
fit: BoxFit.cover, fit: BoxFit.cover,
placeholder: (_, __) => Container( placeholder: (_, __) => Container(
color: scheme.surfaceContainerHighest, color: scheme.surfaceContainerHighest,
+5
View File
@@ -1,9 +1,14 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:media_kit/media_kit.dart';
import 'app/app.dart'; import 'app/app.dart';
void main() { void main() {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
MediaKit.ensureInitialized();
// Optimize image cache to prevent memory bloat and OOM crashes
PaintingBinding.instance.imageCache.maximumSizeBytes = 180 * 1024 * 1024; // 180 MB
PaintingBinding.instance.imageCache.maximumSize = 120; // 120 images
runApp(const ProviderScope(child: GelRuleApp())); runApp(const ProviderScope(child: GelRuleApp()));
} }
+243 -81
View File
@@ -5,7 +5,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import '../../app/app.dart'; import '../../app/app.dart';
import '../../app/motion.dart';
import '../../app/responsive.dart'; import '../../app/responsive.dart';
import '../../app/router.dart'; import '../../app/router.dart';
import '../../backend/backend.dart'; import '../../backend/backend.dart';
@@ -385,10 +384,55 @@ class _DesktopShell extends StatefulWidget {
State<_DesktopShell> createState() => _DesktopShellState(); State<_DesktopShell> createState() => _DesktopShellState();
} }
class _DesktopShellState extends State<_DesktopShell> { class _DesktopShellState extends State<_DesktopShell>
with SingleTickerProviderStateMixin {
late final AnimationController _controller;
late final Animation<double> _animation;
bool _hovered = false; bool _hovered = false;
bool _pinned = false; bool _pinned = false;
@override
void initState() {
super.initState();
_controller = AnimationController(
vsync: this,
duration: const Duration(milliseconds: 220),
);
_animation = CurvedAnimation(
parent: _controller,
curve: Curves.easeOutCubic,
reverseCurve: Curves.easeInCubic,
);
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
void _handleHover(bool hovered) {
if (_hovered == hovered) return;
setState(() => _hovered = hovered);
if (_pinned) return;
if (hovered) {
_controller.forward();
} else {
_controller.reverse();
}
}
void _togglePinned() {
setState(() {
_pinned = !_pinned;
if (_pinned) {
_controller.forward();
} else if (!_hovered) {
_controller.reverse();
}
});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
@@ -400,47 +444,61 @@ class _DesktopShellState extends State<_DesktopShell> {
final selected = widget.destinations.indexWhere( final selected = widget.destinations.indexWhere(
(item) => AppShell.branchIndexForLocation(item.location) == activeBranch, (item) => AppShell.branchIndexForLocation(item.location) == activeBranch,
); );
final isExpanded = _pinned || _hovered;
return Scaffold( return Scaffold(
body: Row( body: Row(
children: [ children: [
MouseRegion( MouseRegion(
onEnter: (_) => setState(() => _hovered = true), onEnter: (_) => _handleHover(true),
onExit: (_) => setState(() => _hovered = false), onExit: (_) => _handleHover(false),
child: AnimatedContainer( child: AnimatedBuilder(
duration: AppMotion.duration(context, 200), animation: _animation,
curve: Curves.easeOutCubic, builder: (context, _) {
width: isExpanded ? 260 : 74, final progress = _animation.value;
final width = lerpDouble(74.0, 260.0, progress)!;
final contentOpacity =
(progress - 0.25).clamp(0.0, 0.75) / 0.75;
final isFullyExpanded = progress > 0.85;
return Container(
width: width,
decoration: BoxDecoration( decoration: BoxDecoration(
color: isDark color: isDark
? scheme.surfaceContainerHigh.withValues(alpha: 0.75) ? scheme.surfaceContainerHigh
: scheme.surface.withValues(alpha: 0.85), : scheme.surface,
border: Border( border: Border(
right: BorderSide( right: BorderSide(
color: isDark color: isDark
? Colors.white.withValues(alpha: 0.12) ? Colors.white.withValues(alpha: 0.1)
: scheme.outlineVariant.withValues(alpha: 0.35), : scheme.outlineVariant.withValues(alpha: 0.35),
width: 1, width: 1,
), ),
), ),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withValues(alpha: isDark ? 0.3 : 0.05), color:
blurRadius: 18, Colors.black.withValues(alpha: isDark ? 0.3 : 0.05),
offset: const Offset(4, 0), blurRadius: 16,
offset: const Offset(3, 0),
), ),
], ],
), ),
child: ClipRect( child: ClipRect(
child: BackdropFilter( child: OverflowBox(
filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20), minWidth: 260,
maxWidth: 260,
alignment: Alignment.topLeft,
child: SizedBox(
width: 260,
child: SafeArea( child: SafeArea(
child: Column( child: Column(
children: [ children: [
// App Brand Header // App Brand Header
Padding( Padding(
padding: const EdgeInsets.fromLTRB(14, 16, 12, 14), padding:
const EdgeInsets.fromLTRB(15, 16, 12, 14),
child: SizedBox(
height: 44,
child: Row( child: Row(
children: [ children: [
Container( Container(
@@ -455,10 +513,12 @@ class _DesktopShellState extends State<_DesktopShell> {
scheme.tertiary, scheme.tertiary,
], ],
), ),
borderRadius: BorderRadius.circular(14), borderRadius:
BorderRadius.circular(14),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: scheme.primary.withValues(alpha: 0.35), color: scheme.primary
.withValues(alpha: 0.35),
blurRadius: 12, blurRadius: 12,
offset: const Offset(0, 3), offset: const Offset(0, 3),
), ),
@@ -472,39 +532,59 @@ class _DesktopShellState extends State<_DesktopShell> {
), ),
), ),
), ),
if (isExpanded) ...[
const SizedBox(width: 12), const SizedBox(width: 12),
Expanded(
child: Opacity(
opacity: contentOpacity,
child: Row(
children: [
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
mainAxisSize: MainAxisSize.min, CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
Text( Text(
'Lunaris', 'Lunaris',
style: theme.textTheme.titleMedium?.copyWith( maxLines: 1,
fontWeight: FontWeight.w800, softWrap: false,
style: theme
.textTheme
.titleMedium
?.copyWith(
fontWeight:
FontWeight.w800,
letterSpacing: 0.2, letterSpacing: 0.2,
), ),
), ),
const SizedBox(height: 2), const SizedBox(height: 2),
Container( Container(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets
.symmetric(
horizontal: 6, horizontal: 6,
vertical: 1.5, vertical: 1.5,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: scheme.primary.withValues(alpha: 0.15), color: scheme.primary
borderRadius: BorderRadius.circular(6), .withValues(
alpha: 0.15),
borderRadius:
BorderRadius
.circular(6),
border: Border.all( border: Border.all(
color: scheme.primary.withValues(alpha: 0.3), color: scheme.primary
.withValues(
alpha: 0.3),
width: 0.8, width: 0.8,
), ),
), ),
child: Text( child: Text(
'v3.6.0', 'v3.6.4',
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.bold, fontWeight:
FontWeight.bold,
color: scheme.primary, color: scheme.primary,
letterSpacing: 0.4, letterSpacing: 0.4,
), ),
@@ -514,32 +594,43 @@ class _DesktopShellState extends State<_DesktopShell> {
), ),
), ),
IconButton( IconButton(
visualDensity: VisualDensity.compact, visualDensity:
VisualDensity.compact,
tooltip: _pinned tooltip: _pinned
? (widget.ru ? 'Открепить панель' : 'Unpin panel') ? (widget.ru
: (widget.ru ? 'Закрепить панель' : 'Pin panel'), ? 'Открепить панель'
onPressed: () { : 'Unpin panel')
setState(() => _pinned = !_pinned); : (widget.ru
}, ? 'Закрепить панель'
: 'Pin panel'),
onPressed: _togglePinned,
icon: Icon( icon: Icon(
_pinned _pinned
? Icons.push_pin_rounded ? Icons.push_pin_rounded
: Icons.push_pin_outlined, : Icons.push_pin_outlined,
size: 19, size: 19,
color: _pinned ? scheme.primary : scheme.onSurfaceVariant, color: _pinned
? scheme.primary
: scheme
.onSurfaceVariant,
), ),
), ),
], ],
),
),
),
], ],
), ),
), ),
),
const Divider(height: 1), const Divider(height: 1),
const SizedBox(height: 8), const SizedBox(height: 8),
// Destinations List // Destinations List
Expanded( Expanded(
child: ListView( child: ListView(
padding: const EdgeInsets.symmetric(horizontal: 8), padding:
const EdgeInsets.symmetric(horizontal: 8),
children: [ children: [
for (var index = 0; for (var index = 0;
index < widget.destinations.length; index < widget.destinations.length;
@@ -547,12 +638,15 @@ class _DesktopShellState extends State<_DesktopShell> {
_RailButton( _RailButton(
destination: widget.destinations[index], destination: widget.destinations[index],
ru: widget.ru, ru: widget.ru,
selected: (selected < 0 ? 0 : selected) == index, selected: (selected < 0 ? 0 : selected) ==
expanded: isExpanded, index,
contentOpacity: contentOpacity,
isFullyExpanded: isFullyExpanded,
shortcutKey: 'Ctrl+${index + 1}', shortcutKey: 'Ctrl+${index + 1}',
onTap: () { onTap: () {
widget.onNavigate( widget.onNavigate(
widget.destinations[index].location); widget.destinations[index]
.location);
}, },
), ),
], ],
@@ -564,22 +658,28 @@ class _DesktopShellState extends State<_DesktopShell> {
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 8), horizontal: 8, vertical: 8),
child: Column( child: SizedBox(
width: 244,
child: Row(
children: [ children: [
// Shortcuts helper button Expanded(
Tooltip( child: Tooltip(
message: isExpanded message: isFullyExpanded
? '' ? ''
: (widget.ru : (widget.ru
? 'Горячие клавиши (F1 / ?)' ? 'Горячие клавиши (F1 / ?)'
: 'Keyboard Shortcuts (F1 / ?)'), : 'Keyboard Shortcuts (F1 / ?)'),
waitDuration: const Duration(milliseconds: 350), waitDuration: const Duration(
milliseconds: 350),
child: Material( child: Material(
color: Colors.transparent, color: Colors.transparent,
borderRadius: BorderRadius.circular(14), borderRadius:
BorderRadius.circular(14),
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: InkWell( child: InkWell(
onTap: () => DesktopShortcutsDialog.show(context), onTap: () =>
DesktopShortcutsDialog.show(
context),
child: SizedBox( child: SizedBox(
height: 44, height: 44,
child: Row( child: Row(
@@ -589,68 +689,110 @@ class _DesktopShellState extends State<_DesktopShell> {
child: Icon( child: Icon(
Icons.keyboard_rounded, Icons.keyboard_rounded,
size: 22, size: 22,
color: scheme.onSurfaceVariant, color: scheme
.onSurfaceVariant,
), ),
), ),
if (isExpanded) ...[ Expanded(
child: Opacity(
opacity: contentOpacity,
child: Row(
children: [
Expanded( Expanded(
child: Text( child: Text(
widget.ru widget.ru
? 'Горячие клавиши' ? 'Горячие клавиши'
: 'Shortcuts', : 'Shortcuts',
style: TextStyle( maxLines: 1,
fontWeight: FontWeight.w600, softWrap: false,
overflow:
TextOverflow
.ellipsis,
style:
TextStyle(
fontWeight:
FontWeight
.w600,
fontSize: 13, fontSize: 13,
color: scheme.onSurface, color: scheme
.onSurface,
), ),
overflow: TextOverflow.ellipsis,
), ),
), ),
Container( Container(
padding: const EdgeInsets.symmetric( padding:
const EdgeInsets
.symmetric(
horizontal: 6, horizontal: 6,
vertical: 2, vertical: 2,
), ),
decoration: BoxDecoration( decoration:
BoxDecoration(
color: isDark color: isDark
? Colors.white.withValues(alpha: 0.1) ? Colors
: Colors.black.withValues(alpha: 0.06), .white
borderRadius: BorderRadius.circular(6), .withValues(
alpha:
0.1)
: Colors
.black
.withValues(
alpha:
0.06),
borderRadius:
BorderRadius
.circular(
6),
), ),
child: const Text( child: const Text(
'?', '?',
style: TextStyle( style:
TextStyle(
fontSize: 11, fontSize: 11,
fontWeight: FontWeight.bold, fontWeight:
fontFamily: 'monospace', FontWeight
.bold,
fontFamily:
'monospace',
), ),
), ),
), ),
const SizedBox(width: 8), const SizedBox(
width: 8),
], ],
),
),
),
], ],
), ),
), ),
), ),
), ),
), ),
),
// Quick pin toggle button when collapsed if (!_pinned && progress < 0.4)
if (!isExpanded)
IconButton( IconButton(
tooltip: widget.ru ? 'Закрепить панель' : 'Pin sidebar', tooltip: widget.ru
onPressed: () => setState(() => _pinned = true), ? 'Закрепить панель'
icon: const Icon(Icons.chevron_right_rounded, size: 20), : 'Pin sidebar',
onPressed: _togglePinned,
icon: const Icon(
Icons.chevron_right_rounded,
size: 20),
), ),
], ],
), ),
), ),
),
], ],
), ),
), ),
), ),
), ),
), ),
);
},
),
), ),
Expanded(child: widget.child), Expanded(child: widget.child),
], ],
@@ -663,7 +805,8 @@ class _RailButton extends StatelessWidget {
const _RailButton({ const _RailButton({
required this.destination, required this.destination,
required this.selected, required this.selected,
required this.expanded, required this.contentOpacity,
required this.isFullyExpanded,
required this.ru, required this.ru,
required this.shortcutKey, required this.shortcutKey,
required this.onTap, required this.onTap,
@@ -671,7 +814,8 @@ class _RailButton extends StatelessWidget {
final _Destination destination; final _Destination destination;
final bool selected; final bool selected;
final bool expanded; final double contentOpacity;
final bool isFullyExpanded;
final bool ru; final bool ru;
final String shortcutKey; final String shortcutKey;
final VoidCallback onTap; final VoidCallback onTap;
@@ -686,7 +830,7 @@ class _RailButton extends StatelessWidget {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 2), padding: const EdgeInsets.symmetric(vertical: 2),
child: Tooltip( child: Tooltip(
message: expanded ? '' : '$label ($shortcutKey)', message: isFullyExpanded ? '' : '$label ($shortcutKey)',
waitDuration: const Duration(milliseconds: 350), waitDuration: const Duration(milliseconds: 350),
child: Material( child: Material(
color: selected color: selected
@@ -696,13 +840,16 @@ class _RailButton extends StatelessWidget {
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: InkWell( child: InkWell(
onTap: onTap, onTap: onTap,
child: Container( child: SizedBox(
width: 244,
height: 46, height: 46,
child: DecoratedBox(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
border: selected border: selected
? Border.all( ? Border.all(
color: scheme.primary.withValues(alpha: isDark ? 0.45 : 0.28), color: scheme.primary
.withValues(alpha: isDark ? 0.45 : 0.28),
width: 1.1, width: 1.1,
) )
: null, : null,
@@ -735,21 +882,31 @@ class _RailButton extends StatelessWidget {
color: selected color: selected
? scheme.primary ? scheme.primary
: (isDark : (isDark
? scheme.onSurfaceVariant.withValues(alpha: 0.85) ? scheme.onSurfaceVariant
.withValues(alpha: 0.85)
: scheme.onSurfaceVariant), : scheme.onSurfaceVariant),
), ),
), ),
), ),
if (expanded) ...[ Expanded(
child: Opacity(
opacity: contentOpacity,
child: Row(
children: [
Expanded( Expanded(
child: Text( child: Text(
label, label,
maxLines: 1, maxLines: 1,
softWrap: false,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 13.5, fontSize: 13.5,
fontWeight: selected ? FontWeight.w700 : FontWeight.w500, fontWeight: selected
color: selected ? scheme.primary : scheme.onSurface, ? FontWeight.w700
: FontWeight.w500,
color: selected
? scheme.primary
: scheme.onSurface,
), ),
), ),
), ),
@@ -778,18 +935,23 @@ class _RailButton extends StatelessWidget {
fontFamily: 'monospace', fontFamily: 'monospace',
color: selected color: selected
? scheme.primary ? scheme.primary
: scheme.onSurfaceVariant.withValues(alpha: 0.8), : scheme.onSurfaceVariant
.withValues(alpha: 0.8),
), ),
), ),
), ),
const SizedBox(width: 10), const SizedBox(width: 8),
], ],
),
),
),
], ],
), ),
), ),
), ),
), ),
), ),
),
); );
} }
} }
+12 -5
View File
@@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:collection'; import 'dart:collection';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -232,7 +233,7 @@ class _PostCardState extends ConsumerState<PostCard>
} }
final dpr = MediaQuery.devicePixelRatioOf(context); final dpr = MediaQuery.devicePixelRatioOf(context);
final cacheWidth = final cacheWidth =
(constraints.maxWidth * dpr).round().clamp(320, 1800); (constraints.maxWidth * dpr).round().clamp(280, 960);
final headers = _headersFor(post); final headers = _headersFor(post);
final videoUrls = MediaUrlSelector.video(post); final videoUrls = MediaUrlSelector.video(post);
if (!mobile && if (!mobile &&
@@ -590,7 +591,15 @@ class _FeedVideoPreviewState extends State<_FeedVideoPreview> {
super.initState(); super.initState();
MediaKit.ensureInitialized(); MediaKit.ensureInitialized();
_player = Player(); _player = Player();
_controller = VideoController(_player); final isDesktop =
Platform.isLinux || Platform.isWindows || Platform.isMacOS;
_controller = VideoController(
_player,
configuration: VideoControllerConfiguration(
enableHardwareAcceleration: !isDesktop,
hwdec: isDesktop ? 'no' : 'auto-safe',
),
);
_player.stream.error.listen((_) { _player.stream.error.listen((_) {
if (mounted) setState(() => _failed = true); if (mounted) setState(() => _failed = true);
}); });
@@ -633,17 +642,15 @@ class _FeedVideoPreviewState extends State<_FeedVideoPreview> {
AnimatedOpacity( AnimatedOpacity(
opacity: _ready ? 1 : 0, opacity: _ready ? 1 : 0,
duration: AppMotion.duration(context, 180), duration: AppMotion.duration(context, 180),
child: ColoredBox(
color: Colors.black,
child: Video( child: Video(
controller: _controller, controller: _controller,
fit: BoxFit.cover, fit: BoxFit.cover,
fill: Colors.transparent,
controls: null, controls: null,
pauseUponEnteringBackgroundMode: false, pauseUponEnteringBackgroundMode: false,
resumeUponEnteringForegroundMode: false, resumeUponEnteringForegroundMode: false,
), ),
), ),
),
], ],
); );
} }
+3 -1
View File
@@ -68,7 +68,8 @@ class PostMasonryGrid extends StatelessWidget {
final spacing = mobile ? 8.0 : 12.0; final spacing = mobile ? 8.0 : 12.0;
Widget buildCard(Post post) { Widget buildCard(Post post) {
return PostCard( return RepaintBoundary(
child: PostCard(
post: post, post: post,
blurExplicit: blurExplicit && !nsfwEnabled, blurExplicit: blurExplicit && !nsfwEnabled,
showBadges: showBadges, showBadges: showBadges,
@@ -86,6 +87,7 @@ class PostMasonryGrid extends StatelessWidget {
onToggleSelected == null ? null : () => onToggleSelected!(post), onToggleSelected == null ? null : () => onToggleSelected!(post),
onAddToCollection: onAddToCollection:
onAddToCollection == null ? null : () => onAddToCollection!(post), onAddToCollection == null ? null : () => onAddToCollection!(post),
),
); );
} }
+1 -1
View File
@@ -1,7 +1,7 @@
name: gel_rule_app name: gel_rule_app
description: Local backend/core layer for a Flutter booru browser app. description: Local backend/core layer for a Flutter booru browser app.
publish_to: "none" publish_to: "none"
version: 3.6.0+82 version: 3.6.4+86
environment: environment:
sdk: ">=3.3.0 <4.0.0" sdk: ">=3.3.0 <4.0.0"