Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'swipe-refresh' into 'master'

Browse Source 
Color swipe to refresh indicator

See merge request fdroid/fdroidclient!804
This commit is contained in:
Hans-Christoph Steiner 2019-04-09 21:26:32 +00:00
commit 623e27931a
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
View File

@ -18,6 +18,7 @@ import android.widget.TextView;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.UpdateService;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.CategoryProvider; import org.fdroid.fdroid.data.CategoryProvider;
import org.fdroid.fdroid.data.Schema; import org.fdroid.fdroid.data.Schema;
import org.fdroid.fdroid.views.apps.AppListActivity; import org.fdroid.fdroid.views.apps.AppListActivity;
@ -60,6 +61,7 @@ class CategoriesViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
final SwipeRefreshLayout swipeToRefresh = final SwipeRefreshLayout swipeToRefresh =
(SwipeRefreshLayout) categoriesView.findViewById(R.id.swipe_to_refresh); (SwipeRefreshLayout) categoriesView.findViewById(R.id.swipe_to_refresh);
Utils.applySwipeLayoutColors(swipeToRefresh);
swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override @Override
public void onRefresh() { public void onRefresh() {

8
app/src/main/java/org/fdroid/fdroid/Utils.java
View File

@ -33,6 +33,7 @@ import android.os.StatFs;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi; import android.support.annotation.RequiresApi;
import android.support.v4.widget.SwipeRefreshLayout;
import android.text.Editable; import android.text.Editable;
import android.text.Html; import android.text.Html;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@ -862,4 +863,11 @@ public final class Utils {
} }
}); });
} }
public static void applySwipeLayoutColors(SwipeRefreshLayout swipeLayout) {
TypedValue typedValue = new TypedValue();
Resources.Theme theme = swipeLayout.getContext().getTheme();
theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
swipeLayout.setColorSchemeColors(typedValue.data);
}
} }

1
app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
View File

@ -64,6 +64,7 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) whatsNewView final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) whatsNewView
.findViewById(R.id.swipe_to_refresh); .findViewById(R.id.swipe_to_refresh);
Utils.applySwipeLayoutColors(swipeToRefresh);
swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override @Override
public void onRefresh() { public void onRefresh() {

2
app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
View File

@ -12,6 +12,7 @@ import android.widget.TextView;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.UpdateService;
import org.fdroid.fdroid.Utils;
public class UpdatesViewBinder { public class UpdatesViewBinder {
@ -38,6 +39,7 @@ public class UpdatesViewBinder {
emptyImage = (ImageView) view.findViewById(R.id.image); emptyImage = (ImageView) view.findViewById(R.id.image);
final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) view.findViewById(R.id.swipe_to_refresh); final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) view.findViewById(R.id.swipe_to_refresh);
Utils.applySwipeLayoutColors(swipeToRefresh);
swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override @Override
public void onRefresh() { public void onRefresh() {