iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

Browse Source
This commit is contained in:
Andrew Dolgov 2013-09-20 10:26:13 +04:00
commit 9bf65bed3c
28 changed files with 285 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="197" android:versionCode="198"
android:versionName="1.10" > android:versionName="1.11" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

BIN
res/drawable-hdpi/ic_action_overflow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 274 B

BIN
res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 350 B

19
res/drawable/headline_row.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#f5f5f5" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_selected.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#88b0f0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_selected_sepia.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#E5B0A0" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_sepia.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#f5f5f5" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_unread.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#e0e0e0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

19
res/drawable/headline_row_unread_sepia.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#d0d0d0" />
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:bottom="2dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<corners android:radius="2dp"/>
</shape>
</item>
</layer-list>

5
res/layout/feeds_row.xml
View File

@ -58,9 +58,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:background="@null"
android:paddingLeft="6dp" android:src="@drawable/ic_action_overflow" />
android:paddingTop="6dp"
android:visibility="gone"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

5
res/layout/feeds_row_selected.xml
View File

@ -58,9 +58,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:background="@null"
android:paddingLeft="6dp" android:src="@drawable/ic_action_overflow" />
android:paddingTop="6dp"
android:visibility="gone"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

1
res/layout/headlines_fragment.xml
View File

@ -10,6 +10,7 @@
android:layoutAnimation="@anim/layout_headline" android:layoutAnimation="@anim/layout_headline"
android:dividerHeight="0dp" android:dividerHeight="0dp"
android:divider="@null" android:divider="@null"
android:paddingTop="3dp"
android:layout_height="match_parent" > android:layout_height="match_parent" >
</ListView> </ListView>

46
res/layout/headlines_row.xml
View File

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="6dp" android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp" > android:paddingRight="6dp"
android:paddingTop="3dp"
tools:ignore="HardcodedText" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
@ -13,15 +16,17 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineNormalBackground" android:background="?headlineNormalBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal" >
android:paddingLeft="6dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -42,14 +47,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingTop="3dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
@ -78,7 +77,7 @@
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="6dp" android:paddingTop="3dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" /> android:textSize="13sp" />
@ -86,8 +85,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical" >
android:paddingLeft="6dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-6dp"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/author" android:id="@+id/author"
@ -116,17 +122,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

42
res/layout/headlines_row_selected.xml
View File

@ -3,9 +3,10 @@
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp" android:paddingRight="6dp"
android:paddingTop="6dp" > android:paddingTop="3dp" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
@ -13,15 +14,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineSelectedBackground" android:background="?headlineSelectedBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal" >
android:paddingLeft="6dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -33,8 +33,7 @@
android:singleLine="false" android:singleLine="false"
android:text="Sample entry title" android:text="Sample entry title"
android:textColor="?attr/headlineSelectedTextColor" android:textColor="?attr/headlineSelectedTextColor"
android:textSize="16sp" android:textSize="16sp" />
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -43,14 +42,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingTop="3dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
@ -79,7 +72,7 @@
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="6dp" android:paddingTop="3dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineSelectedExcerptTextColor" android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" /> android:textSize="13sp" />
@ -87,8 +80,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical" >
android:paddingLeft="6dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-6dp"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/author" android:id="@+id/author"
@ -117,17 +117,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

39
res/layout/headlines_row_selected_unread.xml
View File

@ -3,9 +3,10 @@
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp" android:paddingRight="6dp"
android:paddingTop="6dp" > android:paddingTop="3dp" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
@ -13,15 +14,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineSelectedBackground" android:background="?headlineSelectedBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal" >
android:paddingLeft="6dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -43,14 +43,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingTop="3dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
@ -79,7 +73,7 @@
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="6dp" android:paddingTop="3dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineSelectedExcerptTextColor" android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" /> android:textSize="13sp" />
@ -87,8 +81,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical" >
android:paddingLeft="6dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-6dp"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/author" android:id="@+id/author"
@ -117,17 +118,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

39
res/layout/headlines_row_unread.xml
View File

@ -3,9 +3,10 @@
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp" android:paddingRight="6dp"
android:paddingTop="6dp" > android:paddingTop="3dp" >
<LinearLayout <LinearLayout
android:id="@+id/inner_row" android:id="@+id/inner_row"
@ -13,15 +14,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?headlineUnreadBackground" android:background="?headlineUnreadBackground"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal" >
android:paddingLeft="6dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -43,14 +43,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingTop="3dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
@ -79,7 +73,7 @@
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="6dp" android:paddingTop="3dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" /> android:textSize="13sp" />
@ -87,8 +81,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical" >
android:paddingLeft="6dp" >
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-6dp"
android:layout_weight="0"
android:focusable="false" />
<TextView <TextView
android:id="@+id/author" android:id="@+id/author"
@ -117,17 +118,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:clickable="true" android:clickable="true"
android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
<ImageButton <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@null" android:src="@drawable/ic_action_overflow" />
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

