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

Merge with upstream and more cleanup

Browse source
This commit is contained in:
doompadee 2017-12-24 23:34:55 +01:00
commit 5242ddb76f
3 changed files with 37 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

141
app/src/main/java/com/kabouzeid/gramophone/adapter/CategoryAdapter.java
View file

@ -1,20 +1,6 @@
package com.kabouzeid.gramophone.adapter; package com.kabouzeid.gramophone.adapter;
import android.content.Context; import android.annotation.SuppressLint;
import android.content.res.ColorStateList;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper; import android.support.v7.widget.helper.ItemTouchHelper;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -24,117 +10,46 @@ import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.TextView; import android.widget.TextView;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.util.SwipeAndDragHelper;
import com.kabouzeid.gramophone.model.Category; import com.kabouzeid.gramophone.model.Category;
import com.kabouzeid.gramophone.util.SwipeAndDragHelper;
import java.util.ArrayList; import java.util.ArrayList;
public class CategoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements SwipeAndDragHelper.ActionCompletionContract { public class CategoryAdapter extends RecyclerView.Adapter<CategoryAdapter.ViewHolder> implements SwipeAndDragHelper.ActionCompletionContract {
private ArrayList<Category> categories; private ArrayList<Category> categories;
private ItemTouchHelper touchHelper; private ItemTouchHelper touchHelper;
private ColorStateList color;
public CategoryAdapter(ArrayList<Category> categories, ColorStateList color) { public CategoryAdapter(ArrayList<Category> categories) {
this.categories = copy(categories); this.categories = categories;
this.color = color;
} }
@Override @Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public CategoryAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_library_categories_listitem, parent, false); View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_library_categories_listitem, parent, false);
return new CategoryViewHolder(view); return new ViewHolder(view);
} }
@SuppressLint("ClickableViewAccessibility")
@Override @Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(CategoryAdapter.ViewHolder holder, int position) {
Category category = categories.get(position); Category category = categories.get(position);
CategoryViewHolder h = (CategoryViewHolder) holder;
h.checkBox.setChecked(category.visible);
h.title.setText(h.title.getResources().getString(category.id.key));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { holder.checkBox.setChecked(category.visible);
h.checkBox.setButtonTintList(color); holder.title.setText(holder.title.getResources().getString(category.id.key));
} else {
Drawable checkDrawable =
ContextCompat.getDrawable(h.checkBox.getContext(), R.drawable.abc_btn_check_material);
Drawable drawable = DrawableCompat.wrap(checkDrawable);
DrawableCompat.setTintList(drawable, color);
h.checkBox.setButtonDrawable(drawable);
}
h.checkBox.setOnClickListener((view) -> { holder.itemView.setOnClickListener(v -> {
h.checkBox.setChecked(category.visible = !category.visible); category.visible = !category.visible;
notifyDataSetChanged(); holder.checkBox.setChecked(category.visible);
} });
);
h.title.setOnClickListener((view) -> { holder.dragView.setOnTouchListener((view, event) -> {
h.checkBox.setChecked(category.visible = !category.visible);
notifyDataSetChanged();
}
);
h.dragHandle.setOnTouchListener((view, event) -> {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
touchHelper.startDrag(h); touchHelper.startDrag(holder);
} }
return false; return false;
} }
); );
Context context = h.dragHandle.getContext();
int backgroundColor = ThemeStore.textColorSecondary(context);
int borderColor = ThemeStore.textColorSecondaryInverse(context);
h.dragHandle.setBackground(new DragHandle(h.dragHandle.getResources().getDisplayMetrics().density, backgroundColor, borderColor));
}
private static class DragHandle extends Drawable {
private float density;
private Paint shape;
private Paint outline;
public DragHandle(float density, int color, int borderColor) {
this.shape = new Paint();
this.shape.setStyle(Paint.Style.FILL);
this.shape.setColor(color);
this.outline = new Paint();
this.outline.setAntiAlias(true);
this.outline.setStyle(Paint.Style.STROKE);
this.outline.setColor(borderColor);
this.density = density;
}
@Override
public void draw(@NonNull Canvas canvas) {
Rect bounds = getBounds();
float width = 15 * density;
float left = bounds.centerX() - width / 2;
float top = bounds.top + bounds.centerY() - 3 * density;
canvas.save();
canvas.drawRect(left, top, left + width, top + 2 * density, shape);
canvas.drawRect(left, top, left + width, top + 2 * density, outline);
canvas.translate(0, (density * 2) * 2);
canvas.drawRect(left, top, left + width, top + 2 * density, shape);
canvas.drawRect(left, top, left + width, top + 2 * density, outline);
canvas.restore();
}
@Override
public void setAlpha(int i) {
}
@Override
public void setColorFilter(@Nullable ColorFilter filter) {
}
@Override
public int getOpacity() {
return PixelFormat.TRANSLUCENT;
}
} }
@Override @Override
@ -142,13 +57,9 @@ public class CategoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
return categories.size(); return categories.size();
} }
@Override
public int getItemViewType(int position) {
return 1;
}
public void setCategories(ArrayList<Category> categories) { public void setCategories(ArrayList<Category> categories) {
this.categories = copy(categories); this.categories = categories;
notifyDataSetChanged(); notifyDataSetChanged();
} }
@ -168,24 +79,16 @@ public class CategoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
return categories; return categories;
} }
private ArrayList<Category> copy(ArrayList<Category> categories) { static class ViewHolder extends RecyclerView.ViewHolder {
ArrayList<Category> result = new ArrayList<>();
for (Category category : categories) {
result.add(new Category(category));
}
return result;
}
private static class CategoryViewHolder extends RecyclerView.ViewHolder {
public CheckBox checkBox; public CheckBox checkBox;
public TextView title; public TextView title;
public View dragHandle; public View dragView;
public CategoryViewHolder(View view) { public ViewHolder(View view) {
super(view); super(view);
checkBox = view.findViewById(R.id.checkbox); checkBox = view.findViewById(R.id.checkbox);
title = view.findViewById(R.id.title); title = view.findViewById(R.id.title);
dragHandle = view.findViewById(R.id.drag_handle); dragView = view.findViewById(R.id.drag_view);
} }
} }
} }

