diff options
Diffstat (limited to 'vdrmanager/res/layout')
| -rw-r--r-- | vdrmanager/res/layout/channel_list.xml | 140 | ||||
| -rw-r--r-- | vdrmanager/res/layout/channel_list_fragment.xml | 70 | ||||
| -rw-r--r-- | vdrmanager/res/layout/drawer_list_item.xml | 27 | ||||
| -rw-r--r-- | vdrmanager/res/layout/event_epg_list.xml | 175 | ||||
| -rw-r--r-- | vdrmanager/res/layout/left_drawer.xml | 19 | ||||
| -rw-r--r-- | vdrmanager/res/layout/recording_list.xml | 11 | ||||
| -rw-r--r-- | vdrmanager/res/layout/search_epg_list.xml | 10 | ||||
| -rw-r--r-- | vdrmanager/res/layout/time_epg_list.xml | 171 | ||||
| -rw-r--r-- | vdrmanager/res/layout/timer_list.xml | 96 |
9 files changed, 464 insertions, 255 deletions
diff --git a/vdrmanager/res/layout/channel_list.xml b/vdrmanager/res/layout/channel_list.xml index 3ff4c1e..df2d984 100644 --- a/vdrmanager/res/layout/channel_list.xml +++ b/vdrmanager/res/layout/channel_list.xml @@ -1,70 +1,102 @@ -<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/flipper" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <LinearLayout - android:id="@+id/main_content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > +<!-- + Copyright 2013 The Android Open Source Project - <EditText - android:id="@+id/search_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:hint="@string/type_to_filter" - android:inputType="text" - android:maxLines="1" - android:visibility="gone" /> - - <ExpandableListView - android:id="@+id/channel_list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignParentTop="true" - android:layout_alignWithParentIfMissing="true" - android:layout_centerHorizontal="true" - android:cacheColorHint="?android:attr/colorBackground" /> - - <TextView - android:id="@android:id/empty" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Empty set" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/no_connection_layout" + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + + +<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <!-- + As the main content view, the view below consumes the entire + space available using match_parent in both dimensions. + --> + + <ViewFlipper + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > <LinearLayout + android:id="@+id/main_content" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:gravity="center" - android:orientation="horizontal" > + android:orientation="vertical" > - <TextView - android:layout_width="wrap_content" + <EditText + android:id="@+id/search_box" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/no_connection" - android:textSize="18dip" /> + android:hint="@string/type_to_filter" + android:inputType="text" + android:maxLines="1" + android:visibility="gone" /> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/sad" /> + <ExpandableListView + android:id="@+id/channel_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_alignParentTop="true" + android:layout_alignWithParentIfMissing="true" + android:layout_centerHorizontal="true" + android:cacheColorHint="?android:attr/colorBackground" /> - <Button - android:id="@+id/retry_button" + <TextView + android:id="@android:id/empty" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/no_connection_retry" - android:textSize="18dip" /> + android:text="Empty set" /> </LinearLayout> - </LinearLayout> -</ViewFlipper>
\ No newline at end of file + <LinearLayout + android:id="@+id/no_connection_layout" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="horizontal" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection" + android:textSize="18dip" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/sad" /> + + <Button + android:id="@+id/retry_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection_retry" + android:textSize="18dip" /> + </LinearLayout> + </LinearLayout> + </ViewFlipper> + + <include layout="@layout/left_drawer" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/vdrmanager/res/layout/channel_list_fragment.xml b/vdrmanager/res/layout/channel_list_fragment.xml new file mode 100644 index 0000000..becf269 --- /dev/null +++ b/vdrmanager/res/layout/channel_list_fragment.xml @@ -0,0 +1,70 @@ +<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/flipper" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/main_content" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <EditText + android:id="@+id/search_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/type_to_filter" + android:inputType="text" + android:maxLines="1" + android:visibility="gone" /> + + <ExpandableListView + android:id="@+id/channel_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_alignParentTop="true" + android:layout_alignWithParentIfMissing="true" + android:layout_centerHorizontal="true" + android:cacheColorHint="?android:attr/colorBackground" /> + + <TextView + android:id="@android:id/empty" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Empty set" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/no_connection_layout" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="horizontal" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection" + android:textSize="18dip" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/sad" /> + + <Button + android:id="@+id/retry_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection_retry" + android:textSize="18dip" /> + </LinearLayout> + </LinearLayout> + +</ViewFlipper> diff --git a/vdrmanager/res/layout/drawer_list_item.xml b/vdrmanager/res/layout/drawer_list_item.xml new file mode 100644 index 0000000..ab52575 --- /dev/null +++ b/vdrmanager/res/layout/drawer_list_item.xml @@ -0,0 +1,27 @@ +<!-- + Copyright 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:gravity="center_vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textColor="#fff" + android:background="?android:attr/activatedBackgroundIndicator" + android:minHeight="?android:attr/listPreferredItemHeightSmall"/>
\ No newline at end of file diff --git a/vdrmanager/res/layout/event_epg_list.xml b/vdrmanager/res/layout/event_epg_list.xml index 6c26b4a..2e835d4 100644 --- a/vdrmanager/res/layout/event_epg_list.xml +++ b/vdrmanager/res/layout/event_epg_list.xml @@ -1,107 +1,116 @@ <?xml version="1.0" encoding="utf-8"?> -<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/flipper" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > +<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > - <RelativeLayout + <ViewFlipper + android:id="@+id/flipper" android:layout_width="fill_parent" - android:layout_height="wrap_content" > + android:layout_height="fill_parent" + android:orientation="vertical" > - <LinearLayout - android:id="@+id/whatson_time" + <RelativeLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:orientation="horizontal" > + android:layout_height="wrap_content" > - <Spinner - android:id="@+id/epg_list_channel_spinner" + <LinearLayout + android:id="@+id/whatson_time" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="3dip" - android:layout_weight="1" - android:prompt="@string/epg_list_channel_spinner" /> - - <ImageView - android:id="@+id/switch_epg_view" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_centerHorizontal="true" - android:layout_gravity="center_horizontal" - android:background="@android:drawable/list_selector_background" - android:clickable="true" - android:src="@drawable/ic_menu_revert" /> - </LinearLayout> + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:orientation="horizontal" > - <ListView - android:id="@+id/whatson_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/channel_info" - android:layout_alignWithParentIfMissing="true" - android:layout_below="@+id/whatson_time" - android:layout_centerHorizontal="true" - android:cacheColorHint="?android:attr/colorBackground" /> + <Spinner + android:id="@+id/epg_list_channel_spinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="3dip" + android:layout_weight="1" + android:prompt="@string/epg_list_channel_spinner" /> - <LinearLayout - android:id="@+id/channel_info" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="@drawable/back" - android:orientation="horizontal" - android:layout_marginTop="4dp" - android:padding="2dp" > - - <ImageView - android:id="@+id/audio_image" - android:layout_width="wrap_content" + <ImageView + android:id="@+id/switch_epg_view" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:clickable="true" + android:src="@drawable/ic_menu_revert" /> + </LinearLayout> + + <ListView + android:id="@+id/whatson_list" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:src="@drawable/ic_volume_small" /> + android:layout_above="@+id/channel_info" + android:layout_alignWithParentIfMissing="true" + android:layout_below="@+id/whatson_time" + android:layout_centerHorizontal="true" + android:cacheColorHint="?android:attr/colorBackground" /> - <TextView - android:id="@+id/channel_audio" + <LinearLayout + android:id="@+id/channel_info" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:text="" /> - </LinearLayout> - </RelativeLayout> + android:layout_alignParentBottom="true" + android:layout_marginTop="4dp" + android:background="@drawable/back" + android:orientation="horizontal" + android:padding="2dp" > - <LinearLayout - android:id="@+id/no_connection_layout" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > + <ImageView + android:id="@+id/audio_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_volume_small" /> + + <TextView + android:id="@+id/channel_audio" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" + android:text="" /> + </LinearLayout> + </RelativeLayout> <LinearLayout + android:id="@+id/no_connection_layout" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:gravity="center" - android:orientation="horizontal" > + android:orientation="vertical" > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/no_connection" - android:textSize="18dip" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="horizontal" > - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/sad" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection" + android:textSize="18dip" /> - <Button - android:id="@+id/retry_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/no_connection_retry" - android:textSize="18dip" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/sad" /> + + <Button + android:id="@+id/retry_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection_retry" + android:textSize="18dip" /> + </LinearLayout> </LinearLayout> - </LinearLayout> + </ViewFlipper> + + <include layout="@layout/left_drawer" /> -</ViewFlipper>
\ No newline at end of file +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/vdrmanager/res/layout/left_drawer.xml b/vdrmanager/res/layout/left_drawer.xml new file mode 100644 index 0000000..ad8379a --- /dev/null +++ b/vdrmanager/res/layout/left_drawer.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + android:layout_gravity="start" tells DrawerLayout to treat + this as a sliding drawer on the left side for left-to-right + languages and on the right side for right-to-left languages. + The drawer is given a fixed width in dp and extends the full height of + the container. A solid background is used for contrast + with the content view. +--> +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/left_drawer" + android:layout_width="240dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="#111" + android:choiceMode="singleChoice" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> diff --git a/vdrmanager/res/layout/recording_list.xml b/vdrmanager/res/layout/recording_list.xml index 3ad9103..dd4b100 100644 --- a/vdrmanager/res/layout/recording_list.xml +++ b/vdrmanager/res/layout/recording_list.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> <ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/flipper" android:layout_width="fill_parent" @@ -99,4 +104,8 @@ android:textSize="18sp" /> </LinearLayout> -</ViewFlipper>
\ No newline at end of file +</ViewFlipper> + +<include layout="@layout/left_drawer" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/vdrmanager/res/layout/search_epg_list.xml b/vdrmanager/res/layout/search_epg_list.xml index eef7503..d5cc5af 100644 --- a/vdrmanager/res/layout/search_epg_list.xml +++ b/vdrmanager/res/layout/search_epg_list.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"> @@ -38,6 +41,7 @@ </LinearLayout> </LinearLayout> - - </LinearLayout> + +<include layout="@layout/left_drawer"/> +</android.support.v4.widget.DrawerLayout> diff --git a/vdrmanager/res/layout/time_epg_list.xml b/vdrmanager/res/layout/time_epg_list.xml index 3274adb..f42ab32 100644 --- a/vdrmanager/res/layout/time_epg_list.xml +++ b/vdrmanager/res/layout/time_epg_list.xml @@ -1,106 +1,115 @@ <?xml version="1.0" encoding="utf-8"?> -<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/flipper" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > +<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > - <LinearLayout + <ViewFlipper + android:id="@+id/flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > <LinearLayout - android:id="@+id/whatson_time" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + android:layout_height="fill_parent" + android:orientation="vertical" > - <TextView - android:id="@+id/epg_list_time_label" - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/whatson_time" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/epg_list_time_label" - android:visibility="gone" /> + android:orientation="horizontal" > - <ImageView - android:id="@+id/epg_list_times" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" - android:layout_height="match_parent" + <TextView + android:id="@+id/epg_list_time_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/epg_list_time_label" + android:visibility="gone" /> + + <ImageView + android:id="@+id/epg_list_times" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:clickable="true" + android:src="@drawable/btn_search_times" /> + + <Spinner + android:id="@+id/epg_list_time_spinner" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="2dip" + android:layout_weight="1" + android:prompt="@string/epg_list_time_label" /> + + <ImageView + android:id="@+id/switch_epg_view" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:clickable="true" + android:src="@drawable/ic_menu_revert" /> + </LinearLayout> + + <ListView + android:id="@+id/whatson_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_alignParentTop="true" + android:layout_alignWithParentIfMissing="true" + android:layout_below="@id/epg_list_time_spinner" android:layout_centerHorizontal="true" - android:layout_gravity="center_horizontal" - android:background="@android:drawable/list_selector_background" - android:clickable="true" - android:src="@drawable/btn_search_times" /> + android:cacheColorHint="?android:attr/colorBackground" /> - <Spinner - android:id="@+id/epg_list_time_spinner" + <TextView + android:id="@+id/epg_list_search_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginTop="2dip" - android:prompt="@string/epg_list_time_label" /> - - <ImageView - android:id="@+id/switch_epg_view" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_centerHorizontal="true" - android:layout_gravity="center_horizontal" - android:background="@android:drawable/list_selector_background" - android:clickable="true" - android:src="@drawable/ic_menu_revert" /> + android:text="@string/epg_list_search_label" /> </LinearLayout> - <ListView - android:id="@+id/whatson_list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignParentTop="true" - android:layout_alignWithParentIfMissing="true" - android:layout_below="@id/epg_list_time_spinner" - android:layout_centerHorizontal="true" - android:cacheColorHint="?android:attr/colorBackground" /> - - <TextView - android:id="@+id/epg_list_search_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/epg_list_search_label" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/no_connection_layout" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - <LinearLayout + android:id="@+id/no_connection_layout" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:gravity="center" - android:orientation="horizontal" > + android:orientation="vertical" > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/no_connection" - android:textSize="18dip" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="horizontal" > - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/sad" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection" + android:textSize="18dip" /> - <Button - android:id="@+id/retry_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/no_connection_retry" - android:textSize="18dip" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/sad" /> + + <Button + android:id="@+id/retry_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection_retry" + android:textSize="18dip" /> + </LinearLayout> </LinearLayout> - </LinearLayout> + </ViewFlipper> + + <include layout="@layout/left_drawer" /> -</ViewFlipper>
\ No newline at end of file +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/vdrmanager/res/layout/timer_list.xml b/vdrmanager/res/layout/timer_list.xml index ccb4be1..7a3ed02 100644 --- a/vdrmanager/res/layout/timer_list.xml +++ b/vdrmanager/res/layout/timer_list.xml @@ -1,34 +1,64 @@ <?xml version="1.0" encoding="utf-8"?> -<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/flipper" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - <LinearLayout android:layout_height="fill_parent" - android:layout_width="fill_parent" android:id="@+id/main_content"> - <ListView - android:id="@+id/timer_list" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignWithParentIfMissing="true" - android:layout_alignParentTop="true" android:layout_centerHorizontal="true" - android:cacheColorHint="?android:attr/colorBackground" /> - </LinearLayout> - - <LinearLayout android:orientation="vertical" - android:id="@+id/no_connection_layout" android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <LinearLayout android:layout_height="fill_parent" - android:gravity="center" android:layout_width="fill_parent" - android:orientation="horizontal"> - <TextView android:text="@string/no_connection" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:textSize="18dip" /> - <ImageView android:src="@drawable/sad" - android:layout_height="wrap_content" android:layout_width="wrap_content" /> - <Button android:text="@string/no_connection_retry" - android:textSize="18dip" android:layout_height="wrap_content" - android:layout_width="wrap_content" android:id="@+id/retry_button" /> - - </LinearLayout> - </LinearLayout> -</ViewFlipper>
\ No newline at end of file +<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <ViewFlipper + android:id="@+id/flipper" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/main_content" + android:layout_width="fill_parent" + android:layout_height="fill_parent" > + + <ListView + android:id="@+id/timer_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_alignParentTop="true" + android:layout_alignWithParentIfMissing="true" + android:layout_centerHorizontal="true" + android:cacheColorHint="?android:attr/colorBackground" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/no_connection_layout" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="horizontal" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection" + android:textSize="18dip" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/sad" /> + + <Button + android:id="@+id/retry_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection_retry" + android:textSize="18dip" /> + </LinearLayout> + </LinearLayout> + </ViewFlipper> + + <include layout="@layout/left_drawer" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file |