aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/abstract_activity.xml19
-rw-r--r--app/src/main/res/layout/abstract_fragment_activity.xml197
-rw-r--r--app/src/main/res/layout/abstract_fragment_container.xml4
-rw-r--r--app/src/main/res/layout/abstract_recycler_fragment.xml (renamed from app/src/main/res/layout/abstract_list_fragment.xml)24
-rw-r--r--app/src/main/res/layout/actionbar_spinner.xml21
-rw-r--r--app/src/main/res/layout/album_cell_item.xml11
-rw-r--r--app/src/main/res/layout/album_list_header.xml29
-rw-r--r--app/src/main/res/layout/album_list_item.xml17
-rw-r--r--app/src/main/res/layout/appwidget4x1.xml14
-rw-r--r--app/src/main/res/layout/appwidget4x2.xml14
-rw-r--r--app/src/main/res/layout/appwidget4x3.xml14
-rw-r--r--app/src/main/res/layout/appwidget4x4.xml14
-rw-r--r--app/src/main/res/layout/basic_choice_item.xml27
-rw-r--r--app/src/main/res/layout/basic_count_item.xml6
-rw-r--r--app/src/main/res/layout/basic_header.xml13
-rw-r--r--app/src/main/res/layout/basic_list_item.xml11
-rw-r--r--app/src/main/res/layout/change_email.xml3
-rw-r--r--app/src/main/res/layout/change_password.xml3
-rw-r--r--app/src/main/res/layout/chat_item.xml11
-rw-r--r--app/src/main/res/layout/chat_item_reverse.xml11
-rw-r--r--app/src/main/res/layout/complex_list_item.xml20
-rw-r--r--app/src/main/res/layout/confirm_password.xml3
-rw-r--r--app/src/main/res/layout/create_bookmark.xml3
-rw-r--r--app/src/main/res/layout/create_podcast.xml3
-rw-r--r--app/src/main/res/layout/create_user.xml14
-rw-r--r--app/src/main/res/layout/details_item.xml28
-rw-r--r--app/src/main/res/layout/download_activity.xml4
-rw-r--r--app/src/main/res/layout/download_media_buttons.xml17
-rw-r--r--app/src/main/res/layout/download_playlist.xml34
-rw-r--r--app/src/main/res/layout/drawer_header.xml58
-rw-r--r--app/src/main/res/layout/drawer_list_item.xml26
-rw-r--r--app/src/main/res/layout/edit_play_action.xml15
-rw-r--r--app/src/main/res/layout/equalizer_bar.xml55
-rw-r--r--app/src/main/res/layout/fast_scroller.xml25
-rw-r--r--app/src/main/res/layout/genre_list_item.xml11
-rw-r--r--app/src/main/res/layout/grid_view.xml14
-rw-r--r--app/src/main/res/layout/home.xml2
-rw-r--r--app/src/main/res/layout/jukebox_volume.xml46
-rw-r--r--app/src/main/res/layout/lyrics.xml101
-rw-r--r--app/src/main/res/layout/main_buttons.xml157
-rw-r--r--app/src/main/res/layout/notification.xml34
-rw-r--r--app/src/main/res/layout/notification_expanded.xml64
-rw-r--r--app/src/main/res/layout/playlist_cell_item.xml39
-rw-r--r--app/src/main/res/layout/playlist_list_item.xml34
-rw-r--r--app/src/main/res/layout/progress.xml30
-rw-r--r--app/src/main/res/layout/save_playlist.xml25
-rw-r--r--app/src/main/res/layout/search_buttons.xml73
-rw-r--r--app/src/main/res/layout/seekbar_preference.xml3
-rw-r--r--app/src/main/res/layout/select_album.xml28
-rw-r--r--app/src/main/res/layout/select_album_header.xml21
-rw-r--r--app/src/main/res/layout/select_artist_header.xml15
-rw-r--r--app/src/main/res/layout/settings_activity.xml21
-rw-r--r--app/src/main/res/layout/shuffle_dialog.xml9
-rw-r--r--app/src/main/res/layout/song_list_item.xml49
-rw-r--r--app/src/main/res/layout/start_timer.xml3
-rw-r--r--app/src/main/res/layout/sync_dialog.xml3
-rw-r--r--app/src/main/res/layout/tab_progress.xml3
-rw-r--r--app/src/main/res/layout/unscrollable_grid_view.xml11
-rw-r--r--app/src/main/res/layout/update_playlist.xml9
-rw-r--r--app/src/main/res/layout/update_share.xml9
-rw-r--r--app/src/main/res/layout/user_header.xml12
-rw-r--r--app/src/main/res/layout/user_list_item.xml11
62 files changed, 799 insertions, 806 deletions
diff --git a/app/src/main/res/layout/abstract_activity.xml b/app/src/main/res/layout/abstract_activity.xml
index be65e437..56db1439 100644
--- a/app/src/main/res/layout/abstract_activity.xml
+++ b/app/src/main/res/layout/abstract_activity.xml
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
<!-- The main content view -->
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
+
<!-- The navigation drawer -->
- <ListView android:id="@+id/left_drawer"
- android:layout_width="240dp"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:choiceMode="singleChoice"
- android:divider="@android:color/transparent"
- android:dividerHeight="0dp"
- android:background="?android:windowBackground"/>
+ <android.support.design.widget.NavigationView
+ android:id="@+id/left_drawer"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"/>
</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index d9c99f2f..04e6ec81 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -1,84 +1,133 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.sothree.slidinguppanel.SlidingUpPanelLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:sothree="http://schemas.android.com/apk/res-auto"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/slide_up_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
+ android:gravity="bottom"
+ sothree:umanoPanelHeight="?attr/actionBarSize"
+ sothree:umanoShadowHeight="4dp"
+ sothree:umanoDragView="@+id/slide_up_swipe_target">
- <include layout="@layout/abstract_fragment_container" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/main_toolbar"
+ android:layout_height="?attr/actionBarSize"
+ android:layout_width="match_parent"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="?attr/actionbarPopupStyle"/>
+
+ <include layout="@layout/abstract_fragment_container"/>
+ </FrameLayout>
<LinearLayout
- android:id="@+id/bottom_bar"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- style="@style/BasicButton"
- android:orientation="horizontal">
-
- <github.daneren2005.dsub.view.RecyclingImageView
- android:id="@+id/album_art"
- android:layout_width="50dip"
- android:layout_height="50dip"
- android:layout_gravity="left|center"
- android:scaleType="fitStart"/>
-
- <LinearLayout
- android:layout_width="0dp"
+ android:id="@+id/slide_up_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <FrameLayout
+ android:id="@+id/slide_up_swipe_target"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:orientation="vertical"
- android:paddingLeft="8dip">
+ android:background="?attr/colorPrimary">
- <TextView
- android:id="@+id/track_name"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:textColor="?android:textColorPrimary"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="13sp"
- android:text="@string/search.artists"/>
-
- <TextView
- android:id="@+id/artist_name"
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/now_playing_toolbar"
+ android:layout_height="?attr/actionBarSize"
+ android:layout_width="match_parent"
+ android:elevation="4dp"
+ android:visibility="gone"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="?attr/actionbarPopupStyle"/>
+
+ <LinearLayout
+ android:id="@+id/bottom_bar"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:textColor="?android:textColorSecondary"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="12sp"
- android:text="@string/search.albums"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1">
-
- <ImageButton
- style="@style/PlaybackControl.Small"
- android:id="@+id/download_previous"
- android:src="?attr/media_button_backward"
- android:layout_width="0dp"
- android:layout_weight="1"/>
-
- <ImageButton
- style="@style/PlaybackControl.Small"
- android:id="@+id/download_start"
- android:src="?attr/media_button_start"
- android:layout_width="0dp"
- android:layout_weight="1"/>
-
- <ImageButton
- style="@style/PlaybackControl.Small"
- android:id="@+id/download_next"
- android:src="?attr/media_button_forward"
- android:layout_width="0dp"
- android:layout_weight="1"/>
- </LinearLayout>
+ style="@style/BasicButton"
+ android:orientation="horizontal"
+ android:elevation="4dp">
+
+ <github.daneren2005.dsub.view.RecyclingImageView
+ android:id="@+id/album_art"
+ android:layout_width="?attr/actionBarSize"
+ android:layout_height="?attr/actionBarSize"
+ android:layout_gravity="left|center"
+ android:scaleType="fitStart"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="8dip">
+
+ <TextView
+ android:id="@+id/track_name"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:singleLine="true"
+ android:text="@string/main.title"
+ android:ellipsize="marquee"
+ android:marqueeRepeatLimit="marquee_forever"
+ android:scrollHorizontally="true"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ style="?attr/actionbarTitleStyle">
+
+ <requestFocus android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:duplicateParentState="true" />
+ </TextView>
+
+ <TextView
+ android:id="@+id/artist_name"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:singleLine="true"
+ android:text="@string/main.artist"
+ style="?attr/actionbarSubtitleStyle"/>
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_height="fill_parent"
+ android:layout_width="0dp"
+ android:layout_weight="1">
+
+ <ImageButton
+ style="@style/PlaybackControl.BottomBar"
+ android:id="@+id/download_previous"
+ android:src="?attr/actionbar_backward"
+ android:padding="2dp"/>
+
+ <ImageButton
+ style="@style/PlaybackControl.BottomBar"
+ android:id="@+id/download_start"
+ android:src="?attr/actionbar_start"/>
+
+ <ImageButton
+ style="@style/PlaybackControl.BottomBar"
+ android:id="@+id/download_next"
+ android:src="?attr/actionbar_forward"
+ android:padding="2dp"/>
+ </LinearLayout>
+ </LinearLayout>
+ </FrameLayout>
+
+ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/now_playing_fragment_container"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:clickable="true"/>
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</com.sothree.slidinguppanel.SlidingUpPanelLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/abstract_fragment_container.xml b/app/src/main/res/layout/abstract_fragment_container.xml
index 61e17d1d..f13356c4 100644
--- a/app/src/main/res/layout/abstract_fragment_container.xml
+++ b/app/src/main/res/layout/abstract_fragment_container.xml
@@ -2,5 +2,5 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_container"
android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="1"/> \ No newline at end of file
+ android:layout_height="match_parent"
+ android:layout_marginTop="?attr/actionBarSize"/> \ No newline at end of file
diff --git a/app/src/main/res/layout/abstract_list_fragment.xml b/app/src/main/res/layout/abstract_recycler_fragment.xml
index 618a7341..0e0c87f4 100644
--- a/app/src/main/res/layout/abstract_list_fragment.xml
+++ b/app/src/main/res/layout/abstract_recycler_fragment.xml
@@ -10,17 +10,23 @@
android:layout_height="fill_parent"
android:orientation="vertical" >
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <ListView
- android:id="@+id/fragment_list"
+ <RelativeLayout
android:layout_width="fill_parent"
android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
+ android:layout_weight="1.0">
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/fragment_recycler"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:scrollbars="vertical"/>
+
+ <github.daneren2005.dsub.view.FastScroller
+ android:id="@+id/fragment_fast_scroller"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_alignParentRight="true"/>
+ </RelativeLayout>
<include layout="@layout/tab_progress" />
</LinearLayout>
diff --git a/app/src/main/res/layout/actionbar_spinner.xml b/app/src/main/res/layout/actionbar_spinner.xml
index 22055901..4d9f95a4 100644
--- a/app/src/main/res/layout/actionbar_spinner.xml
+++ b/app/src/main/res/layout/actionbar_spinner.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:gravity="fill_horizontal" >
- <Spinner
- android:id="@+id/spinner"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:prompt="@string/common.appname"
- />
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:gravity="fill_horizontal" >
+
+ <Spinner
+ android:id="@+id/spinner"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:prompt="@string/common.appname"
+ android:background="@drawable/abc_spinner_mtrl_am_alpha"/>
</RelativeLayout>
diff --git a/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml
index 3f708e63..244c6f1f 100644
--- a/app/src/main/res/layout/album_cell_item.xml
+++ b/app/src/main/res/layout/album_cell_item.xml
@@ -2,7 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="?attr/selectableItemBackground">
<RelativeLayout
android:layout_width="match_parent"
@@ -66,10 +67,10 @@
<ImageButton
android:id="@+id/album_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/Star.Small"
+ android:layout_height="@dimen/Star.Small"
+ android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_stat_star"
android:background="@android:color/transparent"
android:focusable="false"
android:visibility="gone"/>
@@ -77,7 +78,7 @@
</LinearLayout>
<ImageView
- android:id="@+id/album_more"
+ android:id="@+id/more_button"
android:src="?attr/download_none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/album_list_header.xml b/app/src/main/res/layout/album_list_header.xml
new file mode 100644
index 00000000..e78d0ace
--- /dev/null
+++ b/app/src/main/res/layout/album_list_header.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/item_name"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:background="@android:color/transparent"
+ android:textColor="?attr/colorAccent"
+ android:textStyle="bold"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"/>
+
+ <CheckBox
+ android:id="@+id/item_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/main.albums_per_folder"
+ android:layout_marginRight="6dp"
+ android:layout_gravity="right"
+ android:textColor="?android:textColorPrimary"/>
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
index 0ee92edd..ba892365 100644
--- a/app/src/main/res/layout/album_list_item.xml
+++ b/app/src/main/res/layout/album_list_item.xml
@@ -3,7 +3,8 @@
android:id="@id/drag_handle"
android:orientation="horizontal"
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackground">
<RelativeLayout
android:layout_width="@dimen/AlbumArt.Small"
@@ -43,29 +44,31 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
android:ellipsize="marquee"
- android:paddingBottom="6dip"/>
+ android:paddingBottom="6dip"
+ android:textColor="?android:textColorPrimary"/>
<TextView
android:id="@+id/album_artist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:singleLine="true"/>
+ android:singleLine="true"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
<ImageButton
android:id="@+id/album_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/Star.Small"
+ android:layout_height="@dimen/Star.Small"
+ android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_stat_star"
android:background="@android:color/transparent"
android:focusable="false"
android:visibility="gone"/>
<ImageView
- android:id="@+id/album_more"
+ android:id="@+id/more_button"
android:src="?attr/download_none"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/appwidget4x1.xml b/app/src/main/res/layout/appwidget4x1.xml
index 8f52c872..86ddade0 100644
--- a/app/src/main/res/layout/appwidget4x1.xml
+++ b/app/src/main/res/layout/appwidget4x1.xml
@@ -30,7 +30,7 @@
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
- style="@style/BasicButton">
+ style="@style/NotificationButton">
<TextView
android:id="@+id/title"
@@ -81,8 +81,8 @@
android:layout_height="fill_parent"
android:layout_weight="1"
android:scaleType="center"
- style="@style/BasicButton"
- android:src="@drawable/ic_appwidget_music_previous" />
+ style="@style/NotificationButton"
+ android:src="@drawable/media_backward_dark" />
<ImageButton
android:id="@+id/control_play"
@@ -90,8 +90,8 @@
android:layout_height="fill_parent"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_play"
- style="@style/BasicButton" />
+ android:src="@drawable/media_start_dark"
+ style="@style/NotificationButton" />
<ImageButton
android:id="@+id/control_next"
@@ -99,8 +99,8 @@
android:layout_height="fill_parent"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_next"
- style="@style/BasicButton" />
+ android:src="@drawable/media_forward_dark"
+ style="@style/NotificationButton" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x2.xml b/app/src/main/res/layout/appwidget4x2.xml
index 5763fb01..52d0c15c 100644
--- a/app/src/main/res/layout/appwidget4x2.xml
+++ b/app/src/main/res/layout/appwidget4x2.xml
@@ -32,7 +32,7 @@
android:orientation="vertical"
android:paddingTop="4dip"
android:paddingBottom="4dip"
- style="@style/BasicButton">
+ style="@style/NotificationButton">
<TextView
android:id="@+id/title"
@@ -104,8 +104,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="center"
- style="@style/BasicButton"
- android:src="@drawable/ic_appwidget_music_previous" />
+ style="@style/NotificationButton"
+ android:src="@drawable/media_backward_dark" />
<ImageButton
android:id="@+id/control_play"
@@ -113,8 +113,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_play"
- style="@style/BasicButton" />
+ android:src="@drawable/media_start_dark"
+ style="@style/NotificationButton" />
<ImageButton
android:id="@+id/control_next"
@@ -122,8 +122,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_next"
- style="@style/BasicButton" />
+ android:src="@drawable/media_forward_dark"
+ style="@style/NotificationButton" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x3.xml b/app/src/main/res/layout/appwidget4x3.xml
index 539b9f01..4cfb4b77 100644
--- a/app/src/main/res/layout/appwidget4x3.xml
+++ b/app/src/main/res/layout/appwidget4x3.xml
@@ -34,7 +34,7 @@
android:orientation="vertical"
android:paddingBottom="4dip"
android:paddingTop="4dip"
- style="@style/BasicButton">
+ style="@style/NotificationButton">
<TextView
android:id="@+id/title"
@@ -86,8 +86,8 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- style="@style/BasicButton"
- android:src="@drawable/ic_appwidget_music_previous" />
+ style="@style/NotificationButton"
+ android:src="@drawable/media_backward_dark" />
<ImageButton
android:id="@+id/control_play"
@@ -95,8 +95,8 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_play"
- style="@style/BasicButton" />
+ android:src="@drawable/media_start_dark"
+ style="@style/NotificationButton" />
<ImageButton
android:id="@+id/control_next"
@@ -104,8 +104,8 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_next"
- style="@style/BasicButton" />
+ android:src="@drawable/media_forward_dark"
+ style="@style/NotificationButton" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x4.xml b/app/src/main/res/layout/appwidget4x4.xml
index 1f2db9e1..681d9252 100644
--- a/app/src/main/res/layout/appwidget4x4.xml
+++ b/app/src/main/res/layout/appwidget4x4.xml
@@ -35,7 +35,7 @@
android:orientation="vertical"
android:paddingTop="4dip"
android:paddingBottom="4dip"
- style="@style/BasicButton">
+ style="@style/NotificationButton">
<TextView
android:id="@+id/title"
@@ -88,8 +88,8 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- style="@style/BasicButton"
- android:src="@drawable/ic_appwidget_music_previous" />
+ style="@style/NotificationButton"
+ android:src="@drawable/media_backward_dark" />
<ImageButton
android:id="@+id/control_play"
@@ -97,8 +97,8 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_play"
- style="@style/BasicButton" />
+ android:src="@drawable/media_start_dark"
+ style="@style/NotificationButton" />
<ImageButton
android:id="@+id/control_next"
@@ -106,8 +106,8 @@
android:layout_height="56dip"
android:layout_weight="1"
android:scaleType="center"
- android:src="@drawable/ic_appwidget_music_next"
- style="@style/BasicButton" />
+ android:src="@drawable/media_forward_dark"
+ style="@style/NotificationButton" />
</LinearLayout>
</LinearLayout>
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..e2dc2204
--- /dev/null
+++ b/app/src/main/res/layout/basic_choice_item.xml
@@ -0,0 +1,27 @@
+<?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"
+ android:textColor="?android:textColorPrimary"/>
+
+ <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/basic_count_item.xml b/app/src/main/res/layout/basic_count_item.xml
index 08d276db..ce1aa800 100644
--- a/app/src/main/res/layout/basic_count_item.xml
+++ b/app/src/main/res/layout/basic_count_item.xml
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:color/transparent"
+ android:background="?attr/selectableItemBackground"
android:minHeight="50dip">
<TextView
@@ -14,7 +14,8 @@
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:background="@android:color/transparent"
- android:text="Text"/>
+ android:text="Text"
+ android:textColor="?android:textColorPrimary"/>
<TextView
android:id="@+id/basic_count_count"
@@ -31,5 +32,6 @@
android:textSize="11sp"
android:gravity="right|center_vertical"
android:layout_gravity="center_vertical"
+ android:textColor="?android:textColorPrimary"
android:visibility="gone"/>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/basic_header.xml b/app/src/main/res/layout/basic_header.xml
new file mode 100644
index 00000000..b1f94b33
--- /dev/null
+++ b/app/src/main/res/layout/basic_header.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/item_name"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:background="@android:color/transparent"
+ android:textColor="?attr/colorAccent"
+ android:textStyle="bold"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"/> \ No newline at end of file
diff --git a/app/src/main/res/layout/basic_list_item.xml b/app/src/main/res/layout/basic_list_item.xml
index 2338f7e0..ea1df8e8 100644
--- a/app/src/main/res/layout/basic_list_item.xml
+++ b/app/src/main/res/layout/basic_list_item.xml
@@ -3,7 +3,7 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:color/transparent">
+ android:background="?attr/selectableItemBackground">
<TextView
android:id="@+id/item_name"
@@ -15,14 +15,15 @@
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:minHeight="50dip"
- android:background="@android:color/transparent"/>
+ android:background="@android:color/transparent"
+ android:textColor="?android:textColorPrimary"/>
<ImageButton
android:id="@+id/item_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/Star.Small"
+ android:layout_height="@dimen/Star.Small"
+ android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_stat_star"
android:background="@android:color/transparent"
android:focusable="false"
android:visibility="gone"/>
diff --git a/app/src/main/res/layout/change_email.xml b/app/src/main/res/layout/change_email.xml
index 18ffc765..87d297be 100644
--- a/app/src/main/res/layout/change_email.xml
+++ b/app/src/main/res/layout/change_email.xml
@@ -15,7 +15,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/admin.change_email_label" />
+ android:text="@string/admin.change_email_label"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/new_email"
android:inputType="textEmailAddress"
diff --git a/app/src/main/res/layout/change_password.xml b/app/src/main/res/layout/change_password.xml
index 1a382a6b..d8043c05 100644
--- a/app/src/main/res/layout/change_password.xml
+++ b/app/src/main/res/layout/change_password.xml
@@ -15,7 +15,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/admin.change_password_label" />
+ android:text="@string/admin.change_password_label"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/new_password"
android:inputType="textPassword"
diff --git a/app/src/main/res/layout/chat_item.xml b/app/src/main/res/layout/chat_item.xml
index f31f7988..bf5d81ca 100644
--- a/app/src/main/res/layout/chat_item.xml
+++ b/app/src/main/res/layout/chat_item.xml
@@ -2,7 +2,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:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackground">
<github.daneren2005.dsub.view.RecyclingImageView
android:id="@+id/chat_avatar"
@@ -34,7 +35,7 @@
android:singleLine="true"
android:text="User"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="?android:textColorSecondary"/>
+ android:textColor="?android:textColorPrimary"/>
<TextView
android:id="@+id/chat_time"
@@ -43,7 +44,8 @@
android:layout_marginLeft="6dip"
android:singleLine="true"
android:text="00:00"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
<TextView
@@ -56,6 +58,7 @@
android:linksClickable="true"
android:singleLine="false"
android:text="Message Text Goes Here"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/chat_item_reverse.xml b/app/src/main/res/layout/chat_item_reverse.xml
index b8102193..31875208 100644
--- a/app/src/main/res/layout/chat_item_reverse.xml
+++ b/app/src/main/res/layout/chat_item_reverse.xml
@@ -2,7 +2,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:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackground">
<LinearLayout
android:layout_width="0dip"
@@ -24,7 +25,8 @@
android:layout_marginRight="6dip"
android:singleLine="true"
android:text="00:00"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:textColorSecondary"/>
<TextView
android:id="@+id/chat_username"
@@ -35,7 +37,7 @@
android:singleLine="true"
android:text="User"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="?android:textColorSecondary"/>
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout>
<TextView
@@ -49,7 +51,8 @@
android:singleLine="false"
android:text="Chat message"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_gravity="right"/>
+ android:layout_gravity="right"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
<github.daneren2005.dsub.view.RecyclingImageView
diff --git a/app/src/main/res/layout/complex_list_item.xml b/app/src/main/res/layout/complex_list_item.xml
index 67851eca..143f9af9 100644
--- a/app/src/main/res/layout/complex_list_item.xml
+++ b/app/src/main/res/layout/complex_list_item.xml
@@ -1,9 +1,9 @@
<?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="?android:attr/listPreferredItemHeight"
- android:background="@android:color/transparent">
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:background="?attr/selectableItemBackground">
<LinearLayout android:orientation="vertical"
android:layout_width="0dip"
@@ -19,22 +19,24 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:background="@android:color/transparent"/>
+ android:background="@android:color/transparent"
+ android:textColor="?android:textColorPrimary"/>
<TextView
android:id="@+id/item_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:background="@android:color/transparent"/>
+ android:background="@android:color/transparent"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
<ImageButton
android:id="@+id/item_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/Star.Small"
+ android:layout_height="@dimen/Star.Small"
+ android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_stat_star"
android:background="@android:color/transparent"
android:focusable="false"
android:visibility="gone"/>
diff --git a/app/src/main/res/layout/confirm_password.xml b/app/src/main/res/layout/confirm_password.xml
index 27ee04ea..9ec61c0a 100644
--- a/app/src/main/res/layout/confirm_password.xml
+++ b/app/src/main/res/layout/confirm_password.xml
@@ -15,7 +15,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/admin.add_user_password" />
+ android:text="@string/admin.add_user_password"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/password"
android:inputType="textPassword"
diff --git a/app/src/main/res/layout/create_bookmark.xml b/app/src/main/res/layout/create_bookmark.xml
index f72b39d8..d6f077c3 100644
--- a/app/src/main/res/layout/create_bookmark.xml
+++ b/app/src/main/res/layout/create_bookmark.xml
@@ -14,7 +14,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/common.comment" />
+ android:text="@string/common.comment"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/comment_text"
android:inputType="text"
diff --git a/app/src/main/res/layout/create_podcast.xml b/app/src/main/res/layout/create_podcast.xml
index 5a2ec970..04e74ec3 100644
--- a/app/src/main/res/layout/create_podcast.xml
+++ b/app/src/main/res/layout/create_podcast.xml
@@ -14,7 +14,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/select_podcasts.add_url"/>
+ android:text="@string/select_podcasts.add_url"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/create_podcast_url"
android:inputType="textUri"
diff --git a/app/src/main/res/layout/create_user.xml b/app/src/main/res/layout/create_user.xml
index eac6e5cb..b2d8f6e0 100644
--- a/app/src/main/res/layout/create_user.xml
+++ b/app/src/main/res/layout/create_user.xml
@@ -22,7 +22,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginLeft="4dp" />
+ android:layout_marginLeft="4dp"
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -43,7 +44,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginLeft="4dp" />
+ android:layout_marginLeft="4dp"
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -64,14 +66,14 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginLeft="4dp" />
+ android:layout_marginLeft="4dp"
+ android:textColor="?android:textColorPrimary"/>
</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/details_item.xml b/app/src/main/res/layout/details_item.xml
new file mode 100644
index 00000000..4ef5fef0
--- /dev/null
+++ b/app/src/main/res/layout/details_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="8dp">
+
+ <TextView
+ android:id="@+id/detail_name"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:textColorPrimary"
+ android:paddingLeft="14dp"
+ android:layout_gravity="center_vertical"/>
+
+ <TextView
+ android:id="@+id/detail_value"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:textColorSecondary"
+ android:paddingLeft="14dp"
+ android:layout_gravity="center_vertical"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/download_activity.xml b/app/src/main/res/layout/download_activity.xml
deleted file mode 100644
index 017e4013..00000000
--- a/app/src/main/res/layout/download_activity.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fragment_container"
- android:layout_width="match_parent"
- android:layout_height="match_parent" /> \ No newline at end of file
diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml
index 1affb164..58fda5c0 100644
--- a/app/src/main/res/layout/download_media_buttons.xml
+++ b/app/src/main/res/layout/download_media_buttons.xml
@@ -3,11 +3,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@android:color/transparent">
+ android:layout_height="wrap_content">
<ImageButton
- style="@style/PlaybackControl.Small"
+ style="@style/PlaybackControl"
android:id="@+id/download_repeat"
android:src="?attr/media_button_repeat_off"
android:layout_alignParentLeft="true"
@@ -15,7 +14,7 @@
/>
<github.daneren2005.dsub.view.AutoRepeatButton
- style="@style/PlaybackControl"
+ style="@style/PlaybackControl.Small"
android:id="@+id/download_previous"
android:src="?attr/media_button_backward"
android:layout_toLeftOf="@+id/download_pause"
@@ -23,7 +22,7 @@
/>
<ImageButton
- style="@style/PlaybackControl"
+ style="@style/PlaybackControl.Large"
android:id="@+id/download_pause"
android:src="?attr/media_button_pause"
android:layout_centerInParent="true"
@@ -31,7 +30,7 @@
/>
<ImageButton
- style="@style/PlaybackControl"
+ style="@style/PlaybackControl.Large"
android:id="@+id/download_stop"
android:src="?attr/media_button_stop"
android:layout_centerInParent="true"
@@ -39,14 +38,14 @@
/>
<ImageButton
- style="@style/PlaybackControl"
+ style="@style/PlaybackControl.Large"
android:id="@+id/download_start"
android:src="?attr/media_button_start"
android:layout_centerInParent="true"
/>
<github.daneren2005.dsub.view.AutoRepeatButton
- style="@style/PlaybackControl"
+ style="@style/PlaybackControl.Small"
android:id="@+id/download_next"
android:src="?attr/media_button_forward"
android:layout_toRightOf="@+id/download_start"
@@ -54,7 +53,7 @@
/>
<ImageButton
- style="@style/PlaybackControl.Small"
+ style="@style/PlaybackControl"
android:id="@+id/download_toggle_list"
android:src="?attr/toggle_list"
android:layout_alignParentRight="true"
diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml
index 8a73ef3b..7a83330c 100644
--- a/app/src/main/res/layout/download_playlist.xml
+++ b/app/src/main/res/layout/download_playlist.xml
@@ -1,31 +1,29 @@
<?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="?attr/colorPrimary"/>
<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"
+ android:textColor="?android:textColorPrimary"/>
- <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/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
new file mode 100644
index 00000000..91fad9fe
--- /dev/null
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="178dp"
+ android:orientation="vertical"
+ android:weightSum="1"
+ android:background="@drawable/drawer_header">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:orientation="horizontal"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:background="?attr/selectableItemBackground">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/header_server_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dp"
+ style="?attr/actionbarTitleStyle"/>
+
+ <TextView
+ android:id="@+id/header_user_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dp"
+ style="?attr/actionbarSubtitleStyle"/>
+ </LinearLayout>
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+
+ <ImageView
+ android:id="@+id/header_select_image"
+ android:src="@drawable/main_select_server_dark"
+ android:layout_gravity="center_vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="20dp"/>
+ </LinearLayout>
+
+ <de.hdodenhof.circleimageview.CircleImageView
+ android:id="@+id/header_user_avatar"
+ android:layout_width="70dp"
+ android:layout_height="70dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginTop="38dp"/>
+</RelativeLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
deleted file mode 100644
index 5f17c9e9..00000000
--- a/app/src/main/res/layout/drawer_list_item.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:paddingTop="8dip"
- android:paddingBottom="9dip">
-
- <ImageView
- android:id="@+id/drawer_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left|center_vertical"
- android:paddingTop="1dip"
- android:paddingBottom="1dip"
- android:paddingRight="8dip"
- android:paddingLeft="10dip"/>
-
- <TextView
- android:id="@+id/drawer_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="26sp"
- android:singleLine="true"
- android:textColor="?android:textColorPrimary"/>
-</LinearLayout>
diff --git a/app/src/main/res/layout/edit_play_action.xml b/app/src/main/res/layout/edit_play_action.xml
index a1115da6..95a3d7ff 100644
--- a/app/src/main/res/layout/edit_play_action.xml
+++ b/app/src/main/res/layout/edit_play_action.xml
@@ -14,7 +14,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/tasker.edit_shuffle_mode" />
+ android:text="@string/tasker.edit_shuffle_mode"
+ android:textColor="?android:textColorPrimary"/>
<CheckBox
android:id="@+id/edit_shuffle_checkbox"
android:layout_width="wrap_content"
@@ -33,7 +34,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/tasker.edit_shuffle_start_year" />
+ android:text="@string/tasker.edit_shuffle_start_year"
+ android:textColor="?android:textColorPrimary"/>
<CheckBox
android:id="@+id/edit_start_year_checkbox"
@@ -61,7 +63,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/tasker.edit_shuffle_end_year" />
+ android:text="@string/tasker.edit_shuffle_end_year"
+ android:textColor="?android:textColorPrimary"/>
<CheckBox
android:id="@+id/edit_end_year_checkbox"
@@ -89,7 +92,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/tasker.edit_shuffle_genre"/>
+ android:text="@string/tasker.edit_shuffle_genre"
+ android:textColor="?android:textColorPrimary"/>
<Button
android:id="@+id/edit_genre_spinner"
@@ -109,7 +113,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/tasker.edit_server_offline"/>
+ android:text="@string/tasker.edit_server_offline"
+ android:textColor="?android:textColorPrimary"/>
<Spinner
android:id="@+id/edit_offline_spinner"
diff --git a/app/src/main/res/layout/equalizer_bar.xml b/app/src/main/res/layout/equalizer_bar.xml
index 6dc91565..9e3fab5c 100644
--- a/app/src/main/res/layout/equalizer_bar.xml
+++ b/app/src/main/res/layout/equalizer_bar.xml
@@ -1,36 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/equalizer.frequency"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:layout_alignParentLeft="true"
- />
-
- <TextView
- android:id="@+id/equalizer.level"
- android:text="0 dB"
- android:textSize="12sp"
- android:gravity="right"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:layout_alignParentRight="true"
- android:layout_toRightOf="@+id/equalizer.frequency"
- />
-
- <SeekBar
- android:id="@+id/equalizer.bar"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/equalizer.frequency"
- />
+ <TextView
+ android:id="@+id/equalizer.frequency"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_alignParentLeft="true"
+ android:textColor="?android:textColorPrimary"/>
+ <TextView
+ android:id="@+id/equalizer.level"
+ android:text="0 dB"
+ android:textSize="12sp"
+ android:gravity="right"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/equalizer.frequency"
+ android:textColor="?android:textColorSecondary"/>
+ <SeekBar
+ android:id="@+id/equalizer.bar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/equalizer.frequency"/>
</RelativeLayout>
diff --git a/app/src/main/res/layout/fast_scroller.xml b/app/src/main/res/layout/fast_scroller.xml
new file mode 100644
index 00000000..b2e244e3
--- /dev/null
+++ b/app/src/main/res/layout/fast_scroller.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/fastscroller_bubble"
+ android:layout_gravity="right|end"
+ android:gravity="center"
+ android:textSize="48sp" tools:text="A"
+ android:layout_width="wrap_content"
+ android:textColor="#FFffffff"
+ android:layout_height="wrap_content"
+ android:background="@drawable/fast_scroller_bubble"
+ android:visibility="visible"/>
+
+ <ImageView
+ android:id="@+id/fastscroller_handle"
+ android:layout_width="wrap_content"
+ android:layout_marginRight="8dp"
+ android:layout_marginLeft="8dp"
+ android:layout_height="wrap_content"
+ android:src="@drawable/fast_scroller_handle"/>
+</merge> \ No newline at end of file
diff --git a/app/src/main/res/layout/genre_list_item.xml b/app/src/main/res/layout/genre_list_item.xml
index 6affa24c..fb30e167 100644
--- a/app/src/main/res/layout/genre_list_item.xml
+++ b/app/src/main/res/layout/genre_list_item.xml
@@ -3,7 +3,7 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:color/transparent">
+ android:background="?attr/selectableItemBackground">
<TextView
android:id="@+id/genre_name"
@@ -17,7 +17,8 @@
android:minHeight="50dip"
android:singleLine="true"
android:ellipsize="marquee"
- android:background="@android:color/transparent"/>
+ android:background="@android:color/transparent"
+ android:textColor="?android:textColorPrimary"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -31,12 +32,14 @@
android:id="@+id/genre_songs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"/>
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:textColorSecondary"/>
<TextView
android:id="@+id/genre_albums"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"/>
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/grid_view.xml b/app/src/main/res/layout/grid_view.xml
deleted file mode 100644
index 599cf92c..00000000
--- a/app/src/main/res/layout/grid_view.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.dsub.view.HeaderGridView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/gridview"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:numColumns="@integer/Grid.Columns"
- android:horizontalSpacing="10dp"
- android:verticalSpacing="10dp"
- android:gravity="center"
- android:stretchMode="columnWidth"
- android:padding="24px"
- android:fastScrollEnabled="true"
- android:scrollbarStyle="outsideOverlay"/> \ No newline at end of file
diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/home.xml
index e5bf5a70..043886a2 100644
--- a/app/src/main/res/layout/home.xml
+++ b/app/src/main/res/layout/home.xml
@@ -8,7 +8,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="1px"
- android:background="@color/dividerColor"/>
+ android:background="?attr/colorPrimary"/>
<ListView
android:id="@+id/main_list"
diff --git a/app/src/main/res/layout/jukebox_volume.xml b/app/src/main/res/layout/jukebox_volume.xml
deleted file mode 100644
index 0c49f634..00000000
--- a/app/src/main/res/layout/jukebox_volume.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout
- android:background="@drawable/toast_frame"
- android:padding="20dip"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
- android:orientation="vertical"
- android:id="@+id/toast_layout_root"
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <TextView
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:id="@+id/jukebox_volume_title"
- android:paddingBottom="12dp"
- android:paddingRight="32dp"
- android:paddingLeft="32dp"
- android:shadowRadius="2.75"
- android:shadowColor="#bb000000"
- android:textColor="#ffffffff"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/download.jukebox_volume"
- android:gravity="center_horizontal"
- android:layout_alignParentTop="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentLeft="true"/>
-
- <ImageView
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:id="@+id/jukebox_volume_image"
- android:paddingRight="12dip"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/jukebox_volume_title"
- android:src="@drawable/ic_action_volume_dark"/>
-
- <SeekBar
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:id="@+id/jukebox_volume_progress_bar"
- android:paddingBottom="3dp"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/jukebox_volume_title"
- android:layout_toRightOf="@+id/jukebox_volume_image"
- android:indeterminate="false"/>
-</RelativeLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/lyrics.xml b/app/src/main/res/layout/lyrics.xml
index 747727bd..f2aa7c7f 100644
--- a/app/src/main/res/layout/lyrics.xml
+++ b/app/src/main/res/layout/lyrics.xml
@@ -1,55 +1,54 @@
<?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">
-
- <include layout="@layout/tab_progress"/>
-
- <ScrollView
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0">
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
- <TextView
- android:id="@+id/lyrics_artist"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center_horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingTop="10dip"
- android:paddingBottom="4dip"
- />
-
- <TextView
- android:id="@+id/lyrics_title"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center_horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- />
-
- <TextView
- android:id="@+id/lyrics_text"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:gravity="center_horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- />
-
- </LinearLayout>
-
- </ScrollView>
-
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <include layout="@layout/tab_progress"/>
+
+ <ScrollView
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <TextView
+ android:id="@+id/lyrics_artist"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingTop="10dip"
+ android:paddingBottom="4dip"
+ android:textColor="?android:textColorPrimary"/>
+
+ <TextView
+ android:id="@+id/lyrics_title"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:gravity="center_horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingBottom="12dip"
+ android:textColor="?android:textColorPrimary"/>
+
+ <TextView
+ android:id="@+id/lyrics_text"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:gravity="center_horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:textColor="?android:textColorSecondary"/>
+ </LinearLayout>
+ </ScrollView>
</LinearLayout>
diff --git a/app/src/main/res/layout/main_buttons.xml b/app/src/main/res/layout/main_buttons.xml
deleted file mode 100644
index 95a60409..00000000
--- a/app/src/main/res/layout/main_buttons.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?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="wrap_content">
-
- <LinearLayout
- android:id="@+id/main_select_server"
- android:orientation="horizontal"
- android:paddingTop="2dip"
- android:paddingBottom="2dip"
- android:paddingLeft="6dp"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight">
-
- <ImageView
- android:src="?attr/select_server"
- android:layout_gravity="center_vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
-
- <TextView android:id="@+id/main.select_server_1"
- android:text="@string/main.select_server"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dip"
- android:layout_marginTop="6dip"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
-
- <TextView android:id="@+id/main.select_server_2"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dip"
- android:textAppearance="?android:attr/textAppearanceSmall"/>
-
- </LinearLayout>
- </LinearLayout>
-
- <TextView
- android:id="@+id/main_offline"
- android:text="@string/main.offline"
- android:drawablePadding="12dip"
- android:drawableLeft="?attr/offline_icon"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center_vertical"
- android:paddingLeft="6dp"
- android:paddingBottom="4dp"
- android:minHeight="50dip"/>
-
- <LinearLayout
- android:id="@+id/main_albums"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:text="@string/main.albums_title"
- style="@style/MainAlbumButtonLabel"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="fill_parent"/>
-
- <CheckBox
- android:id="@+id/main_albums_per_folder"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/main.albums_per_folder"
- android:layout_marginRight="6dp"
- android:layout_gravity="right"/>
- </LinearLayout>
-
- <TextView
- android:id="@+id/main_video_section"
- android:text="@string/main.videos"
- style="@style/MainAlbumButtonLabel"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="fill_parent"/>
-
- <LinearLayout
- android:id="@+id/main_albums_newest"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:minHeight="46dip">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:text="@string/main.albums_newest"
- style="@style/MainAlbumButton"/>
-
- <TextView
- android:id="@+id/main_albums_recent_count"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_marginRight="12dp"
- android:background="@drawable/ic_number_border"
- android:focusable="false"
- android:paddingRight="10dp"
- android:layout_marginLeft="20px"
- android:layout_marginBottom="4px"
- android:text="99"
- android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
- android:textSize="11sp"
- android:gravity="right|center_vertical"
- android:layout_gravity="center_vertical"
- android:visibility="gone"/>
- </LinearLayout>
-
- <TextView
- android:id="@+id/main_albums_recent"
- android:text="@string/main.albums_recent"
- style="@style/MainAlbumButton"/>
- <TextView
- android:id="@+id/main_albums_frequent"
- android:text="@string/main.albums_frequent"
- style="@style/MainAlbumButton"/>
- <TextView
- android:id="@+id/main_albums_highest"
- android:text="@string/main.albums_highest"
- style="@style/MainAlbumButton"/>
- <TextView
- android:id="@+id/main_albums_starred"
- android:text="@string/main.albums_starred"
- style="@style/MainAlbumButton"/>
- <TextView
- android:id="@+id/main_albums_genres"
- android:text="@string/main.albums_genres"
- style="@style/MainAlbumButton"/>
- <TextView
- android:id="@+id/main_albums_year"
- android:text="@string/main.albums_year"
- style="@style/MainAlbumButton"/>
- <TextView
- android:id="@+id/main_albums_random"
- android:text="@string/main.albums_random"
- style="@style/MainAlbumButton"/>
- <TextView
- android:id="@+id/main_albums_alphabetical"
- android:text="@string/main.albums_alphabetical"
- style="@style/MainAlbumButton"/>
-
- <TextView
- android:id="@+id/main_videos"
- android:text="@string/main.videos"
- style="@style/MainAlbumButton"/>
-
-</LinearLayout>
-
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index 12efa4ec..4a89db49 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -23,7 +23,7 @@
<TextView
android:id="@+id/notification_title"
- style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+ style="@style/NotificationText.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
@@ -33,7 +33,7 @@
<TextView
android:id="@+id/notification_artist"
- style="@android:style/TextAppearance.StatusBar.EventContent"
+ style="@style/NotificationText.Content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
@@ -50,34 +50,18 @@
<ImageButton
android:id="@+id/control_previous"
- android:src="@drawable/notification_previous"
- style="@style/BasicButton"
- android:layout_width="46dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center|right"
- android:padding="8.0dip"
- android:layout_weight="0.0"
- android:scaleType="fitCenter"/>
+ android:src="@drawable/notification_backward"
+ style="@style/NotificationButton"/>
<ImageButton
android:id="@+id/control_pause"
android:src="@drawable/notification_pause"
- style="@style/BasicButton"
- android:layout_width="46dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center|right"
- android:padding="8.0dip"
- android:layout_weight="0.0"
- android:scaleType="fitCenter"/>
+ style="@style/NotificationButton"
+ android:layout_width="54dip"
+ android:padding="0dip"/>
<ImageButton
android:id="@+id/control_next"
- android:src="@drawable/notification_next"
- style="@style/BasicButton"
- android:layout_width="46dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center|right"
- android:padding="8.0dip"
- android:layout_weight="0.0"
- android:scaleType="fitCenter"/>
+ android:src="@drawable/notification_forward"
+ style="@style/NotificationButton"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml
index aa9fe759..7b378e12 100644
--- a/app/src/main/res/layout/notification_expanded.xml
+++ b/app/src/main/res/layout/notification_expanded.xml
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/statusbar"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_height="128dp"
android:orientation="horizontal" >
<ImageView
@@ -14,7 +14,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_height="fill_parent"
android:layout_weight="0.0"
android:orientation="vertical"
android:paddingLeft="11.0dip" >
@@ -26,11 +26,11 @@
<TextView
android:id="@+id/notification_title"
- style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+ style="@style/NotificationText.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_gravity="left"
+ android:layout_gravity="left|center_vertical"
android:ellipsize="marquee"
android:focusable="true"
android:singleLine="true" />
@@ -40,15 +40,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/notification_close"
- style="@style/BasicButton"
- android:padding="10dip"
+ style="@style/NotificationButton"
android:layout_gravity="right"
- android:visibility="gone"/>
+ android:visibility="invisible"/>
</LinearLayout>
<TextView
android:id="@+id/notification_artist"
- style="@android:style/TextAppearance.StatusBar.EventContent"
+ style="@style/NotificationText.Content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
@@ -58,66 +57,43 @@
<TextView
android:id="@+id/notification_album"
- style="@android:style/TextAppearance.StatusBar.EventContent"
+ style="@style/NotificationText.Content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:ellipsize="end"
android:scrollHorizontally="true"
- android:singleLine="true" />
-
- <TextView
- android:id="@+id/textView1"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent" />
+ android:singleLine="true"
+ android:paddingBottom="10dp"/>
<ImageView
- android:background="?android:dividerHorizontal"
+ style="@style/NotificationDivider"
android:layout_width="fill_parent"
- android:layout_height="1.0px"/>
+ android:layout_height="1dp"/>
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_weight="1"
android:orientation="horizontal"
android:showDividers="middle"
- android:divider="?android:listDivider">
+ style="@style/NotificationLayoutDivider">
<ImageButton
android:id="@+id/control_previous"
- android:layout_width="0dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center"
- android:layout_weight="1"
- android:padding="10dip"
- style="@style/BasicButton"
- android:scaleType="fitCenter"
- android:src="@drawable/notification_previous" />
+ style="@style/NotificationButton.Expanded"
+ android:src="@drawable/notification_backward" />
<ImageButton
android:id="@+id/control_pause"
- android:layout_width="0dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center"
- android:layout_weight="1"
- android:padding="10dip"
- style="@style/BasicButton"
- android:scaleType="fitCenter"
+ style="@style/NotificationButton.Expanded"
android:src="@drawable/notification_pause" />
<ImageButton
android:id="@+id/control_next"
- android:layout_width="0dip"
- android:layout_height="fill_parent"
- android:layout_gravity="center"
- android:layout_weight="1"
- android:padding="10dip"
- style="@style/BasicButton"
- android:scaleType="fitCenter"
- android:src="@drawable/notification_next" />
+ style="@style/NotificationButton.Expanded"
+ android:src="@drawable/notification_forward" />
</LinearLayout>
-
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/playlist_cell_item.xml b/app/src/main/res/layout/playlist_cell_item.xml
new file mode 100644
index 00000000..7e6ab0cd
--- /dev/null
+++ b/app/src/main/res/layout/playlist_cell_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/selectableItemBackground">
+
+ <github.daneren2005.dsub.view.SquareImageView
+ android:id="@+id/playlist_coverart"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingTop="4dp"
+ android:paddingLeft="2dp">
+
+ <TextView
+ android:id="@+id/playlist_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:textColor="?android:textColorPrimary"/>
+
+ <ImageView
+ android:id="@+id/more_button"
+ android:src="?attr/download_none"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|center_vertical"
+ android:paddingRight="2dp"
+ style="@style/BasicButton"/>
+ </LinearLayout>
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/playlist_list_item.xml b/app/src/main/res/layout/playlist_list_item.xml
new file mode 100644
index 00000000..c1cc7b3c
--- /dev/null
+++ b/app/src/main/res/layout/playlist_list_item.xml
@@ -0,0 +1,34 @@
+<?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">
+
+ <github.daneren2005.dsub.view.RecyclingImageView
+ android:id="@+id/playlist_coverart"
+ android:layout_width="@dimen/AlbumArt.Small"
+ android:layout_height="@dimen/AlbumArt.Small"
+ android:layout_gravity="left|center_vertical"/>
+
+ <TextView
+ android:id="@+id/playlist_title"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="left|center_vertical"
+ android:paddingLeft="10dip"
+ android:paddingRight="3dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:textColor="?android:textColorPrimary"/>
+
+ <ImageView
+ android:id="@+id/more_button"
+ android:src="?attr/download_none"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_gravity="right|center_vertical"
+ style="@style/MoreButton"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/progress.xml b/app/src/main/res/layout/progress.xml
index a1904c11..8a299d63 100644
--- a/app/src/main/res/layout/progress.xml
+++ b/app/src/main/res/layout/progress.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_weight="1"
- android:layout_width="0dip"
- android:layout_height="fill_parent"
- android:padding="10dp">
+ android:orientation="horizontal"
+ android:layout_weight="1"
+ android:layout_width="0dip"
+ android:layout_height="fill_parent"
+ android:padding="10dp">
- <ProgressBar
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:layout_marginRight="10dp"/>
-
- <TextView
- android:id="@+id/progress_message"
- android:text="@string/progress.wait"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"/>
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_marginRight="10dp"/>
+ <TextView
+ android:id="@+id/progress_message"
+ android:text="@string/progress.wait"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/save_playlist.xml b/app/src/main/res/layout/save_playlist.xml
index 8bb21748..9a85d24c 100644
--- a/app/src/main/res/layout/save_playlist.xml
+++ b/app/src/main/res/layout/save_playlist.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/save_playlist_root"
- android:padding="10dip"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:id="@+id/save_playlist_root"
+ android:padding="10dip"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
- <EditText
- android:id="@+id/save_playlist_name"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:singleLine="true"/>
+ <EditText
+ android:id="@+id/save_playlist_name"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:singleLine="true"/>
<CheckBox
android:id="@+id/save_playlist_overwrite"
@@ -20,7 +20,8 @@
android:text="@string/playlist.overwrite"
android:layout_marginLeft="4dp"
android:checked="false"
- android:visibility="gone"/>
+ android:visibility="gone"
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/search_buttons.xml b/app/src/main/res/layout/search_buttons.xml
deleted file mode 100644
index 699ad341..00000000
--- a/app/src/main/res/layout/search_buttons.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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="wrap_content">
-
- <TextView
- android:id="@+id/search_artists"
- android:text="@string/search.artists"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#EFEFEF"
- android:textStyle="bold"
- android:background="#A5A5A5"
- android:gravity="center_vertical"
- android:paddingLeft="4dp"/>
-
- <TextView
- android:id="@+id/search_albums"
- android:text="@string/search.albums"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#EFEFEF"
- android:textStyle="bold"
- android:background="#A5A5A5"
- android:gravity="center_vertical"
- android:paddingLeft="4dp"/>
-
- <TextView
- android:id="@+id/search_songs"
- android:text="@string/search.songs"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#EFEFEF"
- android:textStyle="bold"
- android:background="#A5A5A5"
- android:gravity="center_vertical"
- android:paddingLeft="4dp"/>
-
- <TextView
- android:id="@+id/search_more_artists"
- android:text="@string/search.more"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:gravity="center"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"/>
-
- <TextView
- android:id="@+id/search_more_albums"
- android:text="@string/search.more"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:gravity="center"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"/>
-
- <TextView
- android:id="@+id/search_more_songs"
- android:text="@string/search.more"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:gravity="center"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/seekbar_preference.xml b/app/src/main/res/layout/seekbar_preference.xml
index 030b608b..74dad4cd 100644
--- a/app/src/main/res/layout/seekbar_preference.xml
+++ b/app/src/main/res/layout/seekbar_preference.xml
@@ -9,7 +9,8 @@
android:padding="5dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:gravity="right" />
+ android:gravity="right"
+ android:textColor="?android:textColorPrimary"/>
<SeekBar
android:id="@+id/seek_bar"
android:padding="15dip"
diff --git a/app/src/main/res/layout/select_album.xml b/app/src/main/res/layout/select_album.xml
deleted file mode 100644
index bbdf0e54..00000000
--- a/app/src/main/res/layout/select_album.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/refresh_layout"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <LinearLayout
- android:id="@+id/select_album_layout"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <include layout="@layout/tab_progress"/>
-
- <ListView
- android:id="@+id/select_album_entries"
- android:textFilterEnabled="true"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
- </LinearLayout>
-</android.support.v4.widget.SwipeRefreshLayout> \ 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..5b2294f0 100644
--- a/app/src/main/res/layout/select_album_header.xml
+++ b/app/src/main/res/layout/select_album_header.xml
@@ -30,7 +30,8 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:focusable="true"
- android:focusableInTouchMode="true">
+ android:focusableInTouchMode="true"
+ android:textColor="?android:textColorPrimary">
<requestFocus android:focusable="true"
android:focusableInTouchMode="true"
@@ -44,7 +45,8 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
- android:ellipsize="end"/>
+ android:ellipsize="end"
+ android:textColor="?android:textColorPrimary"/>
<TextView
android:text="XX SONGS"
@@ -54,7 +56,8 @@
android:paddingTop="14dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
- android:ellipsize="none"/>
+ android:ellipsize="none"
+ android:textColor="?android:textColorSecondary"/>
<TextView
android:text="0:00"
@@ -63,7 +66,8 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
- android:ellipsize="none"/>
+ android:ellipsize="none"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
@@ -145,9 +149,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout>
</FrameLayout>
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="?attr/colorPrimary"
+ 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 2821ce43..9ec94ff1 100644
--- a/app/src/main/res/layout/select_artist_header.xml
+++ b/app/src/main/res/layout/select_artist_header.xml
@@ -2,7 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackground">
+
<LinearLayout
android:id="@+id/select_artist_folder"
android:orientation="horizontal"
@@ -30,14 +32,21 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginTop="6dip"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="?attr/colorAccent"/>
<TextView android:id="@+id/select_artist_folder_2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
- android:textAppearance="?android:attr/textAppearanceSmall"/>
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
</LinearLayout>
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="?attr/colorPrimary"/>
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
new file mode 100644
index 00000000..c77528b2
--- /dev/null
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -0,0 +1,21 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/main_toolbar"
+ android:layout_height="?attr/actionBarSize"
+ android:layout_width="match_parent"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+ <FrameLayout
+ android:id="@+id/fragment_container"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/shuffle_dialog.xml b/app/src/main/res/layout/shuffle_dialog.xml
index 295f57cb..63778ed7 100644
--- a/app/src/main/res/layout/shuffle_dialog.xml
+++ b/app/src/main/res/layout/shuffle_dialog.xml
@@ -14,7 +14,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/shuffle.startYear" />
+ android:text="@string/shuffle.startYear"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/start_year"
android:inputType="number"
@@ -36,7 +37,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/shuffle.endYear" />
+ android:text="@string/shuffle.endYear"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/end_year"
android:inputType="number"
@@ -66,7 +68,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="4dp"
- android:hint="@string/shuffle.genre"/>
+ android:hint="@string/shuffle.genre"
+ android:textColor="?android:textColorPrimary"/>
<Button
android:id="@+id/genre_combo"
diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml
index 86f77869..429dc142 100644
--- a/app/src/main/res/layout/song_list_item.xml
+++ b/app/src/main/res/layout/song_list_item.xml
@@ -3,15 +3,8 @@
android:id="@id/drag_handle"
android:orientation="horizontal"
android:layout_width="fill_parent"
- android:layout_height="?android:attr/listPreferredItemHeight">
-
- <CheckedTextView
- android:id="@+id/song_check"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:gravity="center_vertical"
- android:checkMark="?android:attr/listChoiceIndicatorMultiple"
- android:paddingLeft="3dip"/>
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:background="?attr/selectableItemBackground">
<LinearLayout android:orientation="vertical"
android:layout_width="0dip"
@@ -25,24 +18,24 @@
android:layout_gravity="center_vertical">
<TextView
- android:id="@+id/song_title"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="left|center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:drawablePadding="6dip"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"/>
+ android:id="@+id/song_title"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="left|center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:drawablePadding="6dip"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+ android:textColor="?android:textColorPrimary"/>
<ImageButton
android:id="@+id/song_bookmark"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_menu_bookmark_selected"
android:background="@null"
android:focusable="false"
android:scaleType="fitCenter"
@@ -50,10 +43,10 @@
<ImageButton
android:id="@+id/song_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/Star.Small"
+ android:layout_height="@dimen/Star.Small"
+ android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_stat_star"
android:background="@null"
android:focusable="false"
android:visibility="gone"/>
@@ -91,7 +84,8 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
android:ellipsize="middle"
- android:paddingLeft="6dip"/>
+ android:paddingLeft="6dip"
+ android:textColor="?android:textColorSecondary"/>
<RatingBar
android:id="@+id/song_rating"
@@ -111,13 +105,14 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
android:paddingLeft="3dip"
- android:paddingRight="4dip"/>
+ android:paddingRight="4dip"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
</LinearLayout>
<ImageView
- android:id="@+id/artist_more"
+ android:id="@+id/more_button"
android:src="?attr/download_none"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/start_timer.xml b/app/src/main/res/layout/start_timer.xml
index 9736a31d..59bd60e3 100644
--- a/app/src/main/res/layout/start_timer.xml
+++ b/app/src/main/res/layout/start_timer.xml
@@ -11,7 +11,8 @@
android:layout_marginLeft="8dp"
android:textSize="20dp"
android:paddingRight="10px"
- android:layout_gravity="center"/>
+ android:layout_gravity="center"
+ android:textColor="?android:textColorPrimary"/>
<SeekBar
android:id="@+id/timer_length_bar"
diff --git a/app/src/main/res/layout/sync_dialog.xml b/app/src/main/res/layout/sync_dialog.xml
index 5133b753..fc657186 100644
--- a/app/src/main/res/layout/sync_dialog.xml
+++ b/app/src/main/res/layout/sync_dialog.xml
@@ -8,5 +8,6 @@
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:checked="false"
- android:text="@string/offline.sync_dialog_default"/>
+ android:text="@string/offline.sync_dialog_default"
+ android:textColor="?android:textColorPrimary"/>
</FrameLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/tab_progress.xml b/app/src/main/res/layout/tab_progress.xml
index f6d326ca..7423777f 100644
--- a/app/src/main/res/layout/tab_progress.xml
+++ b/app/src/main/res/layout/tab_progress.xml
@@ -26,6 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout>
</FrameLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/unscrollable_grid_view.xml b/app/src/main/res/layout/unscrollable_grid_view.xml
deleted file mode 100644
index 96bea5ce..00000000
--- a/app/src/main/res/layout/unscrollable_grid_view.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.dsub.view.UnscrollableGridView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/gridview"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:numColumns="@integer/Grid.Columns"
- android:horizontalSpacing="10dp"
- android:verticalSpacing="10dp"
- android:gravity="center"
- android:padding="20px"
- android:stretchMode="columnWidth"/> \ No newline at end of file
diff --git a/app/src/main/res/layout/update_playlist.xml b/app/src/main/res/layout/update_playlist.xml
index 7354ef5c..cc7e5ee6 100644
--- a/app/src/main/res/layout/update_playlist.xml
+++ b/app/src/main/res/layout/update_playlist.xml
@@ -22,7 +22,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="4dp"
- android:hint="@string/common.name" />
+ android:hint="@string/common.name"
+ android:textColor="?android:textColorPrimary"/>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -36,7 +37,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/common.comment" />
+ android:text="@string/common.comment"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/get_playlist_comment"
android:inputType="text"
@@ -58,7 +60,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/common.public" />
+ android:text="@string/common.public"
+ android:textColor="?android:textColorPrimary"/>
<CheckBox
android:id="@+id/get_playlist_public"
android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/update_share.xml b/app/src/main/res/layout/update_share.xml
index 92b7137b..ef44e304 100644
--- a/app/src/main/res/layout/update_share.xml
+++ b/app/src/main/res/layout/update_share.xml
@@ -14,7 +14,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/common.name" />
+ android:text="@string/common.name"
+ android:textColor="?android:textColorPrimary"/>
<EditText
android:id="@+id/get_share_name"
android:inputType="text"
@@ -36,7 +37,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/share.expiration" />
+ android:text="@string/share.expiration"
+ android:textColor="?android:textColorPrimary"/>
<DatePicker
android:id="@+id/get_share_expire"
android:layout_width="fill_parent"
@@ -57,7 +59,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:textSize="20dp"
- android:text="@string/share.no_expiration" />
+ android:text="@string/share.no_expiration"
+ android:textColor="?android:textColorPrimary"/>
<CheckBox
android:id="@+id/get_share_no_expire"
android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/user_header.xml b/app/src/main/res/layout/user_header.xml
index 0b303afe..c8186372 100644
--- a/app/src/main/res/layout/user_header.xml
+++ b/app/src/main/res/layout/user_header.xml
@@ -34,7 +34,8 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:focusable="true"
- android:focusableInTouchMode="true">
+ android:focusableInTouchMode="true"
+ android:textColor="?android:textColorPrimary">
<requestFocus android:focusable="true"
android:focusableInTouchMode="true"
@@ -49,9 +50,16 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
android:ellipsize="end"
- android:autoLink="email"/>
+ android:autoLink="email"
+ android:textColor="?android:textColorSecondary"/>
</LinearLayout>
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="?attr/colorPrimary"
+ android:layout_alignParentBottom="true"/>
</RelativeLayout>
diff --git a/app/src/main/res/layout/user_list_item.xml b/app/src/main/res/layout/user_list_item.xml
index dc2bdab9..c2e708c8 100644
--- a/app/src/main/res/layout/user_list_item.xml
+++ b/app/src/main/res/layout/user_list_item.xml
@@ -3,7 +3,7 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:color/transparent">
+ android:background="?attr/selectableItemBackground">
<github.daneren2005.dsub.view.RecyclingImageView
android:id="@+id/item_avatar"
@@ -22,14 +22,15 @@
android:paddingLeft="12dip"
android:paddingRight="6dip"
android:minHeight="50dip"
- android:background="@android:color/transparent"/>
+ android:background="@android:color/transparent"
+ android:textColor="?android:textColorPrimary"/>
<ImageButton
android:id="@+id/item_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/Star.Small"
+ android:layout_height="@dimen/Star.Small"
+ android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_stat_star"
android:background="@android:color/transparent"
android:focusable="false"
android:visibility="gone"/>