bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bumped Jabit version to prepare for conversations

Browse Source
This commit is contained in:
Christian Basler
2017-03-18 07:09:03 +01:00
parent 22ac1920a2
commit 42cf18445c
10 changed files with 176 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/ch/dissem/apps/abit/MainActivity.java
View File

@@ -55,6 +55,7 @@ import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import ch.dissem.apps.abit.dialog.AddIdentityDialogFragment;
import ch.dissem.apps.abit.dialog.FullNodeDialogActivity;
@@ -311,7 +312,15 @@ public class MainActivity extends AppCompatActivity
public boolean onItemClick(View view, int position, IDrawerItem item) {
if (item.getTag() instanceof Label) {
selectedLabel = (Label) item.getTag();
showSelectedLabel();
if (getSupportFragmentManager().findFragmentById(R.id.item_list) instanceof
MessageListFragment) {
((MessageListFragment) getSupportFragmentManager()
.findFragmentById(R.id.item_list)).updateList(selectedLabel);
} else {
MessageListFragment listFragment = new MessageListFragment();
changeList(listFragment);
listFragment.updateList(selectedLabel);
}
return false;
} else if (item instanceof Nameable<?>) {
Nameable<?> ni = (Nameable<?>) item;
@@ -374,7 +383,7 @@ public class MainActivity extends AppCompatActivity
for (Label label : labels) {
addLabelEntry(label);
}
showSelectedLabel();
drawer.setSelection(drawer.getDrawerItem(selectedLabel));
}
}.execute();
}
@@ -389,7 +398,9 @@ public class MainActivity extends AppCompatActivity
@SuppressWarnings("unchecked")
protected void onRestoreInstanceState(Bundle savedInstanceState) {
selectedLabel = (Label) savedInstanceState.getSerializable("selectedLabel");
showSelectedLabel();
drawer.setSelection(drawer.getDrawerItem(selectedLabel));
super.onRestoreInstanceState(savedInstanceState);
}
@@ -439,7 +450,7 @@ public class MainActivity extends AppCompatActivity
item.withIcon(CommunityMaterial.Icon.cmd_file);
break;
case OUTBOX:
item.withIcon(CommunityMaterial.Icon.cmd_outbox);
item.withIcon(CommunityMaterial.Icon.cmd_inbox_arrow_up);
break;
case SENT:
item.withIcon(CommunityMaterial.Icon.cmd_send);
@@ -521,18 +532,6 @@ public class MainActivity extends AppCompatActivity
}
}
private void showSelectedLabel() {
if (getSupportFragmentManager().findFragmentById(R.id.item_list) instanceof
MessageListFragment) {
((MessageListFragment) getSupportFragmentManager()
.findFragmentById(R.id.item_list)).updateList(selectedLabel);
} else {
MessageListFragment listFragment = new MessageListFragment();
changeList(listFragment);
listFragment.updateList(selectedLabel);
}
}
/**
* Callback method from {@link ListSelectionListener}
* indicating that the item with the given ID was selected.