diff options
Diffstat (limited to 'res')
24 files changed, 100 insertions, 40 deletions
diff --git a/res/drawable-xhdpi/ic_undobar_undo.png b/res/drawable-xhdpi/ic_undobar_undo.png Binary files differnew file mode 100644 index 000000000..91c8429ad --- /dev/null +++ b/res/drawable-xhdpi/ic_undobar_undo.png diff --git a/res/drawable-xhdpi/undobar.9.png b/res/drawable-xhdpi/undobar.9.png Binary files differnew file mode 100644 index 000000000..22fa2205b --- /dev/null +++ b/res/drawable-xhdpi/undobar.9.png diff --git a/res/drawable-xhdpi/undobar_button_focused.9.png b/res/drawable-xhdpi/undobar_button_focused.9.png Binary files differnew file mode 100644 index 000000000..d284ca7cb --- /dev/null +++ b/res/drawable-xhdpi/undobar_button_focused.9.png diff --git a/res/drawable-xhdpi/undobar_button_pressed.9.png b/res/drawable-xhdpi/undobar_button_pressed.9.png Binary files differnew file mode 100644 index 000000000..e990659f0 --- /dev/null +++ b/res/drawable-xhdpi/undobar_button_pressed.9.png diff --git a/res/drawable-xhdpi/undobar_divider.9.png b/res/drawable-xhdpi/undobar_divider.9.png Binary files differnew file mode 100644 index 000000000..1b067d4e7 --- /dev/null +++ b/res/drawable-xhdpi/undobar_divider.9.png diff --git a/res/drawable/undobar_button.xml b/res/drawable/undobar_button.xml new file mode 100644 index 000000000..a4de91b49 --- /dev/null +++ b/res/drawable/undobar_button.xml @@ -0,0 +1,22 @@ +<!-- + + Copyright 2012 Roman Nurik + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/undobar_button_pressed" android:state_pressed="true"/> + <item android:drawable="@drawable/undobar_button_focused" android:state_focused="true"/> + <item android:drawable="@android:color/transparent"/> +</selector> diff --git a/res/layout/organize_queue.xml b/res/layout/organize_queue.xml index b73263632..62b2e980c 100644 --- a/res/layout/organize_queue.xml +++ b/res/layout/organize_queue.xml @@ -1,14 +1,12 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:dslv="http://schemas.android.com/apk/res/de.danoeh.antennapod" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > + android:layout_height="fill_parent" > <com.mobeta.android.dslv.DragSortListView android:id="@android:id/list" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" + android:layout_height="match_parent" dslv:collapsed_height="2dp" dslv:drag_enabled="true" dslv:drag_handle_id="@id/drag_handle" @@ -32,4 +30,9 @@ android:gravity="center" android:text="@string/no_items_label" /> -</LinearLayout>
\ No newline at end of file + <LinearLayout android:id="@+id/undobar" style="@style/UndoBar"> + <TextView android:id="@+id/undobar_message" style="@style/UndoBarMessage" /> + <Button android:id="@+id/undobar_button" style="@style/UndoBarButton" /> + </LinearLayout> + +</FrameLayout> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 6ef477546..eb15eea29 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">L\'emmagatzemament extern no està disponible. Assegureu-vos que està muntat per què l\'aplicació funcioni correctament.</string> <string name="chapters_label">Capítols</string> <string name="shownotes_label">Notes del programa</string> - <string name="last_update_prefix">Darrera actualització:\u0020</string> <string name="episodes_suffix">\u0020episodis</string> <string name="published_prefix">Publicat:\u0020</string> <string name="length_prefix">Durada:\u0020</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 02094b1b2..2e98a6e63 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">Ingen ekstern harddisk er tilgængelig. Vær venlig at sørge for at den eksterne hukommelse er monteret så app\'en kan fungere korrekt.</string> <string name="chapters_label">Kapitler</string> <string name="shownotes_label">Afsnitsnoter</string> - <string name="last_update_prefix">Sidste opdateringer:\u0020</string> <string name="episodes_suffix">\u0020episoder</string> <string name="published_prefix">Offentliggjort:\u0020</string> <string name="length_prefix">Længde:\u0020</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 71236ef02..be723effe 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -32,7 +32,7 @@ <string name="external_storage_error_msg">Der externe Speicher ist nicht verfügbar. Bitte stelle sicher, dass das externe Speichermedium eingelegt ist, damit die App funktioniert.</string> <string name="chapters_label">Kapitel</string> <string name="shownotes_label">Notizen</string> - <string name="last_update_prefix">Letztes Update:\u0020</string> + <string name="most_recent_prefix">Letzte Episode:\u0020</string> <string name="episodes_suffix">\u0020Episoden</string> <string name="published_prefix">Veröffentlicht:\u0020</string> <string name="length_prefix">Länge:\u0020</string> diff --git a/res/values-es-rES/strings.xml b/res/values-es-rES/strings.xml index 31d088279..1eb829472 100644 --- a/res/values-es-rES/strings.xml +++ b/res/values-es-rES/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">No se encuentra un almacenamiento externo. Asegúrese de que su almacenamiento externo esté montado para que la aplicación funcione correctamente.</string> <string name="chapters_label">Capítulos</string> <string name="shownotes_label">Notas del programa</string> - <string name="last_update_prefix">Última actualización:\u0020</string> <string name="episodes_suffix">\u0020episodios</string> <string name="published_prefix">Publicado:\u0020</string> <string name="length_prefix">Duración:\u0020</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index f28453dcc..09ad122f5 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">No se encuentra un almacenamiento externo. Asegúrese de que su almacenamiento externo esté montado para que la aplicación funcione correctamente.</string> <string name="chapters_label">Capítulos</string> <string name="shownotes_label">Notas del programa</string> - <string name="last_update_prefix">Última actualización:\u0020</string> <string name="episodes_suffix">\u0020episodios</string> <string name="published_prefix">Publicado:\u0020</string> <string name="length_prefix">Duración:\u0020</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index e747fc625..02fb68388 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">Aucun stockage externe n\'est disponible. Merci de connecter un volume de stockage externe pour que l\'application puisse fonctionner correctement.</string> <string name="chapters_label">Chapitres</string> <string name="shownotes_label">Notes d\'épisode</string> - <string name="last_update_prefix">Dernière mise à jour :\u0020</string> <string name="episodes_suffix">\u0020épisodes</string> <string name="published_prefix">Publié :\u0020</string> <string name="length_prefix">Durée :\u0020</string> diff --git a/res/values-it-rIT/strings.xml b/res/values-it-rIT/strings.xml index b664d20b5..96e0b0ca1 100644 --- a/res/values-it-rIT/strings.xml +++ b/res/values-it-rIT/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">Non risulta disponibile lo spazio di archiviazione esterno. Assicurati che lo spazio di archiviazione sia montato per permettere all\'applicazione di funzionare correttamente.</string> <string name="chapters_label">Capitoli</string> <string name="shownotes_label">Note dell\'episodio</string> - <string name="last_update_prefix">Ultimo aggiornamento:\u0020</string> <string name="episodes_suffix">\u0020episodi</string> <string name="published_prefix">Pubblicato:\u0020</string> <string name="length_prefix">Durata:\u0020</string> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index b5abb58bd..299e282ee 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">Não há dispositivos de armazenamento disponíveis. Por favor, certifique-se de que um dispositivo de armazenamento externo está montado para que o aplicativo possa funcionar adequadamente.</string> <string name="chapters_label">Capítulos</string> <string name="shownotes_label">Notas do podcast</string> - <string name="last_update_prefix">Última atualização:\u0020</string> <string name="episodes_suffix">\u0020episódios</string> <string name="published_prefix">Publicado:\u0020</string> <string name="length_prefix">Duração:\u0020</string> diff --git a/res/values-ro-rRO/strings.xml b/res/values-ro-rRO/strings.xml index ba3c26827..d0bc9fdec 100644 --- a/res/values-ro-rRO/strings.xml +++ b/res/values-ro-rRO/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">Nu exista stocare externă. Asigurați-vă că stocarea externă este conectată pentru ca aplicația să funcționeze corespunzător.</string> <string name="chapters_label">Capitole</string> <string name="shownotes_label">Notițe</string> - <string name="last_update_prefix">Ultima actualizare:\u0020</string> <string name="episodes_suffix">\u0020episoade</string> <string name="published_prefix">Publicat:\u0020</string> <string name="length_prefix">Durată:\u0020</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 6f9f165cf..eac5da4b1 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">Внешний носитель данных недоступен. Убедитесь что внешний носитель смонтирован, иначе это приложение не сможет нормально работать.</string> <string name="chapters_label">Разделы</string> <string name="shownotes_label">Описание</string> - <string name="last_update_prefix">Последнее обновление:\u0020</string> <string name="episodes_suffix">\u0020 выпуск(ов)</string> <string name="published_prefix">Опубликовано:\u0020</string> <string name="length_prefix">Продолжительность:\u0020</string> diff --git a/res/values-uk-rUA/strings.xml b/res/values-uk-rUA/strings.xml index ccb65ab61..b2b6e7786 100644 --- a/res/values-uk-rUA/strings.xml +++ b/res/values-uk-rUA/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">Немає доступної флешки. Зовнішній носій потрібен для коректної роботи додатку</string> <string name="chapters_label">Глави</string> <string name="shownotes_label">Нотатки до епізода</string> - <string name="last_update_prefix">Останнє оновлення:\u0020</string> <string name="episodes_suffix">\u0020епізодів</string> <string name="published_prefix">Опубліковано:\u0020</string> <string name="length_prefix">Довжина:\u0020</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index d8c99b20a..5e2840536 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -32,7 +32,6 @@ <string name="external_storage_error_msg">没有可用的外部存储. 请确保安装外部存储器, 这样本应用才可以正常工作.</string> <string name="chapters_label">章节</string> <string name="shownotes_label">笔记</string> - <string name="last_update_prefix">最后更新:\u0020</string> <string name="episodes_suffix">\u0020 曲</string> <string name="published_prefix">发表:\u0020</string> <string name="length_prefix">长度:\u0020</string> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index aebc74b33..4036ff0f4 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,16 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="update_intervall_options"> - <item>Manual</item> - <item>1 hour</item> - <item>2 hours</item> - <item>4 hours</item> - <item>8 hours</item> - <item>12 hours</item> - <item>24 hours</item> - </string-array> - <string-array name="update_intervall_values"> <item>0</item> <item>1</item> @@ -20,8 +10,17 @@ <item>12</item> <item>24</item> </string-array> - - <string-array name="episode_cache_size"> + <string-array name="episode_cache_size_entries"> + <item>@string/pref_episode_cache_unlimited</item> + <item>10</item> + <item>20</item> + <item>40</item> + <item>60</item> + <item>80</item> + <item>100</item> + </string-array> + <string-array name="episode_cache_size_values"> + <item>-1</item> <item>10</item> <item>20</item> <item>40</item> @@ -29,20 +28,16 @@ <item>80</item> <item>100</item> </string-array> - <string-array name="autodl_select_networks_default_entries"> <item>N/A</item> </string-array> - <string-array name="autodl_select_networks_default_values"> <item>0</item> </string-array> - <string-array name="theme_options"> - <item>Light</item> - <item>Dark</item> + <item>@string/pref_theme_title_light</item> + <item>@string/pref_theme_title_dark</item> </string-array> - <string-array name="theme_values"> <item>0</item> <item>1</item> diff --git a/res/values/integers.xml b/res/values/integers.xml new file mode 100644 index 000000000..33501d9fb --- /dev/null +++ b/res/values/integers.xml @@ -0,0 +1,4 @@ +<resources> + <integer name="undobar_hide_delay">5000</integer> + <integer name="episode_cache_size_unlimited">-1</integer> +</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 5bc40db54..b79c561f4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -36,7 +36,7 @@ <string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string> <string name="chapters_label">Chapters</string> <string name="shownotes_label">Shownotes</string> - <string name="last_update_prefix">Last Update:\u0020</string> + <string name="most_recent_prefix">Most Recent Episode:\u0020</string> <string name="episodes_suffix">\u0020episodes</string> <string name="published_prefix">Published:\u0020</string> <string name="length_prefix">Length:\u0020</string> @@ -122,6 +122,8 @@ <!-- Queue operations --> <string name="clear_queue_label">Clear queue</string> <string name="organize_queue_label">Organize queue</string> + <string name="undo">Undo</string> + <string name="removed_from_queue">Item removed</string> <!-- Flattr --> <string name="flattr_auth_label">Flattr sign-in</string> @@ -177,6 +179,13 @@ <string name="pref_autodl_wifi_filter_title">Enable Wi-Fi filter</string> <string name="pref_autodl_wifi_filter_sum">Allow automatic download only for selected Wi-Fi networks.</string> <string name="pref_episode_cache_title">Episode cache</string> + <string name="pref_theme_title_light">Light</string> + <string name="pref_theme_title_dark">Dark</string> + <string name="pref_episode_cache_unlimited">Unlimited</string> + <string name="pref_update_interval_hours_plural">hours</string> + <string name="pref_update_interval_hours_singular">hour</string> + <string name="pref_update_interval_hours_manual">Manual</string> + <!-- Search --> <string name="search_hint">Search for Feeds or Episodes</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index c5e3abde3..f32ea3894 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -92,4 +92,42 @@ <item name="android:textColor">#FFFFFF</item> </style> -</resources>
\ No newline at end of file + <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:showDividers">middle</item> + <item name="android:divider">@drawable/undobar_divider</item> + <item name="android:dividerPadding">10dp</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:textAllCaps">true</item> + <item name="android:textStyle">bold</item> + <item name="android:textColor">#fff</item> + <item name="android:text">@string/undo</item> + </style> +</resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index dfa67d4f9..e94d1c47e 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -22,7 +22,7 @@ <PreferenceCategory android:title="@string/network_pref" > <ListPreference android:defaultValue="0" - android:entries="@array/update_intervall_options" + android:entries="@array/update_intervall_values" android:entryValues="@array/update_intervall_values" android:key="prefAutoUpdateIntervall" android:summary="@string/pref_autoUpdateIntervall_sum" @@ -34,7 +34,7 @@ android:key="prefMobileUpdate" android:summary="@string/pref_mobileUpdate_sum" android:title="@string/pref_mobileUpdate_title" /> - <ListPreference android:defaultValue="20" android:entries="@array/episode_cache_size" android:key="prefEpisodeCacheSize" android:title="@string/pref_episode_cache_title" android:entryValues="@array/episode_cache_size"/><PreferenceScreen android:summary="@string/pref_automatic_download_sum" android:key="prefAutoDownloadSettings" android:title="@string/pref_automatic_download_title"> + <ListPreference android:defaultValue="20" android:entries="@array/episode_cache_size_entries" android:key="prefEpisodeCacheSize" android:title="@string/pref_episode_cache_title" android:entryValues="@array/episode_cache_size_values"/><PreferenceScreen android:summary="@string/pref_automatic_download_sum" android:key="prefAutoDownloadSettings" android:title="@string/pref_automatic_download_title"> <CheckBoxPreference android:key="prefEnableAutoDl" android:title="@string/pref_automatic_download_title" android:defaultValue="false"/><CheckBoxPreference android:key="prefEnableAutoDownloadWifiFilter" android:title="@string/pref_autodl_wifi_filter_title" android:summary="@string/pref_autodl_wifi_filter_sum"/> </PreferenceScreen> |
