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

fix: use built-in appkit empty view styles entry and remove hack to apply colors to the empty view texts

This commit is contained in:
LucasGGamerM 2023-09-29 16:22:56 -03:00
parent 232d2e7e6d
commit 23843e9002
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java
View File

@ -40,19 +40,10 @@ public abstract class MastodonRecyclerFragment<T> extends BaseRecyclerFragment<T
@CallSuper @CallSuper
public void onViewCreated(View view, Bundle savedInstanceState){ public void onViewCreated(View view, Bundle savedInstanceState){
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
if (getParentFragment() instanceof HasElevationOnScrollListener elevator) if(wantsElevationOnScrollEffect())
list.addOnScrollListener(elevator.getElevationOnScrollListener());
else if(wantsElevationOnScrollEffect())
list.addOnScrollListener(elevationOnScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, getViewsForElevationEffect())); list.addOnScrollListener(elevationOnScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, getViewsForElevationEffect()));
if(refreshLayout!=null) if(refreshLayout!=null){
setRefreshLayoutColors(refreshLayout); setRefreshLayoutColors(refreshLayout);
// This is to set the color of the 'This list is empty'
for (int i = 0; i < ((LinearLayout) emptyView).getChildCount(); i++) {
View v = ((LinearLayout) emptyView).getChildAt(i);
if(v instanceof TextView) {
((TextView) v).setTextColor(UiUtils.getThemeColor(getContext(), android.R.attr.textColorSecondary));
}
} }
} }

6
mastodon/src/main/res/values/styles.xml
View File

@ -44,6 +44,7 @@
<item name="android:textColor">?colorM3OnSurface</item> <item name="android:textColor">?colorM3OnSurface</item>
<item name="android:textColorPrimary">?colorM3OnSurface</item> <item name="android:textColorPrimary">?colorM3OnSurface</item>
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item> <item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
<item name="appkitEmptyTextAppearance">@style/empty_text</item>
</style> </style>
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit"> <style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
@ -86,6 +87,7 @@
<item name="android:textColor">?colorM3OnSurface</item> <item name="android:textColor">?colorM3OnSurface</item>
<item name="android:textColorPrimary">?colorM3OnSurface</item> <item name="android:textColorPrimary">?colorM3OnSurface</item>
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item> <item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
<item name="appkitEmptyTextAppearance">@style/empty_text</item>
</style> </style>
<style name="Theme.Mastodon.Dark.SplashFragment"> <style name="Theme.Mastodon.Dark.SplashFragment">
@ -383,4 +385,8 @@
<style name="window_fade_out"> <style name="window_fade_out">
<item name="android:windowExitAnimation">@anim/fade_out_fast</item> <item name="android:windowExitAnimation">@anim/fade_out_fast</item>
</style> </style>
<style name="empty_text" parent="m3_body_large">
<item name="android:textColor">?colorM3OnSurfaceVariant</item>
</style>
</resources> </resources>