Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid showAsAction=always whenever possible

Browse Source 
In AppDetails, work around it by using ifRoom and placing that button
first so that it gets preference. The rest aren't affected at all.
This commit is contained in:
Daniel Martí 2015-11-01 20:06:17 +01:00
parent 6db5da2cf7
commit 81db276f8d
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/res/menu/main.xml
View File

@ -6,7 +6,7 @@
android:id="@+id/action_search"
android:icon="@drawable/ic_search_white"
android:title="@string/menu_search"
app:showAsAction="always"/>
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_update_repo"
android:icon="@drawable/ic_refresh_white"

6
F-Droid/res/menu/manage_repos.xml
View File

@ -6,11 +6,11 @@
android:id="@+id/action_update_repo"
android:icon="@drawable/ic_refresh_white"
android:title="@string/menu_update_repo"
app:showAsAction="always|withText"/>
app:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/action_add_repo"
android:icon="@drawable/ic_add_white"
android:title="@string/menu_add_repo"
app:showAsAction="always|withText"/>
app:showAsAction="ifRoom|withText"/>
</menu>
</menu>

24
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -646,11 +646,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
if (app == null)
return true;
MenuItemCompat.setShowAsAction(menu.add(
Menu.NONE, SHARE, 1, R.string.menu_share)
.setIcon(R.drawable.ic_share_white),
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
if (mPm.getLaunchIntentForPackage(app.id) != null && app.canAndWantToUpdate()) {
MenuItemCompat.setShowAsAction(menu.add(
Menu.NONE, LAUNCH, 1, R.string.menu_launch)
.setIcon(R.drawable.ic_play_arrow_white),
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
}
if (app.isInstalled()) {
MenuItemCompat.setShowAsAction(menu.add(
@ -660,13 +662,11 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
}
if (mPm.getLaunchIntentForPackage(app.id) != null && app.canAndWantToUpdate()) {
MenuItemCompat.setShowAsAction(menu.add(
Menu.NONE, LAUNCH, 1, R.string.menu_launch)
.setIcon(R.drawable.ic_play_arrow_white),
MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
}
MenuItemCompat.setShowAsAction(menu.add(
Menu.NONE, SHARE, 1, R.string.menu_share)
.setIcon(R.drawable.ic_share_white),
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
menu.add(Menu.NONE, IGNOREALL, 2, R.string.menu_ignore_all)
.setIcon(R.drawable.ic_do_not_disturb_white)

2
F-Droid/src/org/fdroid/fdroid/SearchResults.java
View File

@ -78,7 +78,7 @@ public class SearchResults extends ActionBarActivity {
super.onCreateOptionsMenu(menu);
MenuItem search = menu.add(Menu.NONE, SEARCH, 1, R.string.menu_search).setIcon(
android.R.drawable.ic_menu_search);
MenuItemCompat.setShowAsAction(search, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
MenuItemCompat.setShowAsAction(search, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
return true;
}