sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-19 20:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add clear button to task filters

Browse source
This commit is contained in:
Phillip Thelen 2017-04-06 18:36:45 +02:00
parent c204054104
commit b113917c01
3 changed files with 67 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Habitica/res/layout/dialog_task_filter.xml
View file

@ -7,12 +7,13 @@
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/pill_gray" />
android:background="@color/pill_gray"
android:layout_marginTop="6dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_margin="24dp"
android:orientation="vertical">
<TextView
android:id="@+id/task_type_title"

1
Habitica/res/values/strings.xml
View file

@ -557,4 +557,5 @@ To start, which parts of your life do you want to improve?</string>
<string name="dated">Dated</string>
<string name="completed">Completed</string>
<string name="setuP_group_other">Other</string>
<string name="clear">Clear</string>
</resources>

67
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
View file

@ -1,8 +1,14 @@
package com.habitrpg.android.habitica.ui.views.tasks;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.CompoundButtonCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.AppCompatCheckBox;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.TypedValue;
@ -83,7 +89,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
setTitle(R.string.filters);
setView(view);
this.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.close), (dialog, which) -> {
this.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.done), (dialog, which) -> {
if (isEditing) {
stopEditing();
}
@ -92,6 +98,26 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
}
this.dismiss();
});
setButton(AlertDialog.BUTTON_NEUTRAL, getContext().getString(R.string.clear), (dialog, which) -> {
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Button clearButton = getButton(AlertDialog.BUTTON_NEUTRAL);
if (clearButton != null) {
clearButton.setOnClickListener(view1 -> {
if (isEditing) {
stopEditing();
}
setActiveFilter(null);
setActiveTags(null);
});
clearButton.setEnabled(hasActiveFilters());
}
}
@Override
@ -109,9 +135,23 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
private void createTagViews() {
for (Tag tag : tags) {
CheckBox tagCheckbox = new CheckBox(getContext());
AppCompatCheckBox tagCheckbox = new AppCompatCheckBox(getContext());
tagCheckbox.setText(tag.getName());
tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,14);
ColorStateList colorStateList = new ColorStateList(
new int[][]{
new int[]{-android.R.attr.state_checked}, //disabled
new int[]{android.R.attr.state_checked} //enabled
},
new int[] {
Color.GRAY, //disabled
ContextCompat.getColor(getContext(), R.color.brand_400) //enabled
}
);
CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList);
tagCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (isChecked) {
if (!activeTags.contains(tag.getId())) {
@ -122,6 +162,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
activeTags.remove(tag.getId());
}
}
filtersChanged();
});
tagsList.addView(tagCheckbox);
}
@ -218,13 +259,18 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
}
public void setActiveTags(List<String> tagIds) {
this.activeTags = tagIds;
for (String tagId : tagIds) {
if (tagIds == null) {
this.activeTags.clear();
} else {
this.activeTags = tagIds;
}
for (String tagId : this.activeTags) {
int index = indexForId(tagId);
if (index >= 0) {
((CheckBox)tagsList.getChildAt(index)).setChecked(true);
}
}
filtersChanged();
}
private int indexForId(String tagId) {
@ -293,6 +339,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
}
}
taskFilters.check(checkedId);
filtersChanged();
}
@Override
@ -328,6 +375,7 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
break;
}
}
filtersChanged();
}
@OnClick(R.id.tag_edit_button)
@ -340,6 +388,17 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
}
}
private void filtersChanged() {
Button clearButton = getButton(AlertDialog.BUTTON_NEUTRAL);
if (clearButton != null) {
clearButton.setEnabled(hasActiveFilters());
}
}
private boolean hasActiveFilters() {
return taskFilters.getCheckedRadioButtonId() != R.id.all_task_filter || activeTags.size() > 0;
}
public void setListener(OnFilterCompletedListener listener) {
this.listener = listener;
}