Skip to content

Commit 87eb341

Browse files
committed
Combine star and share repository menus
1 parent fd2e0cc commit 87eb341

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

app/res/menu/repository_star.xml renamed to app/res/menu/repository.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,9 @@
2020
android:id="@+id/m_star"
2121
android:showAsAction="never"
2222
android:title="@string/star"/>
23+
<item
24+
android:id="@+id/m_share"
25+
android:showAsAction="never"
26+
android:title="@string/share"/>
2327

24-
</menu>
28+
</menu>

app/res/menu/repository_share.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
-->
1717
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
1818

19-
<item
20-
android:id="@+id/m_share"
21-
android:showAsAction="never"
22-
android:title="@string/share"/>
2319

24-
</menu>
20+
21+
</menu>

app/src/main/java/com/github/mobile/ui/repo/RepositoryViewActivity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ protected void onException(Exception e) throws RuntimeException {
127127

128128
@Override
129129
public boolean onCreateOptionsMenu(Menu optionsMenu) {
130-
MenuInflater inflater = getSupportMenuInflater();
131-
inflater.inflate(menu.repository_star, optionsMenu);
132-
inflater.inflate(menu.repository_share, optionsMenu);
133-
130+
getSupportMenuInflater().inflate(menu.repository, optionsMenu);
134131
return super.onCreateOptionsMenu(optionsMenu);
135132
}
136133

@@ -283,4 +280,4 @@ private void shareRepositoryURL() {
283280
startActivity(Intent.createChooser(sharingIntent, getResources()
284281
.getText(string.share_repo)));
285282
}
286-
}
283+
}

0 commit comments

Comments
 (0)