diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/basic_choice_item.xml | 26 | ||||
| -rw-r--r-- | app/src/main/res/layout/create_user.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/download_playlist.xml | 33 | ||||
| -rw-r--r-- | app/src/main/res/layout/select_album_header.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/select_artist_header.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/user_header.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 17 |
7 files changed, 60 insertions, 38 deletions
diff --git a/app/src/main/res/layout/basic_choice_item.xml b/app/src/main/res/layout/basic_choice_item.xml new file mode 100644 index 00000000..00a45be4 --- /dev/null +++ b/app/src/main/res/layout/basic_choice_item.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground"> + + <TextView + android:id="@+id/item_name" + android:layout_width="0dip" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="left|center_vertical" + android:paddingLeft="6dip" + android:paddingRight="6dip" + android:background="@android:color/transparent"/> + + <CheckBox + android:id="@+id/item_checkbox" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_gravity="right|center_vertical" + android:checkMark="?android:attr/listChoiceIndicatorMultiple" + style="@style/MoreButton"/> +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/create_user.xml b/app/src/main/res/layout/create_user.xml index eac6e5cb..e2f6c4eb 100644 --- a/app/src/main/res/layout/create_user.xml +++ b/app/src/main/res/layout/create_user.xml @@ -67,11 +67,10 @@ android:layout_marginLeft="4dp" /> </LinearLayout> - <ListView + <android.support.v7.widget.RecyclerView android:id="@+id/settings_list" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1.0" - android:fastScrollEnabled="true"/> - + android:scrollbars="vertical"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml index 8a73ef3b..afb46081 100644 --- a/app/src/main/res/layout/download_playlist.xml +++ b/app/src/main/res/layout/download_playlist.xml @@ -1,31 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_weight="1"> <View - android:layout_width="fill_parent" - android:layout_height="1px" - android:background="@color/dividerColor"/> + android:layout_width="fill_parent" + android:layout_height="1px" + android:background="@color/dividerColor"/> <TextView - android:id="@+id/download_empty" - android:text="@string/download.empty" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dip"/> + android:id="@+id/download_empty" + android:text="@string/download.empty" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="10dip"/> - <com.mobeta.android.dslv.DragSortListView - style="@style/DragDropListView" + <android.support.v7.widget.RecyclerView android:id="@+id/download_list" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1" - android:cacheColorHint="#00000000" - android:fastScrollEnabled="true"/> + android:scrollbars="vertical"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/select_album_header.xml b/app/src/main/res/layout/select_album_header.xml index d028a476..e3a09443 100644 --- a/app/src/main/res/layout/select_album_header.xml +++ b/app/src/main/res/layout/select_album_header.xml @@ -148,6 +148,12 @@ android:textAppearance="?android:attr/textAppearanceMedium"/> </LinearLayout> </FrameLayout> + + <View + android:layout_width="fill_parent" + android:layout_height="1px" + android:background="@color/dividerColor" + android:layout_gravity="bottom"/> </FrameLayout> diff --git a/app/src/main/res/layout/select_artist_header.xml b/app/src/main/res/layout/select_artist_header.xml index 0ac9e6a6..168120d9 100644 --- a/app/src/main/res/layout/select_artist_header.xml +++ b/app/src/main/res/layout/select_artist_header.xml @@ -42,4 +42,9 @@ </LinearLayout> </LinearLayout> + + <View + android:layout_width="fill_parent" + android:layout_height="1px" + android:background="@color/dividerColor"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/user_header.xml b/app/src/main/res/layout/user_header.xml index 0b303afe..a9ff4bee 100644 --- a/app/src/main/res/layout/user_header.xml +++ b/app/src/main/res/layout/user_header.xml @@ -52,6 +52,12 @@ android:autoLink="email"/> </LinearLayout> + + <View + android:layout_width="fill_parent" + android:layout_height="1px" + android:background="@color/dividerColor" + android:layout_alignParentBottom="true"/> </RelativeLayout> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c4a53b99..cfe446f3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -59,23 +59,6 @@ <item name="android:paddingLeft">16dip</item> </style> - <style name="DragDropListView"> - <item name="drag_enabled">true</item> - <item name="collapsed_height">1dp</item> - <item name="drag_scroll_start">1.0</item> - <item name="max_drag_scroll_speed">2.0</item> - <item name="float_alpha">0.6</item> - <item name="slide_shuffle_speed">0.3</item> - <item name="track_drag_sort">false</item> - <item name="use_default_controller">true</item> - <item name="drag_handle_id">@id/drag_handle</item> - <item name="sort_enabled">true</item> - <item name="remove_enabled">false</item> - <item name="remove_mode">flingRemove</item> - <item name="drag_start_mode">onLongPress</item> - <item name="float_background_color">@android:color/transparent</item> - </style> - <style name="MainAlbumButton"> <item name="android:drawablePadding">6dip</item> <item name="android:layout_width">fill_parent</item> |