Landscape Fixes (#66)

smashedr · web-flow · commit 52629be77154 · 2025-07-23T16:21:52.000-07:00
diff --git a/app/src/main/java/com/djangofiles/djangofiles/MainActivity.kt b/app/src/main/java/com/djangofiles/djangofiles/MainActivity.kt
@@ -184,12 +184,18 @@ class MainActivity : AppCompatActivity() {
         window.statusBarColor = Color.TRANSPARENT
         //WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightStatusBars = false
 
+        // Set Global Left/Right System Insets
+        ViewCompat.setOnApplyWindowInsetsListener(binding.appBarMain.contentMain.contentMainLayout) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            Log.i("Main[ViewCompat]", "bars: $bars")
+            v.updatePadding(left = bars.left, right = bars.right)
+            insets
+        }
 
         //binding.drawerLayout.setStatusBarBackgroundColor(Color.TRANSPARENT)
         //WindowCompat.setDecorFitsSystemWindows(window, false)
         //window.decorView.setOnApplyWindowInsetsListener { view, insets -> insets }
 
-
         // Update Navigation Bar
         window.navigationBarColor = Color.TRANSPARENT
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -199,9 +205,9 @@ class MainActivity : AppCompatActivity() {
         // Set Nav Header Top Padding
         val headerView = binding.navView.getHeaderView(0)
         ViewCompat.setOnApplyWindowInsetsListener(headerView) { v, insets ->
-            val top = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
-            Log.d("ViewCompat", "top: $top")
-            v.updatePadding(top = top)
+            val bars = insets.getInsets(WindowInsetsCompat.Type.statusBars())
+            Log.d("ViewCompat", "top: ${bars.top}")
+            v.updatePadding(top = bars.top)
             insets
         }
 
@@ -294,7 +300,7 @@ class MainActivity : AppCompatActivity() {
                     showPreview(uris[0])
                 } else {
                     Log.w("filePickerLauncher", "No Files Selected!")
-                    Toast.makeText(this, "No Files Selected!", Toast.LENGTH_SHORT).show()
+                    //Toast.makeText(this, "No Files Selected!", Toast.LENGTH_SHORT).show()
                 }
             }
 
@@ -663,6 +669,10 @@ class MainActivity : AppCompatActivity() {
         Log.d("setDrawerLockMode", "setDrawerLockMode: $lockMode")
         binding.drawerLayout.setDrawerLockMode(lockMode)
     }
+
+    fun launchFilePicker() {
+        filePickerLauncher.launch(arrayOf("*/*"))
+    }
 }
 
 
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/files/FilesFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/files/FilesFragment.kt
@@ -32,6 +32,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import com.bumptech.glide.Glide
 import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
 import com.bumptech.glide.load.model.GlideUrl
+import com.djangofiles.djangofiles.MainActivity
 import com.djangofiles.djangofiles.R
 import com.djangofiles.djangofiles.ServerApi
 import com.djangofiles.djangofiles.ServerApi.FileResponse
@@ -124,9 +125,9 @@ class FilesFragment : Fragment() {
         //Log.d("File[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
         ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-            val top = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
-            Log.d("ViewCompat", "top: $top")
-            v.updatePadding(top = top)
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            Log.d("ViewCompat", "top: ${bars.top}")
+            v.updatePadding(top = bars.top)
             insets
         }
 
@@ -512,6 +513,11 @@ class FilesFragment : Fragment() {
                 filesAdapter.notifyItemChanged(pos)
             }
         }
