summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/arrowhead_light.pngbin1283 -> 287 bytes
-rw-r--r--res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.pngbin0 -> 274 bytes
-rw-r--r--res/drawable-hdpi/ic_mailbox_collapsed_holo_light.pngbin0 -> 350 bytes
-rw-r--r--res/drawable/headline_row_selected_dark.xml2
-rw-r--r--res/drawable/shadow_headlines.xml2
-rw-r--r--res/layout-sw600dp/feeds_row_selected.xml12
-rw-r--r--res/layout/feeds_row.xml12
-rw-r--r--res/layout/feeds_row_selected.xml12
-rw-r--r--res/layout/headlines_row.xml9
-rw-r--r--res/layout/headlines_row_selected.xml10
-rw-r--r--res/layout/headlines_row_selected_unread.xml9
-rw-r--r--res/layout/headlines_row_unread.xml12
-rw-r--r--res/values-v11/style.xml2
-rw-r--r--res/values/strings.xml1
-rw-r--r--res/xml/preferences.xml6
15 files changed, 86 insertions, 3 deletions
diff --git a/res/drawable-hdpi/arrowhead_light.png b/res/drawable-hdpi/arrowhead_light.png
index 130dbf18..2c113ae1 100644
--- a/res/drawable-hdpi/arrowhead_light.png
+++ b/res/drawable-hdpi/arrowhead_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
new file mode 100644
index 00000000..eb1a7bd8
--- /dev/null
+++ b/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
new file mode 100644
index 00000000..2c395b80
--- /dev/null
+++ b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
Binary files differ
diff --git a/res/drawable/headline_row_selected_dark.xml b/res/drawable/headline_row_selected_dark.xml
index b8ddb446..75c79a11 100644
--- a/res/drawable/headline_row_selected_dark.xml
+++ b/res/drawable/headline_row_selected_dark.xml
@@ -3,6 +3,8 @@
<item android:drawable="@color/ics_cyan"/>
+ <item android:drawable="@drawable/shadow"/>
+
<item><bitmap
xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/arrowhead_dark"
diff --git a/res/drawable/shadow_headlines.xml b/res/drawable/shadow_headlines.xml
index 09e5aa6a..7c31ab34 100644
--- a/res/drawable/shadow_headlines.xml
+++ b/res/drawable/shadow_headlines.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
- <item android:drawable="@color/headlines_light"/>
+ <!-- <item android:drawable="@color/headlines_light"/> -->
<item android:drawable="@drawable/shadow"/>
</layer-list> \ No newline at end of file
diff --git a/res/layout-sw600dp/feeds_row_selected.xml b/res/layout-sw600dp/feeds_row_selected.xml
index 12336d71..f6217520 100644
--- a/res/layout-sw600dp/feeds_row_selected.xml
+++ b/res/layout-sw600dp/feeds_row_selected.xml
@@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:background="?feedsSelectedBackground"
+ android:descendantFocusability="blocksDescendants"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="10dip"
@@ -43,4 +44,15 @@
android:textSize="13sp"
android:textStyle="bold" />
+ <ImageButton
+ android:id="@+id/feed_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="@null"
+ android:paddingLeft="6dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light"
+ android:visibility="gone" />
+
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index bd033b25..ffea8cf6 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -3,6 +3,7 @@
android:id="@+id/feeds_row"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
+ android:descendantFocusability="blocksDescendants"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="10dip"
@@ -42,4 +43,15 @@
android:textSize="13sp"
android:textStyle="bold" />
+ <ImageButton
+ android:id="@+id/feed_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="@null"
+ android:paddingLeft="6dp"
+ android:paddingTop="6dp"
+ android:visibility="gone"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index cb95a819..b1d53549 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:background="?feedsSelectedBackgroundSolid"
+ android:descendantFocusability="blocksDescendants"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="10dip"
@@ -43,4 +44,15 @@
android:textSize="13sp"
android:textStyle="bold" />
+ <ImageButton
+ android:id="@+id/feed_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="@null"
+ android:paddingLeft="6dp"
+ android:paddingTop="6dp"
+ android:visibility="gone"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 94d5f856..d339e281 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -120,6 +120,15 @@
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+ <ImageButton
+ android:id="@+id/article_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="@null"
+ android:paddingLeft="6dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index e1788ad5..be2239d9 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -120,6 +120,16 @@
android:layout_weight="0"
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+
+ <ImageButton
+ android:id="@+id/article_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="@null"
+ android:paddingLeft="6dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout>
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 9051cfc9..93135abb 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -122,6 +122,15 @@
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+ <ImageButton
+ android:id="@+id/article_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="@null"
+ android:paddingLeft="6dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index b43b7f22..fc1ab67a 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -118,9 +118,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
- android:clickable="true"
+ android:clickable="true"
android:src="@drawable/ic_rss_bw" />
+ <ImageButton
+ android:id="@+id/article_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="@null"
+ android:paddingLeft="6dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index 6fbb05e3..343c1e8e 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/style.xml
@@ -51,7 +51,7 @@
<style name="DarkTheme" parent="Theme.Sherlock">
<item name="smallScreenBackground">@android:color/transparent</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
- <item name="feedlistBackground">@drawable/ics_divider_vertical</item>
+ <item name="feedlistBackground">@android:color/transparent</item>
<item name="unreadCounterColor">@color/ics_cyan</item>
<item name="headlinesBackground">@drawable/headlines_dark</item>
<item name="headlinesBackgroundSolid">@drawable/headlines_dark</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9212a1e6..05df6e0c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -196,4 +196,5 @@
<string name="pref_headlines_mark_read_scroll">Mark read on scroll</string>
<string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string>
<string name="mark_num_headlines_as_read">Mark %1$d article(s) as read?</string>
+ <string name="prefs_confirm_headlines_catchup">Confirm marking articles as read</string>
</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e05fc5b6..6bfa0e29 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -129,6 +129,12 @@
android:defaultValue="false"
android:key="full_screen_mode"
android:title="@string/prefs_fullscreen_mode" />
+
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="confirm_headlines_catchup"
+ android:title="@string/prefs_confirm_headlines_catchup" />
+
</PreferenceCategory>
<PreferenceCategory android:title="@string/offline_mode" >
<ListPreference
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 23:22:13 +0000