Skip to content

added logout function #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fattyduck wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added logout function #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/res/values/typeface.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@
<item>\uf00e</item>
<item>\uf07d</item>
<item>\uf07b</item>
<item>\uf08d</item>

</string-array>
</resources>
5 changes: 5 additions & 0 deletions app/src/main/java/com/github/mobile/ui/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static com.github.mobile.ui.NavigationDrawerObject.TYPE_SEPERATOR;
import android.app.SearchManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
Expand All @@ -18,6 +19,7 @@

import com.github.mobile.R;
import com.github.mobile.accounts.AccountUtils;
import com.github.mobile.accounts.LoginActivity;
import com.github.mobile.core.user.UserComparator;
import com.github.mobile.persistence.AccountDataManager;
import com.github.mobile.ui.gist.GistsPagerFragment;
Expand Down Expand Up @@ -161,6 +163,9 @@ public void onNavigationDrawerItemSelected(int position) {
case 4:
fragment = new FilterListFragment();
break;
case 5:
Intent i = new Intent(this, LoginActivity.class);
startActivity(i);
default:
fragment = new HomePagerFragment();
args.putSerializable("org", orgs.get(position - 6));
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/mobile/ui/NavigationDrawerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public NavigationDrawerAdapter(Context context, List<User> orgs, final AvatarLoa
private void createData() {
orgs.remove(0);
String[] names = new String[] { context.getString(R.string.home), context.getString(R.string.gist),
context.getString(R.string.issue_dashboard), context.getString(R.string.bookmarks) };
context.getString(R.string.issue_dashboard), context.getString(R.string.bookmarks) , "Logout"};
String[] icons = context.getResources().getStringArray(R.array.navigation_drawer_icon_list);
data = new ArrayList<>();
int amount = names.length + orgs.size() + 2;
Expand Down