Skip to content

Commit

Permalink
Android: Renamed all icons for actionbar with the actionbar_ prefix i…
Browse files Browse the repository at this point in the history 
…nstead of icon_.

Related to issue #406.
  • Loading branch information
@ycastonguay
ycastonguay committed Jul 26, 2013
1 parent e0b2c6b commit b6afff8
Show file tree
Hide file tree
Showing 42 changed files with 64 additions and 64 deletions.
14 changes: 7 additions & 7 deletions MPfm/MPfm.Android/Classes/Activities/MainActivity.cs
View file
Expand Up @@ -308,28 +308,28 @@ public override bool OnCreateOptionsMenu(IMenu menu)
switch (option.Key)
{
case MobileOptionsMenuType.About:
menuItem.SetIcon(Resource.Drawable.icon_info);
menuItem.SetIcon(Resource.Drawable.actionbar_info);
break;
case MobileOptionsMenuType.EqualizerPresets:
menuItem.SetShowAsAction(ShowAsAction.IfRoom);
menuItem.SetIcon(Resource.Drawable.icon_equalizer);
menuItem.SetIcon(Resource.Drawable.actionbar_equalizer);
break;
case MobileOptionsMenuType.Preferences:
menuItem.SetShowAsAction(ShowAsAction.IfRoom);
menuItem.SetIcon(Resource.Drawable.icon_settings);
menuItem.SetIcon(Resource.Drawable.actionbar_settings);
break;
case MobileOptionsMenuType.SyncLibrary:
menuItem.SetShowAsAction(ShowAsAction.IfRoom);
menuItem.SetIcon(Resource.Drawable.icon_mobile);
menuItem.SetIcon(Resource.Drawable.actionbar_mobile);
break;
case MobileOptionsMenuType.SyncLibraryCloud:
menuItem.SetIcon(Resource.Drawable.icon_cloud);
menuItem.SetIcon(Resource.Drawable.actionbar_cloud);
break;
case MobileOptionsMenuType.SyncLibraryFileSharing:
menuItem.SetIcon(Resource.Drawable.icon_share);
menuItem.SetIcon(Resource.Drawable.actionbar_share);
break;
case MobileOptionsMenuType.SyncLibraryWebBrowser:
menuItem.SetIcon(Resource.Drawable.icon_earth);
menuItem.SetIcon(Resource.Drawable.actionbar_earth);
break;
}
}
Expand Down
72 changes: 36 additions & 36 deletions MPfm/MPfm.Android/MPfm.Android.csproj
View file
Expand Up @@ -254,38 +254,38 @@
<AndroidResource Include="Resources\drawable-mdpi\Icon.png" />
<AndroidResource Include="Resources\drawable-xhdpi\Icon.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\Icon.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_cloud.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_cloud.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_cloud.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_cloud.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_cloud.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_cloud.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_cloud.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_cloud.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_transparent.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_transparent.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_transparent.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_transparent.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_earth.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_equalizer.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_info.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_mobile.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_settings.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_share.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_earth.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_equalizer.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_info.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_mobile.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_settings.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_share.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_earth.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_equalizer.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_info.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_mobile.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_settings.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_share.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_earth.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_equalizer.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_info.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_mobile.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_settings.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_share.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_earth.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_equalizer.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_info.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_mobile.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_settings.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_share.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_earth.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_equalizer.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_info.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_mobile.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_settings.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_share.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_earth.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_equalizer.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_info.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_mobile.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_settings.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_share.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_earth.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_equalizer.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_info.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_mobile.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_settings.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_share.png" />
<AndroidResource Include="Resources\animator\fade_out.xml" />
<AndroidResource Include="Resources\animator\slide_in.xml" />
<AndroidResource Include="Resources\animator\slide_out.xml" />
Expand Down Expand Up @@ -339,14 +339,14 @@
<AndroidResource Include="Resources\drawable-hdpi\icon_phone.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_tablet.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_windows.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_add.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon_download.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_add.png" />
<AndroidResource Include="Resources\drawable-mdpi\icon_download.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_add.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon_download.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_add.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon_download.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_add.png" />
<AndroidResource Include="Resources\drawable-hdpi\actionbar_download.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_add.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_download.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_add.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_download.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_add.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_download.png" />
<AndroidResource Include="Resources\drawable-hdpi\player_previous.png" />
<AndroidResource Include="Resources\drawable-hdpi\player_previous_on.png" />
<AndroidResource Include="Resources\drawable-mdpi\player_previous.png" />
Expand Down
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Resources/Menu/equalizerpresets_menu.xml
View file
Expand Up @@ -2,6 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:id="@+id/equalizerPresetsMenu_item_add"
android:title="Add"
android:icon="@drawable/icon_add"
android:icon="@drawable/actionbar_add"
android:showAsAction="always|withText" />
</menu>
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Resources/Menu/player_menu.xml
View file
Expand Up @@ -2,6 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:id="@+id/playerMenu_item_effects"
android:title="Effects"
android:icon="@drawable/icon_equalizer"
android:icon="@drawable/actionbar_equalizer"
android:showAsAction="ifRoom" />
</menu>
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Resources/Menu/syncmenu_menu.xml
View file
Expand Up @@ -2,6 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:id="@+id/syncMenuMenu_item_sync"
android:title="Download"
android:icon="@drawable/icon_download"
android:icon="@drawable/actionbar_download"
android:showAsAction="always|withText" />
</menu>
36 changes: 18 additions & 18 deletions MPfm/MPfm.Android/Resources/Resource.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...roid/Resources/drawable-hdpi/icon_add.png → ...Resources/drawable-hdpi/actionbar_add.png
View file
File renamed without changes
0 ...id/Resources/drawable-hdpi/icon_cloud.png → ...sources/drawable-hdpi/actionbar_cloud.png
View file
File renamed without changes
0 ...Resources/drawable-hdpi/icon_download.png → ...rces/drawable-hdpi/actionbar_download.png
View file
File renamed without changes
0 ...id/Resources/drawable-hdpi/icon_earth.png → ...sources/drawable-hdpi/actionbar_earth.png
View file
File renamed without changes
0 ...esources/drawable-hdpi/icon_equalizer.png → ...ces/drawable-hdpi/actionbar_equalizer.png
View file
File renamed without changes
0 ...oid/Resources/drawable-hdpi/icon_info.png → ...esources/drawable-hdpi/actionbar_info.png
View file
File renamed without changes
0 ...d/Resources/drawable-hdpi/icon_mobile.png → ...ources/drawable-hdpi/actionbar_mobile.png
View file
File renamed without changes
0 ...Resources/drawable-hdpi/icon_settings.png → ...rces/drawable-hdpi/actionbar_settings.png
View file
File renamed without changes
0 ...id/Resources/drawable-hdpi/icon_share.png → ...sources/drawable-hdpi/actionbar_share.png
View file
File renamed without changes
0 ...roid/Resources/drawable-mdpi/icon_add.png → ...Resources/drawable-mdpi/actionbar_add.png
View file
File renamed without changes
0 ...id/Resources/drawable-mdpi/icon_cloud.png → ...sources/drawable-mdpi/actionbar_cloud.png
View file
File renamed without changes
0 ...Resources/drawable-mdpi/icon_download.png → ...rces/drawable-mdpi/actionbar_download.png
View file
File renamed without changes
0 ...id/Resources/drawable-mdpi/icon_earth.png → ...sources/drawable-mdpi/actionbar_earth.png
View file
File renamed without changes
0 ...esources/drawable-mdpi/icon_equalizer.png → ...ces/drawable-mdpi/actionbar_equalizer.png
View file
File renamed without changes
0 ...oid/Resources/drawable-mdpi/icon_info.png → ...esources/drawable-mdpi/actionbar_info.png
View file
File renamed without changes
0 ...d/Resources/drawable-mdpi/icon_mobile.png → ...ources/drawable-mdpi/actionbar_mobile.png
View file
File renamed without changes
0 ...Resources/drawable-mdpi/icon_settings.png → ...rces/drawable-mdpi/actionbar_settings.png
View file
File renamed without changes
0 ...id/Resources/drawable-mdpi/icon_share.png → ...sources/drawable-mdpi/actionbar_share.png
View file
File renamed without changes
0 ...oid/Resources/drawable-xhdpi/icon_add.png → ...esources/drawable-xhdpi/actionbar_add.png
View file
File renamed without changes
0 ...d/Resources/drawable-xhdpi/icon_cloud.png → ...ources/drawable-xhdpi/actionbar_cloud.png
View file
File renamed without changes
0 ...esources/drawable-xhdpi/icon_download.png → ...ces/drawable-xhdpi/actionbar_download.png
View file
File renamed without changes
0 ...d/Resources/drawable-xhdpi/icon_earth.png → ...ources/drawable-xhdpi/actionbar_earth.png
View file
File renamed without changes
0 ...sources/drawable-xhdpi/icon_equalizer.png → ...es/drawable-xhdpi/actionbar_equalizer.png
View file
File renamed without changes
0 ...id/Resources/drawable-xhdpi/icon_info.png → ...sources/drawable-xhdpi/actionbar_info.png
View file
File renamed without changes
0 .../Resources/drawable-xhdpi/icon_mobile.png → ...urces/drawable-xhdpi/actionbar_mobile.png
View file
File renamed without changes
0 ...esources/drawable-xhdpi/icon_settings.png → ...ces/drawable-xhdpi/actionbar_settings.png
View file
File renamed without changes
0 ...d/Resources/drawable-xhdpi/icon_share.png → ...ources/drawable-xhdpi/actionbar_share.png
View file
File renamed without changes
0 ...id/Resources/drawable-xxhdpi/icon_add.png → ...sources/drawable-xxhdpi/actionbar_add.png
View file
File renamed without changes
0 .../Resources/drawable-xxhdpi/icon_cloud.png → ...urces/drawable-xxhdpi/actionbar_cloud.png
View file
File renamed without changes
0 ...sources/drawable-xxhdpi/icon_download.png → ...es/drawable-xxhdpi/actionbar_download.png
View file
File renamed without changes
0 .../Resources/drawable-xxhdpi/icon_earth.png → ...urces/drawable-xxhdpi/actionbar_earth.png
View file
File renamed without changes
0 ...ources/drawable-xxhdpi/icon_equalizer.png → ...s/drawable-xxhdpi/actionbar_equalizer.png
View file
File renamed without changes
0 ...d/Resources/drawable-xxhdpi/icon_info.png → ...ources/drawable-xxhdpi/actionbar_info.png
View file
File renamed without changes
0 ...Resources/drawable-xxhdpi/icon_mobile.png → ...rces/drawable-xxhdpi/actionbar_mobile.png
View file
File renamed without changes
0 ...sources/drawable-xxhdpi/icon_settings.png → ...es/drawable-xxhdpi/actionbar_settings.png
View file
File renamed without changes
0 .../Resources/drawable-xxhdpi/icon_share.png → ...urces/drawable-xxhdpi/actionbar_share.png
View file
File renamed without changes

0 comments on commit b6afff8

Please sign in to comment.