35
app/src/main/java/com/kabouzeid/gramophone/preferences/LibraryPreferenceDialog.java
View file

@ -1,7 +1,6 @@
package com.kabouzeid.gramophone.preferences; package com.kabouzeid.gramophone.preferences;
import android.app.Dialog; import android.app.Dialog;
import android.content.res.ColorStateList;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
@ -11,10 +10,7 @@ import android.support.v7.widget.helper.ItemTouchHelper;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.util.DialogUtils;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.CategoryAdapter; import com.kabouzeid.gramophone.adapter.CategoryAdapter;
import com.kabouzeid.gramophone.model.Category; import com.kabouzeid.gramophone.model.Category;
@ -35,10 +31,10 @@ public class LibraryPreferenceDialog extends DialogFragment {
LayoutInflater inflater = getActivity().getLayoutInflater(); LayoutInflater inflater = getActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.preference_dialog_library_categories, null); View view = inflater.inflate(R.layout.preference_dialog_library_categories, null);
final ArrayList<Category> categories = PreferenceUtil.getInstance(getContext()).getLibraryCategories(); ArrayList<Category> categories = PreferenceUtil.getInstance(getContext()).getLibraryCategories();
RecyclerView categoriesView = view.findViewById(R.id.recycler_view); RecyclerView categoriesView = view.findViewById(R.id.recycler_view);
categoriesView.setLayoutManager(new LinearLayoutManager(getActivity())); categoriesView.setLayoutManager(new LinearLayoutManager(getActivity()));
final CategoryAdapter adapter = new CategoryAdapter(categories, getCheckboxColors()); CategoryAdapter adapter = new CategoryAdapter(categories);
SwipeAndDragHelper swipeAndDragHelper = new SwipeAndDragHelper(adapter); SwipeAndDragHelper swipeAndDragHelper = new SwipeAndDragHelper(adapter);
ItemTouchHelper touchHelper = new ItemTouchHelper(swipeAndDragHelper); ItemTouchHelper touchHelper = new ItemTouchHelper(swipeAndDragHelper);
adapter.setTouchHelper(touchHelper); adapter.setTouchHelper(touchHelper);
@ -59,10 +55,10 @@ public class LibraryPreferenceDialog extends DialogFragment {
.onPositive((dialog13, action) -> { .onPositive((dialog13, action) -> {
if (!updateCategories(adapter.getCategories())) { if (!updateCategories(adapter.getCategories())) {
new MaterialDialog.Builder(getContext()) new MaterialDialog.Builder(getContext())
.title(R.string.edit_categories) .title(R.string.edit_categories)
.content(R.string.at_least_one_category_must_be_enabled) .content(R.string.at_least_one_category_must_be_enabled)
.positiveText(android.R.string.ok) .positiveText(android.R.string.ok)
.show(); .show();
} else { } else {
dismiss(); dismiss();
} }
@ -84,25 +80,8 @@ public class LibraryPreferenceDialog extends DialogFragment {
int selected = 0; int selected = 0;
for (Category category : categories) { for (Category category : categories) {
if (category.visible) if (category.visible)
selected ++; selected++;
} }
return selected; return selected;
} }
private ColorStateList getCheckboxColors() {
int disabledColor = DialogUtils.getDisabledColor(getContext());
return new ColorStateList(
new int[][] {
new int[] {android.R.attr.state_enabled, -android.R.attr.state_checked},
new int[] {android.R.attr.state_enabled, android.R.attr.state_checked},
new int[] {-android.R.attr.state_enabled, -android.R.attr.state_checked},
new int[] {-android.R.attr.state_enabled, android.R.attr.state_checked}
},
new int[] {
DialogUtils.resolveColor(getContext(), R.attr.colorControlNormal),
ThemeStore.accentColor(getContext()),
disabledColor,
disabledColor
});
}
} }

24
app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
View file

@ -466,24 +466,16 @@ public final class PreferenceUtil {
return result; return result;
} }
return LibraryCategories.DEFAULTS; return getDefaultLibraryCategories();
} }
public ArrayList<Category> getDefaultLibraryCategories() { public ArrayList<Category> getDefaultLibraryCategories() {
return LibraryCategories.DEFAULTS; ArrayList<Category> result = new ArrayList<>();
} result.add(new Category(Category.Id.SONGS, true, 0));
result.add(new Category(Category.Id.ALBUMS, true, 1));
private static class LibraryCategories { result.add(new Category(Category.Id.ARTISTS, true, 2));
public final static ArrayList<Category> DEFAULTS = getDefaults(); result.add(new Category(Category.Id.GENRES, true, 3));
result.add(new Category(Category.Id.PLAYLISTS, true, 4));
private static ArrayList<Category> getDefaults() { return result;
ArrayList<Category> result = new ArrayList<>();
result.add(new Category(Category.Id.SONGS, true, 0));
result.add(new Category(Category.Id.ALBUMS, true, 1));
result.add(new Category(Category.Id.ARTISTS, true, 2));
result.add(new Category(Category.Id.GENRES, true, 3));
result.add(new Category(Category.Id.PLAYLISTS, true, 4));
return result;
}
} }
} }