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

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

Browse Source
This commit is contained in:
Flummi
2025-06-16 15:05:39 +02:00
parent 2a500144f5
commit 14081489cc
22 changed files with 820 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/widgets/end_drawer.dart
View File

@ -1,10 +1,10 @@
import 'package:f0ckapp/screens/settings_screen.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:f0ckapp/providers/theme_provider.dart';
//import 'package:f0ckapp/services/api_service.dart';
import 'package:f0ckapp/utils/appversion_util.dart';
import 'package:f0ckapp/controller/theme_controller.dart';
import 'package:f0ckapp/utils/appversion.dart';
class EndDrawer extends StatelessWidget {
const EndDrawer({super.key});
@ -17,7 +17,6 @@ class EndDrawer extends StatelessWidget {
@override
Widget build(BuildContext context) {
//final ApiService c = Get.find<ApiService>();
final ThemeController themeController = Get.find();
return Drawer(
@ -115,7 +114,7 @@ class EndDrawer extends StatelessWidget {
title: const Text('Settings'),
onTap: () {
Navigator.pop(context);
Get.toNamed('/settings');
Get.bottomSheet(SettingsPage());
},
),
ListTile(

5
lib/widgets/filter_bar.dart
View File

@ -2,7 +2,8 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:f0ckapp/services/api_service.dart';
import 'package:f0ckapp/controller/media_controller.dart';
import 'package:f0ckapp/service/media_service.dart';
class FilterBar extends StatelessWidget {
final ScrollController scrollController;
@ -14,7 +15,7 @@ class FilterBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
final ApiService c = Get.find<ApiService>();
final MediaController c = Get.find<MediaController>();
return BottomAppBar(
height: 50,

3
lib/widgets/media_tile.dart
View File

@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:get/get.dart';
import 'package:f0ckapp/models/mediaitem_model.dart';
import 'package:f0ckapp/models/media_item.dart';
class MediaTile extends StatelessWidget {
final MediaItem item;
@ -14,7 +14,6 @@ class MediaTile extends StatelessWidget {
Widget build(BuildContext context) {
return InkWell(
onTap: () {
//Navigator.pushNamed(context, '/${item.id}');
Get.toNamed('/${item.id}');
},
child: Stack(

10
lib/widgets/video_widget.dart
View File

@ -1,12 +1,12 @@
import 'dart:async';
import 'package:f0ckapp/services/api_service.dart';
import 'package:f0ckapp/controller/media_controller.dart';
import 'package:f0ckapp/models/media_item.dart';
import 'package:flutter/material.dart';
import 'package:cached_video_player_plus/cached_video_player_plus.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:f0ckapp/models/mediaitem_model.dart';
import 'package:f0ckapp/widgets/videooverlay_widget.dart';
import 'package:get/get.dart';
@ -27,7 +27,7 @@ class VideoWidget extends StatefulWidget {
}
class _VideoWidgetState extends State<VideoWidget> {
final ApiService apiService = Get.find<ApiService>();
final MediaController controller = Get.find<MediaController>();
late CachedVideoPlayerPlusController _controller;
bool _showControls = false;
Timer? _hideControlsTimer;
@ -52,7 +52,7 @@ class _VideoWidgetState extends State<VideoWidget> {
}
_controller.setLooping(true);
_controller.setVolume(apiService.muted.value ? 0.0 : 1.0);
_controller.setVolume(controller.muted.value ? 0.0 : 1.0);
}
@override
@ -88,7 +88,7 @@ class _VideoWidgetState extends State<VideoWidget> {
@override
Widget build(BuildContext context) {
final bool muted = apiService.muted.value;
final bool muted = controller.muted.value;
if (_controller.value.isInitialized &&
_controller.value.volume != (muted ? 0.0 : 1.0)) {
_controller.setVolume(muted ? 0.0 : 1.0);

9
lib/widgets/videooverlay_widget.dart
View File

@ -1,9 +1,10 @@
import 'package:f0ckapp/services/api_service.dart';
import 'package:flutter/material.dart';
import 'package:cached_video_player_plus/cached_video_player_plus.dart';
import 'package:get/get.dart';
import 'package:f0ckapp/controller/media_controller.dart';
class VideoControlsOverlay extends StatelessWidget {
final CachedVideoPlayerPlusController controller;
final VoidCallback button;
@ -16,7 +17,7 @@ class VideoControlsOverlay extends StatelessWidget {
@override
Widget build(BuildContext context) {
final ApiService apiService = Get.find<ApiService>();
final MediaController c = Get.find<MediaController>();
return Stack(
alignment: Alignment.center,
@ -26,10 +27,10 @@ class VideoControlsOverlay extends StatelessWidget {
bottom: 12,
child: Obx(
() => _ControlButton(
apiService.muted.value ? Icons.volume_off : Icons.volume_up,
c.muted.value ? Icons.volume_off : Icons.volume_up,
() async {
button();
await apiService.toggleMuted();
await c.toggleMuted();
},
size: 16,
),