3
res/values-ja/strings.xml
View File

@ -195,9 +195,10 @@
<string name="light_theme_is_not_supported_on_honeycomb">ライトテーマはHoneycombではサポートされていません</string> <string name="light_theme_is_not_supported_on_honeycomb">ライトテーマはHoneycombではサポートされていません</string>
<string name="pref_headlines_mark_read_scroll">スクロールしたら既読にする</string> <string name="pref_headlines_mark_read_scroll">スクロールしたら既読にする</string>
<string name="pref_headlines_mark_read_scroll_long">ヘッドラインをスクロールしたら既読にする</string> <string name="pref_headlines_mark_read_scroll_long">ヘッドラインをスクロールしたら既読にする</string>
<string name="mark_num_headlines_as_read"> %1$d 件の記事を既読にしますか？</string> <string name="mark_num_headlines_as_read">%1$d 件の記事を既読にしますか？</string>
<string name="prefs_confirm_headlines_catchup">記事を既読にする際に確認する</string> <string name="prefs_confirm_headlines_catchup">記事を既読にする際に確認する</string>
<string name="author_formatted">by %1$s</string> <string name="author_formatted">by %1$s</string>
<string name="n_unread_articles">%1$d 件の未読記事</string> <string name="n_unread_articles">%1$d 件の未読記事</string>
<string name="pref_headline_font_size">ヘッドラインの文字サイズ</string> <string name="pref_headline_font_size">ヘッドラインの文字サイズ</string>
<string name="context_confirm_catchup">%1$s の全ての記事を既読にしますか？</string>
</resources> </resources>

13
res/values-v11/style.xml
View File

@ -7,9 +7,9 @@
<item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item> <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
<item name="headlinesBackgroundSolid">#f0f0f0</item> <item name="headlinesBackgroundSolid">#f0f0f0</item>
<item name="articleBackground">@android:color/transparent</item> <item name="articleBackground">@android:color/transparent</item>
<item name="headlineSelectedBackground">#88b0f0</item> <item name="headlineSelectedBackground">@drawable/headline_row_selected</item>
<item name="headlineUnreadBackground">#ffffff</item> <item name="headlineUnreadBackground">@drawable/headline_row_unread</item>
<item name="headlineNormalBackground">#f0f0f0</item> <item name="headlineNormalBackground">@drawable/headline_row</item>
<item name="feedsSelectedBackground">#88b0f0</item> <item name="feedsSelectedBackground">#88b0f0</item>
<item name="feedlistTextColor">@android:color/primary_text_light</item> <item name="feedlistTextColor">@android:color/primary_text_light</item>
<item name="feedlistSelectedTextColor">#ffffff</item> <item name="feedlistSelectedTextColor">#ffffff</item>
@ -32,8 +32,9 @@
<item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
<item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
<item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
<item name="headlineUnreadBackground">#f2eae8</item> <!-- #F2EAE8 --> <item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 -->
<item name="headlineSelectedBackground">#E5B0A0</item> <item name="headlineNormalBackground">@drawable/headline_row_sepia</item>
<item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> <!-- #E5B0A0 -->
<item name="feedsSelectedBackground">#E5B0A0</item> <item name="feedsSelectedBackground">#E5B0A0</item>
<item name="articleBackground">@drawable/paper_sepia</item> <item name="articleBackground">@drawable/paper_sepia</item>
<item name="unreadCounterBackground">@drawable/counter_background_sepia</item> <item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
@ -53,7 +54,7 @@
<item name="articleBackground">@android:color/black</item> <item name="articleBackground">@android:color/black</item>
<item name="headlineSelectedBackground">@color/ics_cyan</item> <item name="headlineSelectedBackground">@color/ics_cyan</item>
<item name="headlineUnreadBackground">#202020</item> <item name="headlineUnreadBackground">#202020</item>
<item name="headlineNormalBackground">#101010</item> <item name="headlineNormalBackground">#151515</item>
<item name="feedsSelectedBackground">@color/ics_cyan</item> <item name="feedsSelectedBackground">@color/ics_cyan</item>
<item name="feedlistTextColor">@android:color/primary_text_dark</item> <item name="feedlistTextColor">@android:color/primary_text_dark</item>
<item name="feedlistSelectedTextColor">@android:color/black</item> <item name="feedlistSelectedTextColor">@android:color/black</item>

2
res/values/resources.xml
View File

