tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor some preference dialogs

Browse source
This commit is contained in:
dkanada 2021-06-20 16:05:37 +09:00
commit 9367d5e697
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
View file

@ -92,12 +92,12 @@ public class SettingsActivity extends AbsBaseActivity {
} }
categoryPreference.setOnPreferenceClickListener(preference -> { categoryPreference.setOnPreferenceClickListener(preference -> {
CategoryPreferenceDialog.newInstance().show(getParentFragmentManager(), CategoryPreferenceDialog.TAG); CategoryPreferenceDialog.create().show(getParentFragmentManager(), CategoryPreferenceDialog.TAG);
return false; return false;
}); });
nowPlayingPreference.setOnPreferenceClickListener(preference -> { nowPlayingPreference.setOnPreferenceClickListener(preference -> {
NowPlayingPreferenceDialog.newInstance().show(getParentFragmentManager(), NowPlayingPreferenceDialog.TAG); NowPlayingPreferenceDialog.create().show(getParentFragmentManager(), NowPlayingPreferenceDialog.TAG);
return false; return false;
}); });

9
app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java
View file

@ -22,21 +22,18 @@ import java.util.stream.Collectors;
public class CategoryPreferenceDialog extends DialogFragment { public class CategoryPreferenceDialog extends DialogFragment {
public static final String TAG = CategoryPreferenceDialog.class.getSimpleName(); public static final String TAG = CategoryPreferenceDialog.class.getSimpleName();
public static CategoryPreferenceDialog newInstance() { public static CategoryPreferenceDialog create() {
return new CategoryPreferenceDialog(); return new CategoryPreferenceDialog();
} }
private CategoryAdapter adapter;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
View view = requireActivity().getLayoutInflater().inflate(R.layout.preference_dialog_category, null); View view = requireActivity().getLayoutInflater().inflate(R.layout.preference_dialog_category, null);
List<Category> categories = PreferenceUtil.getInstance(getContext()).getCategories(); List<Category> categories = PreferenceUtil.getInstance(getContext()).getCategories();
CategoryAdapter adapter = new CategoryAdapter(categories);
adapter = new CategoryAdapter(categories);
RecyclerView recyclerView = view.findViewById(R.id.recycler_view); RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
adapter.attachToRecyclerView(recyclerView); adapter.attachToRecyclerView(recyclerView);

8
app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java
View file

@ -25,7 +25,7 @@ public class NowPlayingPreferenceDialog extends DialogFragment implements ViewPa
private int viewPagerPosition; private int viewPagerPosition;
public static NowPlayingPreferenceDialog newInstance() { public static NowPlayingPreferenceDialog create() {
return new NowPlayingPreferenceDialog(); return new NowPlayingPreferenceDialog();
} }
@ -34,11 +34,12 @@ public class NowPlayingPreferenceDialog extends DialogFragment implements ViewPa
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing, null); View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing, null);
ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager); ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager);
InkPageIndicator pageIndicator = view.findViewById(R.id.page_indicator);
viewPager.setAdapter(new NowPlayingScreenAdapter(getContext())); viewPager.setAdapter(new NowPlayingScreenAdapter(getContext()));
viewPager.addOnPageChangeListener(this); viewPager.addOnPageChangeListener(this);
viewPager.setCurrentItem(PreferenceUtil.getInstance(getContext()).getNowPlayingScreen().ordinal()); viewPager.setCurrentItem(PreferenceUtil.getInstance(getContext()).getNowPlayingScreen().ordinal());
InkPageIndicator pageIndicator = view.findViewById(R.id.page_indicator);
pageIndicator.setViewPager(viewPager); pageIndicator.setViewPager(viewPager);
pageIndicator.onPageSelected(viewPager.getCurrentItem()); pageIndicator.onPageSelected(viewPager.getCurrentItem());
@ -78,10 +79,11 @@ public class NowPlayingPreferenceDialog extends DialogFragment implements ViewPa
LayoutInflater inflater = LayoutInflater.from(context); LayoutInflater inflater = LayoutInflater.from(context);
ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.preference_dialog_now_playing_item, collection, false); ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.preference_dialog_now_playing_item, collection, false);
collection.addView(layout);
ImageView image = layout.findViewById(R.id.image); ImageView image = layout.findViewById(R.id.image);
TextView title = layout.findViewById(R.id.title); TextView title = layout.findViewById(R.id.title);
collection.addView(layout);
image.setImageResource(nowPlayingScreen.drawableRes); image.setImageResource(nowPlayingScreen.drawableRes);
title.setText(nowPlayingScreen.titleRes); title.setText(nowPlayingScreen.titleRes);