diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/BaseActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/BaseActivity.java index 9084411b..752f5da8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/BaseActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/BaseActivity.java @@ -330,14 +330,14 @@ public abstract class BaseActivity extends AppCompatActivity implements CustomFo return 0; }*/ - public int getStatusBarHeight() { + /*public int getStatusBarHeight() { int result = 0; int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android"); if (resourceId > 0) { result = getResources().getDimensionPixelSize(resourceId); } return result; - } + }*/ public static void setMargins(T view, int left, int top, int right, int bottom) { ViewGroup.LayoutParams lp = view.getLayoutParams(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemePreviewActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemePreviewActivity.java index 59392cd0..38ae956f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemePreviewActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemePreviewActivity.java @@ -11,7 +11,6 @@ import android.content.res.Configuration; import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -80,6 +79,7 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus private int subscribedColor; private int systemVisibilityToolbarExpanded = 0; private int systemVisibilityToolbarCollapsed = 0; + private int topSystemBarHeight; private SliderPanel mSliderPanel; private ActivityThemePreviewBinding binding; @@ -207,6 +207,8 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus | WindowInsetsCompat.Type.displayCutout() ); + topSystemBarHeight = allInsets.top; + int padding16 = (int) Utils.convertDpToPixel(16, CustomThemePreviewActivity.this); setMargins(binding.fabThemePreviewActivity, @@ -363,7 +365,7 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus @Override public void onGlobalLayout() { binding.appbarLayoutThemePreviewActivity.getViewTreeObserver().removeOnGlobalLayoutListener(this); - binding.collapsingToolbarLayoutThemePreviewActivity.setScrimVisibleHeightTrigger(binding.toolbar.getHeight() + binding.tabLayoutThemePreviewActivity.getHeight() + getStatusBarHeight() * 2); + binding.collapsingToolbarLayoutThemePreviewActivity.setScrimVisibleHeightTrigger(binding.toolbar.getHeight() + binding.tabLayoutThemePreviewActivity.getHeight() + topSystemBarHeight * 2); } }); binding.collapsingToolbarLayoutThemePreviewActivity.setContentScrimColor(customTheme.colorPrimary); @@ -401,14 +403,14 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus } } - private int getStatusBarHeight() { + /*private int getStatusBarHeight() { int result = 0; int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android"); if (resourceId > 0) { result = getResources().getDimensionPixelSize(resourceId); } return result; - } + }*/ protected void applyAppBarLayoutAndToolbarTheme(AppBarLayout appBarLayout, Toolbar toolbar) { appBarLayout.setBackgroundColor(customTheme.colorPrimary); @@ -431,7 +433,7 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus } } - private void adjustToolbar(Toolbar toolbar) { + /*private void adjustToolbar(Toolbar toolbar) { int statusBarResourceId = getResources().getIdentifier("status_bar_height", "dimen", "android"); if (statusBarResourceId > 0) { ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar.getLayoutParams(); @@ -444,7 +446,7 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics()) + statusBarHeight, 0, 0); } } - } + }*/ protected void applyTabLayoutTheme(TabLayout tabLayout) { int toolbarAndTabBackgroundColor = customTheme.colorPrimary; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java index ab520082..836e2529 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java @@ -202,6 +202,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp private int unsubscribedColor; private int subscribedColor; private int fabOption; + private int topSystemBarHeight; private MaterialAlertDialogBuilder nsfwWarningBuilder; private Bitmap subredditIconBitmap; private ActivityViewSubredditDetailBinding binding; @@ -253,6 +254,8 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp | WindowInsetsCompat.Type.displayCutout() ); + topSystemBarHeight = allInsets.top; + int padding16 = (int) Utils.convertDpToPixel(16, ViewSubredditDetailActivity.this); if (navigationWrapper.navigationRailView == null) { @@ -597,7 +600,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp @Override public void onGlobalLayout() { binding.appbarLayoutViewSubredditDetailActivity.getViewTreeObserver().removeOnGlobalLayoutListener(this); - binding.collapsingToolbarLayoutViewSubredditDetailActivity.setScrimVisibleHeightTrigger(binding.toolbar.getHeight() + binding.tabLayoutViewSubredditDetailActivity.getHeight() + getStatusBarHeight() * 2); + binding.collapsingToolbarLayoutViewSubredditDetailActivity.setScrimVisibleHeightTrigger(binding.toolbar.getHeight() + binding.tabLayoutViewSubredditDetailActivity.getHeight() + topSystemBarHeight * 2); } }); applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutViewSubredditDetailActivity, diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java index 961aa01d..fdc20fcb 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java @@ -191,6 +191,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele private int unsubscribedColor; private int subscribedColor; private int fabOption; + private int topSystemBarHeight; private boolean showToast = false; private boolean hideFab; private boolean showBottomAppBar; @@ -283,6 +284,8 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele | WindowInsetsCompat.Type.displayCutout() ); + topSystemBarHeight = allInsets.top; + int padding16 = (int) Utils.convertDpToPixel(16, ViewUserDetailActivity.this); if (navigationWrapper.navigationRailView == null) { @@ -686,7 +689,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele @Override public void onGlobalLayout() { binding.appbarLayoutViewUserDetail.getViewTreeObserver().removeOnGlobalLayoutListener(this); - binding.collapsingToolbarLayoutViewUserDetailActivity.setScrimVisibleHeightTrigger(binding.toolbarViewUserDetailActivity.getHeight() + binding.tabLayoutViewUserDetailActivity.getHeight() + getStatusBarHeight() * 2); + binding.collapsingToolbarLayoutViewUserDetailActivity.setScrimVisibleHeightTrigger(binding.toolbarViewUserDetailActivity.getHeight() + binding.tabLayoutViewUserDetailActivity.getHeight() + topSystemBarHeight * 2); } }); applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutViewUserDetail,