diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/article_fragment.xml | 24 | ||||
| -rw-r--r-- | res/layout/feeds.xml (renamed from res/layout/main.xml) | 2 | ||||
| -rw-r--r-- | res/layout/headlines.xml | 27 | ||||
| -rw-r--r-- | res/layout/headlines_row_loadmore.xml | 13 | ||||
| -rw-r--r-- | res/layout/login.xml | 14 |
5 files changed, 55 insertions, 25 deletions
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 94e0a42e..0b847017 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -1,18 +1,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/article_fragment"
android:layout_width="fill_parent"
+ android:padding="5sp"
android:layout_height="fill_parent"
- android:orientation="horizontal" > -
- <LinearLayout
- xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/article_holder"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical"
- android:padding="5sp" >
+ android:orientation="vertical" > <LinearLayout
android:id="@+id/article_header"
@@ -24,6 +15,7 @@ <TextView
android:id="@+id/title"
+ android:textColor="?linkColor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -92,12 +84,18 @@ 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>
-
+
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/main.xml b/res/layout/feeds.xml index eb06058c..c3f7be59 100644 --- a/res/layout/main.xml +++ b/res/layout/feeds.xml @@ -19,7 +19,7 @@ </LinearLayout>
<FrameLayout
- android:id="@+id/fragment_container"
+ android:id="@+id/feeds_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
diff --git a/res/layout/headlines.xml b/res/layout/headlines.xml new file mode 100644 index 00000000..c3027217 --- /dev/null +++ b/res/layout/headlines.xml @@ -0,0 +1,27 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/headlines"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <LinearLayout
+ android:id="@+id/loading_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/loading_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:text="@string/loading_message" />
+ </LinearLayout>
+
+ <FrameLayout
+ android:id="@+id/headlines_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout/headlines_row_loadmore.xml b/res/layout/headlines_row_loadmore.xml index d2eda7a6..ab7adc87 100644 --- a/res/layout/headlines_row_loadmore.xml +++ b/res/layout/headlines_row_loadmore.xml @@ -4,18 +4,10 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineNormalBackground"
- android:gravity="center_vertical"
+ android:gravity="center"
+ android:padding="5dp"
android:orientation="horizontal" >
- <LinearLayout
- android:id="@+id/loadmore_content"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:layout_weight="1"
- android:orientation="horizontal"
- android:padding="10dp" >
-
<ProgressBar
android:id="@+id/loadmore_progress"
style="?android:attr/progressBarStyleSmall"
@@ -29,6 +21,5 @@ android:layout_height="wrap_content"
android:textColor="?headlineTextColor"
android:text="@string/loading_message" />
- </LinearLayout>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/login.xml b/res/layout/login.xml new file mode 100644 index 00000000..1ed26afa --- /dev/null +++ b/res/layout/login.xml @@ -0,0 +1,14 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/loading_container"
+ android:layout_width="fill_parent"
+ android:gravity="center"
+ android:layout_height="fill_parent" >
+
+ <TextView
+ android:id="@+id/loading_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:text="@string/loading_message" />
+
+</LinearLayout>
\ No newline at end of file |