@ -10,5 +10,5 @@
<color name="unread_counter_background_dark">#303030</color> <color name="unread_counter_background_dark">#303030</color>
<color name="unread_counter_background_sepia">#C46262</color> <color name="unread_counter_background_sepia">#C46262</color>
<color name="unread_counter_background_selected_light">#4684ff</color> <color name="unread_counter_background_selected_light">#4684ff</color>
<color name="feeds_dark_gray">#1c1d1e</color> <color name="feeds_dark_gray">#1c1d1e</color>
</resources> </resources>

1
res/values/strings.xml
View File

@ -200,4 +200,5 @@
<string name="author_formatted">by %1$s</string> <string name="author_formatted">by %1$s</string>
<string name="n_unread_articles">%1$d unread articles</string> <string name="n_unread_articles">%1$d unread articles</string>
<string name="pref_headline_font_size">Headline text size</string> <string name="pref_headline_font_size">Headline text size</string>
<string name="context_confirm_catchup">Mark all articles in %1$s as read?</string>
</resources> </resources>

2
res/values/style.xml
View File

@ -53,7 +53,7 @@
<item name="articleBackground">@android:color/black</item> <item name="articleBackground">@android:color/black</item>
<item name="headlineSelectedBackground">@color/ics_cyan</item> <item name="headlineSelectedBackground">@color/ics_cyan</item>
<item name="headlineUnreadBackground">#202020</item> <item name="headlineUnreadBackground">#202020</item>
<item name="headlineNormalBackground">#101010</item> <item name="headlineNormalBackground">#151515</item>
<item name="feedsSelectedBackground">@color/ics_cyan</item> <item name="feedsSelectedBackground">@color/ics_cyan</item>
<item name="feedlistTextColor">@android:color/primary_text_dark</item> <item name="feedlistTextColor">@android:color/primary_text_dark</item>
<item name="feedlistSelectedTextColor">@android:color/black</item> <item name="feedlistSelectedTextColor">@android:color/black</item>

37
src/org/fox/ttrss/FeedCategoriesFragment.java
View File

@ -13,7 +13,10 @@ import org.fox.ttrss.types.FeedCategoryList;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Bundle; import android.os.Bundle;
@ -125,9 +128,36 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
return true; return true;
case R.id.catchup_category: case R.id.catchup_category:
if (true) { if (true) {
FeedCategory cat = getCategoryAtPosition(info.position); final FeedCategory cat = getCategoryAtPosition(info.position);
if (cat != null) { if (cat != null) {
m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
AlertDialog.Builder builder = new AlertDialog.Builder(
m_activity)
.setMessage(getString(R.string.context_confirm_catchup, cat.title))
.setPositiveButton(R.string.catchup,
new Dialog.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
}
})
.setNegativeButton(R.string.dialog_cancel,
new Dialog.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
}
});
AlertDialog dlg = builder.create();
dlg.show();
} else {
m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
}
} }
} }
return true; return true;
@ -415,9 +445,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

36
src/org/fox/ttrss/FeedsFragment.java
View File

@ -19,7 +19,10 @@ import org.fox.ttrss.types.FeedList;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -156,9 +159,35 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
return true; return true;
case R.id.catchup_feed: case R.id.catchup_feed:
if (true) { if (true) {
Feed feed = getFeedAtPosition(info.position); final Feed feed = getFeedAtPosition(info.position);
if (feed != null) { if (feed != null) {
m_activity.catchupFeed(feed); if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
AlertDialog.Builder builder = new AlertDialog.Builder(
m_activity)
.setMessage(getString(R.string.context_confirm_catchup, feed.title))
.setPositiveButton(R.string.catchup,
new Dialog.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
m_activity.catchupFeed(feed);
}
})
.setNegativeButton(R.string.dialog_cancel,
new Dialog.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
}
});
AlertDialog dlg = builder.create();
dlg.show();
} else {
m_activity.catchupFeed(feed);
}
} }
} }
return true; return true;
@ -542,9 +571,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

10
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -795,13 +795,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
}); });
} }
ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); ImageView iv = (ImageView) v.findViewById(R.id.article_menu_button);
if (ib != null) { if (iv != null) {
if (m_activity.isDarkTheme()) //if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { iv.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
getActivity().openContextMenu(v); getActivity().openContextMenu(v);

3
src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
View File

@ -288,9 +288,6 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

3
src/org/fox/ttrss/offline/OfflineFeedsFragment.java
View File

@ -322,9 +322,6 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

6
src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
View File

@ -645,11 +645,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
}); });
} }
ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); ImageView ib = (ImageView) v.findViewById(R.id.article_menu_button);
if (ib != null) { if (ib != null) {
if (m_activity.isDarkTheme()) //if (m_activity.isDarkTheme())
ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
ib.setOnClickListener(new OnClickListener() { ib.setOnClickListener(new OnClickListener() {
@Override @Override