diff options
| author | Andrew Dolgov <[email protected]> | 2012-12-31 14:01:59 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-12-31 14:01:59 +0400 |
| commit | cd2df32b453497a7acb1e3662c8df8a5f9411793 (patch) | |
| tree | ca4a3e432be572410288ff0aaf418907070f1fc5 /res/layout-sw600dp | |
| parent | 651029505689544bf9d7f49b8933a9cb9a0e272f (diff) | |
various layout readability updates
Diffstat (limited to 'res/layout-sw600dp')
| -rw-r--r-- | res/layout-sw600dp/article_fragment.xml | 120 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines_row.xml | 42 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines_row_selected.xml | 41 | ||||
| -rw-r--r-- | res/layout-sw600dp/headlines_row_unread.xml | 42 |
4 files changed, 167 insertions, 78 deletions
diff --git a/res/layout-sw600dp/article_fragment.xml b/res/layout-sw600dp/article_fragment.xml new file mode 100644 index 00000000..82cd99d4 --- /dev/null +++ b/res/layout-sw600dp/article_fragment.xml @@ -0,0 +1,120 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/article_fragment"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:padding="10sp" >
+
+ <LinearLayout
+ android:id="@+id/article_header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:orientation="vertical"
+ android:paddingBottom="4sp" >
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="There are many variations of passages of Lorem Ipsum available"
+ android:textColor="?linkColor"
+ android:textSize="21sp" />
+
+ <TextView
+ android:id="@+id/comments"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingBottom="2sp"
+ android:paddingTop="2sp"
+ android:text="24 comments"
+ android:textColor="?linkColor"
+ android:textSize="13sp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" >
+
+ <TextView
+ android:id="@+id/tags"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.7"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textColor="?headlineExcerptTextColor"
+ android:text="{TAGS}"
+ android:textSize="13sp" />
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.2"
+ android:gravity="right"
+ android:text="{DATE}"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?headlineExcerptTextColor"
+ android:textSize="13sp"
+ android:textStyle="italic" />
+
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:background="?horizontalDivider"
+ android:layout_marginTop="5sp"
+ android:layout_marginBottom="5sp"
+ android:paddingTop="2dip" />
+
+ </LinearLayout>
+
+ <com.nobu_games.android.view.web.TitleBarWebView
+ android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ />
+
+ <LinearLayout
+ android:id="@+id/attachments_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:paddingTop="5sp" >
+
+ <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_share"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/attachment_share" />
+
+ <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>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/headlines_row.xml b/res/layout-sw600dp/headlines_row.xml index 2983823e..eb1819e9 100644 --- a/res/layout-sw600dp/headlines_row.xml +++ b/res/layout-sw600dp/headlines_row.xml @@ -4,6 +4,7 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineNormalBackground"
+ android:padding="4sp"
android:orientation="vertical" >
<LinearLayout
@@ -34,7 +35,7 @@ android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
- android:singleLine="true"
+ android:singleLine="false"
android:text="{Title...}"
android:textColor="?headlineTextColor"
android:textSize="16sp"
@@ -61,40 +62,29 @@ android:textStyle="italic" />
</LinearLayout>
-
+
<LinearLayout
- android:id="@+id/linerLayout3"
+ android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="15px"
android:gravity="center"
- android:orientation="vertical"
- android:padding="3dip" >
+ android:paddingRight="15px" >
- <LinearLayout
- android:id="@+id/linearLayout4"
+ <ImageView
+ android:id="@+id/marked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingRight="2sp" >
-
- <ImageView
- android:id="@+id/marked"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:src="@android:drawable/star_off" >
- </ImageView>
+ android:clickable="true"
+ android:src="@android:drawable/star_off" />
- <ImageView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:src="@drawable/ic_rss_bw" >
- </ImageView>
- </LinearLayout>
+ <ImageView
+ android:id="@+id/published"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
+
</LinearLayout>
</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 b7bab698..c8c02767 100644 --- a/res/layout-sw600dp/headlines_row_selected.xml +++ b/res/layout-sw600dp/headlines_row_selected.xml @@ -4,6 +4,7 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineSelectedBackground"
+ android:padding="4sp"
android:orientation="vertical" >
<LinearLayout
@@ -34,7 +35,7 @@ android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
- android:singleLine="true"
+ android:singleLine="false"
android:text="{Title...}"
android:textColor="?headlineSelectedTextColor"
android:textSize="16sp"
@@ -60,39 +61,27 @@ android:textStyle="italic" />
</LinearLayout>
-
+
<LinearLayout
- android:id="@+id/linerLayout3"
+ android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="15px"
android:gravity="center"
- android:orientation="vertical"
- android:padding="3dip" >
+ android:paddingRight="15px" >
- <LinearLayout
- android:id="@+id/linearLayout4"
+ <ImageView
+ android:id="@+id/marked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingRight="2sp" >
+ android:clickable="true"
+ android:src="@android:drawable/star_off" />
- <ImageView
- android:id="@+id/marked"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:src="@android:drawable/star_off" >
- </ImageView>
-
- <ImageView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:src="@drawable/ic_rss_bw" >
- </ImageView>
- </LinearLayout>
+ <ImageView
+ android:id="@+id/published"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout-sw600dp/headlines_row_unread.xml b/res/layout-sw600dp/headlines_row_unread.xml index e1ab6e28..c5e56a5e 100644 --- a/res/layout-sw600dp/headlines_row_unread.xml +++ b/res/layout-sw600dp/headlines_row_unread.xml @@ -4,6 +4,7 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineUnreadBackground"
+ android:padding="4sp"
android:orientation="vertical" >
<LinearLayout
@@ -34,7 +35,7 @@ android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
- android:singleLine="true"
+ android:singleLine="false"
android:text="{Title...}"
android:textColor="?headlineUnreadTextColor"
android:textSize="16sp"
@@ -61,40 +62,29 @@ android:textStyle="italic" />
</LinearLayout>
-
+
<LinearLayout
- android:id="@+id/linerLayout3"
+ android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="15px"
android:gravity="center"
- android:orientation="vertical"
- android:padding="3dip" >
+ android:paddingRight="15px" >
- <LinearLayout
- android:id="@+id/linearLayout4"
+ <ImageView
+ android:id="@+id/marked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingRight="2sp" >
-
- <ImageView
- android:id="@+id/marked"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:src="@android:drawable/star_off" >
- </ImageView>
+ android:clickable="true"
+ android:src="@android:drawable/star_off" />
- <ImageView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:src="@drawable/ic_rss_bw" >
- </ImageView>
- </LinearLayout>
+ <ImageView
+ android:id="@+id/published"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
+
</LinearLayout>
</LinearLayout>
\ No newline at end of file |