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

fix profile fragment crash

Browse Source 
closes sk22#469
This commit is contained in:
sk
2023-03-21 09:56:44 +01:00
parent 781856b822
commit 797642b972
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -439,6 +439,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
toolbarTitleView.setTranslationY(titleTransY); toolbarTitleView.setTranslationY(titleTransY);
toolbarSubtitleView.setTranslationY(titleTransY); toolbarSubtitleView.setTranslationY(titleTransY);
} }
RecyclerFragment.setRefreshLayoutColors(refreshLayout);
} }
@Override @Override

11
mastodon/src/main/java/org/joinmastodon/android/fragments/RecyclerFragment.java
View File

@@ -4,6 +4,8 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import org.joinmastodon.android.R; import org.joinmastodon.android.R;
import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.utils.UiUtils;
@@ -25,7 +27,10 @@ public abstract class RecyclerFragment<T> extends BaseRecyclerFragment<T> {
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
Context ctx = getContext(); if (refreshLayout != null) setRefreshLayoutColors(refreshLayout);
}
public static void setRefreshLayoutColors(SwipeRefreshLayout l) {
List<Integer> colors = new ArrayList<>(Arrays.asList( List<Integer> colors = new ArrayList<>(Arrays.asList(
R.color.primary_600, R.color.primary_600,
R.color.red_primary_600, R.color.red_primary_600,
@@ -33,13 +38,13 @@ public abstract class RecyclerFragment<T> extends BaseRecyclerFragment<T> {
R.color.blue_primary_600, R.color.blue_primary_600,
R.color.purple_600 R.color.purple_600
)); ));
int primary = UiUtils.getThemeColorRes(ctx, R.attr.colorPrimary600); int primary = UiUtils.getThemeColorRes(l.getContext(), R.attr.colorPrimary600);
if (!colors.contains(primary)) colors.add(0, primary); if (!colors.contains(primary)) colors.add(0, primary);
int offset = colors.indexOf(primary); int offset = colors.indexOf(primary);
int[] sorted = new int[colors.size()]; int[] sorted = new int[colors.size()];
for (int i = 0; i < colors.size(); i++) { for (int i = 0; i < colors.size(); i++) {
sorted[i] = colors.get((i + offset) % colors.size()); sorted[i] = colors.get((i + offset) % colors.size());
} }
refreshLayout.setColorSchemeResources(sorted); l.setColorSchemeResources(sorted);
} }
} }