diff options
| -rw-r--r-- | AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | res/layout-port/headlines_row.xml | 12 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_selected.xml | 6 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_unread.xml | 6 | ||||
| -rw-r--r-- | res/layout/article_fragment.xml | 16 | ||||
| -rw-r--r-- | res/layout/headlines_row_loadmore.xml | 13 | ||||
| -rw-r--r-- | res/layout/login.xml | 11 |
7 files changed, 15 insertions, 54 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8b178bac..1f72589d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -44,6 +44,11 @@ </activity> <activity + android:name=".CommonActivity" + android:label="@string/app_name" > + </activity> + + <activity android:name=".ArticleActivity" android:label="@string/app_name" > </activity> diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml index 8f65f7ec..568078a6 100644 --- a/res/layout-port/headlines_row.xml +++ b/res/layout-port/headlines_row.xml @@ -7,15 +7,10 @@ android:gravity="center_vertical"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/linearLayout7"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:padding="3dip" >
@@ -39,7 +34,7 @@ <TextView
android:id="@+id/excerpt"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
@@ -50,7 +45,7 @@ <LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
android:layout_weight="0"
android:gravity="center"
android:orientation="horizontal" >
@@ -100,7 +95,6 @@ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>
- </LinearLayout>
<TextView
android:id="@+id/content"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml index 8c5af7f9..ad5ab33f 100644 --- a/res/layout-port/headlines_row_selected.xml +++ b/res/layout-port/headlines_row_selected.xml @@ -7,11 +7,6 @@ android:gravity="center_vertical"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/linearLayout7"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
@@ -100,7 +95,6 @@ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>
- </LinearLayout>
<TextView
android:id="@+id/content"
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml index 35b2dead..ce0cf9a3 100644 --- a/res/layout-port/headlines_row_unread.xml +++ b/res/layout-port/headlines_row_unread.xml @@ -7,11 +7,6 @@ android:gravity="center_vertical"
android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/linearLayout7"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
@@ -100,7 +95,6 @@ android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>
- </LinearLayout>
<TextView
android:id="@+id/content"
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 94e0a42e..e46de546 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"
@@ -98,6 +89,5 @@ android:layout_weight="0"
android:text="@string/attachment_copy" />
</LinearLayout>
- </LinearLayout>
-
+
</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 index d144df96..1ed26afa 100644 --- a/res/layout/login.xml +++ b/res/layout/login.xml @@ -1,21 +1,14 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/login"
+ android:id="@+id/loading_container"
android:layout_width="fill_parent"
+ android:gravity="center"
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>
</LinearLayout>
\ No newline at end of file |