mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2025-11-07 02:33:00 +00:00
add missing icons in bright theme
* missing white icons * update attrs.xml and styles.xml
This commit is contained in:
@@ -7,9 +7,12 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.ServiceConnection;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.TypedArray;
|
||||
import android.os.Bundle;
|
||||
import android.os.IBinder;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.annotation.AttrRes;
|
||||
import android.support.annotation.DrawableRes;
|
||||
import android.support.v7.widget.GridLayoutManager;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
@@ -89,7 +92,7 @@ public class MissionsFragment extends Fragment {
|
||||
mEmpty = v.findViewById(R.id.list_empty_view);
|
||||
mList = v.findViewById(R.id.mission_recycler);
|
||||
|
||||
// Init
|
||||
// Init layouts managers
|
||||
mGridManager = new GridLayoutManager(getActivity(), SPAN_SIZE);
|
||||
mGridManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
|
||||
@Override
|
||||
@@ -103,7 +106,6 @@ public class MissionsFragment extends Fragment {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
mLinearManager = new LinearLayoutManager(getActivity());
|
||||
|
||||
setHasOptionsMenu(true);
|
||||
@@ -120,7 +122,7 @@ public class MissionsFragment extends Fragment {
|
||||
|
||||
// Bug: in api< 23 this is never called
|
||||
// so mActivity=null
|
||||
// so app crashes with nullpointer exception
|
||||
// so app crashes with null-pointer exception
|
||||
mActivity = activity;
|
||||
}
|
||||
|
||||
@@ -189,12 +191,21 @@ public class MissionsFragment extends Fragment {
|
||||
mList.setAdapter(mAdapter);
|
||||
|
||||
if (mSwitch != null) {
|
||||
mSwitch.setIcon(mLinear ? R.drawable.grid : R.drawable.list);
|
||||
mSwitch.setIcon(getDrawableFromAttribute(mLinear ? R.attr.ic_grid : R.attr.ic_list));
|
||||
mSwitch.setTitle(mLinear ? R.string.grid : R.string.list);
|
||||
mPrefs.edit().putBoolean("linear", mLinear).apply();
|
||||
}
|
||||
}
|
||||
|
||||
@DrawableRes
|
||||
private int getDrawableFromAttribute(@AttrRes int ic) {
|
||||
TypedArray styledAttributes = mActivity.obtainStyledAttributes(new int[]{ic});
|
||||
int resId = styledAttributes.getResourceId(0, -1);
|
||||
styledAttributes.recycle();
|
||||
|
||||
return resId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSaveInstanceState(Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
|
||||
Reference in New Issue
Block a user