diff options
author | Andrew Dolgov <[email protected]> | 2011-11-23 13:55:05 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-11-23 13:55:05 +0300 |
commit | e0c40e5fb8b9c9ca72a5bb306593565c22e1f804 (patch) | |
tree | 2a8db7c2042b1fc0783b6e25824c0e942d430cb0 /res/layout | |
parent | 2250b86e3b00ffd8bde4b65285ef06d2581f6a80 (diff) |
implement headlines view
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/feeds_fragment.xml | 13 | ||||
-rw-r--r-- | res/layout/feeds_row.xml | 6 | ||||
-rw-r--r-- | res/layout/headlines_fragment.xml | 6 | ||||
-rw-r--r-- | res/layout/main.xml | 19 |
4 files changed, 26 insertions, 18 deletions
diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml index f4abec8a..c66895b3 100644 --- a/res/layout/feeds_fragment.xml +++ b/res/layout/feeds_fragment.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"> - <LinearLayout android:layout_width="match_parent" android:id="@+id/linearLayout1" android:gravity="center" android:layout_height="match_parent">
- <ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar>
- <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message"></TextView>
- </LinearLayout> - <ListView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/feeds"></ListView>
+ android:layout_height="fill_parent" android:id="@+id/feeds_container" android:layout_width="match_parent"> + <LinearLayout android:id="@+id/loading_container" android:gravity="center" android:layout_height="match_parent" android:layout_width="match_parent"> + <ProgressBar android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress" android:layout_height="wrap_content"></ProgressBar> + <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:layout_height="wrap_content" ></TextView> + </LinearLayout> + <ListView android:id="@+id/feeds" android:layout_height="match_parent" android:layout_width="match_parent"></ListView>
</FrameLayout>
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml index a53e0eeb..4eb22e22 100644 --- a/res/layout/feeds_row.xml +++ b/res/layout/feeds_row.xml @@ -1,18 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:gravity="center_vertical" - android:padding="3dip" android:id="@+id/feeds_row"> + android:padding="3dip" android:id="@+id/feeds_row" android:layout_width="match_parent"> <TextView android:id="@+id/title" - android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="center_vertical" android:paddingLeft="6dip" - android:text="{FEED}" android:textSize="16sp"/> + android:text="{FEED}" android:textSize="16sp" android:layout_width="wrap_content"/> <TextView android:id="@+id/unread_counter" android:gravity="right" diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml index ffcad32c..1828adb2 100644 --- a/res/layout/headlines_fragment.xml +++ b/res/layout/headlines_fragment.xml @@ -4,6 +4,8 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent" android:id="@+id/headlines_fragment"> <ListView android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines" android:background="#fafafa"></ListView> - <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:text="@string/no_unread_headlines" android:layout_gravity="center" android:id="@+id/no_unread_headlines"></TextView>
-
+ <LinearLayout android:id="@+id/loading_container" android:gravity="center" android:layout_height="match_parent" android:layout_width="match_parent">
+ <ProgressBar android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress" android:layout_height="wrap_content"></ProgressBar>
+ <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:layout_height="wrap_content" ></TextView>
+ </LinearLayout>
</FrameLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml index 86fcf5fa..d8fb875f 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -1,13 +1,22 @@ <ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:id="@+id/main_flipper"> - <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/sync_splash" android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout android:layout_width="match_parent" android:id="@+id/linearLayout1" android:gravity="center" android:layout_height="match_parent"> - <ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar> - <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message"></TextView> + <FrameLayout android:layout_gravity="center_vertical" android:layout_width="match_parent" android:id="@+id/sync_splash" android:layout_height="match_parent"> + <LinearLayout android:id="@+id/linearLayout1" android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent"> + <ProgressBar android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress" android:layout_height="wrap_content"></ProgressBar> + <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:text="@string/loading_message" android:layout_height="wrap_content"></TextView> </LinearLayout> </FrameLayout> - <LinearLayout android:id="@+id/main" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal"> + <LinearLayout android:id="@+id/main" android:layout_width="fill_parent" android:orientation="horizontal" android:layout_height="fill_parent"> + <fragment android:id="@+id/feeds_fragment" android:name="org.fox.ttrss.FeedsFragment" android:layout_height="match_parent" android:layout_width="300dp"> + <!-- Preview: layout=@layout/feeds_fragment --> + </fragment> + <fragment android:id="@+id/headlines_fragment" android:name="org.fox.ttrss.HeadlinesFragment" android:layout_height="match_parent" android:layout_width="wrap_content"> + <!-- Preview: layout=@layout/headlines_fragment --> + </fragment> + <fragment android:id="@+id/article_fragment" android:name="org.fox.ttrss.ArticleFragment" android:layout_height="match_parent" android:layout_width="wrap_content"> + <!-- Preview: layout=@layout/article_fragment --> + </fragment> </LinearLayout> |