+
+        binding.uploadFiles.setOnClickListener {
+            Log.d("uploadFiles", "setOnClickListener")
+            (requireActivity() as MainActivity).launchFilePicker()
+        }
     }
 
     fun getFileIds(positions: List<Int>): List<Int> {
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/files/FilesPreviewFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/files/FilesPreviewFragment.kt
@@ -118,9 +118,9 @@ class FilesPreviewFragment : Fragment() {
         Log.d("FilesPreviewFragment", "onViewCreated: ${savedInstanceState?.size()}")
 
         ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-            val top = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
-            Log.d("ViewCompat", "top: $top")
-            v.updatePadding(top = top)
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            Log.d("ViewCompat", "top: ${bars.top}")
+            v.updatePadding(top = bars.top)
             insets
         }
 
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/home/HomeFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/home/HomeFragment.kt
@@ -90,9 +90,9 @@ class HomeFragment : Fragment() {
         //}
 
         ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-            val top = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
-            Log.d("ViewCompat", "top: $top")
-            v.updatePadding(top = top)
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            Log.d("ViewCompat", "top: ${bars.top}")
+            v.updatePadding(top = bars.top)
             insets
         }
 
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt
@@ -10,6 +10,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.edit
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavOptions
@@ -73,6 +76,12 @@ class AuthorizeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         Log.d("Authorize[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
+
         val ctx = requireContext()
 
         val packageInfo = ctx.packageManager.getPackageInfo(ctx.packageName, 0)
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
@@ -8,6 +8,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.net.toUri
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
@@ -62,6 +65,12 @@ class LoginFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         Log.d("Login[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
+
         val packageInfo =
             requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
         val versionName = packageInfo.versionName
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginTwoFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginTwoFragment.kt
@@ -9,7 +9,10 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.edit
 import androidx.core.net.toUri
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
@@ -76,6 +79,12 @@ class LoginTwoFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         Log.d("Login[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
+
         val appContext = requireContext()
         val packageInfo =
             appContext.packageManager.getPackageInfo(appContext.packageName, 0)
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt
@@ -75,14 +75,13 @@ class SettingsFragment : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-            val top = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
-            Log.d("ViewCompat", "top: $top")
-            v.updatePadding(top = top)
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            Log.d("ViewCompat", "top: ${bars.top}")
+            v.updatePadding(top = bars.top)
 
             if (arguments?.getBoolean("hide_bottom_nav") == true) {
-                val bottom = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
-                Log.d("ViewCompat", "bottom: $bottom")
-                v.updatePadding(bottom = bottom)
+                Log.d("ViewCompat", "bottom: ${bars.bottom}")
+                v.updatePadding(bottom = bars.bottom)
             }
             insets
         }
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/settings/WidgetSettingsFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/settings/WidgetSettingsFragment.kt
@@ -34,14 +34,13 @@ class WidgetSettingsFragment : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-            val top = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
-            Log.d("ViewCompat", "top: $top")
-            v.updatePadding(top = top)
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            Log.d("ViewCompat", "top: ${bars.top}")
+            v.updatePadding(top = bars.top)
 
             if (arguments?.getBoolean("hide_bottom_nav") == true) {
-                val bottom = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
-                Log.d("ViewCompat", "bottom: $bottom")
-                v.updatePadding(bottom = bottom)
+                Log.d("ViewCompat", "bottom: ${bars.bottom}")
+                v.updatePadding(bottom = bars.bottom)
             }
             insets
         }
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/upload/ShortFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/upload/ShortFragment.kt
@@ -9,6 +9,9 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavOptions
@@ -67,6 +70,12 @@ class ShortFragment : Fragment() {
         Log.d("Short[onViewCreated]", "savedInstanceState: $savedInstanceState")
         Log.d("Short[onViewCreated]", "arguments: $arguments")
 
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
+
         val savedUrl = preferences.getString("saved_url", null)
         val authToken = preferences.getString("auth_token", null)
         Log.d("Short[onViewCreated]", "savedUrl: $savedUrl - authToken: $authToken")
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/upload/TextFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/upload/TextFragment.kt
@@ -8,6 +8,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.os.bundleOf
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavOptions
@@ -67,6 +70,12 @@ class TextFragment : Fragment() {
         Log.d("Text[onViewCreated]", "savedInstanceState: $savedInstanceState")
         Log.d("Text[onViewCreated]", "arguments: $arguments")
 
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
+
         val savedUrl = preferences.getString("saved_url", null)
         val authToken = preferences.getString("auth_token", null)
         Log.d("Text[onViewCreated]", "savedUrl: $savedUrl - authToken: $authToken")
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/upload/UploadFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/upload/UploadFragment.kt
@@ -20,6 +20,9 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResultListener
 import androidx.lifecycle.lifecycleScope
@@ -90,6 +93,9 @@ class UploadFragment : Fragment() {
         super.onStart()
         Log.d("Upload[onStart]", "onStart - Hide UI")
         requireActivity().findViewById<BottomNavigationView>(R.id.bottom_nav).visibility = View.GONE
+        //val window = requireActivity().window
+        //val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
+        //windowInsetsController.hide(Type.systemBars())
     }
 
     override fun onStop() {
@@ -104,6 +110,9 @@ class UploadFragment : Fragment() {
         Log.d("Upload[onStop]", "onStop - Show UI")
         requireActivity().findViewById<BottomNavigationView>(R.id.bottom_nav).visibility =
             View.VISIBLE
+        //val window = requireActivity().window
+        //val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
+        //windowInsetsController.show(Type.systemBars())
         super.onStop()
     }
 
@@ -113,12 +122,11 @@ class UploadFragment : Fragment() {
         Log.d("Upload[onViewCreated]", "savedInstanceState: $savedInstanceState")
         Log.d("Upload[onViewCreated]", "arguments: $arguments")
 
-        //ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-        //    val bottom = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
-        //    Log.d("ViewCompat", "bottom: $bottom")
-        //    //v.updatePadding(bottom = bottom)
-        //    insets
-        //}
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
 
         val savedUrl = preferences.getString("saved_url", null)
         val authToken = preferences.getString("auth_token", null)
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/upload/UploadMultiFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/upload/UploadMultiFragment.kt
@@ -11,6 +11,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.os.bundleOf
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
@@ -83,6 +86,13 @@ class UploadMultiFragment : Fragment() {
         Log.d("Multi[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
         Log.d("Multi[onViewCreated]", "arguments: $arguments")
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.previewRecycler) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            //WindowInsetsCompat.CONSUMED
+            insets
+        }
+
         val savedUrl = preferences.getString("saved_url", null)
         val authToken = preferences.getString("auth_token", null)
         Log.d("Multi[onViewCreated]", "savedUrl: $savedUrl - authToken: $authToken")
diff --git a/app/src/main/res/layout-land/fragment_upload.xml b/app/src/main/res/layout-land/fragment_upload.xml
@@ -4,8 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/left_layout"
diff --git a/app/src/main/res/layout-land/fragment_upload_multi.xml b/app/src/main/res/layout-land/fragment_upload_multi.xml
@@ -16,20 +16,20 @@
             android:id="@+id/preview_recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
             android:clipToPadding="false"
             android:scrollbars="vertical"
             tools:itemCount="8"
             tools:viewBindingType="androidx.recyclerview.widget.RecyclerView"
             tools:layoutManager="GridLayoutManager"
-            tools:spanCount="4"
+            tools:spanCount="3"
             tools:listitem="@layout/file_item_upload" />
     </LinearLayout>
 
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
         android:layout_gravity="bottom"
         android:paddingHorizontal="8dp"
         android:orientation="horizontal">
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:minHeight="60dp"
         app:itemPaddingTop="8dp"
-        app:itemPaddingBottom="0dp"
+        app:itemPaddingBottom="2dp"
         app:itemTextAppearanceActiveBoldEnabled="false"
         app:itemActiveIndicatorStyle="@style/BottomNavigation.Indicator"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_authorize.xml b/app/src/main/res/layout/fragment_authorize.xml
diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
diff --git a/app/src/main/res/layout/fragment_login_two.xml b/app/src/main/res/layout/fragment_login_two.xml
diff --git a/app/src/main/res/layout/fragment_short.xml b/app/src/main/res/layout/fragment_short.xml
diff --git a/app/src/main/res/layout/fragment_text.xml b/app/src/main/res/layout/fragment_text.xml
diff --git a/app/src/main/res/layout/fragment_upload.xml b/app/src/main/res/layout/fragment_upload.xml
diff --git a/app/src/main/res/layout/fragment_upload_multi.xml b/app/src/main/res/layout/fragment_upload_multi.xml
