kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply patch changes

Browse source
This commit is contained in:
RichyHBM 2017-11-16 19:47:21 +00:00
parent 22d2c8ff02
commit c44a6f5028
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
View file

@ -582,7 +582,7 @@ public class MainActivity extends BaseActivity
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeButtonEnabled(true);
DrawerLayout tagsDrawerLayout = (DrawerLayout)findViewById(R.id.drawer_layout);
final DrawerLayout tagsDrawerLayout = (DrawerLayout)findViewById(R.id.drawer_layout);
tagsToggle = new ActionBarDrawerToggle(this, tagsDrawerLayout, R.string.drawer_open, R.string.drawer_close) {
@Override
@ -604,7 +604,7 @@ public class MainActivity extends BaseActivity
tagsDrawerLayout.addDrawerListener(tagsToggle);
final CheckedTextView noTagsButton = (CheckedTextView)findViewById(R.id.no_tags_entries);
CheckedTextView allTagsButton = (CheckedTextView)findViewById(R.id.all_tags_in_drawer);
final CheckedTextView allTagsButton = (CheckedTextView)findViewById(R.id.all_tags_in_drawer);
allTagsButton.setOnClickListener(new View.OnClickListener() {
@Override
@ -617,12 +617,12 @@ public class MainActivity extends BaseActivity
for(int i = 0; i < tagsDrawerListView.getChildCount(); i++) {
CheckedTextView childCheckBox = (CheckedTextView)tagsDrawerListView.getChildAt(i);
childCheckBox.setChecked(checkedTextView.isChecked());
tagsDrawerAdapter.setTagState(childCheckBox.getText().toString(), childCheckBox.isChecked());
settings.setTagToggle(childCheckBox.getText().toString(), childCheckBox.isChecked());
}
noTagsButton.setChecked(checkedTextView.isChecked());
settings.setNoTagsToggle(noTagsButton.isChecked());
if(checkedTextView.isChecked()) {
adapter.filterByTags(adapter.getTags());
adapter.filterByTags(tagsDrawerAdapter.getActiveTags());
} else {
adapter.filterByTags(new ArrayList<String>());
}
@ -637,13 +637,12 @@ public class MainActivity extends BaseActivity
checkedTextView.setChecked(!checkedTextView.isChecked());
settings.setNoTagsToggle(checkedTextView.isChecked());
adapter.filterByTags(adapter.getTags());
adapter.filterByTags(tagsDrawerAdapter.getActiveTags());
}
});
noTagsButton.setChecked(settings.getNoTagsToggle());
tagsDrawerListView.setAdapter(tagsDrawerAdapter);
tagsDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@ -652,6 +651,17 @@ public class MainActivity extends BaseActivity
settings.setTagToggle(checkedTextView.getText().toString(), checkedTextView.isChecked());
tagsDrawerAdapter.setTagState(checkedTextView.getText().toString(), checkedTextView.isChecked());
if (! checkedTextView.isChecked()) {
allTagsButton.setChecked(false);
settings.setAllTagsToggle(false);
}
if (tagsDrawerAdapter.allTagsActive()) {
allTagsButton.setChecked(true);
settings.setAllTagsToggle(true);
}
adapter.filterByTags(tagsDrawerAdapter.getActiveTags());
}
});

1
app/src/main/java/org/shadowice/flocke/andotp/Database/Entry.java
View file

@ -161,6 +161,7 @@ public class Entry {
this.tags.add(tagsArray.getString(i));
}
} catch (JSONException e) {
e.printStackTrace();
}
}

8
app/src/main/java/org/shadowice/flocke/andotp/View/TagsAdapter.java
View file

@ -69,6 +69,14 @@ public class TagsAdapter extends ArrayAdapter<String> {
return tagsList;
}
public boolean allTagsActive() {
for (String key : tagsState.keySet())
if (! tagsState.get(key))
return false;
return true;
}
public HashMap<String, Boolean> getTagsWithState() {
return new HashMap<String, Boolean>(tagsState);
}