v1.4.2+63

lib/controller/authcontroller.dart

@@ -4,14 +4,14 @@ import 'package:get/get.dart';
 import 'package:encrypt_shared_preferences/provider.dart';
 import 'package:http/http.dart' as http;
 
+import 'package:f0ckapp/models/user.dart';
+
 class AuthController extends GetxController {
   final EncryptedSharedPreferencesAsync storage =
       EncryptedSharedPreferencesAsync.getInstance();
 
   RxnString token = RxnString();
-  RxnInt userId = RxnInt();
-  RxnString avatarUrl = RxnString();
-  RxnString username = RxnString();
+  Rxn<User> user = Rxn<User>();
   RxBool isLoading = false.obs;
   RxnString error = RxnString();
 
@@ -47,9 +47,7 @@ class AuthController extends GetxController {
       } catch (_) {}
     }
     token.value = null;
-    userId.value = null;
-    avatarUrl.value = null;
-    username.value = null;
+    user.value = null;
     await storage.remove('token');
   }
 
@@ -66,11 +64,7 @@ class AuthController extends GetxController {
         final dynamic data = json.decode(response.body);
         if (data['token'] != null) {
           await saveToken(data['token']);
-          userId.value = data['userid'];
-          avatarUrl.value = data['avatar'] != null
-              ? 'https://f0ck.me/t/${data['avatar']}.webp'
-              : null;
-          this.username.value = data['user'];
+          user.value = User.fromJson(data);
           return true;
         } else {
           error.value = 'Kein Token erhalten';
@@ -95,13 +89,7 @@ class AuthController extends GetxController {
       );
       if (response.statusCode == 200) {
         final dynamic data = json.decode(response.body);
-        userId.value = data['userid'] != null
-            ? int.tryParse(data['userid'].toString())
-            : null;
-        avatarUrl.value = data['avatar'] != null
-            ? 'https://f0ck.me/t/${data['avatar']}.webp'
-            : null;
-        username.value = data['user'];
+        user.value = User.fromJson(data);
       } else {
         await logout();
       }

lib/controller/mediacontroller.dart

@@ -27,6 +27,8 @@ class MediaController extends GetxController {
   Rx<PageTransition> transitionType = PageTransition.opacity.obs;
   RxBool drawerSwipeEnabled = true.obs;
   RxInt crossAxisCount = 0.obs;
+  RxInt videoControlsTimerNotifier = 0.obs;
+  RxInt hideControlsNotifier = 0.obs;
 
   void setTypeIndex(int idx) {
     typeIndex.value = idx;
@@ -163,6 +165,9 @@ class MediaController extends GetxController {
     fetchInitial();
   }
 
+  void resetVideoControlsTimer() => videoControlsTimerNotifier.value++;
+  void hideVideoControls() => hideControlsNotifier.value++;
+
   @override
   void onInit() async {
     super.onInit();

lib/controller/themecontroller.dart

@@ -186,7 +186,6 @@ final ThemeData f0ck95Theme = ThemeData(
     backgroundColor: const Color(0xFFE0E0E0),
     foregroundColor: Colors.black,
     elevation: 4,
-    centerTitle: true,
   ),
   textTheme: const TextTheme(
     bodyLarge: TextStyle(color: Colors.black),