v1.1.3+33
All checks were successful
Flutter Schmutter / build (push) Successful in 3m38s

This commit is contained in:
2025-06-07 16:30:49 +02:00
parent 27476fbc1d
commit bf4e0fa493
75 changed files with 594 additions and 3454 deletions

View File

@ -2,27 +2,28 @@ import 'dart:io';
import 'dart:typed_data';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:provider/provider.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:share_plus/share_plus.dart';
import 'package:f0ckapp/models/MediaItem.dart';
import 'package:f0ckapp/services/Api.dart';
import 'package:f0ckapp/widgets/VideoWidget.dart';
import 'package:f0ckapp/utils/SmartRefreshIndicator.dart';
import 'package:f0ckapp/utils/PageTransformer.dart';
import 'package:f0ckapp/providers/MediaProvider.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:share_plus/share_plus.dart';
class DetailView extends StatefulWidget {
class DetailView extends ConsumerStatefulWidget {
final int initialItemId;
const DetailView({super.key, required this.initialItemId});
@override
State createState() => _DetailViewState();
ConsumerState<DetailView> createState() => _DetailViewState();
}
class _DetailViewState extends State<DetailView> {
class _DetailViewState extends ConsumerState<DetailView> {
late PageController _pageController;
bool isLoading = false;
int _currentIndex = 0;
@ -30,15 +31,14 @@ class _DetailViewState extends State<DetailView> {
@override
void initState() {
super.initState();
final provider = Provider.of<MediaProvider>(context, listen: false);
final initialIndex = provider.mediaItems.indexWhere(
final mediaState = ref.read(mediaProvider);
final initialIndex = mediaState.mediaItems.indexWhere(
(item) => item.id == widget.initialItemId,
);
_pageController = PageController(initialPage: initialIndex);
_currentIndex = initialIndex;
_pageController.addListener(() {
setState(() => _currentIndex = _pageController.page?.round() ?? 0);
});
@ -47,16 +47,15 @@ class _DetailViewState extends State<DetailView> {
}
void _preloadAdjacentMedia(int index) async {
final provider = Provider.of<MediaProvider>(context, listen: false);
if (index + 1 < provider.mediaItems.length) {
final nextUrl = provider.mediaItems[index + 1].mediaUrl;
final mediaState = ref.read(mediaProvider);
if (index + 1 < mediaState.mediaItems.length) {
final nextUrl = mediaState.mediaItems[index + 1].mediaUrl;
if (await DefaultCacheManager().getFileFromCache(nextUrl) == null) {
await DefaultCacheManager().downloadFile(nextUrl);
}
}
if (index - 1 >= 0) {
final prevUrl = provider.mediaItems[index - 1].mediaUrl;
final prevUrl = mediaState.mediaItems[index - 1].mediaUrl;
if (await DefaultCacheManager().getFileFromCache(prevUrl) == null) {
await DefaultCacheManager().downloadFile(prevUrl);
}
@ -67,19 +66,8 @@ class _DetailViewState extends State<DetailView> {
if (isLoading) return;
setState(() => isLoading = true);
final provider = Provider.of<MediaProvider>(context, listen: false);
try {
final newMedia = await fetchMedia(
older: provider.mediaItems.last.id,
type: provider.type,
mode: provider.mode,
random: provider.random,
tag: provider.tag,
);
if (mounted && newMedia.isNotEmpty) {
setState(() => provider.mediaItems.addAll(newMedia));
}
await ref.read(mediaProvider.notifier).loadMedia();
} catch (e) {
_showError("Fehler beim Laden der Medien: $e");
} finally {
@ -89,41 +77,49 @@ class _DetailViewState extends State<DetailView> {
void _showError(String message) {
if (!mounted) return;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(message)));
ScaffoldMessenger.of(context)
..removeCurrentSnackBar()
..showSnackBar(SnackBar(content: Text(message)));
}
@override
void dispose() {
_pageController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final provider = Provider.of<MediaProvider>(context);
final mediaState = ref.watch(mediaProvider);
final mediaNotifier = ref.read(mediaProvider.notifier);
if (mediaState.mediaItems.isEmpty) {
return Scaffold(
appBar: AppBar(),
body: const Center(child: CircularProgressIndicator()),
);
}
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text(
'f0ck #${provider.mediaItems.elementAt(_currentIndex).id.toString()}',
),
title: Text('f0ck #${mediaState.mediaItems[_currentIndex].id}'),
actions: [
IconButton(
icon: Icon(
provider.muted ? Icons.volume_up : Icons.volume_off,
color: Colors.white,
),
icon: Icon(mediaState.muted ? Icons.volume_off : Icons.volume_up),
onPressed: () {
provider.toggleMute();
mediaNotifier.toggleMute();
},
),
PopupMenuButton<String>(
onSelected: (value) async {
final item = provider.mediaItems.elementAt(_currentIndex);
final item = mediaState.mediaItems[_currentIndex];
switch (value) {
case 'media':
File file = await DefaultCacheManager().getSingleFile(
item.mediaUrl,
);
Uint8List bytes = await file.readAsBytes();
final params = ShareParams(
files: [XFile.fromData(bytes, mimeType: item.mime)],
);
@ -145,26 +141,26 @@ class _DetailViewState extends State<DetailView> {
PopupMenuItem(
value: 'media',
child: ListTile(
leading: Icon(Icons.image),
title: Text('Als Datei'),
leading: const Icon(Icons.image),
title: const Text('Als Datei'),
),
),
PopupMenuItem(
value: 'direct_link',
child: ListTile(
leading: Icon(Icons.link),
title: Text('Link zum Bild'),
leading: const Icon(Icons.link),
title: const Text('Link zum Bild'),
),
),
PopupMenuItem(
value: 'post_link',
child: ListTile(
leading: Icon(Icons.article),
title: Text('Link zum Post'),
leading: const Icon(Icons.article),
title: const Text('Link zum Post'),
),
),
],
icon: Icon(Icons.share),
icon: const Icon(Icons.share),
),
],
),
@ -172,9 +168,8 @@ class _DetailViewState extends State<DetailView> {
children: [
PageTransformer(
controller: _pageController,
pages: provider.mediaItems.map((item) {
int itemIndex = provider.mediaItems.indexOf(item);
pages: mediaState.mediaItems.map((item) {
int itemIndex = mediaState.mediaItems.indexOf(item);
return SafeArea(
child: SmartRefreshIndicator(
onRefresh: _loadMoreMedia,
@ -185,14 +180,14 @@ class _DetailViewState extends State<DetailView> {
),
],
),
persistentFooterButtons: provider.tag != null
persistentFooterButtons: mediaState.tag != null
? [
InputChip(
label: Text(provider.tag!),
backgroundColor: const Color(0xFF090909),
labelStyle: const TextStyle(color: Colors.white),
label: Text(mediaState.tag!),
//backgroundColor: const Color(0xFF090909),
//labelStyle: const TextStyle(color: Colors.white),
onDeleted: () {
provider.setTag(null);
mediaNotifier.setTag(null);
Navigator.pop(context);
},
),
@ -202,7 +197,7 @@ class _DetailViewState extends State<DetailView> {
}
Widget _buildMediaItem(MediaItem item, bool isActive) {
final provider = Provider.of<MediaProvider>(context);
final mediaNotifier = ref.read(mediaProvider.notifier);
return SingleChildScrollView(
child: Column(
@ -211,16 +206,11 @@ class _DetailViewState extends State<DetailView> {
CachedNetworkImage(
imageUrl: item.mediaUrl,
fit: BoxFit.contain,
placeholder: (context, url) => CircularProgressIndicator(),
errorWidget: (context, url, error) => Icon(Icons.error),
placeholder: (context, url) => const CircularProgressIndicator(),
errorWidget: (context, url, error) => const Icon(Icons.error),
)
else
VideoWidget(details: item, isActive: isActive),
/*const SizedBox(height: 20),
Text(
'f0ck #${item.id.toString()}',
style: const TextStyle(color: Colors.white, fontSize: 18),
),*/
const SizedBox(height: 10, width: double.infinity),
Wrap(
alignment: WrapAlignment.center,
@ -230,7 +220,7 @@ class _DetailViewState extends State<DetailView> {
onPressed: () {
if (tag.tag == 'sfw' || tag.tag == 'nsfw') return;
setState(() {
provider.setTag(tag.tag);
mediaNotifier.setTag(tag.tag);
Navigator.pop(context, true);
});
},