summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/feeds_row.xml5
-rw-r--r--res/layout/feeds_row_selected.xml5
-rw-r--r--res/layout/headlines_fragment.xml1
-rw-r--r--res/layout/headlines_row.xml46
-rw-r--r--res/layout/headlines_row_selected.xml42
-rw-r--r--res/layout/headlines_row_selected_unread.xml39
-rw-r--r--res/layout/headlines_row_unread.xml39
7 files changed, 86 insertions, 91 deletions
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index e52de2c2..35cef732 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -58,9 +58,6 @@
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" />
+ android:src="@drawable/ic_action_overflow" />
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index 7876d150..0d145b23 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -58,9 +58,6 @@
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" />
+ android:src="@drawable/ic_action_overflow" />
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml
index d3effae6..5df36557 100644
--- a/res/layout/headlines_fragment.xml
+++ b/res/layout/headlines_fragment.xml
@@ -10,6 +10,7 @@
android:layoutAnimation="@anim/layout_headline"
android:dividerHeight="0dp"
android:divider="@null"
+ android:paddingTop="3dp"
android:layout_height="match_parent" >
</ListView>
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index c4ea2c76..92b0d3cc 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:paddingTop="6dp"
+ android:paddingBottom="3dp"
android:paddingLeft="6dp"
- android:paddingRight="6dp" >
+ android:paddingRight="6dp"
+ android:paddingTop="3dp"
+ tools:ignore="HardcodedText" >
<LinearLayout
android:id="@+id/inner_row"
@@ -13,15 +16,17 @@
android:layout_height="match_parent"
android:background="?headlineNormalBackground"
android:orientation="vertical"
- android:padding="6dp" >
+ android:paddingBottom="2dp"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:paddingTop="6dp" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:orientation="horizontal" >
<TextView
android:id="@+id/title"
@@ -42,14 +47,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
- android:orientation="horizontal" >
-
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ android:orientation="horizontal"
+ android:paddingTop="3dp" >
<TextView
android:id="@+id/feed_title"
@@ -78,7 +77,7 @@
android:id="@+id/excerpt"
android:layout_width="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:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
@@ -86,8 +85,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ android:gravity="center_vertical" >
+
+ <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
android:id="@+id/author"
@@ -116,17 +122,15 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
+ android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" />
- <ImageButton
+ <ImageView
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" />
+ android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 5cebee9d..c88c0a83 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -3,9 +3,10 @@
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:paddingBottom="3dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
- android:paddingTop="6dp" >
+ android:paddingTop="3dp" >
<LinearLayout
android:id="@+id/inner_row"
@@ -13,15 +14,14 @@
android:layout_height="match_parent"
android:background="?headlineSelectedBackground"
android:orientation="vertical"
- android:padding="6dp" >
+ android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:orientation="horizontal" >
<TextView
android:id="@+id/title"
@@ -33,8 +33,7 @@
android:singleLine="false"
android:text="Sample entry title"
android:textColor="?attr/headlineSelectedTextColor"
- android:textSize="16sp"
- android:textStyle="bold" />
+ android:textSize="16sp" />
</LinearLayout>
<LinearLayout
@@ -43,14 +42,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
- android:orientation="horizontal" >
-
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ android:orientation="horizontal"
+ android:paddingTop="3dp" >
<TextView
android:id="@+id/feed_title"
@@ -79,7 +72,7 @@
android:id="@+id/excerpt"
android:layout_width="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:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" />
@@ -87,8 +80,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ android:gravity="center_vertical" >
+
+ <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
android:id="@+id/author"
@@ -117,17 +117,15 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
+ android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" />
- <ImageButton
+ <ImageView
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" />
+ android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 3cc7cbd9..764571d4 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -3,9 +3,10 @@
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:paddingBottom="3dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
- android:paddingTop="6dp" >
+ android:paddingTop="3dp" >
<LinearLayout
android:id="@+id/inner_row"
@@ -13,15 +14,14 @@
android:layout_height="match_parent"
android:background="?headlineSelectedBackground"
android:orientation="vertical"
- android:padding="6dp" >
+ android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:orientation="horizontal" >
<TextView
android:id="@+id/title"
@@ -43,14 +43,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
- android:orientation="horizontal" >
-
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ android:orientation="horizontal"
+ android:paddingTop="3dp" >
<TextView
android:id="@+id/feed_title"
@@ -79,7 +73,7 @@
android:id="@+id/excerpt"
android:layout_width="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:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" />
@@ -87,8 +81,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ android:gravity="center_vertical" >
+
+ <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
android:id="@+id/author"
@@ -117,17 +118,15 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
+ android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" />
- <ImageButton
+ <ImageView
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" />
+ android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 93fe4106..141b1736 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -3,9 +3,10 @@
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:paddingBottom="3dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
- android:paddingTop="6dp" >
+ android:paddingTop="3dp" >
<LinearLayout
android:id="@+id/inner_row"
@@ -13,15 +14,14 @@
android:layout_height="match_parent"
android:background="?headlineUnreadBackground"
android:orientation="vertical"
- android:padding="6dp" >
+ android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingLeft="6dp" >
+ android:orientation="horizontal" >
<TextView
android:id="@+id/title"
@@ -43,14 +43,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
- android:orientation="horizontal" >
-
- <CheckBox
- android:id="@+id/selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:focusable="false" />
+ android:orientation="horizontal"
+ android:paddingTop="3dp" >
<TextView
android:id="@+id/feed_title"
@@ -79,7 +73,7 @@
android:id="@+id/excerpt"
android:layout_width="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:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
@@ -87,8 +81,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingLeft="6dp" >
+ android:gravity="center_vertical" >
+
+ <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
android:id="@+id/author"
@@ -117,17 +118,15 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:clickable="true"
+ android:paddingRight="6dp"
android:src="@drawable/ic_rss_bw" />
- <ImageButton
+ <ImageView
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" />
+ android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 23:22:02 +0000