diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/headlines_row.xml | 8 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_selected.xml | 8 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_unread.xml | 13 | ||||
| -rw-r--r-- | res/layout-sw600dp-port/headlines_row_selected.xml | 60 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines_row.xml | 61 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines_row_selected.xml | 63 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines_row_unread.xml | 59 | ||||
| -rw-r--r-- | res/layout/headlines_row.xml | 63 | ||||
| -rw-r--r-- | res/layout/headlines_row_selected.xml | 63 | ||||
| -rw-r--r-- | res/layout/headlines_row_unread.xml | 61 |
11 files changed, 247 insertions, 216 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e5071a74..59ee1771 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="91" - android:versionName="0.7.0" > + android:versionCode="92" + android:versionName="0.7.1" > <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="11" /> diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml index e3f4b705..7df3c4a7 100644 --- a/res/layout-port/headlines_row.xml +++ b/res/layout-port/headlines_row.xml @@ -138,10 +138,14 @@ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml index f348cc8e..2a5d93fc 100644 --- a/res/layout-port/headlines_row_selected.xml +++ b/res/layout-port/headlines_row_selected.xml @@ -139,10 +139,14 @@ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml index 7770bcc0..8a466753 100644 --- a/res/layout-port/headlines_row_unread.xml +++ b/res/layout-port/headlines_row_unread.xml @@ -69,8 +69,8 @@ android:layout_weight="1"
android:text="Jan 01, 00:00"
android:textColor="?headlineExcerptTextColor"
- android:textSize="11sp" /> -
+ android:textSize="11sp" />
+
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
@@ -138,11 +138,14 @@ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp-port/headlines_row_selected.xml b/res/layout-sw600dp-port/headlines_row_selected.xml index 616f96ba..d8ff252e 100644 --- a/res/layout-sw600dp-port/headlines_row_selected.xml +++ b/res/layout-sw600dp-port/headlines_row_selected.xml @@ -35,8 +35,8 @@ android:layout_height="match_parent"
android:ellipsize="end"
android:singleLine="true"
- android:textColor="?headlineSelectedTextColor"
android:text="{Title...}"
+ android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" >
</TextView>
@@ -100,41 +100,45 @@ android:layout_weight="1"
android:padding="3dip" >
</TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
+
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" >
+
+ <Spinner
+ android:id="@+id/attachments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
+ android:layout_weight="1"
+ android:prompt="@string/attachments_prompt" />
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
+ <Button
+ android:id="@+id/attachment_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_view" />
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
+ <Button
+ android:id="@+id/attachment_copy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_copy" />
+ </LinearLayout>
- <ImageButton
+ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml index bb673f9f..4f7aa7d3 100644 --- a/res/layout-sw600dp/headlines_row.xml +++ b/res/layout-sw600dp/headlines_row.xml @@ -6,7 +6,6 @@ android:background="?headlineNormalBackground"
android:orientation="vertical" >
-
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
@@ -36,8 +35,8 @@ android:layout_height="match_parent"
android:ellipsize="end"
android:singleLine="true"
- android:textColor="?headlineTextColor"
android:text="{Title...}"
+ android:textColor="?headlineTextColor"
android:textSize="16sp" >
</TextView>
@@ -102,40 +101,44 @@ android:padding="3dip" >
</TextView>
- <LinearLayout
- android:id="@+id/attachments_holder"
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" >
+
+ <Spinner
+ android:id="@+id/attachments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0" >
+ android:layout_weight="1"
+ android:prompt="@string/attachments_prompt" />
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
+ <Button
+ android:id="@+id/attachment_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_view" />
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
+ <Button
+ android:id="@+id/attachment_copy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_copy" />
+ </LinearLayout>
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
- <ImageButton
+ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
+
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/headlines_row_selected.xml b/res/layout-sw600dp/headlines_row_selected.xml index 5df99772..41d01e43 100644 --- a/res/layout-sw600dp/headlines_row_selected.xml +++ b/res/layout-sw600dp/headlines_row_selected.xml @@ -35,8 +35,8 @@ android:layout_height="match_parent"
android:ellipsize="end"
android:singleLine="true"
- android:textColor="?headlineSelectedTextColor"
android:text="{Title...}"
+ android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" >
</TextView>
@@ -100,42 +100,45 @@ android:layout_weight="1"
android:padding="3dip" >
</TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
+
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" >
+
+ <Spinner
+ android:id="@+id/attachments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
+ android:layout_weight="1"
+ android:prompt="@string/attachments_prompt" />
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
+ <Button
+ android:id="@+id/attachment_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_view" />
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
+ <Button
+ android:id="@+id/attachment_copy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_copy" />
+ </LinearLayout>
- <ImageButton
+ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
-
+
</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml index 5ccac557..92fe54e4 100644 --- a/res/layout-sw600dp/headlines_row_unread.xml +++ b/res/layout-sw600dp/headlines_row_unread.xml @@ -101,41 +101,44 @@ android:padding="3dip" >
</TextView>
- <LinearLayout
- android:id="@+id/attachments_holder"
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" >
+
+ <Spinner
+ android:id="@+id/attachments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0" >
+ android:layout_weight="1"
+ android:prompt="@string/attachments_prompt" />
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
+ <Button
+ android:id="@+id/attachment_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_view" />
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
+ <Button
+ android:id="@+id/attachment_copy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_copy" />
+ </LinearLayout>
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
- <ImageButton
+ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
-
+
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index a339b18e..439e1b1e 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -6,7 +6,6 @@ android:background="?headlineNormalBackground"
android:orientation="vertical" >
-
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
@@ -50,7 +49,7 @@ android:textSize="13sp" >
</TextView>
</LinearLayout>
-
+
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
@@ -104,7 +103,6 @@ </ImageView>
</LinearLayout>
</LinearLayout>
-
</LinearLayout>
<TextView
@@ -115,41 +113,44 @@ android:padding="3dip" >
</TextView>
- <LinearLayout
- android:id="@+id/attachments_holder"
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" >
+
+ <Spinner
+ android:id="@+id/attachments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0" >
+ android:layout_weight="1"
+ android:prompt="@string/attachments_prompt" />
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
+ <Button
+ android:id="@+id/attachment_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_view" />
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
+ <Button
+ android:id="@+id/attachment_copy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_copy" />
+ </LinearLayout>
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
- <ImageButton
+ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
-
+
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index edffdd2c..7de3da3d 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -49,7 +49,7 @@ android:textSize="13sp" >
</TextView>
</LinearLayout>
-
+
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
@@ -103,7 +103,6 @@ </ImageView>
</LinearLayout>
</LinearLayout>
-
</LinearLayout>
<TextView
@@ -113,41 +112,45 @@ android:layout_weight="1"
android:padding="3dip" >
</TextView>
-
- <LinearLayout
- android:id="@+id/attachments_holder"
+
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" >
+
+ <Spinner
+ android:id="@+id/attachments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0" >
-
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
+ android:layout_weight="1"
+ android:prompt="@string/attachments_prompt" />
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
+ <Button
+ android:id="@+id/attachment_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_view" />
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
+ <Button
+ android:id="@+id/attachment_copy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_copy" />
+ </LinearLayout>
- <ImageButton
+ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
+
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 96fa7bd1..893c9c24 100644 --- a/res/layout/headlines_row_unread.xml +++ b/res/layout/headlines_row_unread.xml @@ -49,7 +49,7 @@ android:textSize="13sp" >
</TextView>
</LinearLayout>
-
+
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
@@ -103,7 +103,6 @@ </ImageView>
</LinearLayout>
</LinearLayout>
-
</LinearLayout>
<TextView
@@ -114,40 +113,44 @@ android:padding="3dip" >
</TextView>
- <LinearLayout
- android:id="@+id/attachments_holder"
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" >
+
+ <Spinner
+ android:id="@+id/attachments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0" >
+ android:layout_weight="1"
+ android:prompt="@string/attachments_prompt" />
- <Spinner
- android:id="@+id/attachments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:prompt="@string/attachments_prompt" />
+ <Button
+ android:id="@+id/attachment_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_view" />
- <Button
- android:id="@+id/attachment_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_view" />
+ <Button
+ android:id="@+id/attachment_copy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_copy" />
+ </LinearLayout>
- <Button
- android:id="@+id/attachment_copy"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/attachment_copy" />
- </LinearLayout>
-
- <ImageButton
+ <ImageButton
android:id="@+id/article_menu_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="4dp"
+ android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
-
+
</LinearLayout>
\ No newline at end of file |