diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-24 16:04:58 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-24 16:04:58 +0300 |
| commit | 7ad712cb413824b1caae4327e8cc2f691e29d888 (patch) | |
| tree | ecd27c5fe7dec0500237795e1a0cab9fe9e29c63 /res | |
| parent | fb86971ca88b47d24f83de1f2d495ba8b1815a44 (diff) | |
handle login/logout and session errors in child fragments
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/main.xml | 14 | ||||
| -rw-r--r-- | res/menu/main_menu.xml | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/res/layout/main.xml b/res/layout/main.xml index 97a9e9c8..9b327d8a 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -1,12 +1,10 @@ -<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout 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:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/sync_splash"> - <LinearLayout android:layout_width="match_parent" android:gravity="center" android:layout_height="match_parent" android:id="@+id/linearLayout1"> - <ProgressBar android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress"></ProgressBar> - <TextView android:id="@+id/loading_message" android:text="@string/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content"></TextView> - </LinearLayout> - </FrameLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:id="@+id/loading_container"> + <ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar> + <TextView android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message"></TextView> + </LinearLayout> <LinearLayout android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/main" android:layout_width="fill_parent"> <FrameLayout android:layout_height="match_parent" android:layout_width="300dp" android:layout_weight="0" android:id="@+id/feeds_fragment"></FrameLayout> <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.5" android:id="@+id/headlines_fragment"></FrameLayout> @@ -14,4 +12,4 @@ </LinearLayout> -</ViewFlipper>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index f7bec3fb..a4dcb9f3 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -1,11 +1,25 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:id="@+id/login" + android:visible="false" + android:icon="@android:drawable/ic_menu_rotate" + android:title="@string/login" + android:showAsAction="ifRoom|withText"/> + + <item android:id="@+id/logout" + android:visible="false" + android:title="@string/logout" + android:showAsAction=""/> + <item android:id="@+id/show_feeds" + android:visible="false" android:icon="@android:drawable/ic_menu_rotate" android:title="@string/menu_all_feeds" android:showAsAction=""/> <item android:id="@+id/update" + android:visible="false" android:icon="@android:drawable/ic_menu_rotate" android:title="@string/update" android:showAsAction="ifRoom|withText"/> |