From 1958bf4392e76c7ab716a2c437d4beb32f40c927 Mon Sep 17 00:00:00 2001 From: fattyduck Date: Wed, 24 Jun 2015 23:43:33 -0400 Subject: [PATCH] added logout function --- app/res/values/typeface.xml | 2 ++ app/src/main/java/com/github/mobile/ui/MainActivity.java | 5 +++++ .../java/com/github/mobile/ui/NavigationDrawerAdapter.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/res/values/typeface.xml b/app/res/values/typeface.xml index f84d3491a..83d185641 100644 --- a/app/res/values/typeface.xml +++ b/app/res/values/typeface.xml @@ -30,5 +30,7 @@ \uf00e \uf07d \uf07b + \uf08d + \ No newline at end of file diff --git a/app/src/main/java/com/github/mobile/ui/MainActivity.java b/app/src/main/java/com/github/mobile/ui/MainActivity.java index 4f7c36ad4..bb9248564 100644 --- a/app/src/main/java/com/github/mobile/ui/MainActivity.java +++ b/app/src/main/java/com/github/mobile/ui/MainActivity.java @@ -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; @@ -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; @@ -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)); diff --git a/app/src/main/java/com/github/mobile/ui/NavigationDrawerAdapter.java b/app/src/main/java/com/github/mobile/ui/NavigationDrawerAdapter.java index b429b34c0..56fd57d04 100644 --- a/app/src/main/java/com/github/mobile/ui/NavigationDrawerAdapter.java +++ b/app/src/main/java/com/github/mobile/ui/NavigationDrawerAdapter.java @@ -40,7 +40,7 @@ public NavigationDrawerAdapter(Context context, List 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;