diff options
4 files changed, 32 insertions, 15 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java index 873706e0..938e74f3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java @@ -21,6 +21,8 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.DrawableImageViewTarget; import com.bumptech.glide.request.target.Target; +import org.fox.ttrss.util.ViewHelper; + public class GalleryImageFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); @@ -39,6 +41,8 @@ public class GalleryImageFragment extends GalleryBaseFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_gallery_entry, container, false); + ViewHelper.applyInsetPadding(view); + Log.d(TAG, "called for URL: " + m_url); ImageView imgView = view.findViewById(R.id.flavor_image); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java index b95e26f5..d2fffdaa 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java @@ -17,6 +17,8 @@ import android.widget.MediaController; import androidx.core.view.ViewCompat; +import org.fox.ttrss.util.ViewHelper; + import java.io.IOException; public class GalleryVideoFragment extends GalleryBaseFragment { @@ -47,6 +49,8 @@ public class GalleryVideoFragment extends GalleryBaseFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View view = inflater.inflate(R.layout.fragment_gallery_entry, container, false); + ViewHelper.applyInsetPadding(view); + Log.d(TAG, "called for URL: " + m_url + " Cover: " + m_coverUrl); ImageView imgView = view.findViewById(R.id.flavor_image); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index cb1fd5db..da9669d3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -13,10 +13,7 @@ import android.view.View; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.widget.Toolbar; -import androidx.core.graphics.Insets; import androidx.core.view.GravityCompat; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; @@ -28,6 +25,7 @@ import com.google.gson.JsonElement; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.Feed; +import org.fox.ttrss.util.ViewHelper; import java.util.Date; import java.util.HashMap; @@ -222,23 +220,13 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList // https://developer.android.com/develop/ui/views/layout/edge-to-edge View coordinatorView = findViewById(R.id.headlines_coordinator); - if (coordinatorView != null) { - ViewCompat.setOnApplyWindowInsetsListener(coordinatorView, (v, windowInsets) -> { - Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); - v.setPadding(0, insets.top, 0, insets.bottom); - return windowInsets; - }); + ViewHelper.applyInsetPadding(coordinatorView); } View navigationView = findViewById(R.id.modal_navigation_view); - if (navigationView != null) { - ViewCompat.setOnApplyWindowInsetsListener(navigationView, (v, windowInsets) -> { - Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); - v.setPadding(0, insets.top, 0, insets.bottom); - return windowInsets; - }); + ViewHelper.applyInsetPadding(navigationView); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ViewHelper.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ViewHelper.java new file mode 100644 index 00000000..2552d27a --- /dev/null +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ViewHelper.java @@ -0,0 +1,21 @@ +package org.fox.ttrss.util; + +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class ViewHelper { + // https://stackoverflow.com/questions/79018063/trying-to-understand-edge-to-edge-in-android + // https://developer.android.com/develop/ui/views/layout/edge-to-edge + public static void applyInsetPadding(@NonNull View view){ + ViewCompat.setOnApplyWindowInsetsListener(view, (v, windowInsets) -> { + int typeMask = WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(); + Insets insets = windowInsets.getInsets(typeMask); + v.setPadding(insets.left, insets.top, insets.right, insets.bottom); + return windowInsets; + }); + } +} |
