diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/download.xml | 13 | ||||
| -rw-r--r-- | res/layout/download_action_buttons.xml | 47 | ||||
| -rw-r--r-- | res/layout/drawer_list_item.xml | 7 | ||||
| -rw-r--r-- | res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 22 | ||||
| -rw-r--r-- | res/values/themes.xml | 3 |
7 files changed, 50 insertions, 44 deletions
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml index 9fb5d7bf..81bb6296 100644 --- a/res/layout-port/download.xml +++ b/res/layout-port/download.xml @@ -38,16 +38,21 @@ android:layout_alignParentTop="true"
android:scaleType="centerCrop"/>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/download_overlay_buttons"
- android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/overlayColor"
android:layout_alignParentBottom="true">
- <include layout="@layout/download_action_buttons"/>
- </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true">
+
+ <include layout="@layout/download_action_buttons"/>
+ </LinearLayout>
+ </RelativeLayout>
<LinearLayout
android:id="@+id/download_visualizer_view_layout"
diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml index 70e8cc43..e3a45151 100644 --- a/res/layout/download_action_buttons.xml +++ b/res/layout/download_action_buttons.xml @@ -9,52 +9,25 @@ <Button
android:id="@+id/download_jukebox"
android:text="RC"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="14dip"
- android:paddingBottom="4dip"/>
+ style="@style/DownloadActionButton"/>
<Button
android:id="@+id/download_equalizer"
android:text="EQ"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
- android:paddingBottom="4dip"/>
+ style="@style/DownloadActionButton"/>
<Button
android:id="@+id/download_visualizer"
android:text="VIS"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
- android:paddingBottom="4dip"/>
+ style="@style/DownloadActionButton"/>
<ImageButton
android:id="@+id/download_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/menubar_button"
- android:src="@android:drawable/star_big_off"
- android:paddingTop="8dip"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingBottom="8dip"/>
+ style="@style/DownloadActionImageButton"
+ android:src="@android:drawable/star_big_off"/>
+
+ <ImageButton
+ android:id="@+id/download_bookmark"
+ style="@style/DownloadActionImageButton"
+ android:src="?attr/bookmark"/>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml index 66dd5a70..a85d043e 100644 --- a/res/layout/drawer_list_item.xml +++ b/res/layout/drawer_list_item.xml @@ -3,8 +3,8 @@ android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:paddingTop="5dip"
- android:paddingBottom="6dip">
+ android:paddingTop="8dip"
+ android:paddingBottom="9dip">
<ImageView
android:id="@+id/drawer_icon"
@@ -20,6 +20,7 @@ android:id="@+id/drawer_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="26sp"
+ android:textStyle="bold"
android:singleLine="true"/>
</LinearLayout>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 78009e60..ae0939f1 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,5 +18,6 @@ <attr name="toggle_list" format="reference"/> <attr name="select_server" format="reference"/> <attr name="downloading" format="reference"/> + <attr name="bookmark" format="reference"/> <attr name="drawerItemsIcons" format="reference"/> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4eb57348..b0e9d77c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -187,6 +187,7 @@ <string name="download.need_download">Video needs to be downloaded first</string>
<string name="download.no_streaming_player">No player can play this stream</string>
<string name="download.playing_out_of">Playing: %1$d/%2$d</string>
+ <string name="download.save_bookmark">Saved bookmark</string>
<string name="starring_content_starred">Starred \"%s\"</string>
<string name="starring_content_unstarred">Unstarred \"%s\"</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml index 6ff6c4fc..b1475eb6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -27,6 +27,28 @@ <item name="android:textColor">?android:textColorPrimary</item> </style> + <style name="DownloadActionButton"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textStyle">bold</item> + <item name="android:textSize">22sp</item> + <item name="android:background">@drawable/menubar_button</item> + <item name="android:paddingTop">4dip</item> + <item name="android:paddingBottom">4dip</item> + <item name="android:paddingRight">4dip</item> + <item name="android:paddingLeft">4dip</item> + </style> + + <style name="DownloadActionImageButton"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:background">@drawable/menubar_button</item> + <item name="android:paddingTop">8dip</item> + <item name="android:paddingBottom">8dip</item> + <item name="android:paddingRight">16dip</item> + <item name="android:paddingLeft">16dip</item> + </style> + <style name="DragDropListView"> <item name="drag_enabled">true</item> <item name="collapsed_height">1dp</item> diff --git a/res/values/themes.xml b/res/values/themes.xml index 06cbab6e..1b2078a7 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -21,6 +21,7 @@ <item name="toggle_list">@drawable/action_toggle_list_light</item> <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="drawerItemsIcons">@array/drawerItemIconsLight</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> @@ -47,6 +48,7 @@ <item name="toggle_list">@drawable/action_toggle_list_dark</item> <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="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> @@ -76,6 +78,7 @@ <item name="toggle_list">@drawable/action_toggle_list_dark</item> <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="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> |