fix: apply proper insets to player controls and extended details (#766)

* fix: apply proper insets to player controls and extended details

This fixes overlap in landscape mode.

* docs: update changelog

Author: naveensingh

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed overlap between editor controls and preview ([#752])
 - Fixed crash when viewing photos with extended details enabled ([#754])
 - Fixed cropped copies being saved in app data when setting wallpaper ([#759]) 
+- Fixed overlap between player controls and navigation bars in landscape mode
 
 ## [1.8.1] - 2025-11-04
 ### Changed

app/src/main/kotlin/org/fossify/gallery/activities/BaseViewerActivity.kt

@@ -10,6 +10,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.coroutines.launch
+import org.fossify.commons.extensions.updateMarginWithBase
 import org.fossify.commons.extensions.updatePaddingWithBase
 import org.fossify.gallery.extensions.config
 
@@ -52,7 +53,6 @@ abstract class BaseViewerActivity : SimpleActivity() {
         } else {
             val system = insets.getInsetsIgnoringVisibility(Type.systemBars())
             val cutout = insets.getInsetsIgnoringVisibility(Type.displayCutout())
-
             appBarLayout.updatePaddingWithBase(
                 top = if (cutout.top > 0) 0 else system.top,
                 left = if (cutout.left > 0) 0 else system.left,
@@ -67,4 +67,25 @@ abstract class BaseViewerActivity : SimpleActivity() {
             )
         }
     }
+
+    fun applyProperHorizontalInsets(view: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { _, insets ->
+            if (config.showNotch) {
+                val systemAndCutout =
+                    insets.getInsetsIgnoringVisibility(Type.systemBars() or Type.displayCutout())
+                view.updateMarginWithBase(
+                    left = systemAndCutout.left,
+                    right = systemAndCutout.right
+                )
+            } else {
+                val system = insets.getInsetsIgnoringVisibility(Type.systemBars())
+                val cutout = insets.getInsetsIgnoringVisibility(Type.displayCutout())
+                view.updateMarginWithBase(
+                    left = if (cutout.left > 0) 0 else system.left,
+                    right = if (cutout.right > 0) 0 else system.right
+                )
+            }
+            insets
+        }
+    }
 }

app/src/main/kotlin/org/fossify/gallery/activities/VideoPlayerActivity.kt

@@ -659,6 +659,7 @@ open class VideoPlayerActivity : BaseViewerActivity(), SeekBar.OnSeekBarChangeLi
         binding.bottomVideoTimeHolder.videoSeekbar.max = mDuration.toInt()
         binding.bottomVideoTimeHolder.videoDuration.text = mDuration.getFormattedDuration()
         binding.bottomVideoTimeHolder.videoCurrTime.text = mCurrTime.getFormattedDuration()
+        applyProperHorizontalInsets(binding.bottomVideoTimeHolder.videoTimeHolder)
         setupTimer()
     }
 

app/src/main/kotlin/org/fossify/gallery/fragments/PhotoFragment.kt

@@ -75,6 +75,7 @@ import org.fossify.commons.helpers.DEFAULT_ANIMATION_DURATION
 import org.fossify.commons.helpers.ensureBackgroundThread
 import org.fossify.commons.helpers.isRPlus
 import org.fossify.gallery.R
+import org.fossify.gallery.activities.BaseViewerActivity
 import org.fossify.gallery.activities.PhotoActivity
 import org.fossify.gallery.activities.PhotoVideoActivity
 import org.fossify.gallery.activities.ViewPagerActivity
@@ -909,6 +910,7 @@ class PhotoFragment : ViewPagerFragment() {
                         beVisibleIf(text.isNotEmpty())
                         val hideExtendedDetails = context?.config?.hideExtendedDetails == true
                         alpha = if (!hideExtendedDetails || !mIsFullscreen) 1f else 0f
+                        (activity as? BaseViewerActivity)?.applyProperHorizontalInsets(this)
                     }
                 }
             }

app/src/main/kotlin/org/fossify/gallery/fragments/VideoFragment.kt

@@ -62,6 +62,7 @@ import org.fossify.commons.extensions.updateTextColors
 import org.fossify.commons.helpers.DEFAULT_ANIMATION_DURATION
 import org.fossify.commons.helpers.ensureBackgroundThread
 import org.fossify.gallery.R
+import org.fossify.gallery.activities.BaseViewerActivity
 import org.fossify.gallery.activities.VideoActivity
 import org.fossify.gallery.databinding.PagerVideoItemBinding
 import org.fossify.gallery.extensions.config
@@ -566,6 +567,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener,
                 text = getMediumExtendedDetails(mMedium)
                 beVisibleIf(text.isNotEmpty())
                 alpha = if (!mConfig.hideExtendedDetails || !mIsFullscreen) 1f else 0f
+                (activity as? BaseViewerActivity)?.applyProperHorizontalInsets(this)
             }
         } else {
             binding.videoDetails.beGone()
@@ -575,6 +577,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener,
     private fun initTimeHolder() {
         mTimeHolder.beGoneIf(mIsFullscreen)
         mTimeHolder.alpha = if (mIsFullscreen) 0f else 1f
+        (activity as? BaseViewerActivity)?.applyProperHorizontalInsets(mTimeHolder)
     }
 
     private fun checkIfPanorama() {

app/src/main/res/layout/bottom_video_time_holder.xml

@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/video_time_holder"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/medium_margin">
 
     <TextView
         android:id="@+id/video_playback_speed"
@@ -31,7 +32,6 @@
         android:layout_width="@dimen/video_player_play_pause_size"
         android:layout_height="@dimen/video_player_play_pause_size"
         android:layout_marginStart="@dimen/small_margin"
-        android:layout_marginTop="@dimen/activity_margin"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_prev_outline_vector"
@@ -44,7 +44,6 @@
         android:id="@+id/video_toggle_play_pause"
         android:layout_width="@dimen/video_player_play_pause_size"
         android:layout_height="@dimen/video_player_play_pause_size"
-        android:layout_marginTop="@dimen/activity_margin"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/small_margin"
         android:src="@drawable/ic_pause_outline_vector"
@@ -58,7 +57,6 @@
         android:id="@+id/video_next_file"
         android:layout_width="@dimen/video_player_play_pause_size"
         android:layout_height="@dimen/video_player_play_pause_size"
-        android:layout_marginTop="@dimen/activity_margin"
         android:layout_marginEnd="@dimen/small_margin"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/normal_margin"