From 57f21e50cec7fc85f0a633db9401a18bd0d75b55 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 8 Dec 2021 10:03:52 +0100
Subject: [PATCH] Better positioning of preview media fragment

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../com/owncloud/android/ui/activity/FileDisplayActivity.java | 4 +++-
 .../com/owncloud/android/ui/preview/PreviewMediaFragment.java | 2 ++
 src/main/res/layout/fragment_preview_media.xml                | 1 +
 src/main/res/layout/media_control.xml                         | 4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 039a72534a..a899ce19cf 100644
--- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -48,7 +48,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
-import android.widget.Toast;
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.snackbar.Snackbar;
@@ -1124,6 +1123,8 @@ public class FileDisplayActivity extends FileActivity
             createMinFragments(null);
         } else {
             // pop back
+            ((CoordinatorLayout.LayoutParams) binding.rootLayout.getLayoutParams())
+                .setBehavior(new AppBarLayout.ScrollingViewBehavior());
             hideSearchView(getCurrentDir());
             showSortListGroup(true);
             super.onBackPressed();
@@ -2187,6 +2188,7 @@ public class FileDisplayActivity extends FileActivity
             Fragment mediaFragment = PreviewMediaFragment.newInstance(file, user.get(), startPlaybackPosition, autoplay);
             setLeftFragment(mediaFragment);
             binding.rightFragmentContainer.setVisibility(View.GONE);
+            ((CoordinatorLayout.LayoutParams) binding.rootLayout.getLayoutParams()).setBehavior(null);
             super.updateActionBarTitleAndHomeButton(file);
         } else {
             Intent previewIntent = new Intent();
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 517959aee7..2a5916f072 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -178,6 +178,8 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
 
         emptyListView = binding.emptyView.emptyListView;
 
+        getActivity().findViewById(R.id.sort_list_button_group).setVisibility(View.GONE);
+
         setLoadingView();
         return view;
     }
diff --git a/src/main/res/layout/fragment_preview_media.xml b/src/main/res/layout/fragment_preview_media.xml
index 47bbb85e4e..7c8adb9fd8 100644
--- a/src/main/res/layout/fragment_preview_media.xml
+++ b/src/main/res/layout/fragment_preview_media.xml
@@ -26,6 +26,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
+    android:layout_marginTop="?attr/actionBarSize"
     tools:context=".ui.preview.PreviewMediaFragment">
 
     <ImageView
diff --git a/src/main/res/layout/media_control.xml b/src/main/res/layout/media_control.xml
index 78469f63b3..ed0ba3525b 100644
--- a/src/main/res/layout/media_control.xml
+++ b/src/main/res/layout/media_control.xml
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:paddingEnd="@dimen/standard_quarter_padding"
             android:text="@string/placeholder_media_time"
-            android:textColor="@color/text_color_inverse"
+            android:textColor="@color/text_color"
             />
 
         <SeekBar
@@ -87,7 +87,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/standard_quarter_padding"
             android:text="@string/placeholder_media_time"
-            android:textColor="@color/text_color_inverse"
+            android:textColor="@color/text_color"
             />
         
     </LinearLayout>