Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt upstream changes

This commit is contained in:
sk 2023-01-26 01:09:08 +01:00 committed by LucasGGamerM
parent 0fd2894a8b
commit e1b1ae717f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/utils/ElevationOnScrollListener.java
View File

@ -94,9 +94,9 @@ public class ElevationOnScrollListener extends RecyclerView.OnScrollListener imp
if(fragmentRootLayout!=null){ if(fragmentRootLayout!=null){
int color; int color;
if(isAtTop){ if(isAtTop){
color=UiUtils.getThemeColor(context, R.attr.colorM3Background); color=UiUtils.getThemeColor(context, R.attr.toolbarBackground);
}else{ }else{
color=UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Background), UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.07843137f); color=UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.toolbarBackground), UiUtils.getThemeColor(context, R.attr.colorWindowBackground), 0.07843137f);
} }
anims.add(ObjectAnimator.ofArgb(fragmentRootLayout, "statusBarColor", color)); anims.add(ObjectAnimator.ofArgb(fragmentRootLayout, "statusBarColor", color));
} }

4
mastodon/src/main/res/drawable/bg_onboarding_panel.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item>
<color android:color="?colorM3Background"/> <color android:color="?colorWindowBackground"/>
</item> </item>
<item android:id="@+id/color_overlay"> <item android:id="@+id/color_overlay">
<color android:color="?colorM3Primary"/> <color android:color="?toolbarBackground"/>
</item> </item>
</layer-list> </layer-list>

1
mastodon/src/main/res/layout/fragment_onboarding_rules.xml
View File

@ -15,6 +15,7 @@
android:id="@+id/button_bar" android:id="@+id/button_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button