diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index c7da5931a0..c0f8e35dd7 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -169,7 +169,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc v.setLayoutParams(mlp); if (edge_to_edge) - for (View child : getInsetViews(v)) { + for (View child : Helper.getViewsWithTag(v, "inset")) { mlp = (ViewGroup.MarginLayoutParams) child.getLayoutParams(); mlp.bottomMargin = insets.bottom; child.setLayoutParams(mlp); @@ -226,18 +226,6 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc setContentView(view); } - private static List getInsetViews(View view) { - List result = new ArrayList<>(); - if (view != null && "inset".equals(view.getTag())) - result.add(view); - if (view instanceof ViewGroup) { - ViewGroup group = (ViewGroup) view; - for (int i = 0; i <= group.getChildCount(); i++) - result.addAll(getInsetViews(group.getChildAt(i))); - } - return result; - } - @Override protected void onCreate(Bundle savedInstanceState) { EntityLog.log(this, "Activity create " + this.getClass().getName() + diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index a1e17c0af1..558087ba76 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -935,6 +935,18 @@ public class Helper { return context.getResources().getDimensionPixelSize(resid); } + static @NonNull List getViewsWithTag(@NonNull View view, @NonNull String tag) { + List result = new ArrayList<>(); + if (view != null && tag.equals(view.getTag())) + result.add(view); + if (view instanceof ViewGroup) { + ViewGroup group = (ViewGroup) view; + for (int i = 0; i <= group.getChildCount(); i++) + result.addAll(getViewsWithTag(group.getChildAt(i), tag)); + } + return result; + } + static ObjectAnimator getFabAnimator(View fab, LifecycleOwner owner) { ObjectAnimator.AnimatorUpdateListener listener = new ObjectAnimator.AnimatorUpdateListener() { @Override