sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 18:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

delete old TaskTags

Browse source
This commit is contained in:
Phillip Thelen 2016-04-12 17:15:06 +02:00
parent 7e44e5f85e
commit 5000ab8d78
4 changed files with 102 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -120,11 +120,16 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
private static final int MIN_LEVEL_FOR_SKILLS = 11;
@Bind(R.id.floating_menu_wrapper) FrameLayout floatingMenuWrapper;
@Bind(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.detail_tabs) TabLayout detail_tabs;
@Bind(R.id.avatar_with_bars) View avatar_with_bars;
@Bind(R.id.overlayFrameLayout) FrameLayout overlayFrameLayout;
@Bind(R.id.floating_menu_wrapper)
FrameLayout floatingMenuWrapper;
@Bind(R.id.toolbar)
Toolbar toolbar;
@Bind(R.id.detail_tabs)
TabLayout detail_tabs;
@Bind(R.id.avatar_with_bars)
View avatar_with_bars;
@Bind(R.id.overlayFrameLayout)
FrameLayout overlayFrameLayout;
// Checkout needs to be in the Activity..
public ActivityCheckout checkout = null;
@ -203,7 +208,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
//a state can arise in which the active fragment no longer has a
//reference to the tabLayout (and all its adapters are null).
//Recreate the fragment as a result.
if (activeFragment != null && activeFragment.tabLayout == null){
if (activeFragment != null && activeFragment.tabLayout == null) {
activeFragment = null;
drawer.setSelectionAtPosition(1);
}
@ -314,15 +319,22 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
loadAndRemoveOldTasks(user.getId(), allTasks);
ArrayList<ChecklistItem> allChecklistItems = new ArrayList<>();
for (Task t : allTasks) {
if (t.checklist != null) {
allChecklistItems.addAll(t.checklist);
}
}
loadAndRemoveOldChecklists(allChecklistItems);
ArrayList<TaskTag> allTaskTags = new ArrayList<>();
for (Task t : allTasks) {
if (t.tags != null) {
allTaskTags.addAll(t.tags);
}
}
loadAndRemoveOldTaskTags(allTaskTags);
updateOwnedEquipment(user.getItems().getGear().owned);
}
}).start();
@ -433,6 +445,52 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
}
private void loadAndRemoveOldTaskTags(final List<TaskTag> onlineEntries) {
final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
for (TaskTag item : onlineEntries) {
onlineTaskTagItemIdList.add(item.getId());
}
From<TaskTag> query = new Select().from(TaskTag.class);
try {
if (query.count() != onlineEntries.size()) {
// Load Database Checklist items
query.async().queryList(new TransactionListener<List<TaskTag>>() {
@Override
public void onResultReceived(List<TaskTag> items) {
ArrayList<TaskTag> checkListItemsToDelete = new ArrayList<>();
for (TaskTag ttag : items) {
if (!onlineTaskTagItemIdList.contains(ttag.getId())) {
checkListItemsToDelete.add(ttag);
}
}
for (TaskTag ttag : checkListItemsToDelete) {
ttag.async().delete();
}
}
@Override
public boolean onReady(BaseTransaction<List<TaskTag>> baseTransaction) {
return false;
}
@Override
public boolean hasResult(BaseTransaction<List<TaskTag>> baseTransaction, List<TaskTag> items) {
return items != null && items.size() > 0;
}
});
}
} catch (SQLiteDoneException ignored) {
//Ignored
}
}
private void updateOwnedEquipment(List<ItemData> owned) {
HashMap<String, ItemData> ownedMap = new HashMap<>();
for (ItemData item : owned) {
@ -625,7 +683,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
} else {
snackbarMessage = getApplicationContext().getString(R.string.armoireExp);
}
} else if(!event.Reward.getId().equals("potion")) {
} else if (!event.Reward.getId().equals("potion")) {
EventBus.getDefault().post(new TaskRemovedEvent(event.Reward.getId()));
}
@ -711,7 +769,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
@Override
public void onUserReceived(HabitRPGUser user) {
FrameLayout petWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
ImageView petImageView = (ImageView)petWrapper.findViewById(R.id.pet_imageview);
ImageView petImageView = (ImageView) petWrapper.findViewById(R.id.pet_imageview);
DataBindingUtils.loadImage(petImageView, "Pet-" + event.usingEgg.getKey() + "-" + event.usingHatchingPotion.getKey());
@ -878,7 +936,6 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
.create();
this.faintDialog.show();
}
}
@ -964,7 +1021,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
eventProperties.put("eventAction", "tutorial");
eventProperties.put("eventCategory", "behaviour");
eventProperties.put("hitType", "event");
eventProperties.put("eventLabel", step.getIdentifier()+"-android");
eventProperties.put("eventLabel", step.getIdentifier() + "-android");
eventProperties.put("eventValue", step.getIdentifier());
eventProperties.put("complete", false);
} catch (JSONException exception) {
@ -986,7 +1043,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
eventProperties.put("eventAction", "tutorial");
eventProperties.put("eventCategory", "behaviour");
eventProperties.put("hitType", "event");
eventProperties.put("eventLabel", step.getIdentifier()+"-android");
eventProperties.put("eventLabel", step.getIdentifier() + "-android");
eventProperties.put("eventValue", step.getIdentifier());
eventProperties.put("complete", true);
} catch (JSONException exception) {
@ -1009,7 +1066,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
}
}
public String getUserID(){
public String getUserID() {
if (this.user != null) {
return user.getId();
} else {

52
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -22,21 +22,17 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.NumberPicker;
import android.widget.PopupWindow;
import android.widget.Spinner;
import android.widget.TableRow;
import android.widget.TextView;
import com.github.data5tream.emojilib.EmojiEditText;
import com.github.data5tream.emojilib.EmojiGridView;
import com.github.data5tream.emojilib.EmojiPopup;
import com.github.data5tream.emojilib.emoji.Emojicon;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.TaskSaveEvent;
import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
@ -74,7 +70,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
public static final String TASK_ID_KEY = "taskId";
public static final String TASK_TYPE_KEY = "type";
public static final String TAG_IDS_KEY = "tagsId";
public static final String TAG_NAMES_KEY = "tagsName";
public static final String TAG_NAMES_KEY = "TagNames";
public static final String ALLOCATION_MODE_KEY = "allocationModeKey";
private String taskType;
@ -84,11 +80,11 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
private String allocationMode;
private List<CheckBox> weekdayCheckboxes = new ArrayList<>();
private NumberPicker frequencyPicker;
private List<String> tags;
private List<String> tagsName; //added this
private List<String> tagIds;
private List<String> TagNames; //added this
private CheckListAdapter checklistAdapter;
private List<CharSequence> userSelectedTags;
private List<CheckBox> allTags;
private List<CheckBox> tagCheckBoxList;
private List<String> userSelectedTagIds;
@Bind(R.id.task_value_edittext)
@ -204,11 +200,11 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
Bundle bundle = intent.getExtras();
taskType = bundle.getString(TASK_TYPE_KEY);
taskId = bundle.getString(TASK_ID_KEY);
tags = bundle.getStringArrayList(TAG_IDS_KEY);
tagsName = bundle.getStringArrayList(TAG_NAMES_KEY);
tagIds = bundle.getStringArrayList(TAG_IDS_KEY);
TagNames = bundle.getStringArrayList(TAG_NAMES_KEY);
allocationMode = bundle.getString(ALLOCATION_MODE_KEY);
userSelectedTags = new ArrayList<>();
allTags = new ArrayList<>();
tagCheckBoxList = new ArrayList<>();
userSelectedTagIds = new ArrayList<>();
if (taskType == null) {
return;
@ -246,10 +242,10 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
taskAttributeSpinner.setAdapter(attributeAdapter);
taskAttributeSpinner.setSelection(0);
//Filling in the tags check boxes
//If tags list is empty, we don't allow user to select a tag.
//If they have tags, we allow them to add tags
if (tags.isEmpty()) {
//Filling in the tagIds check boxes
//If tagIds list is empty, we don't allow user to select a tag.
//If they have tagIds, we allow them to add tagIds
if (tagIds.isEmpty()) {
mainWrapper.removeView(tagsWrapper);
} else {
createTagsCheckBoxes();
@ -512,11 +508,11 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
private void createTagsCheckBoxes() {
for (int i = 0; i < tagsName.size(); i++) {
for (int i = 0; i < TagNames.size(); i++) {
TableRow row = new TableRow(tagsContainerLinearLayout.getContext());
row.setId(i);
CheckBox tagsCheckBox = new CheckBox(tagsContainerLinearLayout.getContext());
tagsCheckBox.setText(tagsName.get(i)); // set text Name
tagsCheckBox.setText(TagNames.get(i)); // set text Name
tagsCheckBox.setId(i);
//This is to check if the tag was selected by the user. Similar to onClickListener
tagsCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
@ -528,7 +524,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
});
row.addView(tagsCheckBox);
tagsContainerLinearLayout.addView(row);
allTags.add(tagsCheckBox);
tagCheckBoxList.add(tagsCheckBox);
}
@ -570,7 +566,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
String[] weekdays = getResources().getStringArray(R.array.weekdays);
for (int i = 0; i < 7; i++) {
View weekdayRow = getLayoutInflater().inflate(R.layout.row_checklist, null);
View weekdayRow = getLayoutInflater().inflate(R.layout.row_checklist, this.frequencyContainer, false);
TextView tv = (TextView) weekdayRow.findViewById(R.id.label);
CheckBox checkbox = (CheckBox) weekdayRow.findViewById(R.id.checkbox);
checkbox.setChecked(true);
@ -579,7 +575,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
this.frequencyContainer.addView(weekdayRow);
}
} else {
View dayRow = getLayoutInflater().inflate(R.layout.row_number_picker, null);
View dayRow = getLayoutInflater().inflate(R.layout.row_number_picker, this.frequencyContainer, false);
this.frequencyPicker = (NumberPicker) dayRow.findViewById(R.id.numberPicker);
this.frequencyPicker.setMinValue(1);
this.frequencyPicker.setMaxValue(366);
@ -634,13 +630,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
taskValue.setText(String.format(Locale.getDefault(), "%.2f", task.value));
for (TaskTag tt : task.getTags()) {
int tagNameLocation = tags.indexOf(tt.getTag().getId());
if (tagsName.size() > tagNameLocation && tagNameLocation > 0) {
for (CheckBox box : allTags) {
if (tagsName.get(tagNameLocation) == box.getText()) {
box.setChecked(true);
}
}
int position = tagIds.indexOf(tt.getTag().getId());
if (tagCheckBoxList.size() > position) {
tagCheckBoxList.get(position).setChecked(true);
}
}
@ -727,13 +719,13 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
//To add tags, I must first make a TaskTag, then grab information on which Tag they want to associate with the task
//To add tagIds, I must first make a TaskTag, then grab information on which Tag they want to associate with the task
//After that, I need to make a List<TaskTag> so I can do task.setTags(List<TaskTag>)
if (!userSelectedTags.isEmpty()) {
for (CharSequence names : userSelectedTags) {
int tagIdLocation = tagsName.indexOf(names);
int tagIdLocation = TagNames.indexOf(names);
if (tagIdLocation > 0) {
userSelectedTagIds.add(tags.get(tagIdLocation)); //used for the SQL command
userSelectedTagIds.add(tagIds.get(tagIdLocation)); //used for the SQL command
}
}
}

8
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskTag.java
View file

@ -36,6 +36,14 @@ public class TaskTag extends BaseModel {
saveForeignKeyModel = false)
public ForeignKeyContainer<Task> task;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Tag getTag() {
return tag.toModel();
}

1
Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java
View file

@ -77,6 +77,7 @@ public class DateDeserializerTest {
JsonElement dateElement = this.deserializer.serialize(new Date(referenceTimestamp), Date.class, this.serializationContext);
assertThat(dateElement.getAsString(), is("2015-09-28T13:00:00.000Z"));
}
@Test
public void validateEmptySerialize() {
JsonElement dateElement = this.deserializer.serialize(null, Date.class, this.serializationContext);