Icon Schmicon

- overlay buttons
- encrypted storage
- downloadbutton (wip)

android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
         android:label="f0ckapp"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

lib/providers/ThemeProvider.dart

@@ -34,7 +34,11 @@ class ThemeNotifier extends StateNotifier<ThemeData> {
 final themeNotifierProvider = StateNotifierProvider<ThemeNotifier, ThemeData>((
   ref,
 ) {
-  return ThemeNotifier(secureStorage: FlutterSecureStorage());
+  return ThemeNotifier(
+    secureStorage: FlutterSecureStorage(
+      aOptions: AndroidOptions(encryptedSharedPreferences: true),
+    ),
+  );
 });
 
 class CustomTheme {

lib/screens/DetailView.dart

@@ -106,9 +106,9 @@ class _DetailViewState extends ConsumerState<DetailView> {
         title: Text('f0ck #${mediaState.mediaItems[_currentIndex].id}'),
         actions: [
           IconButton(
-            icon: Icon(mediaState.muted ? Icons.volume_off : Icons.volume_up),
+            icon: Icon(Icons.download),
             onPressed: () {
-              mediaNotifier.toggleMute();
+              // wip
             },
           ),
           PopupMenuButton<String>(
@@ -149,14 +149,14 @@ class _DetailViewState extends ConsumerState<DetailView> {
                 value: 'direct_link',
                 child: ListTile(
                   leading: const Icon(Icons.link),
-                  title: const Text('Link zum Bild'),
+                  title: const Text('Link zur Datei'),
                 ),
               ),
               PopupMenuItem(
                 value: 'post_link',
                 child: ListTile(
                   leading: const Icon(Icons.article),
-                  title: const Text('Link zum Post'),
+                  title: const Text('Link zum f0ck'),
                 ),
               ),
             ],
@@ -182,14 +182,14 @@ class _DetailViewState extends ConsumerState<DetailView> {
       ),
       persistentFooterButtons: mediaState.tag != null
           ? [
-              InputChip(
+              Center(
-                label: Text(mediaState.tag!),
+                child: InputChip(
-                //backgroundColor: const Color(0xFF090909),
+                  label: Text(mediaState.tag!),
-                //labelStyle: const TextStyle(color: Colors.white),
+                  onDeleted: () {
-                onDeleted: () {
+                    mediaNotifier.setTag(null);
-                  mediaNotifier.setTag(null);
+                    Navigator.pop(context);
-                  Navigator.pop(context);
+                  },
-                },
+                ),
               ),
             ]
           : null,

lib/screens/MediaGrid.dart

@@ -61,15 +61,21 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
     return Scaffold(
       key: _scaffoldKey,
       appBar: AppBar(
-        title: Row(
+        title: GestureDetector(
-          spacing: 15,
+          child: Row(
-          children: [
+            spacing: 10,
-            Image.asset('assets/images/f0ck_small.webp', fit: BoxFit.fitHeight),
+            children: [
-            Text(
+              Image.asset(
-              'fApp',
+                'assets/images/f0ck_small.webp',
-              style: TextStyle(fontSize: 24),
+                fit: BoxFit.fitHeight,
-            ),
+              ),
-          ],
+              Text('fApp', style: TextStyle(fontSize: 24)),
+            ],
+          ),
+          onTap: () {
+            mediaNotifier.setTag(null);
+            _scrollController.jumpTo(0);
+          },
         ),
         actions: [
           IconButton(
@@ -236,12 +242,14 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
       ),
       persistentFooterButtons: mediaState.tag != null
           ? [
-              InputChip(
+              Center(
-                label: Text(mediaState.tag!),
+                child: InputChip(
-                onDeleted: () {
+                  label: Text(mediaState.tag!),
-                  mediaNotifier.setTag(null);
+                  onDeleted: () {
-                  _scrollController.jumpTo(0);
+                    mediaNotifier.setTag(null);
-                },
+                    _scrollController.jumpTo(0);
+                  },
+                ),
               ),
             ]
           : null,

lib/widgets/VideoOverlay.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:cached_video_player_plus/cached_video_player_plus.dart';
 
-class VideoControlsOverlay extends StatelessWidget {
+import 'package:f0ckapp/providers/MediaProvider.dart';
+
+class VideoControlsOverlay extends ConsumerWidget {
   final CachedVideoPlayerPlusController controller;
   final VoidCallback button;
 
@@ -13,10 +16,32 @@ class VideoControlsOverlay extends StatelessWidget {
   });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, ref) {
+    final mediaState = ref.watch(mediaProvider);
+    final mediaNotifier = ref.read(mediaProvider.notifier);
+
     return Stack(
       alignment: Alignment.center,
       children: [
+        Positioned(
+          right: 12,
+          top: 12,
+          child: _ControlButton(
+            mediaState.muted ? Icons.volume_off : Icons.volume_up,
+            () {
+              button();
+              mediaNotifier.toggleMute();
+            },
+            size: 16,
+          ),
+        ),
+        Positioned(
+          right: 12,
+          bottom: 12,
+          child: _ControlButton(Icons.fullscreen, () {
+            button();
+          }, size: 16),
+        ),
         Center(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.3+33
+version: 1.1.5+35
 
 environment:
   sdk: ^3.9.0-100.2.beta