|
|
@ -19,7 +19,6 @@ import android.view.ViewGroup;
|
|
|
|
import android.widget.TextView;
|
|
|
|
import android.widget.TextView;
|
|
|
|
import androidx.annotation.Nullable;
|
|
|
|
import androidx.annotation.Nullable;
|
|
|
|
import butterknife.BindView;
|
|
|
|
import butterknife.BindView;
|
|
|
|
import butterknife.OnClick;
|
|
|
|
|
|
|
|
import com.google.android.material.chip.Chip;
|
|
|
|
import com.google.android.material.chip.Chip;
|
|
|
|
import com.google.android.material.chip.ChipGroup;
|
|
|
|
import com.google.android.material.chip.ChipGroup;
|
|
|
|
import com.google.common.base.Predicates;
|
|
|
|
import com.google.common.base.Predicates;
|
|
|
@ -111,13 +110,18 @@ public final class TagsControlSet extends TaskEditControlFragment {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@OnClick(R.id.tag_row)
|
|
|
|
@Override
|
|
|
|
void onClickRow() {
|
|
|
|
protected void onRowClick() {
|
|
|
|
Intent intent = new Intent(getContext(), TagPickerActivity.class);
|
|
|
|
Intent intent = new Intent(getContext(), TagPickerActivity.class);
|
|
|
|
intent.putParcelableArrayListExtra(TagPickerActivity.EXTRA_SELECTED, selectedTags);
|
|
|
|
intent.putParcelableArrayListExtra(TagPickerActivity.EXTRA_SELECTED, selectedTags);
|
|
|
|
startActivityForResult(intent, REQUEST_TAG_PICKER_ACTIVITY);
|
|
|
|
startActivityForResult(intent, REQUEST_TAG_PICKER_ACTIVITY);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
protected boolean isClickable() {
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public int getIcon() {
|
|
|
|
public int getIcon() {
|
|
|
|
return R.drawable.ic_outline_label_24px;
|
|
|
|
return R.drawable.ic_outline_label_24px;
|
|
|
@ -149,7 +153,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Chip chip = chipProvider.newClosableChip(tagData);
|
|
|
|
Chip chip = chipProvider.newClosableChip(tagData);
|
|
|
|
chipProvider.apply(chip, tagData);
|
|
|
|
chipProvider.apply(chip, tagData);
|
|
|
|
chip.setOnClickListener(view -> onClickRow());
|
|
|
|
chip.setOnClickListener(view -> onRowClick());
|
|
|
|
chip.setOnCloseIconClickListener(
|
|
|
|
chip.setOnCloseIconClickListener(
|
|
|
|
view -> {
|
|
|
|
view -> {
|
|
|
|
selectedTags.remove(tagData);
|
|
|
|
selectedTags.remove(tagData);
|
|
|
|