diff --git a/app/src/main/java/com/gh4a/activities/RepositoryListActivity.java b/app/src/main/java/com/gh4a/activities/RepositoryListActivity.java
index 1e8ea953f..afad2dbe1 100644
--- a/app/src/main/java/com/gh4a/activities/RepositoryListActivity.java
+++ b/app/src/main/java/com/gh4a/activities/RepositoryListActivity.java
@@ -56,7 +56,7 @@ public void onCreate(Bundle savedInstanceState) {
updateRightNavigationDrawer();
ActionBar actionBar = getSupportActionBar();
- actionBar.setTitle(R.string.user_pub_repos);
+ actionBar.setTitle(R.string.repositories);
actionBar.setSubtitle(mUserLogin);
actionBar.setDisplayHomeAsUpEnabled(true);
}
diff --git a/app/src/main/java/com/gh4a/activities/home/HomeActivity.java b/app/src/main/java/com/gh4a/activities/home/HomeActivity.java
index 88cc853ea..81d89147a 100644
--- a/app/src/main/java/com/gh4a/activities/home/HomeActivity.java
+++ b/app/src/main/java/com/gh4a/activities/home/HomeActivity.java
@@ -72,7 +72,7 @@ public class HomeActivity extends BasePagerActivity implements
static {
START_PAGE_MAPPING.put(R.id.news_feed, "newsfeed");
START_PAGE_MAPPING.put(R.id.notifications, "notifications");
- START_PAGE_MAPPING.put(R.id.my_repos, "repos");
+ START_PAGE_MAPPING.put(R.id.repositories, "repos");
START_PAGE_MAPPING.put(R.id.my_issues, "issues");
START_PAGE_MAPPING.put(R.id.my_prs, "prs");
START_PAGE_MAPPING.put(R.id.my_gists, "gists");
@@ -298,7 +298,7 @@ private FragmentFactory getFactoryForItem(int id) {
return new NewsFeedFactory(this, mUserLogin);
case R.id.notifications:
return new NotificationListFactory(this);
- case R.id.my_repos:
+ case R.id.repositories:
return new RepositoryFactory(this, mUserLogin, getPrefs());
case R.id.my_issues:
return new IssueListFactory(this, mUserLogin, false);
diff --git a/app/src/main/java/com/gh4a/activities/home/RepositoryFactory.java b/app/src/main/java/com/gh4a/activities/home/RepositoryFactory.java
index 5bf87ee78..848ab84b6 100644
--- a/app/src/main/java/com/gh4a/activities/home/RepositoryFactory.java
+++ b/app/src/main/java/com/gh4a/activities/home/RepositoryFactory.java
@@ -12,7 +12,9 @@
public class RepositoryFactory extends FragmentFactory {
private static final int[] TAB_TITLES = new int[] {
- R.string.my_repositories
+ R.string.my,
+ R.string.starred,
+ R.string.repo_type_watched
};
private final String mUserLogin;
@@ -37,7 +39,7 @@ public RepositoryFactory(HomeActivity activity, String userLogin, SharedPreferen
@Override
protected @StringRes int getTitleResId() {
- return R.string.my_repositories;
+ return R.string.repositories;
}
@Override
@@ -116,9 +118,22 @@ protected void onRestoreInstanceState(Bundle state) {
}
}
+ @Override
+ protected boolean onCreateOptionsMenu(Menu menu) {
+ boolean result = super.onCreateOptionsMenu(menu);
+ // TODO
+ return result;
+ }
+
@Override
protected Fragment makeFragment(int position) {
- return RepositoryListContainerFragment.newInstance(mUserLogin, false);
+ String filterType = "all";
+ if (position == 1) {
+ filterType = "starred";
+ } else if (position == 2) {
+ filterType = "watched";
+ }
+ return RepositoryListContainerFragment.newInstance(mUserLogin, false, filterType);
}
@Override
diff --git a/app/src/main/java/com/gh4a/fragment/RepositoryListContainerFragment.java b/app/src/main/java/com/gh4a/fragment/RepositoryListContainerFragment.java
index 5277c87cc..ec592a1ea 100644
--- a/app/src/main/java/com/gh4a/fragment/RepositoryListContainerFragment.java
+++ b/app/src/main/java/com/gh4a/fragment/RepositoryListContainerFragment.java
@@ -360,8 +360,6 @@ public static class FilterDrawerHelper {
FILTER_LOOKUP.put(R.id.filter_type_private, "private");
FILTER_LOOKUP.put(R.id.filter_type_sources, "sources");
FILTER_LOOKUP.put(R.id.filter_type_forks, "forks");
- FILTER_LOOKUP.put(R.id.filter_type_watched, "watched");
- FILTER_LOOKUP.put(R.id.filter_type_starred, "starred");
}
public static FilterDrawerHelper create(String userLogin, boolean isOrg) {
diff --git a/app/src/main/res/layout/user.xml b/app/src/main/res/layout/user.xml
index 43eba21bf..bfd8a774b 100644
--- a/app/src/main/res/layout/user.xml
+++ b/app/src/main/res/layout/user.xml
@@ -248,7 +248,7 @@
style="@style/HeaderLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/user_pub_repos" />
+ android:text="@string/repositories" />