summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-large/feedlist.xml3
-rw-r--r--res/layout/feeditemlist.xml3
-rw-r--r--res/layout/feedlist.xml4
-rw-r--r--res/layout/listview_activity.xml12
-rw-r--r--res/layout/miroguide_category.xml10
-rw-r--r--res/layout/organize_queue.xml2
-rw-r--r--res/menu/main.xml46
-rw-r--r--res/values-land/styles.xml2
-rw-r--r--res/values/strings.xml5
-rw-r--r--res/values/styles.xml26
-rw-r--r--res/xml/searchable.xml7
11 files changed, 67 insertions, 53 deletions
diff --git a/res/layout-large/feedlist.xml b/res/layout-large/feedlist.xml
index 3e8664245..49261b88b 100644
--- a/res/layout-large/feedlist.xml
+++ b/res/layout-large/feedlist.xml
@@ -19,7 +19,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
- android:gravity="center"
- android:text="@string/no_feeds_label" />
+ android:gravity="center"/>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/feeditemlist.xml b/res/layout/feeditemlist.xml
index c2c51ba63..932cfb051 100644
--- a/res/layout/feeditemlist.xml
+++ b/res/layout/feeditemlist.xml
@@ -16,7 +16,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
- android:gravity="center"
- android:text="@string/no_items_label" />
+ android:gravity="center"/>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/feedlist.xml b/res/layout/feedlist.xml
index b88e2eb6e..0557d8aea 100644
--- a/res/layout/feedlist.xml
+++ b/res/layout/feedlist.xml
@@ -15,7 +15,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:layout_gravity="center"
- android:text="@string/no_feeds_label" />
-
+ android:layout_gravity="center"/>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/listview_activity.xml b/res/layout/listview_activity.xml
new file mode 100644
index 000000000..b276f506c
--- /dev/null
+++ b/res/layout/listview_activity.xml
@@ -0,0 +1,12 @@
+<?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">
+ <ListView
+ android:id="@+id/listview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/miroguide_category.xml b/res/layout/miroguide_category.xml
index 1ab614050..b6f9f9418 100644
--- a/res/layout/miroguide_category.xml
+++ b/res/layout/miroguide_category.xml
@@ -5,17 +5,15 @@
android:layout_height="match_parent"
android:orientation="vertical" >
- <com.viewpagerindicator.TabPageIndicator
- android:id="@+id/tabs"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- />
-
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
+ <android.support.v4.view.PagerTabStrip
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top" />
</android.support.v4.view.ViewPager>
</LinearLayout>
diff --git a/res/layout/organize_queue.xml b/res/layout/organize_queue.xml
index 62b2e980c..3982529a2 100644
--- a/res/layout/organize_queue.xml
+++ b/res/layout/organize_queue.xml
@@ -1,5 +1,5 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:dslv="http://schemas.android.com/apk/res/de.danoeh.antennapod"
+ xmlns:dslv="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 9232a95aa..0b1b3cbcb 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,17 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/all_feed_refresh" android:title="@string/refresh_label" android:icon="?attr/navigation_refresh" android:showAsAction="ifRoom|collapseActionView">
- </item><item
+ <item
+ android:id="@+id/all_feed_refresh"
+ android:title="@string/refresh_label"
+ android:icon="?attr/navigation_refresh"
+ android:showAsAction="ifRoom|collapseActionView">
+ </item>
+ <item
android:id="@+id/add_feed"
android:title="@string/add_feed_label"
android:icon="?attr/content_new"
android:showAsAction="ifRoom|collapseActionView">
</item>
-
-
-
- <item android:id="@id/search_item" android:icon="?attr/action_search" android:title="@string/search_label" android:showAsAction="ifRoom|collapseActionView"></item><item android:id="@+id/show_player" android:title="@string/show_player_label" android:icon="@drawable/av_play" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_playback_history" android:title="@string/playback_history_label" android:showAsAction="collapseActionView"></item><item android:id="@+id/show_downloads" android:title="@string/downloads_label" android:icon="@drawable/av_download" android:showAsAction="collapseActionView">
- </item><item android:id="@+id/show_preferences" android:title="@string/settings_label" android:icon="?attr/action_settings" android:showAsAction="collapseActionView"></item>
-
-
+
+
+ <item
+ android:id="@id/search_item"
+ android:icon="?attr/action_search"
+ android:title="@string/search_label"
+ android:showAsAction="ifRoom|collapseActionView"
+ android:actionViewClass="android.support.v7.widget.SearchView"/>
+ <item
+ android:id="@+id/show_player"
+ android:title="@string/show_player_label"
+ android:icon="@drawable/av_play"
+ android:showAsAction="collapseActionView"/>
+ <item
+ android:id="@+id/show_playback_history"
+ android:title="@string/playback_history_label"
+ android:showAsAction="collapseActionView"/>
+ <item
+ android:id="@+id/show_downloads"
+ android:title="@string/downloads_label"
+ android:icon="@drawable/av_download"
+ android:showAsAction="collapseActionView">
+ </item>
+ <item
+ android:id="@+id/show_preferences"
+ android:title="@string/settings_label"
+ android:icon="?attr/action_settings"
+ android:showAsAction="collapseActionView"/>
+
+
</menu>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 877ac6412..d964ef3d4 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="Theme.MediaPlayer" parent="@style/Theme.Sherlock.Light.ForceOverflow">
+ <style name="Theme.MediaPlayer" parent="@style/Theme.AppCompat.Light">
<item name="android:windowActionBarOverlay">true</item>
</style>
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b79c561f4..b3f9975cb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="MissingTranslation"
+ >
<!-- Activitiy titles -->
<string name="app_name">AntennaPod</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f32ea3894..d08b8060f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,8 +1,7 @@
<?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.Sherlock.Light.ForceOverflow">
- <item name="vpiTabPageIndicatorStyle">@style/AntennaPod.LightTabPageIndicator</item>
+ <style name="Theme.AntennaPod.Light" parent="@style/Theme.AppCompat.Light">
<item name="attr/action_about">@drawable/action_about</item>
<item name="attr/action_search">@drawable/action_search</item>
<item name="attr/action_settings">@drawable/action_settings</item>
@@ -38,21 +37,7 @@
<item name="attr/dragview_float_background">@color/white</item>
</style>
- <style name="AntennaPod.TabPageIndicator" parent="Widget.TabPageIndicator">
- <item name="android:paddingTop">16dp</item>
- <item name="android:paddingLeft">8dp</item>
- <item name="android:paddingRight">8dp</item>
- <item name="android:paddingBottom">16dp</item>
- <item name="android:textSize">12sp</item>
- <item name="android:textStyle">bold</item>
- </style>
-
- <style name="AntennaPod.LightTabPageIndicator" parent="AntennaPod.TabPageIndicator">
- <item name="android:textColor">@color/black</item>
- </style>
-
- <style name="Theme.AntennaPod.Dark" parent="@style/Theme.Sherlock.ForceOverflow">
- <item name="vpiTabPageIndicatorStyle">@style/AntennaPod.DarkTabPageIndicator</item>
+ <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat">
<item name="attr/action_about">@drawable/action_about_dark</item>
<item name="attr/action_search">@drawable/action_search_dark</item>
<item name="attr/action_settings">@drawable/action_settings_dark</item>
@@ -88,10 +73,6 @@
<item name="attr/dragview_float_background">@color/black</item>
</style>
- <style name="AntennaPod.DarkTabPageIndicator" parent="AntennaPod.TabPageIndicator">
- <item name="android:textColor">#FFFFFF</item>
- </style>
-
<style name="UndoBar">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">48dp</item>
@@ -102,9 +83,7 @@
<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>
@@ -125,7 +104,6 @@
<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>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 522bd9be5..ee73aca8d 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<searchable xmlns:android="http://schemas.android.com/apk/res/android" android:hint="@string/search_hint" android:label="@string/app_name" android:icon="@drawable/ic_launcher">
-
-
-</searchable> \ No newline at end of file
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+ android:hint="@string/search_hint"
+ android:label="@string/app_name"/> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-18 06:15:22 +0000