diff options
Diffstat (limited to 'vdrmanager/res/layout')
| -rw-r--r-- | vdrmanager/res/layout/about.xml | 13 | ||||
| -rw-r--r-- | vdrmanager/res/layout/channel_list.xml | 7 | ||||
| -rw-r--r-- | vdrmanager/res/layout/epg_detail.xml | 325 | ||||
| -rw-r--r-- | vdrmanager/res/layout/epg_search_times_item.xml | 1 | ||||
| -rw-r--r-- | vdrmanager/res/layout/event_epg_list.xml | 20 | ||||
| -rw-r--r-- | vdrmanager/res/layout/recording_list.xml | 13 | ||||
| -rw-r--r-- | vdrmanager/res/layout/time_epg_list.xml | 148 | ||||
| -rw-r--r-- | vdrmanager/res/layout/timer_list.xml | 13 | ||||
| -rw-r--r-- | vdrmanager/res/layout/timer_operation_list_item | 10 |
9 files changed, 318 insertions, 232 deletions
diff --git a/vdrmanager/res/layout/about.xml b/vdrmanager/res/layout/about.xml new file mode 100644 index 0000000..3831b90 --- /dev/null +++ b/vdrmanager/res/layout/about.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <TextView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:autoLink="all" + android:text="@string/about_text" /> + +</ScrollView>
\ No newline at end of file diff --git a/vdrmanager/res/layout/channel_list.xml b/vdrmanager/res/layout/channel_list.xml index 0a089d2..a632b48 100644 --- a/vdrmanager/res/layout/channel_list.xml +++ b/vdrmanager/res/layout/channel_list.xml @@ -1,4 +1,4 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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"> @@ -19,7 +19,7 @@ </LinearLayout> <LinearLayout android:orientation="vertical" android:id="@+id/no_connection_layout" android:layout_width="fill_parent" - android:layout_height="fill_parent" android:visibility="gone"> + android:layout_height="fill_parent"> <LinearLayout android:layout_height="fill_parent" android:gravity="center" android:layout_width="fill_parent" android:orientation="horizontal"> @@ -34,5 +34,4 @@ </LinearLayout> </LinearLayout> - -</LinearLayout> +</ViewFlipper> diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml index d763429..fb4ed6c 100644 --- a/vdrmanager/res/layout/epg_detail.xml +++ b/vdrmanager/res/layout/epg_detail.xml @@ -1,167 +1,168 @@ <?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="fill_parent" - android:orientation="vertical"> - - <TextView - android:id="@+id/epg_detail_title" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textStyle="bold" - android:textAppearance="?android:textAppearanceMedium" - android:text="Unterwegs nach Cold Mountain"/> <LinearLayout - android:id="@+id/epg_detail_time_channel" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/epg_detail_time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="left" - android:textAppearance="?android:textAppearanceSmall" - android:text="20:10-20-15" - /> - - <TextView - android:id="@+id/epg_detail_duration" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="right" android:layout_weight="1" - android:paddingLeft="10dip" - android:text="2/123min" - android:textAppearance="?android:textAppearanceSmall" - /> - - - <TextView - android:id="@+id/epg_detail_channel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Sky Cinema" - android:visibility="gone" - android:gravity="right"/> - - </LinearLayout> - - - <LinearLayout android:layout_width="fill_parent" android:padding="3dip" android:paddingBottom="1dip" - android:layout_height="wrap_content" android:layout_marginTop="0dip" - android:orientation="horizontal"> - - <ImageView android:id="@+id/epg_timer_state" android:layout_marginRight="5dip" - android:layout_width="wrap_content" android:layout_height="fill_parent" - android:layout_centerVertical="true" android:visibility="gone" /> - - <TextView - android:id="@+id/epg_detail_shorttext" + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="left" - android:layout_weight="1" - android:text="Krimikömedie" - android:textAppearance="?android:textAppearanceSmall"/> - - </LinearLayout> + android:layout_height="fill_parent" + android:orientation="vertical" > + <TextView + android:id="@+id/epg_detail_title" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Unterwegs nach Cold Mountain" + android:textAppearance="?android:textAppearanceMedium" + android:textStyle="bold" /> - <TextView - android:id="@+id/epg_detail_separator_0" - android:layout_width="fill_parent" - android:layout_height="2sp"/> - - - - - <ProgressBar - android:id="@+id/epg_detail_progress" - android:layout_width="fill_parent" - android:indeterminate="false" - android:layout_height="2dip" - android:progress="40" - style="?android:attr/progressBarStyleHorizontal"/> - - <ScrollView - android:id="@+id/epg_detail_description_scroll" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="1"> + <LinearLayout + android:id="@+id/epg_detail_time_channel" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <TextView + android:id="@+id/epg_detail_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="left" + android:text="20:10-20-15" + android:textAppearance="?android:textAppearanceSmall" /> - <TextView android:textSize="16dip" - android:id="@+id/epg_detail_description" + <TextView + android:id="@+id/epg_detail_duration" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="right" + android:paddingLeft="10dip" + android:text="2/123min" + android:textAppearance="?android:textAppearanceSmall" /> + + <TextView + android:id="@+id/epg_detail_channel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="right" + android:text="Sky Cinema" + android:visibility="gone" /> + </LinearLayout> + + <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent"> - </TextView> - - </ScrollView> + android:layout_height="wrap_content" + android:layout_marginTop="0dip" + android:orientation="horizontal" + android:padding="3dip" + android:paddingBottom="1dip" > - <TextView - android:id="@+id/epg_detail_separator_2" - android:layout_width="fill_parent" - android:layout_height="1sp"/> + <ImageView + android:id="@+id/epg_timer_state" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_centerVertical="true" + android:layout_marginRight="5dip" + android:visibility="gone" /> - <TextView - android:id="@+id/epg_detail_separator_3" - android:layout_width="fill_parent" - android:layout_height="4sp"/> - -<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center"> + <TextView + android:id="@+id/epg_detail_shorttext" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="left" + android:text="Krimikömedie" + android:textAppearance="?android:textAppearanceSmall" /> + </LinearLayout> + + <TextView + android:id="@+id/epg_detail_separator_0" + android:layout_width="fill_parent" + android:layout_height="2sp" /> + + <ProgressBar + android:id="@+id/epg_detail_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="fill_parent" + android:layout_height="2dip" + android:indeterminate="false" + android:progress="40" /> + + <ScrollView + android:id="@+id/epg_detail_description_scroll" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/epg_detail_description" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:textSize="16dip" > + </TextView> + </ScrollView> + + <TextView + android:id="@+id/epg_detail_separator_2" + android:layout_width="fill_parent" + android:layout_height="1sp" /> + + <TextView + android:id="@+id/epg_detail_separator_3" + android:layout_width="fill_parent" + android:layout_height="4sp" /> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal" > -<!-- + <!-- --> <ImageButton android:id="@+id/epg_event_left" - android:src="@drawable/left" + android:src="@drawable/ic_menu_back" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="left" - style="?android:attr/buttonStyleSmall" - android:layout_marginRight="40dip" android:background="@android:drawable/list_selector_background"/> - - --> - - - <ImageButton - android:id="@+id/epg_event_livetv" - android:src="@drawable/tv" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_centerHorizontal="true" - style="?android:attr/buttonStyleSmall" android:layout_marginLeft="20dip" android:layout_marginRight="20dip" - android:background="@android:drawable/list_selector_background" - android:text="@string/epg_eent_livetv_text"/> - - <ImageButton - android:id="@+id/epg_event_create_timer" - android:src="@drawable/timer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:layout_marginRight="20dip" - android:layout_gravity="center_horizontal" - android:layout_centerHorizontal="true" - android:background="@android:drawable/list_selector_background" - style="?android:attr/buttonStyleSmall" - android:text="@string/epg_event_create_timer_text"/> - - <ImageButton - android:id="@+id/epg_event_imdb" - android:src="@drawable/imdb" - android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:layout_marginRight="20dip" - android:layout_gravity="center_horizontal" - android:layout_centerHorizontal="true" - android:background="@android:drawable/list_selector_background" - style="?android:attr/buttonStyleSmall" - android:text="@string/epg_event_imdb_text"/> - - - <!-- + <!-- --> + +<LinearLayout android:orientation="horizontal" android:layout_height="wrap_content" android:addStatesFromChildren="true" android:layout_weight="1.0" android:layout_width="wrap_content" android:gravity="center_vertical" + android:baselineAligned="false"> + <ImageButton android:layout_weight="1" + android:id="@+id/epg_event_livetv" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:src="@drawable/tv" + android:text="@string/epg_eent_livetv_text" /> + + <ImageButton android:layout_weight="1" + android:id="@+id/epg_event_create_timer" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:src="@drawable/timer" + android:text="@string/epg_event_create_timer_text" /> + + <ImageButton android:layout_weight="1" + android:id="@+id/epg_event_imdb" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:src="@drawable/imdb" + android:text="@string/epg_event_imdb_text" /> +</LinearLayout> + <!-- <ImageButton android:id="@+id/epg_event_share" android:src="@android:drawable/ic_menu_share" @@ -172,9 +173,10 @@ android:background="@android:drawable/list_selector_background" style="?android:attr/buttonStyleSmall" android:text="@string/epg_event_share_text"/> - --> - - <!-- + --> + + + <!-- <ImageButton android:id="@+id/epg_event_epg" android:src="@drawable/epg" @@ -185,22 +187,15 @@ android:background="@android:drawable/list_selector_background" style="?android:attr/buttonStyleSmall" android:text="@string/epg_event_create_timer_text"/> - --> - <!-- - <ImageButton + --> + <!-- --> + <ImageButton android:id="@+id/epg_event_right" - android:src="@drawable/right" + android:src="@drawable/ic_menu_forward" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:layout_centerHorizontal="true" - style="?android:attr/buttonStyleSmall" - android:layout_marginLeft="40dip" android:background="@android:drawable/list_selector_background"/> ---> - - - </LinearLayout> - - -</LinearLayout> + + + </LinearLayout> + </LinearLayout>
\ No newline at end of file diff --git a/vdrmanager/res/layout/epg_search_times_item.xml b/vdrmanager/res/layout/epg_search_times_item.xml index 93aa44b..5680f7e 100644 --- a/vdrmanager/res/layout/epg_search_times_item.xml +++ b/vdrmanager/res/layout/epg_search_times_item.xml @@ -5,4 +5,5 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:gravity= "center_vertical" + android:textAppearance="?android:textAppearanceLarge" android:lines="2"/> diff --git a/vdrmanager/res/layout/event_epg_list.xml b/vdrmanager/res/layout/event_epg_list.xml index 436ca23..e706f06 100644 --- a/vdrmanager/res/layout/event_epg_list.xml +++ b/vdrmanager/res/layout/event_epg_list.xml @@ -10,13 +10,33 @@ 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" > + <Spinner android:id="@+id/epg_list_channel_spinner" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_weight="1" android:prompt="@string/epg_list_channel_spinner" /> + <ImageView + android:clickable="true" + android:background="@android:drawable/list_selector_background" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:id="@+id/switch_epg_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:attr/buttonStyleSmall" + android:src="@android:drawable/ic_menu_revert" /> + </LinearLayout> + <ListView android:id="@+id/whatson_list" android:layout_width="fill_parent" diff --git a/vdrmanager/res/layout/recording_list.xml b/vdrmanager/res/layout/recording_list.xml index 1dabd2c..66eb5de 100644 --- a/vdrmanager/res/layout/recording_list.xml +++ b/vdrmanager/res/layout/recording_list.xml @@ -1,7 +1,9 @@ <?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="fill_parent" - android:orientation="vertical"> +<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 xmlns:android="http://schemas.android.com/apk/res/android" @@ -11,9 +13,10 @@ 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" android:visibility="gone"> + android:layout_height="fill_parent"> <LinearLayout android:layout_height="fill_parent" android:gravity="center" android:layout_width="fill_parent" android:orientation="horizontal"> @@ -28,4 +31,4 @@ </LinearLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ViewFlipper>
\ No newline at end of file diff --git a/vdrmanager/res/layout/time_epg_list.xml b/vdrmanager/res/layout/time_epg_list.xml index c45f9ba..5364aa9 100644 --- a/vdrmanager/res/layout/time_epg_list.xml +++ b/vdrmanager/res/layout/time_epg_list.xml @@ -1,63 +1,105 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<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"> + android:orientation="vertical" > - <LinearLayout - android:id="@+id/whatson_time" + <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/epg_list_time_label" + 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" > + + <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_centerHorizontal="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:clickable="true" + android:src="@android:drawable/ic_menu_recent_history" /> + + <Spinner + android:id="@+id/epg_list_time_spinner" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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="wrap_content" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:background="@android:drawable/list_selector_background" + android:clickable="true" + android:src="@android: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: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_time_label"/> - - <Spinner - android:id="@+id/epg_list_time_spinner" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/epg_list_time_label"/> - + android:text="@string/epg_list_search_label" /> </LinearLayout> - - <ListView - android:id="@+id/whatson_list" + + <LinearLayout + android:id="@+id/no_connection_layout" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_below="@id/epg_list_time_spinner" - android:layout_alignWithParentIfMissing="true" - android:layout_alignParentTop="true" - 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 android:orientation="vertical" - android:id="@+id/no_connection_layout" android:layout_width="fill_parent" - android:layout_height="fill_parent" android:visibility="gone"> - <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> - - -</LinearLayout> + 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>
\ No newline at end of file diff --git a/vdrmanager/res/layout/timer_list.xml b/vdrmanager/res/layout/timer_list.xml index 2416767..5e01c4a 100644 --- a/vdrmanager/res/layout/timer_list.xml +++ b/vdrmanager/res/layout/timer_list.xml @@ -1,7 +1,9 @@ <?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="fill_parent" - android:orientation="vertical"> +<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 xmlns:android="http://schemas.android.com/apk/res/android" @@ -11,9 +13,10 @@ 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" android:visibility="gone"> + android:layout_height="fill_parent"> <LinearLayout android:layout_height="fill_parent" android:gravity="center" android:layout_width="fill_parent" android:orientation="horizontal"> @@ -28,4 +31,4 @@ </LinearLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ViewFlipper>
\ No newline at end of file diff --git a/vdrmanager/res/layout/timer_operation_list_item b/vdrmanager/res/layout/timer_operation_list_item new file mode 100644 index 0000000..16aa849 --- /dev/null +++ b/vdrmanager/res/layout/timer_operation_list_item @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:paddingLeft="5dp" + android:paddingRight="5dp" + android:gravity= "center_vertical" + android:textAppearance="?android:textAppearanceLarge" + android:textColor="#000" + android:lines="2"/> |