diff --git a/lib/models/mediaitem.dart b/lib/models/mediaitem.dart index 77901b5..4b05eaf 100644 --- a/lib/models/mediaitem.dart +++ b/lib/models/mediaitem.dart @@ -32,6 +32,8 @@ class MediaItem { } String get thumbnailUrl => 'https://f0ck.me/t/$id.webp'; + String get mediaUrl => 'https://f0ck.me/b/$dest'; + String get coverUrl => 'https://f0ck.me/ca/$id.webp'; } class Tag { diff --git a/lib/models/mediaitem_detail.dart b/lib/models/mediaitem_detail.dart deleted file mode 100644 index d12334c..0000000 --- a/lib/models/mediaitem_detail.dart +++ /dev/null @@ -1,33 +0,0 @@ -class MediaItemDetail { - final int id; - final String mime; - final String dest; - final String username; - final int stamp; - final int? next; - final int? prev; - - MediaItemDetail({ - required this.id, - required this.mime, - required this.dest, - required this.username, - required this.stamp, - required this.next, - required this.prev, - }); - - factory MediaItemDetail.fromJson(Map json) { - return MediaItemDetail( - id: json['id'], - mime: json['mime'], - dest: json['dest'], - username: json['username'], - stamp: json['stamp'], - next: json['next'], - prev: json['prev'], - ); - } - - String get mediaUrl => 'https://f0ck.me/b/$dest'; -} diff --git a/lib/screens/detailview.dart b/lib/screens/detailview.dart index 89ffb29..762747b 100644 --- a/lib/screens/detailview.dart +++ b/lib/screens/detailview.dart @@ -98,7 +98,7 @@ class _DetailViewState extends State { children: [ if (item.mime.startsWith('image')) ...[ Image.network( - 'https://f0ck.me/b/${item.dest}', + item.mediaUrl, fit: BoxFit.contain, ), ] else ...[ diff --git a/lib/services/api.dart b/lib/services/api.dart index 788b5ee..ecc9501 100644 --- a/lib/services/api.dart +++ b/lib/services/api.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:f0ckapp/models/mediaitem.dart'; -import 'package:f0ckapp/models/mediaitem_detail.dart'; +//import 'package:f0ckapp/models/mediaitem_detail.dart'; Future> fetchMedia({String? older, String? mode}) async { final Uri url = Uri.parse('https://api.f0ck.me/items/get') @@ -20,7 +20,7 @@ Future> fetchMedia({String? older, String? mode}) async { } } -Future fetchMediaDetail(int itemId) async { +/*Future fetchMediaDetail(int itemId) async { final Uri url = Uri.parse('https://f0ck.me/api/v2/item/${itemId.toString()}'); final response = await http.get(url); @@ -30,4 +30,4 @@ Future fetchMediaDetail(int itemId) async { } else { throw Exception('Fehler beim Abrufen der Media-Details: ${response.statusCode}'); } -} +}*/ diff --git a/lib/widgets/video_widget.dart b/lib/widgets/video_widget.dart index 5edfdcc..aa1aff9 100644 --- a/lib/widgets/video_widget.dart +++ b/lib/widgets/video_widget.dart @@ -20,7 +20,7 @@ class _VideoWidgetState extends State { } Future _initController() async { - _controller = VideoPlayerController.networkUrl(Uri.parse('https://f0ck.me/b/${widget.details.dest}')); + _controller = VideoPlayerController.networkUrl(Uri.parse(widget.details.mediaUrl)); await _controller.initialize(); setState(() {}); @@ -64,7 +64,7 @@ class _VideoWidgetState extends State { }, child: isAudio ? Image.network( - 'https://f0ck.me/ca/${widget.details.id}.webp', + widget.details.coverUrl, fit: BoxFit.cover, ) : VideoPlayer(_controller),