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

triangle layout tweak, bump version

Browse Source
This commit is contained in:
Andrew Dolgov 2012-09-02 22:05:56 +04:00
parent 87c43f4981
commit e4eb7fba80
11 changed files with 247 additions and 216 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="91" android:versionCode="92"
android:versionName="0.7.0" > android:versionName="0.7.1" >
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="11" /> <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="11" />

8
res/layout-port/headlines_row.xml
View File

@ -138,10 +138,14 @@
<ImageButton <ImageButton
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

8
res/layout-port/headlines_row_selected.xml
View File

@ -139,10 +139,14 @@
<ImageButton <ImageButton
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

13
res/layout-port/headlines_row_unread.xml
View File

@ -69,8 +69,8 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Jan 01, 00:00" android:text="Jan 01, 00:00"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" /> android:textSize="11sp" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -138,11 +138,14 @@
<ImageButton <ImageButton
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

60
res/layout-sw600dp-port/headlines_row_selected.xml
View File

@ -35,8 +35,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="?headlineSelectedTextColor"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" > android:textSize="16sp" >
</TextView> </TextView>
@ -100,41 +100,45 @@
android:layout_weight="1" android:layout_weight="1"
android:padding="3dip" > android:padding="3dip" >
</TextView> </TextView>
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" > android:layout_weight="1"
android:prompt="@string/attachments_prompt" />
<Spinner <Button
android:id="@+id/attachments" android:id="@+id/attachment_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:prompt="@string/attachments_prompt" /> android:text="@string/attachment_view" />
<Button <Button
android:id="@+id/attachment_view" android:id="@+id/attachment_copy"
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:text="@string/attachment_view" /> android:text="@string/attachment_copy" />
</LinearLayout>
<Button <ImageButton
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
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

61
res/layout-sw600dp/headlines_row.xml
View File

@ -6,7 +6,6 @@
android:background="?headlineNormalBackground" android:background="?headlineNormalBackground"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -36,8 +35,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="?headlineTextColor"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineTextColor"
android:textSize="16sp" > android:textSize="16sp" >
</TextView> </TextView>
@ -102,40 +101,44 @@
android:padding="3dip" > android:padding="3dip" >
</TextView> </TextView>
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" > android:layout_weight="1"
android:prompt="@string/attachments_prompt" />
<Spinner <Button
android:id="@+id/attachments" android:id="@+id/attachment_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:prompt="@string/attachments_prompt" /> android:text="@string/attachment_view" />
<Button <Button
android:id="@+id/attachment_view" android:id="@+id/attachment_copy"
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:text="@string/attachment_view" /> android:text="@string/attachment_copy" />
</LinearLayout>
<Button <ImageButton
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
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

63
res/layout-sw600dp/headlines_row_selected.xml
View File

@ -35,8 +35,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="?headlineSelectedTextColor"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" > android:textSize="16sp" >
</TextView> </TextView>
@ -100,42 +100,45 @@
android:layout_weight="1" android:layout_weight="1"
android:padding="3dip" > android:padding="3dip" >
</TextView> </TextView>
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" > android:layout_weight="1"
android:prompt="@string/attachments_prompt" />
<Spinner <Button
android:id="@+id/attachments" android:id="@+id/attachment_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:prompt="@string/attachments_prompt" /> android:text="@string/attachment_view" />
<Button <Button
android:id="@+id/attachment_view" android:id="@+id/attachment_copy"
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:text="@string/attachment_view" /> android:text="@string/attachment_copy" />
</LinearLayout>
<Button <ImageButton
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
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

59
res/layout-sw600dp/headlines_row_unread.xml
View File

@ -101,41 +101,44 @@
android:padding="3dip" > android:padding="3dip" >
</TextView> </TextView>
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" > android:layout_weight="1"
android:prompt="@string/attachments_prompt" />
<Spinner <Button
android:id="@+id/attachments" android:id="@+id/attachment_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:prompt="@string/attachments_prompt" /> android:text="@string/attachment_view" />
<Button <Button
android:id="@+id/attachment_view" android:id="@+id/attachment_copy"
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:text="@string/attachment_view" /> android:text="@string/attachment_copy" />
</LinearLayout>
<Button <ImageButton
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
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

63
res/layout/headlines_row.xml
View File

@ -6,7 +6,6 @@
android:background="?headlineNormalBackground" android:background="?headlineNormalBackground"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout6" android:id="@+id/linearLayout6"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -50,7 +49,7 @@
android:textSize="13sp" > android:textSize="13sp" >
</TextView> </TextView>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linerLayout3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -104,7 +103,6 @@
</ImageView> </ImageView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -115,41 +113,44 @@
android:padding="3dip" > android:padding="3dip" >
</TextView> </TextView>
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" > android:layout_weight="1"
android:prompt="@string/attachments_prompt" />
<Spinner <Button
android:id="@+id/attachments" android:id="@+id/attachment_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:prompt="@string/attachments_prompt" /> android:text="@string/attachment_view" />
<Button <Button
android:id="@+id/attachment_view" android:id="@+id/attachment_copy"
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:text="@string/attachment_view" /> android:text="@string/attachment_copy" />
</LinearLayout>
<Button <ImageButton
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
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

63
res/layout/headlines_row_selected.xml
View File

@ -49,7 +49,7 @@
android:textSize="13sp" > android:textSize="13sp" >
</TextView> </TextView>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linerLayout3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -103,7 +103,6 @@
</ImageView> </ImageView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -113,41 +112,45 @@
android:layout_weight="1" android:layout_weight="1"
android:padding="3dip" > android:padding="3dip" >
</TextView> </TextView>
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" > android:layout_weight="1"
android:prompt="@string/attachments_prompt" />
<Spinner <Button
android:id="@+id/attachments" android:id="@+id/attachment_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:prompt="@string/attachments_prompt" /> android:text="@string/attachment_view" />
<Button <Button
android:id="@+id/attachment_view" android:id="@+id/attachment_copy"
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:text="@string/attachment_view" /> android:text="@string/attachment_copy" />
</LinearLayout>
<Button <ImageButton
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
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

61
res/layout/headlines_row_unread.xml
View File

@ -49,7 +49,7 @@
android:textSize="13sp" > android:textSize="13sp" >
</TextView> </TextView>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linerLayout3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -103,7 +103,6 @@
</ImageView> </ImageView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -114,40 +113,44 @@
android:padding="3dip" > android:padding="3dip" >
</TextView> </TextView>
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" > android:layout_weight="1"
android:prompt="@string/attachments_prompt" />
<Spinner <Button
android:id="@+id/attachments" android:id="@+id/attachment_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:prompt="@string/attachments_prompt" /> android:text="@string/attachment_view" />
<Button <Button
android:id="@+id/attachment_view" android:id="@+id/attachment_copy"
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:text="@string/attachment_view" /> android:text="@string/attachment_copy" />
</LinearLayout>
<Button <ImageButton
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
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_width="wrap_content" android:paddingBottom="4dp"
android:layout_height="wrap_content" android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" /> android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>