From e00cc0db877542381e6321bdbed96da6d9634c9a Mon Sep 17 00:00:00 2001 From: AnthonyFermin Date: Fri, 19 Jun 2015 13:58:26 -0400 Subject: [PATCH 1/4] added option to report bugs in Navigation Drawer --- app/res/values/typeface.xml | 1 + app/src/main/java/com/github/mobile/ui/MainActivity.java | 5 ++++- .../java/com/github/mobile/ui/NavigationDrawerAdapter.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/res/values/typeface.xml b/app/res/values/typeface.xml index f84d3491a..7aac8500e 100644 --- a/app/res/values/typeface.xml +++ b/app/res/values/typeface.xml @@ -30,5 +30,6 @@ \uf00e \uf07d \uf07b + \uf04f \ 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..2ce5c002b 100644 --- a/app/src/main/java/com/github/mobile/ui/MainActivity.java +++ b/app/src/main/java/com/github/mobile/ui/MainActivity.java @@ -161,9 +161,12 @@ public void onNavigationDrawerItemSelected(int position) { case 4: fragment = new FilterListFragment(); break; + case 5: + fragment = new IssueDashboardPagerFragment(); + break; default: fragment = new HomePagerFragment(); - args.putSerializable("org", orgs.get(position - 6)); + args.putSerializable("org", orgs.get(position - 7)); break; } fragment.setArguments(args); 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..b95ef79eb 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) , "Bug? Report Here"}; String[] icons = context.getResources().getStringArray(R.array.navigation_drawer_icon_list); data = new ArrayList<>(); int amount = names.length + orgs.size() + 2; From 823578e4f79b4d1f8878c1cee438a0595a8a13d9 Mon Sep 17 00:00:00 2001 From: AnthonyFermin Date: Fri, 19 Jun 2015 15:20:49 -0400 Subject: [PATCH 2/4] linked issues item in drawer to original app repo --- .../java/com/github/mobile/ui/MainActivity.java | 13 +++++++++++-- .../github/mobile/ui/NavigationDrawerAdapter.java | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) 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 2ce5c002b..22a9d05dc 100644 --- a/app/src/main/java/com/github/mobile/ui/MainActivity.java +++ b/app/src/main/java/com/github/mobile/ui/MainActivity.java @@ -1,5 +1,6 @@ package com.github.mobile.ui; +import static com.github.mobile.RequestCodes.REPOSITORY_VIEW; import static com.github.mobile.ui.NavigationDrawerObject.TYPE_SEPERATOR; import android.app.SearchManager; import android.content.Context; @@ -24,6 +25,7 @@ import com.github.mobile.ui.issue.FilterListFragment; import com.github.mobile.ui.issue.IssueDashboardPagerFragment; import com.github.mobile.ui.repo.OrganizationLoader; +import com.github.mobile.ui.repo.RepositoryViewActivity; import com.github.mobile.ui.user.HomePagerFragment; import com.github.mobile.util.AvatarLoader; import com.google.inject.Inject; @@ -32,6 +34,7 @@ import java.util.Collections; import java.util.List; +import org.eclipse.egit.github.core.Repository; import org.eclipse.egit.github.core.User; public class MainActivity extends BaseActivity implements NavigationDrawerFragment.NavigationDrawerCallbacks, @@ -162,8 +165,14 @@ public void onNavigationDrawerItemSelected(int position) { fragment = new FilterListFragment(); break; case 5: - fragment = new IssueDashboardPagerFragment(); - break; + Repository repo = new Repository(); + repo.setName("android") + .setOwner(new User().setLogin("forkHubs")) + .setHasIssues(true); + + startActivityForResult(RepositoryViewActivity.createIntent(repo), + REPOSITORY_VIEW); + return; default: fragment = new HomePagerFragment(); args.putSerializable("org", orgs.get(position - 7)); 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 b95ef79eb..12514ac38 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) , "Bug? Report Here"}; + context.getString(R.string.issue_dashboard), context.getString(R.string.bookmarks) , "Report App Issues Here"}; String[] icons = context.getResources().getStringArray(R.array.navigation_drawer_icon_list); data = new ArrayList<>(); int amount = names.length + orgs.size() + 2; From c8ca4a78d4cb01b87828032153557de325f2a8eb Mon Sep 17 00:00:00 2001 From: AnthonyFermin Date: Fri, 19 Jun 2015 15:41:55 -0400 Subject: [PATCH 3/4] removed string literal from NavigationDrawerAdapter.java and added to strings.xml --- app/res/values/strings.xml | 1 + .../main/java/com/github/mobile/ui/NavigationDrawerAdapter.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml index afb0b9dbf..feb765fc0 100644 --- a/app/res/values/strings.xml +++ b/app/res/values/strings.xml @@ -96,6 +96,7 @@ GitHub Home + Report App Issues Here News Issues Gists 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 12514ac38..a514f8130 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) , "Report App Issues Here"}; + context.getString(R.string.issue_dashboard), context.getString(R.string.bookmarks) , context.getString(R.string.report_issues)}; String[] icons = context.getResources().getStringArray(R.array.navigation_drawer_icon_list); data = new ArrayList<>(); int amount = names.length + orgs.size() + 2; From 8da5c5a403b902d2e315e473f5fe4605c908e92f Mon Sep 17 00:00:00 2001 From: AnthonyFermin Date: Fri, 19 Jun 2015 16:01:29 -0400 Subject: [PATCH 4/4] Launches CreateIssueActivity instead of RepositoryActivity for Report App Issue option --- app/src/main/java/com/github/mobile/ui/MainActivity.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 22a9d05dc..068327569 100644 --- a/app/src/main/java/com/github/mobile/ui/MainActivity.java +++ b/app/src/main/java/com/github/mobile/ui/MainActivity.java @@ -1,6 +1,6 @@ package com.github.mobile.ui; -import static com.github.mobile.RequestCodes.REPOSITORY_VIEW; +import static com.github.mobile.RequestCodes.ISSUE_CREATE; import static com.github.mobile.ui.NavigationDrawerObject.TYPE_SEPERATOR; import android.app.SearchManager; import android.content.Context; @@ -22,10 +22,10 @@ import com.github.mobile.core.user.UserComparator; import com.github.mobile.persistence.AccountDataManager; import com.github.mobile.ui.gist.GistsPagerFragment; +import com.github.mobile.ui.issue.EditIssueActivity; import com.github.mobile.ui.issue.FilterListFragment; import com.github.mobile.ui.issue.IssueDashboardPagerFragment; import com.github.mobile.ui.repo.OrganizationLoader; -import com.github.mobile.ui.repo.RepositoryViewActivity; import com.github.mobile.ui.user.HomePagerFragment; import com.github.mobile.util.AvatarLoader; import com.google.inject.Inject; @@ -170,8 +170,9 @@ public void onNavigationDrawerItemSelected(int position) { .setOwner(new User().setLogin("forkHubs")) .setHasIssues(true); - startActivityForResult(RepositoryViewActivity.createIntent(repo), - REPOSITORY_VIEW); + startActivityForResult(EditIssueActivity.createIntent(repo), + ISSUE_CREATE); + return; default: fragment = new HomePagerFragment();