diff options
21 files changed, 453 insertions, 493 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 76116c6c..e6c63139 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="196" - android:versionName="1.9" > + android:versionCode="197" + android:versionName="1.10" > <uses-sdk android:minSdkVersion="8" diff --git a/res/drawable-hdpi/arrowhead_dark.png b/res/drawable-hdpi/arrowhead_dark.png Binary files differdeleted file mode 100644 index ad263895..00000000 --- a/res/drawable-hdpi/arrowhead_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/arrowhead_light.png b/res/drawable-hdpi/arrowhead_light.png Binary files differdeleted file mode 100644 index 2c113ae1..00000000 --- a/res/drawable-hdpi/arrowhead_light.png +++ /dev/null diff --git a/res/drawable-hdpi/arrowhead_sepia.png b/res/drawable-hdpi/arrowhead_sepia.png Binary files differdeleted file mode 100644 index 78e276a0..00000000 --- a/res/drawable-hdpi/arrowhead_sepia.png +++ /dev/null diff --git a/res/drawable/headline_row_selected_dark.xml b/res/drawable/headline_row_selected_dark.xml deleted file mode 100644 index 75c79a11..00000000 --- a/res/drawable/headline_row_selected_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <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"
- android:gravity="center_vertical|right" /></item>
-
-</layer-list>
\ No newline at end of file diff --git a/res/drawable/headline_row_selected_gray.xml b/res/drawable/headline_row_selected_gray.xml deleted file mode 100644 index 17c6dce2..00000000 --- a/res/drawable/headline_row_selected_gray.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@color/headline_row_selected_gray"/>
- <item android:drawable="@drawable/shadow"/>
-
-</layer-list>
\ No newline at end of file diff --git a/res/drawable/headline_row_selected_light.xml b/res/drawable/headline_row_selected_light.xml deleted file mode 100644 index 55e4bc54..00000000 --- a/res/drawable/headline_row_selected_light.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@color/headline_row_selected_light"/>
- <item android:drawable="@drawable/shadow"/>
- <item><bitmap
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/arrowhead_light"
- android:gravity="center_vertical|right" /></item>
-
-</layer-list>
\ No newline at end of file diff --git a/res/drawable/headline_row_selected_sepia.xml b/res/drawable/headline_row_selected_sepia.xml deleted file mode 100644 index 04d82723..00000000 --- a/res/drawable/headline_row_selected_sepia.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@color/headline_row_selected_sepia"/>
- <item android:drawable="@drawable/shadow"/>
- <item><bitmap
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/arrowhead_sepia"
- android:gravity="center_vertical|right" /></item>
-
-</layer-list>
\ No newline at end of file diff --git a/res/drawable/headline_row_unread_gray.xml b/res/drawable/headline_row_unread_gray.xml deleted file mode 100644 index cbaaed86..00000000 --- a/res/drawable/headline_row_unread_gray.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@color/headline_row_unread_gray"/>
- <item android:drawable="@drawable/shadow"/>
-
-</layer-list>
\ No newline at end of file diff --git a/res/drawable/headline_row_unread_light.xml b/res/drawable/headline_row_unread_light.xml deleted file mode 100644 index d64bd7be..00000000 --- a/res/drawable/headline_row_unread_light.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@color/headline_row_unread_light"/>
- <item android:drawable="@drawable/shadow"/>
-
-</layer-list>
\ No newline at end of file diff --git a/res/drawable/headline_row_unread_sepia.xml b/res/drawable/headline_row_unread_sepia.xml deleted file mode 100644 index a19a9559..00000000 --- a/res/drawable/headline_row_unread_sepia.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item android:drawable="@color/headline_row_unread_sepia"/>
- <item android:drawable="@drawable/shadow"/>
-
-</layer-list>
\ No newline at end of file diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml index 58fa6694..d3effae6 100644 --- a/res/layout/headlines_fragment.xml +++ b/res/layout/headlines_fragment.xml @@ -2,13 +2,14 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_fragment"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:paddingLeft="5dp" >
+ android:layout_height="fill_parent">
<ListView
android:id="@+id/headlines"
android:layout_width="match_parent"
android:layoutAnimation="@anim/layout_headline"
+ android:dividerHeight="0dp"
+ android:divider="@null"
android:layout_height="match_parent" >
</ListView>
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index c8a9a0e7..c4ea2c76 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -1,126 +1,133 @@ <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?headlineNormalBackground"
- android:orientation="vertical"
- android:paddingLeft="0dp"
- android:paddingRight="6dp"
- android:paddingTop="6dp" >
+ android:paddingTop="6dp"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp" >
<LinearLayout
- android:id="@+id/linearLayout6"
+ android:id="@+id/inner_row"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:layout_height="match_parent"
+ android:background="?headlineNormalBackground"
+ android:orientation="vertical"
+ android:padding="6dp" >
- <TextView
- android:id="@+id/title"
+ <LinearLayout
+ android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="false"
- android:text="Sample entry title"
- android:textColor="?headlineTextColor"
- android:textSize="16sp" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/linearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:paddingLeft="6dp" >
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="false"
+ android:text="Sample entry title"
+ android:textColor="?headlineTextColor"
+ android:textSize="16sp" />
+ </LinearLayout>
- <TextView
- android:id="@+id/feed_title"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/linearLayout1"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="true"
- android:text="Example Feed"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
+ android:orientation="horizontal" >
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="right|center_vertical"
- android:text="Jan 01, 12:00"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
- </LinearLayout>
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:focusable="false" />
- <TextView
- android:id="@+id/excerpt"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="6dp"
- 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:textSize="13sp" />
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="right|center_vertical"
+ android:text="Jan 01, 12:00"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp" />
+ </LinearLayout>
<TextView
- android:id="@+id/author"
- android:layout_width="wrap_content"
+ android:id="@+id/excerpt"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:ellipsize="end"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:text="by Author"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
+ android:paddingLeft="6dp"
+ 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:textSize="13sp" />
- <ImageView
- android:id="@+id/marked"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:gravity="center_vertical"
+ android:paddingLeft="6dp" >
- <ImageView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:src="@drawable/ic_rss_bw" />
+ <TextView
+ android:id="@+id/author"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="by Author"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp" />
- <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="10dp"
- android:paddingTop="6dp"
- android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:paddingRight="6dp"
+ android:src="@android:drawable/star_off" />
+
+ <ImageView
+ android:id="@+id/published"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ 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="10dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index 34be5023..5cebee9d 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -1,127 +1,134 @@ <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?headlineSelectedBackground"
- android:orientation="vertical"
- android:paddingLeft="0dp"
+ android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout
- android:id="@+id/linearLayout6"
+ android:id="@+id/inner_row"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:layout_height="match_parent"
+ android:background="?headlineSelectedBackground"
+ android:orientation="vertical"
+ android:padding="6dp" >
- <TextView
- android:id="@+id/title"
+ <LinearLayout
+ android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="false"
- android:text="Sample entry title"
- android:textColor="?attr/headlineSelectedTextColor"
- android:textSize="16sp"
- android:textStyle="bold" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/linearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:paddingLeft="6dp" >
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="false"
+ android:text="Sample entry title"
+ android:textColor="?attr/headlineSelectedTextColor"
+ android:textSize="16sp"
+ android:textStyle="bold" />
+ </LinearLayout>
- <TextView
- android:id="@+id/feed_title"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/linearLayout1"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="true"
- android:text="Example Feed"
- android:textColor="?headlineSelectedSecondaryTextColor"
- android:textSize="12sp" />
+ android:orientation="horizontal" >
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="right|center_vertical"
- android:text="Jan 01, 12:00"
- android:textColor="?headlineSelectedSecondaryTextColor"
- android:textSize="12sp" />
- </LinearLayout>
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:focusable="false" />
- <TextView
- android:id="@+id/excerpt"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="6dp"
- 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:textSize="13sp" />
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="right|center_vertical"
+ android:text="Jan 01, 12:00"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp" />
+ </LinearLayout>
<TextView
- android:id="@+id/author"
- android:layout_width="wrap_content"
+ android:id="@+id/excerpt"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:ellipsize="end"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:text="by Author"
- android:textColor="?headlineSelectedSecondaryTextColor"
- android:textSize="12sp" />
+ android:paddingLeft="6dp"
+ 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:textSize="13sp" />
- <ImageView
- android:id="@+id/marked"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:gravity="center_vertical"
+ android:paddingLeft="6dp" >
- <ImageView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:src="@drawable/ic_rss_bw" />
+ <TextView
+ android:id="@+id/author"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="by Author"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp" />
- <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="10dp"
- android:paddingTop="6dp"
- android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:paddingRight="6dp"
+ android:src="@android:drawable/star_off" />
+
+ <ImageView
+ android:id="@+id/published"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ 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="10dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml index 506fcbba..3cc7cbd9 100644 --- a/res/layout/headlines_row_selected_unread.xml +++ b/res/layout/headlines_row_selected_unread.xml @@ -1,127 +1,134 @@ <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?headlineSelectedBackground"
- android:orientation="vertical"
- android:paddingLeft="0dp"
+ android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout
- android:id="@+id/linearLayout6"
+ android:id="@+id/inner_row"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:layout_height="match_parent"
+ android:background="?headlineSelectedBackground"
+ android:orientation="vertical"
+ android:padding="6dp" >
- <TextView
- android:id="@+id/title"
+ <LinearLayout
+ android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="false"
- android:text="Sample entry title"
- android:textColor="?headlineSelectedTextColor"
- android:textSize="16sp"
- android:textStyle="bold" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/linearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:paddingLeft="6dp" >
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="false"
+ android:text="Sample entry title"
+ android:textColor="?headlineSelectedTextColor"
+ android:textSize="16sp"
+ android:textStyle="bold" />
+ </LinearLayout>
- <TextView
- android:id="@+id/feed_title"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/linearLayout1"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="true"
- android:text="Example Feed"
- android:textColor="?headlineSelectedSecondaryTextColor"
- android:textSize="12sp" />
+ android:orientation="horizontal" >
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="right|center_vertical"
- android:text="Jan 01, 12:00"
- android:textColor="?headlineSelectedSecondaryTextColor"
- android:textSize="12sp" />
- </LinearLayout>
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:focusable="false" />
- <TextView
- android:id="@+id/excerpt"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="6dp"
- 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:textSize="13sp" />
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="right|center_vertical"
+ android:text="Jan 01, 12:00"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp" />
+ </LinearLayout>
<TextView
- android:id="@+id/author"
- android:layout_width="wrap_content"
+ android:id="@+id/excerpt"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:ellipsize="end"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:text="by Author"
- android:textColor="?headlineSelectedSecondaryTextColor"
- android:textSize="12sp" />
+ android:paddingLeft="6dp"
+ 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:textSize="13sp" />
- <ImageView
- android:id="@+id/marked"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:gravity="center_vertical"
+ android:paddingLeft="6dp" >
- <ImageView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:src="@drawable/ic_rss_bw" />
+ <TextView
+ android:id="@+id/author"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="by Author"
+ android:textColor="?headlineSelectedSecondaryTextColor"
+ android:textSize="12sp" />
- <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="10dp"
- android:paddingTop="6dp"
- android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:paddingRight="6dp"
+ android:src="@android:drawable/star_off" />
+
+ <ImageView
+ android:id="@+id/published"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ 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="10dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 89537907..93fe4106 100644 --- a/res/layout/headlines_row_unread.xml +++ b/res/layout/headlines_row_unread.xml @@ -1,127 +1,134 @@ <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?headlineUnreadBackground"
- android:orientation="vertical"
- android:paddingLeft="0dp"
+ android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout
- android:id="@+id/linearLayout6"
+ android:id="@+id/inner_row"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:layout_height="match_parent"
+ android:background="?headlineUnreadBackground"
+ android:orientation="vertical"
+ android:padding="6dp" >
- <TextView
- android:id="@+id/title"
+ <LinearLayout
+ android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="false"
- android:text="Sample entry title"
- android:textColor="?headlineUnreadTextColor"
- android:textSize="16sp"
- android:textStyle="bold" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/linearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:paddingLeft="6dp" >
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="false"
+ android:text="Sample entry title"
+ android:textColor="?headlineUnreadTextColor"
+ android:textSize="16sp"
+ android:textStyle="bold" />
+ </LinearLayout>
- <TextView
- android:id="@+id/feed_title"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/linearLayout1"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:ellipsize="end"
android:gravity="center_vertical"
- android:singleLine="true"
- android:text="Example Feed"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
+ android:orientation="horizontal" >
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="right|center_vertical"
- android:text="Jan 01, 12:00"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
- </LinearLayout>
+ <CheckBox
+ android:id="@+id/selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:focusable="false" />
- <TextView
- android:id="@+id/excerpt"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="6dp"
- 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:textSize="13sp" />
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="Example Feed"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="right|center_vertical"
+ android:text="Jan 01, 12:00"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp" />
+ </LinearLayout>
<TextView
- android:id="@+id/author"
- android:layout_width="wrap_content"
+ android:id="@+id/excerpt"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:ellipsize="end"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:text="by Author"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
+ android:paddingLeft="6dp"
+ 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:textSize="13sp" />
- <ImageView
- android:id="@+id/marked"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:paddingRight="6dp"
- android:src="@android:drawable/star_off" />
+ android:gravity="center_vertical"
+ android:paddingLeft="6dp" >
- <ImageView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:clickable="true"
- android:src="@drawable/ic_rss_bw" />
+ <TextView
+ android:id="@+id/author"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:text="by Author"
+ android:textColor="?headlineSecondaryTextColor"
+ android:textSize="12sp" />
- <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="10dp"
- android:paddingTop="6dp"
- android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ <ImageView
+ android:id="@+id/marked"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:clickable="true"
+ android:paddingRight="6dp"
+ android:src="@android:drawable/star_off" />
+
+ <ImageView
+ android:id="@+id/published"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ 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="10dp"
+ android:paddingTop="6dp"
+ android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml index 6d5bde71..b1c0e4ef 100644 --- a/res/values-v11/style.xml +++ b/res/values-v11/style.xml @@ -7,10 +7,10 @@ <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item> <item name="headlinesBackgroundSolid">#f0f0f0</item> <item name="articleBackground">@android:color/transparent</item> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_light</item> - <item name="headlineUnreadBackground">@drawable/headline_row_unread_light</item> - <item name="headlineNormalBackground">@android:color/transparent</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_light</item> + <item name="headlineSelectedBackground">#88b0f0</item> + <item name="headlineUnreadBackground">#ffffff</item> + <item name="headlineNormalBackground">#f0f0f0</item> + <item name="feedsSelectedBackground">#88b0f0</item> <item name="feedlistTextColor">@android:color/primary_text_light</item> <item name="feedlistSelectedTextColor">#ffffff</item> <item name="headlineTextColor">@android:color/secondary_text_light</item> @@ -32,9 +32,9 @@ <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> - <item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 --> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item> + <item name="headlineUnreadBackground">#f2eae8</item> <!-- #F2EAE8 --> + <item name="headlineSelectedBackground">#E5B0A0</item> + <item name="feedsSelectedBackground">#E5B0A0</item> <item name="articleBackground">@drawable/paper_sepia</item> <item name="unreadCounterBackground">@drawable/counter_background_sepia</item> <item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item> @@ -51,10 +51,10 @@ <item name="headlinesBackground">@android:color/black</item> <item name="headlinesBackgroundSolid">@android:color/black</item> <item name="articleBackground">@android:color/black</item> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item> + <item name="headlineSelectedBackground">@color/ics_cyan</item> <item name="headlineUnreadBackground">#202020</item> - <item name="headlineNormalBackground">@android:color/transparent</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_dark</item> + <item name="headlineNormalBackground">#101010</item> + <item name="feedsSelectedBackground">@color/ics_cyan</item> <item name="feedlistTextColor">@android:color/primary_text_dark</item> <item name="feedlistSelectedTextColor">@android:color/black</item> <item name="headlineTextColor">@android:color/secondary_text_dark</item> @@ -78,9 +78,9 @@ <item name="headlinesBackground">@drawable/shadow_headlines_gray</item> <item name="headlinesBackgroundSolid">@color/feeds_dark_gray</item> <item name="articleBackground">@color/feeds_dark_gray</item> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_gray</item> - <item name="headlineUnreadBackground">@drawable/headline_row_unread_gray</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_gray</item> + <item name="headlineSelectedBackground">#22667f</item> + <item name="headlineUnreadBackground">#383c42</item> + <item name="feedsSelectedBackground">#22667f</item> <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item> <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item> <item name="headlineTextColor">@android:color/secondary_text_dark</item> diff --git a/res/values/resources.xml b/res/values/resources.xml index 134f7960..f32ec5b7 100644 --- a/res/values/resources.xml +++ b/res/values/resources.xml @@ -5,16 +5,10 @@ <color name="headlines_light">#ffffff</color>
<color name="headlines_sepia">#EAE2DC</color>
<color name="feeds_sepia">#D3C6BA</color>
- <color name="headline_row_selected_light">#88b0f0</color>
- <color name="headline_row_selected_sepia">#E5B0A0</color>
<color name="ics_cyan">#33b5e5</color>
- <color name="feeds_dark_gray">#1c1d1e</color>
- <color name="headline_row_selected_gray">#22667f</color>
- <color name="headline_row_unread_gray">#383c42</color>
- <color name="headline_row_unread_light">#f0f0f0</color>
- <color name="headline_row_unread_sepia">#F2EAE8</color>
<color name="unread_counter_background">#88b0f0</color>
<color name="unread_counter_background_dark">#303030</color>
<color name="unread_counter_background_sepia">#C46262</color>
<color name="unread_counter_background_selected_light">#4684ff</color>
+ <color name="feeds_dark_gray">#1c1d1e</color>
</resources>
\ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index d1123515..f46cdf73 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -7,10 +7,10 @@ <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item> <item name="headlinesBackgroundSolid">#f0f0f0</item> <item name="articleBackground">@android:color/transparent</item> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_light</item> - <item name="headlineUnreadBackground">@drawable/headline_row_unread_light</item> - <item name="headlineNormalBackground">@android:color/transparent</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_light</item> + <item name="headlineSelectedBackground">#88b0f0</item> + <item name="headlineUnreadBackground">#ffffff</item> + <item name="headlineNormalBackground">#f0f0f0</item> + <item name="feedsSelectedBackground">#88b0f0</item> <item name="feedlistTextColor">@android:color/primary_text_light</item> <item name="feedlistSelectedTextColor">#ffffff</item> <item name="headlineTextColor">@android:color/secondary_text_light</item> @@ -32,9 +32,9 @@ <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> - <item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 --> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item> + <item name="headlineUnreadBackground">#f2eae8</item> <!-- #F2EAE8 --> + <item name="headlineSelectedBackground">#E5B0A0</item> + <item name="feedsSelectedBackground">#E5B0A0</item> <item name="articleBackground">@drawable/paper_sepia</item> <item name="unreadCounterBackground">@drawable/counter_background_sepia</item> <item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item> @@ -51,10 +51,10 @@ <item name="headlinesBackground">@android:color/black</item> <item name="headlinesBackgroundSolid">@android:color/black</item> <item name="articleBackground">@android:color/black</item> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item> + <item name="headlineSelectedBackground">@color/ics_cyan</item> <item name="headlineUnreadBackground">#202020</item> - <item name="headlineNormalBackground">@android:color/transparent</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_dark</item> + <item name="headlineNormalBackground">#101010</item> + <item name="feedsSelectedBackground">@color/ics_cyan</item> <item name="feedlistTextColor">@android:color/primary_text_dark</item> <item name="feedlistSelectedTextColor">@android:color/black</item> <item name="headlineTextColor">@android:color/secondary_text_dark</item> @@ -78,9 +78,9 @@ <item name="headlinesBackground">@drawable/shadow_headlines_gray</item> <item name="headlinesBackgroundSolid">@color/feeds_dark_gray</item> <item name="articleBackground">@color/feeds_dark_gray</item> - <item name="headlineSelectedBackground">@drawable/headline_row_selected_gray</item> - <item name="headlineUnreadBackground">@drawable/headline_row_unread_gray</item> - <item name="feedsSelectedBackground">@drawable/headline_row_selected_gray</item> + <item name="headlineSelectedBackground">#22667f</item> + <item name="headlineUnreadBackground">#383c42</item> + <item name="feedsSelectedBackground">#22667f</item> <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item> <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item> <item name="headlineTextColor">@android:color/secondary_text_dark</item> diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index aacd2833..16a0f64d 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -299,8 +299,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, //list.setEmptyView(view.findViewById(R.id.no_headlines)); registerForContextMenu(list); - if (m_activity.isSmallScreen()) - view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0); + //if (m_activity.isSmallScreen()) + //view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0); Log.d(TAG, "onCreateView, feed=" + m_feed); diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 1953c671..da929569 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -317,8 +317,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis list.setEmptyView(view.findViewById(R.id.no_headlines)); registerForContextMenu(list); - if (m_activity.isSmallScreen()) - view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0); + //if (m_activity.isSmallScreen()) + // view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0); getActivity().setProgressBarIndeterminateVisibility(false); |