v1.3.0+56
All checks were successful
Flutter Schmutter / build (push) Successful in 3m54s

This commit is contained in:
2025-06-16 15:05:39 +02:00
parent 2a500144f5
commit 14081489cc
22 changed files with 820 additions and 538 deletions

View File

@ -1,91 +1,70 @@
import 'dart:io';
import 'package:f0ckapp/utils/animatedtransition.dart';
import 'package:f0ckapp/utils/smartrefreshindicator.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:get/get.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:share_plus/share_plus.dart';
import 'package:f0ckapp/models/mediaitem_model.dart';
import 'package:f0ckapp/services/api_service.dart';
import 'package:f0ckapp/widgets/end_drawer.dart';
import 'package:f0ckapp/controller/media_controller.dart';
import 'package:f0ckapp/models/media_item.dart';
import 'package:f0ckapp/screens/media_grid.dart';
import 'package:f0ckapp/screens/fullscreen_screen.dart';
import 'package:f0ckapp/widgets/end_drawer.dart';
import 'package:f0ckapp/widgets/video_widget.dart';
class DetailView extends StatefulWidget {
final int initialItemId;
const DetailView({super.key, required this.initialItemId});
final int initialId;
const DetailView({super.key, required this.initialId});
@override
State<DetailView> createState() => _DetailViewState();
}
class _DetailViewState extends State<DetailView> {
final ApiService apiService = Get.find<ApiService>();
final MediaController controller = Get.find<MediaController>();
MediaItem? item;
bool isLoading = false;
PageController? _pageController;
Future<void>? _loadingFuture;
int _currentPage = 0;
@override
void initState() {
super.initState();
if (!_mediaItemExists(widget.initialItemId)) {
_loadingFuture = _fetchAndPreloadMedia(widget.initialItemId);
} else {
_initializePageController();
}
_setupInitialView();
ever(controller.drawerSwipeEnabled, (_) {
setState(() {});
});
}
bool _mediaItemExists(int id) {
return apiService.mediaItems.any((media) => media.id == id);
}
Future<void> _setupInitialView() async {
bool itemExists = controller.mediaItems.any(
(media) => media.id == widget.initialId,
);
Future<void> _fetchAndPreloadMedia(int targetId) async {
try {
WidgetsBinding.instance.addPostFrameCallback((_) async {
await apiService.setTag(null);
});
await apiService.fetchMedia(id: targetId + 50, reset: false);
_initializePageController();
} catch (e) {
_showMsg("Medien konnten nicht geladen werden");
if (!itemExists) {
await _initializeDetail(widget.initialId);
}
_initializePageController();
}
void _initializePageController() {
_currentPage = apiService.mediaItems.indexWhere(
(media) => media.id == widget.initialItemId,
_currentPage = controller.mediaItems.indexWhere(
(media) => media.id == widget.initialId,
);
if (_currentPage < 0) {
_currentPage = 0;
}
if (_currentPage < 0) _currentPage = 0;
_pageController = PageController(initialPage: _currentPage)
..addListener(() {
setState(() {
_currentPage = _pageController!.page!.round();
});
setState(() => _currentPage = _pageController!.page!.round());
});
setState(() {});
}
@override
void dispose() {
_pageController?.dispose();
super.dispose();
}
MediaItem? _findMediaItem() {
try {
return apiService.mediaItems.firstWhere(
(media) => media.id == widget.initialItemId,
);
} catch (e) {
return null;
}
}
Future<void> _downloadMedia(MediaItem item) async {
final File file = await DefaultCacheManager().getSingleFile(item.mediaUrl);
final MethodChannel methodChannel = const MethodChannel('MediaShit');
@ -102,59 +81,60 @@ class _DetailViewState extends State<DetailView> {
void _showMsg(String message) {
if (!mounted) return;
ScaffoldMessenger.of(context)
..removeCurrentSnackBar()
..showSnackBar(SnackBar(content: Text(message)));
Get
..closeAllSnackbars()
..snackbar('hehe', message, snackPosition: SnackPosition.BOTTOM);
}
Future<void> _initializeDetail(int deepLinkId) async {
item = controller.mediaItems.firstWhereOrNull(
(element) => element.id == deepLinkId,
);
if (item == null) {
setState(() => isLoading = true);
await controller.loadMediaItems(older: deepLinkId + 50);
item = controller.mediaItems.firstWhereOrNull(
(element) => element.id == deepLinkId,
);
if (item == null) {
Get.offAll(() => const MediaGrid());
}
setState(() => isLoading = false);
}
}
@override
Widget build(BuildContext context) {
if (_loadingFuture != null) {
return FutureBuilder<void>(
future: _loadingFuture,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return Scaffold(
appBar: AppBar(title: const Text("Detail")),
body: const Center(child: CircularProgressIndicator()),
);
} else {
MediaItem? item = _findMediaItem();
if (item == null) {
return Scaffold(
appBar: AppBar(title: const Text("Detail")),
body: const Center(child: Text("f0ck nicht gefunden")),
);
}
return _buildDetail();
}
},
);
}
MediaItem? existingItem = _findMediaItem();
if (existingItem == null) {
if (isLoading) {
return Scaffold(
appBar: AppBar(title: const Text("Detail")),
body: const Center(child: Text("f0ck nicht gefunden")),
appBar: AppBar(
title: const Text("f0ck"),
leading: Navigator.canPop(context)
? null
: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
Get.offAll(() => const MediaGrid());
},
),
),
body: const Center(child: CircularProgressIndicator()),
);
}
return _buildDetail();
}
Widget _buildDetail() {
final MediaItem currentItem = apiService.mediaItems[_currentPage];
final MediaItem currentItem = controller.mediaItems[_currentPage];
return Scaffold(
endDrawer: const EndDrawer(),
endDrawerEnableOpenDragGesture: false,
persistentFooterButtons: apiService.tag.value != null
endDrawerEnableOpenDragGesture: controller.drawerSwipeEnabled.value,
persistentFooterButtons: controller.tag.value != null
? [
Center(
child: InputChip(
label: Text(apiService.tag.value!),
label: Text(controller.tag.value!),
onDeleted: () {
apiService.setTag(null);
controller.setTag(null);
Get.offAllNamed('/');
},
),
@ -254,69 +234,72 @@ class _DetailViewState extends State<DetailView> {
SliverFillRemaining(
child: PageView.builder(
controller: _pageController,
itemCount: apiService.mediaItems.length,
itemCount: controller.mediaItems.length,
itemBuilder: (context, index) {
final MediaItem pageItem = apiService.mediaItems[index];
final MediaItem pageItem = controller.mediaItems[index];
return AnimatedBuilder(
animation: _pageController!,
builder: (context, child) {
double value = 0;
if (_pageController!.position.haveDimensions) {
value = (_pageController!.page! - index).abs();
}
double factor = Curves.easeOut.transform(
1 - value.clamp(0.0, 1.0),
return buildAnimatedTransition(
context: context,
child: child!,
pageController: _pageController!,
index: index,
controller: controller,
);
double scale = 0.8 + factor * 0.2;
return Transform.scale(scale: scale, child: child);
},
child: SafeArea(
top: false,
child: SingleChildScrollView(
child: Column(
children: [
if (pageItem.mime.startsWith('image'))
CachedNetworkImage(
imageUrl: pageItem.mediaUrl,
fit: BoxFit.contain,
placeholder: (context, url) => const Center(
child: CircularProgressIndicator(),
),
errorWidget: (context, url, error) =>
const Center(child: Icon(Icons.error)),
)
else
VideoWidget(
details: pageItem,
isActive: index == _currentPage,
),
const SizedBox(height: 10, width: double.infinity),
Wrap(
alignment: WrapAlignment.center,
spacing: 5.0,
children: pageItem.tags.map((tag) {
return ActionChip(
onPressed: () {
if (tag.tag == 'sfw' || tag.tag == 'nsfw') {
return;
}
apiService.setTag(tag.tag);
Get.offAllNamed('/');
},
label: Text(tag.tag),
backgroundColor: switch (tag.id) {
1 => Colors.green,
2 => Colors.red,
_ => const Color(0xFF090909),
},
labelStyle: const TextStyle(
color: Colors.white,
child: SmartRefreshIndicator(
onRefresh: () async {
_showMsg('not hehe');
},
child: SafeArea(
top: false,
child: SingleChildScrollView(
child: Column(
children: [
if (pageItem.mime.startsWith('image'))
CachedNetworkImage(
imageUrl: pageItem.mediaUrl,
fit: BoxFit.contain,
placeholder: (context, url) => const Center(
child: CircularProgressIndicator(),
),
);
}).toList(),
),
const SizedBox(height: 20),
],
errorWidget: (context, url, error) =>
const Center(child: Icon(Icons.error)),
)
else
VideoWidget(
details: pageItem,
isActive: index == _currentPage,
),
const SizedBox(height: 10, width: double.infinity),
Wrap(
alignment: WrapAlignment.center,
spacing: 5.0,
children: pageItem.tags.map((tag) {
return ActionChip(
onPressed: () {
if (tag.tag == 'sfw' || tag.tag == 'nsfw') {
return;
}
controller.setTag(tag.tag);
Get.offAllNamed('/');
},
label: Text(tag.tag),
backgroundColor: switch (tag.id) {
1 => Colors.green,
2 => Colors.red,
_ => const Color(0xFF090909),
},
labelStyle: const TextStyle(
color: Colors.white,
),
);
}).toList(),
),
const SizedBox(height: 20),
],
),
),
),
),

View File

@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:f0ckapp/models/mediaitem_model.dart';
import 'package:f0ckapp/models/media_item.dart';
import 'package:f0ckapp/widgets/video_widget.dart';
class FullScreenMediaView extends StatefulWidget {

View File

@ -1,31 +1,43 @@
import 'package:f0ckapp/utils/smartrefreshindicator.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:f0ckapp/services/api_service.dart';
import 'package:f0ckapp/widgets/media_tile.dart';
import 'package:f0ckapp/widgets/end_drawer.dart';
import 'package:f0ckapp/utils/customsearchdelegate.dart';
import 'package:f0ckapp/widgets/filter_bar.dart';
import 'package:f0ckapp/utils/customsearchdelegate_util.dart';
import 'package:f0ckapp/widgets/end_drawer.dart';
import 'package:f0ckapp/controller/media_controller.dart';
import 'package:f0ckapp/widgets/media_tile.dart';
class MediaGrid extends StatefulWidget {
const MediaGrid({super.key});
@override
State<StatefulWidget> createState() => _MediaGrid();
State<MediaGrid> createState() => _MediaGridState();
}
class _MediaGrid extends State<MediaGrid> {
final ApiService apiService = Get.find<ApiService>();
class _MediaGridState extends State<MediaGrid> {
final MediaController controller = Get.find<MediaController>();
final ScrollController _scrollController = ScrollController();
@override
void initState() {
super.initState();
_scrollController.addListener(() async {
if (_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent - 300) {
await apiService.fetchMedia();
controller.loadMediaItems();
ever(controller.drawerSwipeEnabled, (_) {
setState(() {});
});
_scrollController.addListener(() {
if (_scrollController.position.extentAfter < 200 &&
!controller.isLoading.value) {
controller.loadMediaItems(
older: controller.mediaItems.isNotEmpty
? controller.mediaItems.last.id
: null,
append: true,
);
}
});
}
@ -34,14 +46,102 @@ class _MediaGrid extends State<MediaGrid> {
Widget build(BuildContext context) {
return Scaffold(
endDrawer: EndDrawer(),
endDrawerEnableOpenDragGesture: controller.drawerSwipeEnabled.value,
body: RefreshIndicator(
edgeOffset: 100,
onRefresh: () async {
await controller.loadMediaItems();
},
child: CustomScrollView(
controller: _scrollController,
slivers: [
SliverAppBar(
floating: true,
snap: true,
title: GestureDetector(
child: Row(
children: [
Image.asset(
'assets/images/f0ck_small.webp',
fit: BoxFit.fitHeight,
),
const SizedBox(width: 10),
const Text('fApp', style: TextStyle(fontSize: 24)),
],
),
onTap: () {
controller.setTag(null);
},
),
actions: [
IconButton(
icon: const Icon(Icons.search),
onPressed: () async {
await showSearch(
context: context,
delegate: CustomSearchDelegate(),
);
},
),
Obx(
() => IconButton(
icon: Icon(
controller.random.value
? Icons.shuffle_on_outlined
: Icons.shuffle,
),
onPressed: () async {
await controller.toggleRandom();
},
),
),
Builder(
builder: (context) {
return IconButton(
icon: const Icon(Icons.menu),
onPressed: () {
Scaffold.of(context).openEndDrawer();
},
);
},
),
],
),
SliverPadding(
padding: EdgeInsets.zero,
sliver: Obx(
() => SliverGrid(
delegate: SliverChildBuilderDelegate((context, index) {
return MediaTile(item: controller.mediaItems[index]);
}, childCount: controller.mediaItems.length),
gridDelegate: controller.crossAxisCount.value == 0
? const SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 150,
crossAxisSpacing: 5,
mainAxisSpacing: 5,
childAspectRatio: 1,
)
: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: controller.crossAxisCount.value,
crossAxisSpacing: 5,
mainAxisSpacing: 5,
childAspectRatio: 1,
),
),
),
),
],
),
),
persistentFooterButtons: [
Obx(() {
if (apiService.tag.value != null) {
if (controller.tag.value != null) {
return Center(
child: InputChip(
label: Text(apiService.tag.value!),
onDeleted: () {
apiService.setTag(null);
label: Text(controller.tag.value!),
onDeleted: () async {
await controller.setTag(null);
Get.offAllNamed('/');
},
),
@ -51,79 +151,6 @@ class _MediaGrid extends State<MediaGrid> {
}
}),
],
body: CustomScrollView(
controller: _scrollController,
slivers: [
SliverAppBar(
floating: true,
snap: true,
title: GestureDetector(
onTap: () async {
apiService.setTag(null);
},
child: Row(
children: [
Image.asset(
'assets/images/f0ck_small.webp',
fit: BoxFit.fitHeight,
),
const SizedBox(width: 10),
const Text('fApp', style: TextStyle(fontSize: 24)),
],
),
),
actions: [
IconButton(
icon: const Icon(Icons.search),
onPressed: () async {
await showSearch(
context: context,
delegate: CustomSearchDelegate(),
);
},
),
Obx(
() => IconButton(
icon: Icon(
apiService.random.value
? Icons.shuffle_on_outlined
: Icons.shuffle,
),
onPressed: () {
apiService.toggleRandom();
},
),
),
Builder(
builder: (context) {
return IconButton(
icon: const Icon(Icons.menu),
onPressed: () {
Scaffold.of(context).openEndDrawer();
},
);
},
),
],
),
SliverPadding(
padding: EdgeInsets.zero,
sliver: Obx(
() => SliverGrid(
delegate: SliverChildBuilderDelegate((context, index) {
return MediaTile(item: apiService.mediaItems[index]);
}, childCount: apiService.mediaItems.length),
gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 150,
crossAxisSpacing: 5,
mainAxisSpacing: 5,
childAspectRatio: 1,
),
),
),
),
],
),
bottomNavigationBar: FilterBar(scrollController: _scrollController),
);
}

View File

@ -1,10 +1,11 @@
import 'package:f0ckapp/utils/animatedtransition.dart';
import 'package:flutter/material.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:f0ckapp/widgets/end_drawer.dart';
import 'package:get/get.dart';
import 'package:f0ckapp/controller/media_controller.dart';
class SettingsPage extends StatefulWidget {
const SettingsPage({super.key});
@ -13,75 +14,94 @@ class SettingsPage extends StatefulWidget {
}
class _SettingsPageState extends State<SettingsPage> {
int _columns = 3;
bool _drawerSwipeEnabled = true;
void _showMsg(String message, BuildContext context) {
ScaffoldMessenger.of(context)
..removeCurrentSnackBar()
..showSnackBar(SnackBar(content: Text(message)));
}
final MediaController controller = Get.find<MediaController>();
@override
Widget build(BuildContext context) {
return Scaffold(
endDrawerEnableOpenDragGesture: _drawerSwipeEnabled,
endDrawer: EndDrawer(),
body: CustomScrollView(
slivers: [
SliverAppBar(
floating: false,
pinned: true,
title: const Text('Settings'),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
Get.back();
},
),
),
SliverList(
delegate: SliverChildListDelegate([
/*Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
"Anzahl der Spalten",
style: Theme.of(context).textTheme.titleLarge,
),
),
ListTile(
title: const Text("Spaltenanzahl"),
trailing: DropdownButton<int>(
value: mediaState.crossAxisCount,
dropdownColor: const Color.fromARGB(255, 43, 43, 43),
iconEnabledColor: Colors.white,
items: [0, 3, 4, 5].map((int value) {
return DropdownMenuItem<int>(
value: value,
child: Text(value == 0 ? 'auto' : '$value Spalten'),
);
}).toList(),
onChanged: (int? newValue) {
if (newValue != null) {
setState(() {
_columns = newValue;
mediaNotifier.setCrossAxisCount(newValue);
});
}
},
trailing: Obx(
() => DropdownButton<int>(
value: controller.crossAxisCount.value,
dropdownColor: const Color.fromARGB(255, 43, 43, 43),
iconEnabledColor: Colors.white,
items: [0, 3, 4, 5].map((int value) {
return DropdownMenuItem<int>(
value: value,
child: Text(value == 0 ? 'auto' : '$value Spalten'),
);
}).toList(),
onChanged: (int? newValue) async {
if (newValue != null) {
await controller.setCrossAxisCount(newValue);
setState(() {});
}
},
),
),
),*/
),
const Divider(),
ListTile(
title: const Text("Seitenwechselanimation"),
trailing: Obx(
() => DropdownButton<PageTransition>(
value: controller.transitionType.value,
dropdownColor: const Color.fromARGB(255, 43, 43, 43),
iconEnabledColor: Colors.white,
items: PageTransition.values.map((PageTransition type) {
String label;
switch (type) {
case PageTransition.opacity:
label = 'Opacity';
break;
case PageTransition.scale:
label = 'Scale';
break;
case PageTransition.slide:
label = 'Slide';
break;
case PageTransition.rotate:
label = 'Rotate';
break;
case PageTransition.flip:
label = 'Flip';
break;
}
return DropdownMenuItem<PageTransition>(
value: type,
child: Text(label),
);
}).toList(),
onChanged: (PageTransition? newValue) async {
if (newValue != null) {
await controller.setTransitionType(newValue);
setState(() {});
}
},
),
),
),
const Divider(),
SwitchListTile(
title: const Text("Drawer per Geste öffnen"),
subtitle: const Text(
"Wähle, ob der Drawer mit einer Wischgeste geschlossen/ geöffnet werden kann.",
),
value: _drawerSwipeEnabled,
onChanged: (bool value) {
setState(() {
_drawerSwipeEnabled = value;
});
value: controller.drawerSwipeEnabled.value,
onChanged: (bool value) async {
await controller.setDrawerSwipeEnabled(value);
setState(() {});
},
),
const Divider(),
@ -91,7 +111,7 @@ class _SettingsPageState extends State<SettingsPage> {
onPressed: () async {
await DefaultCacheManager().emptyCache();
if (!mounted) return;
_showMsg('Cache wurde geleert.', context);
Get.snackbar('', 'der Cache wurde geleert.');
},
child: const Text("Löschen"),
),