diff options
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/arrays.xml | 39 | ||||
| -rw-r--r-- | app/src/main/res/values/attrs.xml | 22 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 69 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 100 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 135 |
7 files changed, 221 insertions, 161 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index c103fb15..a7dd932d 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1,18 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="drawerItems"> - <item>@string/button_bar.home</item> - <item>@string/button_bar.browse</item> - <item>@string/button_bar.playlists</item> - <item>@string/button_bar.podcasts</item> - <item>@string/button_bar.bookmarks</item> - <item>@string/button_bar.shares</item> - <item>@string/button_bar.chat</item> - <item>@string/button_bar.admin</item> - <item>@string/button_bar.downloading</item> - <item>@string/menu.settings</item> - </string-array> - <string-array name="drawerItemsDescriptions"> <item>Home</item> <item>Artist</item> @@ -46,32 +33,6 @@ <item>Chat</item> </string-array> - <array name="drawerItemIconsLight"> - <item>@drawable/main_offline_light</item> - <item>@drawable/ic_menu_library_light</item> - <item>@drawable/ic_menu_playlist_light</item> - <item>@drawable/ic_menu_podcast_light</item> - <item>@drawable/ic_menu_bookmark_light</item> - <item>@drawable/ic_menu_share_light</item> - <item>@drawable/ic_menu_chat_light</item> - <item>@drawable/ic_menu_admin_light</item> - <item>@drawable/ic_menu_download_light</item> - <item>@drawable/ic_menu_settings_light</item> - </array> - - <array name="drawerItemIconsDark"> - <item>@drawable/main_offline_dark</item> - <item>@drawable/ic_menu_library_dark</item> - <item>@drawable/ic_menu_playlist_dark</item> - <item>@drawable/ic_menu_podcast_dark</item> - <item>@drawable/ic_menu_bookmark_dark</item> - <item>@drawable/ic_menu_share_dark</item> - <item>@drawable/ic_menu_chat_dark</item> - <item>@drawable/ic_menu_admin_dark</item> - <item>@drawable/ic_menu_download_dark</item> - <item>@drawable/ic_menu_settings_dark</item> - </array> - <string-array name="themeValues"> <item>light</item> <item>dark</item> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 9667117c..2b9b7f50 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -5,12 +5,20 @@ <attr name="media_button_forward" format="reference"/> <attr name="media_button_pause" format="reference"/> <attr name="media_button_repeat_off" format="reference"/> + <attr name="media_button_repeat_single" format="reference"/> + <attr name="media_button_repeat_all" format="reference"/> <attr name="media_button_start" format="reference"/> <attr name="media_button_stop" format="reference"/> + <attr name="actionbar_backward" format="reference"/> + <attr name="actionbar_forward" format="reference"/> + <attr name="actionbar_pause" format="reference"/> + <attr name="actionbar_start" format="reference"/> + <attr name="actionbar_stop" format="reference"/> <attr name="chat_send" format="reference"/> <attr name="add" format="reference"/> <attr name="download_none" format="reference"/> <attr name="shuffle" format="reference"/> + <attr name="shuffle_button" format="reference"/> <attr name="refresh" format="reference"/> <attr name="search" format="reference"/> <attr name="remove" format="reference"/> @@ -26,7 +34,21 @@ <attr name="rating_bad" format="reference"/> <attr name="rating_good" format="reference"/> <attr name="radio" format="reference"/> + <attr name="star_outline" format="reference"/> <attr name="drawerItemsIcons" format="reference"/> + <attr name="drawerHome" format="reference"/> + <attr name="drawerLibrary" format="reference"/> + <attr name="drawerPlaylists" format="reference"/> + <attr name="drawerPodcasts" format="reference"/> + <attr name="drawerBookmarks" format="reference"/> + <attr name="drawerShares" format="reference"/> + <attr name="drawerChat" format="reference"/> + <attr name="drawerAdmin" format="reference"/> + <attr name="drawerDownloading" format="reference"/> + <attr name="drawerSettings" format="reference"/> + <attr name="actionbarTitleStyle" format="reference"/> + <attr name="actionbarSubtitleStyle" format="reference"/> + <attr name="actionbarPopupStyle" format="reference"/> <declare-styleable name="SeekBarPreference"> <attr name="min" format="integer"/> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b1422ad6..772d0abf 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="lightBackground">#F1F0E6</color> - <color name="dividerColor">#FF33B5E5</color> <color name="appwidget_text">#FFFFFF</color> - <color name="notificationArtist">#434343</color> - <color name="notificationTitle">#000000</color> - <color name="background_holo_light">#ff33b5e5</color> <color name="overlayColor">#80000000</color> - <color name="ics_opaque">#8033b5e5</color> - <color name="cyan">#ff0099cc</color> <color name="holo_blue_light">#ff33b5e5</color> <color name="holo_orange_light">#ffffbb33</color> <color name="holo_green_light">#ff99cc00</color> <color name="holo_red_light">#ffff4444</color> + + <color name="lightPrimary">#2196f3</color> + <color name="lightPrimaryDark">#1e88e5</color> + <color name="lightAccent">#448aff</color> + + <color name="holoPrimary">#009688</color> + <color name="holoPrimaryDark">#00897b</color> + <color name="holoAccent">#64ffda</color> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index be3e843d..b002ac9f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <dimen name="Button">54dip</dimen> + <dimen name="Button.Large">64dip</dimen> <dimen name="Button.Small">46dip</dimen> <dimen name="AlbumArt.Small">78dip</dimen> <dimen name="AlbumArt.Header">120dip</dimen> + <dimen name="Star.Small">20dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d67ec37..fc61a0f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,6 +25,7 @@ <string name="common.confirm_message_cache">cache</string> <string name="common.empty">No data</string> <string name="common.warning">Warning</string> + <string name="common.close">Close</string> <string name="button_bar.home">Home</string> <string name="button_bar.browse">Library</string> @@ -37,17 +38,12 @@ <string name="button_bar.chat">Chat</string> <string name="button_bar.admin">Admin</string> <string name="button_bar.downloading">Downloading</string> + <string name="button_bar.offline">Offline</string> <string name="main.welcome_title">Welcome!</string> <string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve set up your personal server (available from <b>subsonic.org</b>), please go to <b>Settings</b> and change the configuration to connect to it.</string> <string name="main.about_title">About DSub</string> - <string name="main.about_text">Author: Scott Jackson - \nEmail: dsub.android@gmail.com - \nVersion: %1$s - \nFiles Cached: %2$s - \nUsed Space: %3$s of %4$s - \nAvailable Space: %5$s of %6$s</string> <string name="main.faq_title">FAQ</string> <string name="main.faq_text"> <![CDATA[ @@ -79,6 +75,8 @@ <string name="main.songs_genres">@string/main.albums_genres</string> <string name="main.back_confirm">Press back again to exit</string> <string name="main.scan_complete">Completed scan of Server</string> + <string name="main.artist">Artist</string> + <string name="main.title">Title</string> <string name="menu.search">Search</string> <string name="menu.shuffle">Shuffle</string> @@ -139,9 +137,8 @@ <string name="music_library.label_offline">Offline media</string> <string name="select_album.select">Select all</string> - <string name="select_album.n_selected">%d tracks selected.</string> - <string name="select_album.n_unselected">%d tracks unselected.</string> - <string name="select_album.more">More</string> + <string name="select_album.n_selected">%d selected.</string> + <string name="select_album.more">More</string> <string name="select_album.offline">Offline</string> <string name="select_album.searching">Searching...</string> <string name="select_album.no_sdcard">Error: No SD card available.</string> @@ -188,8 +185,7 @@ <string name="download.playerstate_playing_shuffle">Playing shuffle</string> <string name="download.menu_show_album">Show Album</string> <string name="download.menu_lyrics">Lyrics</string> - <string name="download.menu_remove">Remove from queue</string> - <string name="download.menu_remove_all">Remove all</string> + <string name="download.menu_remove_all">Remove all</string> <string name="download.menu_screen_on">Screen on</string> <string name="download.menu_shuffle">Shuffle</string> <string name="download.menu_toggle">Toggle</string> @@ -212,7 +208,7 @@ <string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users > Settings</b> on your Subsonic server.</string> <string name="download.timer_length">Timer:</string> <string name="download.start_timer">Start Timer</string> - <string name="download.stop_timer">Stop Timer</string> + <string name="download.stop_time_remaining">Stop in %1$s</string> <string name="download.need_download">Video needs to be downloaded first</string> <string name="download.no_streaming_player">No player can play this stream</string> <string name="download.playing_out_of">Playing: %1$d/%2$d</string> @@ -234,7 +230,9 @@ <string name="starring_content_starred">Starred \"%s\"</string> <string name="starring_content_unstarred">Unstarred \"%s\"</string> <string name="starring_content_error">Failed to update \"%s\", please try later.</string> - + + <string name="playlist.mine">My Playlists</string> + <string name="playlist.shared">Shared Playlists</string> <string name="playlist_error">Failed to grab list of playlists</string> <string name="updated_playlist">Added %1$s songs to \"%2$s\"</string> <string name="updated_playlist_error">Failed to update \"%s\", please try later.</string> @@ -245,11 +243,6 @@ <string name="bookmark.deleted">Deleted the bookmark for \"%s\"</string> <string name="bookmark.deleted_error">Failed to delete the bookmark for \"%s\"</string> <string name="bookmark.details_title">Bookmark Details</string> - <string name="bookmark.details">Song: %1$s - \nPosition: %2$s - \nCreated: %3$s - \nLast Updated: %4$s - \nComment: %5$s</string> <string name="bookmark.resume_title">Resume playing?</string> <string name="bookmark.resume">Resume playing \'%1$s\' from %2$s</string> <string name="bookmark.action_resume">Resume</string> @@ -592,6 +585,46 @@ <string name="tasker.edit_server_offline">Toggle offline: </string> <string name="tasker.edit_do_nothing">Do Nothing</string> + <string name="details.title.song">Song Details</string> + <string name="details.title.album">Album Details</string> + <string name="details.title.podcast">Podcast Details</string> + <string name="details.title.playlist">Playlist Details</string> + <string name="details.podcast">Podcast</string> + <string name="details.status">Status</string> + <string name="details.artist">Artist</string> + <string name="details.album">Album</string> + <string name="details.track">Track</string> + <string name="details.genre">Genre</string> + <string name="details.year">Year</string> + <string name="details.server_format">Server Format</string> + <string name="details.server_bitrate">Server Bitrate</string> + <string name="details.cached_format">Cached Format</string> + <string name="details.cached_bitrate">Cached Bitrate</string> + <string name="details.size">Size</string> + <string name="details.length">Length</string> + <string name="details.bookmark_position">Bookmark Position</string> + <string name="details.rating">Rating</string> + <string name="details.description">Description</string> + <string name="details.owner">Owner</string> + <string name="details.comments">Comments</string> + <string name="details.song_count">Song Count</string> + <string name="details.public">Public</string> + <string name="details.created">Created</string> + <string name="details.title">Title</string> + <string name="details.url">URL</string> + <string name="details.error">Error Message</string> + <string name="details.author">Author</string> + <string name="details.email">Email</string> + <string name="details.version">Version</string> + <string name="details.files_cached">Files Cached</string> + <string name="details.files_permanent">Permanent Cached</string> + <string name="details.used_space">Used Space</string> + <string name="details.available_space">Available Space</string> + <string name="details.of">%1$s of %2$s</string> + <string name="details.song">Song</string> + <string name="details.position">Position</string> + <string name="details.updated">Updated</string> + <plurals name="select_album_n_songs"> <item quantity="zero">No songs</item> <item quantity="one">One song</item> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 43271afd..94db6bca 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <style name="BasicButton"> - <item name="android:background">@drawable/abc_item_background_holo_light</item> + <item name="android:background">?attr/selectableItemBackgroundBorderless</item> + </style> + <style name="NotificationButton"> + <item name="android:background">?android:selectableItemBackground</item> + <item name="android:layout_width">46dip</item> + <item name="android:layout_height">fill_parent</item> + <item name="android:layout_gravity">center</item> + <item name="android:scaleType">fitCenter</item> + <item name="android:padding">2dip</item> + </style> + + <style name="NotificationButton.ExpandedBase"> + <item name="android:background">?android:selectableItemBackground</item> + <item name="android:layout_width">0dp</item> + <item name="android:layout_height">fill_parent</item> + <item name="android:layout_weight">1</item> + <item name="android:layout_gravity">center</item> + <item name="android:scaleType">fitCenter</item> + </style> + + <style name="NotificationButton.Expanded" parent="@style/NotificationButton.ExpandedBase"> + <item name="android:padding">10dip</item> + </style> + + <style name="NotificationText.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title"></style> + <style name="NotificationText.Content" parent="@android:style/TextAppearance.StatusBar.EventContent"></style> + + <style name="NotificationLayoutDivider"> + <item name="android:divider">?android:listDivider</item> + </style> + <style name="NotificationDivider"> + <item name="android:background">?android:dividerHorizontal</item> </style> <style name="MoreButton" parent="BasicButton"> @@ -10,7 +41,6 @@ <style name="PlaybackControl" parent="@style/BasicButton"> <item name="android:scaleType">fitCenter</item> - <item name="android:padding">6dip</item> <item name="android:layout_marginLeft">4dip</item> <item name="android:layout_marginRight">4dip</item> <item name="android:layout_width">@dimen/Button</item> @@ -19,19 +49,25 @@ </style> <style name="PlaybackControl.Small" parent="@style/PlaybackControl"> - <item name="android:padding">4dip</item> <item name="android:layout_width">@dimen/Button.Small</item> <item name="android:layout_height">@dimen/Button.Small</item> </style> - - <style name="MenuBarButton" parent="@style/BasicButton"> - <item name="android:layout_width">0dip</item> - <item name="android:layout_height">45dip</item> - <item name="android:layout_weight">1</item> - <item name="android:textSize">14sp</item> - <item name="android:textStyle">bold</item> - <item name="android:textColor">?android:textColorPrimary</item> - </style> + + <style name="PlaybackControl.Large" parent="@style/PlaybackControl"> + <item name="android:layout_width">@dimen/Button.Large</item> + <item name="android:layout_height">@dimen/Button.Large</item> + </style> + + <style name="PlaybackControl.Match" parent="@style/PlaybackControl"> + <item name="android:layout_height">match_parent</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:scaleType">fitCenter</item> + </style> + + <style name="PlaybackControl.BottomBar" parent="@style/PlaybackControl.Match"> + <item name="android:layout_width">0dp</item> + <item name="android:layout_weight">1</item> + </style> <style name="DownloadActionButton" parent="@style/BasicButton"> <item name="android:layout_width">wrap_content</item> @@ -52,44 +88,4 @@ <item name="android:paddingRight">16dip</item> <item name="android:paddingLeft">16dip</item> </style> - - <style name="DragDropListView"> - <item name="drag_enabled">true</item> - <item name="collapsed_height">1dp</item> - <item name="drag_scroll_start">1.0</item> - <item name="max_drag_scroll_speed">2.0</item> - <item name="float_alpha">0.6</item> - <item name="slide_shuffle_speed">0.3</item> - <item name="track_drag_sort">false</item> - <item name="use_default_controller">true</item> - <item name="drag_handle_id">@id/drag_handle</item> - <item name="sort_enabled">true</item> - <item name="remove_enabled">false</item> - <item name="remove_mode">flingRemove</item> - <item name="drag_start_mode">onLongPress</item> - <item name="float_background_color">@android:color/transparent</item> - </style> - - <style name="MainAlbumButton"> - <item name="android:drawablePadding">6dip</item> - <item name="android:layout_width">fill_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> - <item name="android:gravity">center_vertical</item> - <item name="android:paddingLeft">6dip</item> - <item name="android:paddingRight">6dip</item> - <item name="android:minHeight">46dip</item> - </style> - - <style name="MainAlbumButtonLabel"> - <item name="android:layout_width">fill_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> - <item name="android:textColor">@color/cyan</item> - <item name="android:gravity">center_vertical</item> - <item name="android:paddingLeft">6dp</item> - <item name="android:textAllCaps">true</item> - <item name="android:textStyle">bold</item> - <item name="android:textSize">16sp</item> - </style> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 78a2c34d..357ecdec 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,54 +1,82 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="Theme.DSub.Light" parent="@style/Theme.AppCompat.Light"> - <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item> - <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item> + <style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar"> <item name="offline_icon">@drawable/main_offline_light</item> <item name="media_button_backward">@drawable/media_backward_light</item> <item name="media_button_forward">@drawable/media_forward_light</item> <item name="media_button_pause">@drawable/media_pause_light</item> <item name="media_button_repeat_off">@drawable/media_repeat_off_light</item> + <item name="media_button_repeat_single">@drawable/media_repeat_single_light</item> + <item name="media_button_repeat_all">@drawable/media_repeat_all_light</item> <item name="media_button_start">@drawable/media_start_light</item> <item name="media_button_stop">@drawable/media_stop_light</item> + <item name="actionbar_backward">@drawable/media_backward_dark</item> + <item name="actionbar_forward">@drawable/media_forward_dark</item> + <item name="actionbar_pause">@drawable/media_pause_dark</item> + <item name="actionbar_start">@drawable/media_start_dark</item> + <item name="actionbar_stop">@drawable/media_stop_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_light</item> - <item name="add">@drawable/ic_action_add_light</item> + <item name="add">@drawable/ic_action_add_dark</item> <item name="download_none">@drawable/download_none_light</item> - <item name="shuffle">@drawable/ic_menu_shuffle_light</item> - <item name="refresh">@drawable/ic_menu_refresh_light</item> - <item name="search">@drawable/ic_menu_search_light</item> - <item name="remove">@drawable/ic_menu_remove_light</item> - <item name="save">@drawable/ic_menu_save_light</item> + <item name="shuffle">@drawable/ic_menu_shuffle_dark</item> + <item name="shuffle_button">@drawable/ic_menu_shuffle_light</item> + <item name="refresh">@drawable/ic_menu_refresh_dark</item> + <item name="search">@drawable/ic_menu_search_dark</item> + <item name="remove">@drawable/ic_menu_remove_dark</item> + <item name="save">@drawable/ic_menu_save_dark</item> <item name="volume">@drawable/ic_action_volume_light</item> <item name="toggle_list">@drawable/action_toggle_list_light</item> <item name="select_server">@drawable/main_select_server_light</item> <item name="downloading">@drawable/downloading_light</item> <item name="bookmark">@drawable/ic_menu_bookmark_light</item> <item name="share">@drawable/ic_menu_share_light</item> - <item name="add_person">@drawable/ic_menu_add_person_light</item> - <item name="password">@drawable/ic_menu_password_light</item> + <item name="add_person">@drawable/ic_menu_add_person_dark</item> + <item name="password">@drawable/ic_menu_password_dark</item> <item name="rating_bad">@drawable/ic_action_rating_bad_light</item> <item name="rating_good">@drawable/ic_action_rating_good_light</item> - <item name="radio">@drawable/ic_menu_radio_light</item> - <item name="drawerItemsIcons">@array/drawerItemIconsLight</item> - <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> - <item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item> + <item name="radio">@drawable/ic_menu_radio_dark</item> + <item name="star_outline">@drawable/ic_toggle_star_outline_light</item> + <item name="drawerHome">@drawable/main_offline_light</item> + <item name="drawerLibrary">@drawable/ic_menu_library_light</item> + <item name="drawerPlaylists">@drawable/ic_menu_playlist_light</item> + <item name="drawerPodcasts">@drawable/ic_menu_podcast_light</item> + <item name="drawerBookmarks">@drawable/ic_menu_bookmark_light</item> + <item name="drawerShares">@drawable/ic_menu_share_light</item> + <item name="drawerChat">@drawable/ic_menu_chat_light</item> + <item name="drawerAdmin">@drawable/ic_menu_admin_light</item> + <item name="drawerDownloading">@drawable/ic_menu_download_light</item> + <item name="drawerSettings">@drawable/ic_menu_settings_light</item> <item name="drawerArrowStyle">@style/DSub.DrawerArrow</item> - <item name="colorAccent">@color/cyan</item> + <item name="colorPrimary">@color/lightPrimary</item> + <item name="colorPrimaryDark">@color/lightPrimaryDark</item> + <item name="colorAccent">@color/lightAccent</item> + <item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item> + <item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item> + <item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Light</item> + <item name="android:spinnerItemStyle">@style/DarkSpinnerItem</item> + <item name="windowActionModeOverlay">true</item> + <item name="actionModeBackground">?attr/colorPrimary</item> </style> - <style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat"> - <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> - <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> + <style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat"> <item name="offline_icon">@drawable/main_offline_dark</item> <item name="media_button_backward">@drawable/media_backward_dark</item> <item name="media_button_forward">@drawable/media_forward_dark</item> <item name="media_button_pause">@drawable/media_pause_dark</item> - <item name="media_button_repeat_off">@drawable/media_repeat_off</item> + <item name="media_button_repeat_off">@drawable/media_repeat_off_dark</item> + <item name="media_button_repeat_single">@drawable/media_repeat_single_dark</item> + <item name="media_button_repeat_all">@drawable/media_repeat_all_dark</item> <item name="media_button_start">@drawable/media_start_dark</item> <item name="media_button_stop">@drawable/media_stop_dark</item> + <item name="actionbar_backward">@drawable/media_backward_dark</item> + <item name="actionbar_forward">@drawable/media_forward_dark</item> + <item name="actionbar_pause">@drawable/media_pause_dark</item> + <item name="actionbar_start">@drawable/media_start_dark</item> + <item name="actionbar_stop">@drawable/media_stop_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> <item name="add">@drawable/ic_action_add_dark</item> <item name="download_none">@drawable/download_none_dark</item> <item name="shuffle">@drawable/ic_menu_shuffle_dark</item> + <item name="shuffle_button">@drawable/ic_menu_shuffle_dark</item> <item name="refresh">@drawable/ic_menu_refresh_dark</item> <item name="search">@drawable/ic_menu_search_dark</item> <item name="remove">@drawable/ic_menu_remove_dark</item> @@ -64,46 +92,63 @@ <item name="rating_bad">@drawable/ic_action_rating_bad_dark</item> <item name="rating_good">@drawable/ic_action_rating_good_dark</item> <item name="radio">@drawable/ic_menu_radio_dark</item> - <item name="drawerItemsIcons">@array/drawerItemIconsDark</item> - <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> - <item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item> + <item name="star_outline">@drawable/ic_toggle_star_outline_dark</item> + <item name="drawerHome">@drawable/main_offline_dark</item> + <item name="drawerLibrary">@drawable/ic_menu_library_dark</item> + <item name="drawerPlaylists">@drawable/ic_menu_playlist_dark</item> + <item name="drawerPodcasts">@drawable/ic_menu_podcast_dark</item> + <item name="drawerBookmarks">@drawable/ic_menu_bookmark_dark</item> + <item name="drawerShares">@drawable/ic_menu_share_dark</item> + <item name="drawerChat">@drawable/ic_menu_chat_dark</item> + <item name="drawerAdmin">@drawable/ic_menu_admin_dark</item> + <item name="drawerDownloading">@drawable/ic_menu_download_dark</item> + <item name="drawerSettings">@drawable/ic_menu_settings_dark</item> <item name="drawerArrowStyle">@style/DSub.DrawerArrow</item> - <item name="colorAccent">@color/cyan</item> + <item name="colorPrimary">@color/lightPrimary</item> + <item name="colorPrimaryDark">@color/lightPrimaryDark</item> + <item name="colorAccent">@color/lightAccent</item> + <item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item> + <item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item> + <item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Dark</item> + <item name="windowActionModeOverlay">true</item> + <item name="actionModeBackground">?attr/colorPrimary</item> + </style> + <style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base"> + </style> + <style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base"> </style> <style name="Theme.DSub.Black" parent="Theme.DSub.Dark"> <item name="android:windowBackground">@android:color/black</item> </style> <style name="Theme.DSub.Holo" parent="Theme.DSub.Dark"> <item name="android:windowBackground">@drawable/background</item> - </style> - - <style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid"> - <item name="background">@android:color/transparent</item> - <item name="android:background">@android:color/transparent</item> - <item name="backgroundStacked">@android:color/transparent</item> - <item name="android:backgroundStacked">@android:color/transparent</item> + <item name="colorPrimary">@color/holoPrimary</item> + <item name="colorPrimaryDark">@color/holoPrimaryDark</item> + <item name="colorAccent">@color/holoAccent</item> </style> - <style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.AppCompat.ActionBar.Solid"> - <item name="background">@android:color/transparent</item> - <item name="android:background">@android:color/transparent</item> - <item name="backgroundStacked">@android:color/transparent</item> - <item name="android:backgroundStacked">@android:color/transparent</item> + <style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> </style> - - <style name="DSub.TextViewStyle" parent="android:Widget.TextView"> + <style name="Theme.DSub.Black.No_Actionbar" parent="Theme.DSub.Black"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> </style> - - <style name="DSub.TextViewStyle.Bold" parent="android:Widget.TextView"> - <item name="android:textStyle">bold</item> + <style name="Theme.DSub.Dark.No_Actionbar" parent="Theme.DSub.Dark"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> </style> - - <style name="DSub.ButtonStyle.Dark" parent="android:Widget.Holo.Button"> - </style> - <style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button"> + <style name="Theme.DSub.Holo.No_Actionbar" parent="Theme.DSub.Holo"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> </style> <style name="DSub.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle"> <item name="spinBars">true</item> </style> + + <style name="DarkSpinnerItem" parent="Widget.AppCompat.TextView.SpinnerItem"> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + </style> </resources> |