diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/select_album_header.xml | 13 | ||||
-rw-r--r-- | res/menu/select_album_context.xml | 6 | ||||
-rw-r--r-- | res/menu/select_share_context.xml | 4 | ||||
-rw-r--r-- | res/menu/select_song_context.xml | 6 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 6 | ||||
-rw-r--r-- | res/values/themes.xml | 3 | ||||
-rw-r--r-- | res/xml/settings.xml | 12 |
8 files changed, 44 insertions, 7 deletions
diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml index 33cbf93e..14bdf365 100644 --- a/res/layout/select_album_header.xml +++ b/res/layout/select_album_header.xml @@ -60,7 +60,18 @@ android:singleLine="true" android:ellipsize="none"/> - </LinearLayout> + </LinearLayout> + + <ImageView + android:id="@+id/select_album_share" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="fitCenter" + android:src="?attr/share" + android:padding="10dip" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:background="@drawable/menubar_button"/> </RelativeLayout> diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml index 6da0150b..b1e0e42c 100644 --- a/res/menu/select_album_context.xml +++ b/res/menu/select_album_context.xml @@ -52,4 +52,10 @@ android:id="@+id/album_menu_star" android:title="@string/common.star"/> </group> + + <group android:id="@+id/hide_share"> + <item + android:id="@+id/album_menu_share" + android:title="@string/menu.share"/> + </group> </menu> diff --git a/res/menu/select_share_context.xml b/res/menu/select_share_context.xml index 3ef2826f..3db445f6 100644 --- a/res/menu/select_share_context.xml +++ b/res/menu/select_share_context.xml @@ -7,6 +7,10 @@ android:title="@string/common.info"/>
<item
+ android:id="@+id/share_menu_share"
+ android:title="@string/menu.share"/>
+
+ <item
android:id="@+id/share_update_info"
android:title="@string/playlist.update_info"
/>
diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml index 686ef308..8a37e0f8 100644 --- a/res/menu/select_song_context.xml +++ b/res/menu/select_song_context.xml @@ -51,4 +51,10 @@ android:id="@+id/song_menu_star" android:title="@string/common.star"/> </group> + + <group android:id="@+id/hide_share"> + <item + android:id="@+id/song_menu_share" + android:title="@string/menu.share"/> + </group> </menu> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index ae0939f1..b557035c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -19,5 +19,6 @@ <attr name="select_server" format="reference"/> <attr name="downloading" format="reference"/> <attr name="bookmark" format="reference"/> + <attr name="share" format="reference"/> <attr name="drawerItemsIcons" format="reference"/> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2c0d2ff3..faa2922a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -82,6 +82,7 @@ <string name="menu.stop_sync">Stop syncing</string>
<string name="menu.show_all">Show all media</string>
<string name="menu.show_artist">Show Artist</string>
+ <string name="menu.share">Share</string>
<string name="playlist.label">Playlists</string>
<string name="playlist.update_info">Update Information</string>
@@ -377,12 +378,10 @@ <string name="settings.sync_notification">Show Sync Notification</string>
<string name="settings.sync_notification_summary">Show a notification after new media has been synced</string>
<string name="settings.menu_options.title">Optional Menu Options</string>
- <string name="settings.menu_options.play_next">Play Next</string>
<string name="settings.menu_options.play_next_summary">Show Play next in menus</string>
- <string name="settings.menu_options.play_last">Play Last</string>
<string name="settings.menu_options.play_last_summary">Show Play last in menus</string>
- <string name="settings.menu_options.star">Star</string>
<string name="settings.menu_options.star_summary">Show Star in menus</string>
+ <string name="settings.menu_options.shared_summary">Show Share in menus</string>
<string name="shuffle.title">Shuffle By</string>
<string name="shuffle.startYear">Start Year:</string>
@@ -407,6 +406,7 @@ <string name="share.expiration">Expires:</string>
<string name="share.updated_info">Updated share information for %s</string>
<string name="share.updated_info_error">Failed to update share information for %s</string>
+ <string name="share.via">Share via</string>
<string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml index ef7cd90e..9aa83d2a 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -22,6 +22,7 @@ <item name="select_server">@drawable/main_select_server_light</item> <item name="downloading">@drawable/downloading_light</item> <item name="bookmark">@drawable/ic_menu_bookmark_light</item> + <item name="share">@drawable/ic_menu_share_light</item> <item name="drawerItemsIcons">@array/drawerItemIconsLight</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> @@ -49,6 +50,7 @@ <item name="select_server">@drawable/main_select_server_dark</item> <item name="downloading">@drawable/downloading_dark</item> <item name="bookmark">@drawable/ic_menu_bookmark_dark</item> + <item name="share">@drawable/ic_menu_share_dark</item> <item name="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> @@ -79,6 +81,7 @@ <item name="select_server">@drawable/main_select_server_dark</item> <item name="downloading">@drawable/downloading_dark</item> <item name="bookmark">@drawable/ic_menu_bookmark_dark</item> + <item name="share">@drawable/ic_menu_share_dark</item> <item name="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 58549367..d9430282 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -61,23 +61,29 @@ android:title="@string/settings.menu_options.title"> <CheckBoxPreference - android:title="@string/settings.menu_options.play_next" + android:title="@string/common.play_next" android:summary="@string/settings.menu_options.play_next_summary" android:key="showPlayNext" android:defaultValue="true"/> <CheckBoxPreference - android:title="@string/settings.menu_options.play_last" + android:title="@string/common.play_last" android:summary="@string/settings.menu_options.play_last_summary" android:key="showPlayLast" android:defaultValue="true"/> <CheckBoxPreference - android:title="@string/settings.menu_options.star" + android:title="@string/common.star" android:summary="@string/settings.menu_options.star_summary" android:key="showStar" android:defaultValue="true"/> + <CheckBoxPreference + android:title="@string/menu.share" + android:summary="@string/settings.menu_options.shared_summary" + android:key="showShared" + android:defaultValue="true"/> + </PreferenceCategory> <PreferenceCategory |