diff options
Diffstat (limited to 'core/src/main/res/values')
-rw-r--r-- | core/src/main/res/values/colors.xml | 8 | ||||
-rw-r--r-- | core/src/main/res/values/strings.xml | 6 | ||||
-rw-r--r-- | core/src/main/res/values/styles.xml | 68 |
3 files changed, 32 insertions, 50 deletions
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 566032da8..ff061be4c 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -6,7 +6,8 @@ <color name="grey600">#757575</color> <color name="light_gray">#bfbfbf</color> <color name="black">#000000</color> - <color name="bright_blue">#33B5E5</color> + <color name="holo_blue_light">#33B5E5</color> + <color name="holo_blue_dark">#0099CC</color> <color name="ics_gray">#858585</color> <color name="actionbar_gray">#DDDDDD</color> <color name="download_success_green">#669900</color> @@ -26,7 +27,8 @@ <!-- Theme colors --> <color name="primary_light">#FFFFFF</color> - <color name="color_accent">#009EC8</color> + <color name="highlight_light">#DDDDDD</color> + <color name="highlight_dark">#414141</color> -</resources>
\ No newline at end of file +</resources> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index e0a7a6a7a..151c0b915 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -25,6 +25,7 @@ <string name="playback_history_label">Playback History</string> <string name="gpodnet_main_label">gpodder.net</string> <string name="gpodnet_auth_label">gpodder.net Login</string> + <string name="free_space_label">"%1$s free</string> <!-- New episodes fragment --> <string name="recently_published_episodes_label">Recently published</string> @@ -464,11 +465,15 @@ <string name="selected_folder_label">Selected folder:</string> <string name="create_folder_label">Create folder</string> <string name="choose_data_directory">Choose Data Folder</string> + <string name="choose_data_directory_message">Please choose the base of your data folder. AntennaPod will create the appropriate sub-directories.</string> <string name="create_folder_msg">Create new folder with name "%1$s"?</string> <string name="create_folder_success">Created new folder</string> <string name="create_folder_error_no_write_access">Cannot write to this folder</string> <string name="create_folder_error_already_exists">Folder already exists</string> <string name="create_folder_error">Could not create folder</string> + <string name="folder_does_not_exist_error">"%1$s" does not exist</string> + <string name="folder_not_readable_error">"%1$s" is not readable</string> + <string name="folder_not_writable_error">"%1$s" is not writable</string> <string name="folder_not_empty_dialog_title">Folder is not empty</string> <string name="folder_not_empty_dialog_msg">The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway?</string> <string name="set_to_default_folder">Choose default folder</string> @@ -478,6 +483,7 @@ <string name="pref_resumeAfterCall_title">Resume after Call</string> <string name="pref_restart_required">AntennaPod has to be restarted for this change to take effect.</string> + <!-- Online feed view --> <string name="subscribe_label">Subscribe</string> <string name="subscribed_label">Subscribed</string> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 5d1eac12d..b9ee70dbf 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="Theme.AntennaPod.Light" parent="@style/Theme.AppCompat.Light"> + <style name="Theme.AntennaPod.Light" parent="Theme.AppCompat.Light"> <item name="colorPrimary">@color/primary_light</item> - <item name="colorAccent">@color/color_accent</item> + <item name="colorAccent">@color/holo_blue_light</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> + <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item> <item name="attr/action_bar_icon_color">@color/grey600</item> <item name="attr/action_about">@drawable/ic_info_grey600_24dp</item> <item name="attr/action_search">@drawable/ic_search_grey600_24dp</item> @@ -49,11 +50,12 @@ <item name="attr/ic_filter">@drawable/ic_filter_grey600_24dp</item> </style> - <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat"> - <item name="colorAccent">@color/color_accent</item> + <style name="Theme.AntennaPod.Dark" parent="Theme.AppCompat"> + <item name="colorAccent">@color/holo_blue_dark</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> + <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item> <item name="attr/action_bar_icon_color">@color/white</item> - <item name="attr/action_about">@drawable/ic_info_white_24dp</item> + <item name="attr/action_about">@drawable/ic_info_white_24dp</item>g <item name="attr/action_search">@drawable/ic_search_white_24dp</item> <item name="attr/action_stream">@drawable/ic_settings_input_antenna_white_24dp</item> <item name="attr/av_download">@drawable/ic_file_download_white_24dp</item> @@ -96,12 +98,13 @@ <item name="attr/ic_filter">@drawable/ic_filter_white_24dp</item> </style> - <style name="Theme.AntennaPod.Light.NoTitle" parent="@style/Theme.AppCompat.Light.NoActionBar"> + <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AppCompat.Light.NoActionBar"> <item name="windowActionBar">false</item> <item name="windowActionModeOverlay">true</item> <item name="colorPrimary">@color/primary_light</item> - <item name="colorAccent">@color/color_accent</item> + <item name="colorAccent">@color/holo_blue_light</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> + <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item> <item name="attr/action_about">@drawable/ic_info_grey600_24dp</item> <item name="attr/action_search">@drawable/ic_search_grey600_24dp</item> <item name="attr/action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item> @@ -145,11 +148,12 @@ <item name="attr/ic_filter">@drawable/ic_filter_grey600_24dp</item> </style> - <style name="Theme.AntennaPod.Dark.NoTitle" parent="@style/Theme.AppCompat.NoActionBar"> + <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.AppCompat.NoActionBar"> <item name="windowActionBar">false</item> <item name="windowActionModeOverlay">true</item> - <item name="colorAccent">@color/color_accent</item> + <item name="colorAccent">@color/holo_blue_dark</item> <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> + <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item> <item name="attr/action_about">@drawable/ic_info_white_24dp</item> <item name="attr/action_search">@drawable/ic_search_white_24dp</item> <item name="attr/action_stream">@drawable/ic_settings_input_antenna_white_24dp</item> @@ -197,44 +201,6 @@ <item name="windowActionBarOverlay">true</item> </style> - <style name="UndoBar"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">48dp</item> - <item name="android:layout_gravity">bottom</item> - <item name="android:layout_marginLeft">8dp</item> - <item name="android:layout_marginRight">8dp</item> - <item name="android:layout_marginBottom">16dp</item> - <item name="android:orientation">horizontal</item> - <item name="android:background">@drawable/undobar</item> - <item name="android:clickable">true</item> - <item name="android:divider">@drawable/undobar_divider</item> - </style> - - <style name="UndoBarMessage"> - <item name="android:layout_width">0dp</item> - <item name="android:layout_weight">1</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginLeft">16dp</item> - <item name="android:layout_gravity">center_vertical</item> - <item name="android:layout_marginRight">16dp</item> - <item name="android:textAppearance">?android:textAppearanceMedium</item> - <item name="android:textColor">#fff</item> - </style> - - <style name="UndoBarButton"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">match_parent</item> - <item name="android:paddingLeft">16dp</item> - <item name="android:paddingRight">16dp</item> - <item name="android:background">@drawable/undobar_button</item> - <item name="android:drawableLeft">@drawable/ic_undobar_undo</item> - <item name="android:drawablePadding">12dp</item> - <item name="android:textAppearance">?android:textAppearanceSmall</item> - <item name="android:textStyle">bold</item> - <item name="android:textColor">#fff</item> - <item name="android:text">@string/undo</item> - </style> - <style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium"> <item name="android:textSize">@dimen/text_size_large</item> <item name="android:textColor">?android:attr/textColorPrimary</item> @@ -271,6 +237,14 @@ <item name="textAllCaps">false</item> </style> + <style name="AntennaPod.Dialog.Light" parent="Theme.AppCompat.Light.Dialog"> + <item name="colorAccent">@color/holo_blue_light</item> + </style> + + <style name="AntennaPod.Dialog.Dark" parent="Theme.AppCompat.Dialog"> + <item name="colorAccent">@color/holo_blue_dark</item> + </style> + <style name="BigBlurryBackground"> <item name="android:scaleType">centerCrop</item> <!-- <item name="android:tint">@color/image_readability_tint</item> --> |