mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2026-02-05 03:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ViewCompat.setOnApplyWindowInsetsListener in CustomThemePreviewActivity. Fix theming issues in CustomThemePreviewActivity.

Browse Source
This commit is contained in:
Docile-Alligator
2025-06-16 22:29:40 -04:00
parent 1a0be352cd
commit 8a133f6a3d
3 changed files with 77 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemePreviewActivity.java
View File

@ -8,7 +8,6 @@ import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
import android.content.SharedPreferences;
import android.content.res.ColorStateList;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
@ -25,7 +24,10 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.graphics.Insets;
import androidx.core.view.OnApplyWindowInsetsListener;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
@ -122,8 +124,9 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus
}
}
boolean immersiveInterface = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
mSharedPreferences.getBoolean(SharedPreferencesUtils.IMMERSIVE_INTERFACE_KEY, true);
boolean immersiveInterface = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
mSharedPreferences.getBoolean(SharedPreferencesUtils.IMMERSIVE_INTERFACE_KEY, true))
|| Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM;
boolean changeStatusBarIconColor = false;
if (immersiveInterface) {
changeStatusBarIconColor = customTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface;
@ -194,7 +197,51 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus
} else {
window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
}
adjustToolbar(binding.toolbar);
ViewCompat.setOnApplyWindowInsetsListener(binding.getRoot(), new OnApplyWindowInsetsListener() {
@NonNull
@Override
public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
Insets allInsets = insets.getInsets(
WindowInsetsCompat.Type.systemBars()
| WindowInsetsCompat.Type.displayCutout()
);
int padding16 = (int) Utils.convertDpToPixel(16, CustomThemePreviewActivity.this);
setMargins(binding.fabThemePreviewActivity,
BaseActivity.IGNORE_MARGIN,
BaseActivity.IGNORE_MARGIN,
BaseActivity.IGNORE_MARGIN,
allInsets.bottom);
binding.toolbarLinearLayoutThemePreviewActivity.setPadding(
padding16 + allInsets.left,
binding.toolbar.getPaddingTop(),
padding16 + allInsets.right,
binding.toolbar.getPaddingBottom());
binding.viewPagerThemePreviewActivity.setPadding(allInsets.left, 0, allInsets.right, 0);
binding.linearLayoutBottomAppBarThemePreviewActivity.setPadding(
binding.linearLayoutBottomAppBarThemePreviewActivity.getPaddingLeft(),
binding.linearLayoutBottomAppBarThemePreviewActivity.getPaddingTop(),
binding.linearLayoutBottomAppBarThemePreviewActivity.getPaddingRight(),
allInsets.bottom
);
setMargins(binding.toolbar,
allInsets.left,
allInsets.top,
allInsets.right,
BaseActivity.IGNORE_MARGIN);
binding.tabLayoutThemePreviewActivity.setPadding(allInsets.left, 0, allInsets.right, 0);
return WindowInsetsCompat.CONSUMED;
}
});
/*adjustToolbar(binding.toolbar);
Resources resources = getResources();
int navBarResourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
@ -207,7 +254,7 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus
binding.linearLayoutBottomAppBarThemePreviewActivity.setPadding(0,
(int) (6 * getResources().getDisplayMetrics().density), 0, navBarHeight);
}
}
}*/
}
if (changeStatusBarIconColor) {
@ -288,6 +335,28 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus
binding.tabLayoutThemePreviewActivity.setupWithViewPager(binding.viewPagerThemePreviewActivity);
}
public static <T extends View> void setMargins(T view, int left, int top, int right, int bottom) {
ViewGroup.LayoutParams lp = view.getLayoutParams();
if (lp instanceof ViewGroup.MarginLayoutParams) {
ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams) lp;
if (top >= 0) {
marginParams.topMargin = top;
}
if (bottom >= 0) {
marginParams.bottomMargin = bottom;
}
if (left >= 0) {
marginParams.setMarginStart(left);
}
if (right >= 0) {
marginParams.setMarginEnd(right);
}
view.setLayoutParams(marginParams);
}
}
private void applyCustomTheme() {
binding.coordinatorLayoutThemePreviewActivity.setBackgroundColor(customTheme.backgroundColor);
binding.appbarLayoutThemePreviewActivity.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@ -307,7 +376,6 @@ public class CustomThemePreviewActivity extends AppCompatActivity implements Cus
collapsedTabTextColor = customTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor;
collapsedTabIndicatorColor = customTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator;
collapsedTabBackgroundColor = customTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground;
binding.linearLayoutBottomAppBarThemePreviewActivity.setBackgroundColor(customTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground);
binding.extraPaddingViewThemePreviewActivity.setBackgroundColor(customTheme.colorPrimary);
binding.subredditNameTextViewThemePreviewActivity.setTextColor(customTheme.subreddit);
binding.userNameTextViewThemePreviewActivity.setTextColor(customTheme.username);

1
app/src/main/res/layout/fragment_theme_preview_comments.xml
View File

@ -9,6 +9,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="144dp"
android:orientation="vertical">
<LinearLayout

2
app/src/main/res/layout/fragment_theme_preview_posts.xml
View File

@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginBottom="144dp"
app:cardCornerRadius="16dp"
app:cardElevation="2dp"
style="?attr/materialCardViewElevatedStyle">