f0ck/fApp
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 51 Wiki Activity

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

Browse Source
This commit is contained in:
Flummi
2025-06-07 16:30:49 +02:00
parent 27476fbc1d
commit bf4e0fa493
75 changed files with 594 additions and 3454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
lib/screens/DetailView.dart
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);
});
},

320
lib/screens/MediaGrid.dart
View File

@ -1,37 +1,29 @@
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:f0ckapp/screens/DetailView.dart';
import 'package:f0ckapp/providers/MediaProvider.dart';
import 'package:f0ckapp/utils/AppVersion.dart';
import 'package:f0ckapp/providers/ThemeProvider.dart';
class MediaGrid extends StatefulWidget {
const List<String> mediaTypes = ["alles", "image", "video", "audio"];
const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
class MediaGrid extends ConsumerStatefulWidget {
const MediaGrid({super.key});
@override
State createState() => _MediaGridState();
ConsumerState<MediaGrid> createState() => _MediaGridState();
}
class _MediaGridState extends State<MediaGrid> {
class _MediaGridState extends ConsumerState<MediaGrid> {
final ScrollController _scrollController = ScrollController();
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
@override
void initState() {
super.initState();
final provider = Provider.of<MediaProvider>(context, listen: false);
Future.microtask(() {
provider.loadMedia();
});
_scrollController.addListener(() {
if (_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent - 200) {
provider.loadMedia(notify: false);
}
});
}
final TextEditingController _usernameController = TextEditingController();
final TextEditingController _passwordController = TextEditingController();
int _calculateCrossAxisCount(BuildContext context, int defaultCount) {
return defaultCount == 0
@ -40,34 +32,59 @@ class _MediaGridState extends State<MediaGrid> {
}
@override
Widget build(BuildContext context) {
final provider = Provider.of<MediaProvider>(context);
final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
void initState() {
super.initState();
Future.microtask(() {
ref.read(mediaProvider.notifier).loadMedia();
});
_scrollController.addListener(() {
if (_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent - 200) {
ref.read(mediaProvider.notifier).loadMedia();
}
});
}
final TextEditingController _usernameController = TextEditingController();
final TextEditingController _passwordController = TextEditingController();
@override
void dispose() {
_scrollController.dispose();
_usernameController.dispose();
_passwordController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final mediaState = ref.watch(mediaProvider);
final mediaNotifier = ref.read(mediaProvider.notifier);
return Scaffold(
key: scaffoldKey,
key: _scaffoldKey,
appBar: AppBar(
title: Image.asset(
'assets/images/f0ck_small.webp',
fit: BoxFit.fitHeight,
title: Row(
spacing: 15,
children: [
Image.asset('assets/images/f0ck_small.webp', fit: BoxFit.fitHeight),
Text(
'fApp',
style: TextStyle(fontSize: 24),
),
],
),
actions: [
IconButton(
icon: Icon(
provider.random ? Icons.shuffle_on_outlined : Icons.shuffle,
mediaState.random ? Icons.shuffle_on_outlined : Icons.shuffle,
),
onPressed: () {
provider.toggleRandom();
mediaNotifier.toggleRandom();
_scrollController.jumpTo(0);
},
),
IconButton(
icon: const Icon(Icons.menu),
onPressed: () {
scaffoldKey.currentState?.openEndDrawer();
_scaffoldKey.currentState?.openEndDrawer();
},
),
],
@ -77,32 +94,11 @@ class _MediaGridState extends State<MediaGrid> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Text('type: '),
const Text('type: '),
DropdownButton<String>(
// type
value: provider.type,
value: mediaTypes[mediaState.typeIndex],
isDense: true,
//icon: SizedBox.shrink(),
items: provider.types.map((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value, style: TextStyle(color: Colors.white)),
);
}).toList(),
onChanged: (String? newValue) {
if (newValue != null) {
provider.setType(newValue);
_scrollController.jumpTo(0);
}
},
),
Text('mode: '),
DropdownButton<String>(
// mode
value: provider.modes[provider.mode],
isDense: true,
//icon: SizedBox.shrink(),
items: provider.modes.map((String value) {
items: mediaTypes.map((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value),
@ -110,7 +106,24 @@ class _MediaGridState extends State<MediaGrid> {
}).toList(),
onChanged: (String? newValue) {
if (newValue != null) {
provider.setMode(provider.modes.indexOf(newValue));
mediaNotifier.setType(newValue);
_scrollController.jumpTo(0);
}
},
),
const Text('mode: '),
DropdownButton<String>(
value: mediaModes[mediaState.modeIndex],
isDense: true,
items: mediaModes.map((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value),
);
}).toList(),
onChanged: (String? newValue) {
if (newValue != null) {
mediaNotifier.setMode(mediaModes.indexOf(newValue));
_scrollController.jumpTo(0);
}
},
@ -123,7 +136,7 @@ class _MediaGridState extends State<MediaGrid> {
padding: EdgeInsets.zero,
children: [
DrawerHeader(
decoration: BoxDecoration(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/menu.webp'),
fit: BoxFit.cover,
@ -133,71 +146,100 @@ class _MediaGridState extends State<MediaGrid> {
child: null,
),
ExpansionTile(
title: Text('Login'),
title: const Text('Login'),
children: [
Padding(
padding: EdgeInsets.all(16.0),
padding: const EdgeInsets.all(16.0),
child: Column(
children: [
TextField(
readOnly: true,
controller: _usernameController,
decoration: InputDecoration(labelText: 'Benutzername'),
decoration: const InputDecoration(
labelText: 'Benutzername',
),
),
SizedBox(height: 10),
const SizedBox(height: 10),
TextField(
readOnly: true,
controller: _passwordController,
obscureText: true,
decoration: InputDecoration(labelText: 'Passwort'),
decoration: const InputDecoration(
labelText: 'Passwort',
),
),
SizedBox(height: 20),
const SizedBox(height: 20),
ElevatedButton(
onPressed: () async {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
const SnackBar(
content: Text("noch nicht implementiert lol"),
),
);
/*final success = await login(
_usernameController.text,
_passwordController.text,
);
if (success) {
Navigator.pop(context);
} else {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Login fehlgeschlagen!")),
/*final success = await login(
_usernameController.text,
_passwordController.text,
);
}*/
if (success) {
Navigator.pop(context);
} else {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Login fehlgeschlagen!")),
);
}*/
);
},
child: Text('Login'),
child: const Text('Login'),
),
],
),
),
],
),
ExpansionTile(
title: const Text('Theme'),
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Column(
children: themes.map((themeData) {
final currentTheme = ref.watch(themeNotifierProvider);
final isSelected = currentTheme == themeData.theme;
return ListTile(
title: Text(themeData.name),
selected: isSelected,
selectedTileColor: Colors.blue.withValues(alpha: 0.2),
onTap: () async {
await ref
.read(themeNotifierProvider.notifier)
.updateTheme(themeData.name);
},
);
}).toList(),
),
),
],
),
ListTile(
title: Text('v${AppVersion.version}'),
onTap: () {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('jooong lass das, hier ist nichts')),
const SnackBar(
content: Text('jooong lass das, hier ist nichts'),
),
);
},
),
],
),
),
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!),
onDeleted: () {
provider.setTag(null);
mediaNotifier.setTag(null);
_scrollController.jumpTo(0);
},
),
@ -205,68 +247,64 @@ class _MediaGridState extends State<MediaGrid> {
: null,
body: RefreshIndicator(
onRefresh: () async {
await provider.resetMedia();
mediaNotifier.resetMedia();
_scrollController.jumpTo(0);
},
child: Consumer<MediaProvider>(
builder: (context, mediaProvider, child) {
return GridView.builder(
key: PageStorageKey('mediaGrid'),
controller: _scrollController,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: _calculateCrossAxisCount(
context,
provider.crossAxisCount,
),
crossAxisSpacing: 5.0,
mainAxisSpacing: 5.0,
),
itemCount:
provider.mediaItems.length + (provider.isLoading ? 1 : 0),
itemBuilder: (context, index) {
if (index >= provider.mediaItems.length) {
return const Center(child: CircularProgressIndicator());
}
final item = provider.mediaItems[index];
child: GridView.builder(
key: const PageStorageKey('mediaGrid'),
controller: _scrollController,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: _calculateCrossAxisCount(
context,
mediaState.crossAxisCount,
),
crossAxisSpacing: 5.0,
mainAxisSpacing: 5.0,
),
itemCount:
mediaState.mediaItems.length + (mediaState.isLoading ? 1 : 0),
itemBuilder: (context, index) {
if (index >= mediaState.mediaItems.length) {
return const Center(child: CircularProgressIndicator());
}
final item = mediaState.mediaItems[index];
return InkWell(
onTap: () async {
bool? ret = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
DetailView(initialItemId: item.id),
),
);
if (ret != null && ret) {
_scrollController.jumpTo(0);
}
},
child: Stack(
fit: StackFit.expand,
children: <Widget>[
CachedNetworkImage(
imageUrl: item.thumbnailUrl,
fit: BoxFit.cover,
placeholder: (context, url) => SizedBox.shrink(),
errorWidget: (context, url, error) => Icon(Icons.error),
),
Align(
alignment: FractionalOffset.bottomRight,
child: Icon(
Icons.square,
color: switch (item.mode) {
1 => Colors.green,
2 => Colors.red,
_ => Colors.yellow,
},
size: 15.0,
),
),
],
return InkWell(
onTap: () async {
bool? ret = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => DetailView(initialItemId: item.id),
),
);
if (ret != null && ret) {
_scrollController.jumpTo(0);
}
},
child: Stack(
fit: StackFit.expand,
children: <Widget>[
CachedNetworkImage(
imageUrl: item.thumbnailUrl,
fit: BoxFit.cover,
placeholder: (context, url) => const SizedBox.shrink(),
errorWidget: (context, url, error) =>
const Icon(Icons.error),
),
Align(
alignment: Alignment.bottomRight,
child: Icon(
Icons.square,
color: switch (item.mode) {
1 => Colors.green,
2 => Colors.red,
_ => Colors.yellow,
},
size: 15.0,
),
),
],
),
);
},
),