diff options
author | git-vdr <herrlado@gmail.com> | 2011-10-04 01:56:35 +0200 |
---|---|---|
committer | git-vdr <herrlado@gmail.com> | 2011-10-04 01:56:35 +0200 |
commit | db8177ec1fa3683fdf9b1c459be57df21edd3fce (patch) | |
tree | 9fbafffad96f176b94d8a72a22fd9ef1e08dd9df /vdrmanager/res/layout | |
parent | a1069beee7a98787d679f831e595b2673c6099a2 (diff) | |
download | vdr-manager-db8177ec1fa3683fdf9b1c459be57df21edd3fce.tar.gz vdr-manager-db8177ec1fa3683fdf9b1c459be57df21edd3fce.tar.bz2 |
new icons, layout changes, etc
Diffstat (limited to 'vdrmanager/res/layout')
-rw-r--r-- | vdrmanager/res/layout/epg_detail.xml | 108 | ||||
-rw-r--r-- | vdrmanager/res/layout/epg_event_item.xml | 52 | ||||
-rw-r--r-- | vdrmanager/res/layout/epg_list.xml | 19 | ||||
-rw-r--r-- | vdrmanager/res/layout/event_epg_list.xml | 49 | ||||
-rw-r--r-- | vdrmanager/res/layout/event_item.xml | 40 | ||||
-rw-r--r-- | vdrmanager/res/layout/recording_detail.xml | 99 | ||||
-rw-r--r-- | vdrmanager/res/layout/recording_list.xml | 31 | ||||
-rw-r--r-- | vdrmanager/res/layout/time_epg_list.xml | 63 | ||||
-rw-r--r-- | vdrmanager/res/layout/timer_list.xml | 40 |
9 files changed, 441 insertions, 60 deletions
diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml index 7752819..2e18937 100644 --- a/vdrmanager/res/layout/epg_detail.xml +++ b/vdrmanager/res/layout/epg_detail.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"> @@ -9,7 +9,9 @@ android:id="@+id/epg_detail_title" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textStyle="bold"/> + android:textStyle="bold" + android:textSize="15dip" + android:text="Unterwegs nach Cold Mountain"/> <LinearLayout android:id="@+id/epg_detail_time_channel" @@ -22,32 +24,58 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="left" - android:layout_weight="1"/> + 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" + /> + <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> + + <TextView - android:id="@+id/epg_detail_date" + android:id="@+id/epg_detail_shorttext" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="left" + android:text="Krimikömedie" android:layout_below="@id/epg_detail_time"/> + + + <TextView android:id="@+id/epg_detail_separator_0" android:layout_width="fill_parent" android:layout_height="2sp"/> - <TextView - android:id="@+id/epg_detail_separator_1" - android:layout_width="fill_parent" - android:layout_height="1sp"/> + + + + <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" @@ -56,6 +84,7 @@ android:layout_weight="1"> <TextView + android:textSize="15dip" android:id="@+id/epg_detail_description" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -72,13 +101,72 @@ 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"> - <Button - android:id="@+id/epg_event_create_timer" +<!-- + <ImageButton + android:id="@+id/epg_event_left" + android:src="@drawable/left" + 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_event_create_timer_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_epg" + android:src="@drawable/epg" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_centerHorizontal="true" android:layout_weight="1" + 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_right" + android:src="@drawable/right" + 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> diff --git a/vdrmanager/res/layout/epg_event_item.xml b/vdrmanager/res/layout/epg_event_item.xml new file mode 100644 index 0000000..3001d43 --- /dev/null +++ b/vdrmanager/res/layout/epg_event_item.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/timer_item" android:layout_width="fill_parent" + android:layout_height="fill_parent" android:padding="3dp" android:paddingTop="5dp" android:paddingBottom="8dp" + android:orientation="vertical"> + +<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:background="@android:drawable/list_selector_background" +> +<TextView + android:id="@+id/timer_item_channel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:text="Sky Film" android:textSize="17dip"/> + + <ProgressBar + android:id="@+id/timer_progress" android:layout_width="fill_parent" + android:indeterminate="false" android:layout_height="3dip" android:layout_marginTop="3dip" + style="?android:attr/progressBarStyleHorizontal" android:visibility="gone" /> + + <LinearLayout android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_marginTop="0dip"> + + <TextView android:id="@+id/timer_item_time" android:textSize="17dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@android:drawable/list_selector_background" + android:gravity="left" android:text="22:33" android:paddingRight="5dip" /> + + <TextView android:id="@+id/timer_item_title" android:text="timer_item_title" android:layout_weight="1" android:textStyle="bold" + android:ellipsize="end" android:layout_width="wrap_content" android:textSize="17dip" android:background="@android:drawable/list_selector_background" + android:layout_height="wrap_content" /> + + </LinearLayout> + + <LinearLayout android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_marginTop="0dip" + android:orientation="horizontal"> + + <ImageView android:id="@+id/timer_item_state" android:layout_marginRight="5dip" android:layout_marginBottom="2dip" + android:layout_width="wrap_content" android:layout_height="fill_parent" android:background="@android:drawable/list_selector_background" + android:layout_centerVertical="true" android:visibility="gone" /> + + <TextView android:id="@+id/timer_item_shorttext" android:textSize="15dip" + android:text="timer_short_text" android:ellipsize="end" android:background="@android:drawable/list_selector_background" + android:layout_alignLeft="@id/timer_item_title" android:layout_width="wrap_content" android:layout_weight="1" + android:layout_height="wrap_content" /> + + <TextView android:id="@+id/timer_item_duration" android:background="@android:drawable/list_selector_background" + android:ellipsize="end" android:layout_width="wrap_content" android:gravity="right" android:textSize="13dip" + android:layout_height="wrap_content" android:text="89min"/> + + </LinearLayout> +</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/vdrmanager/res/layout/epg_list.xml b/vdrmanager/res/layout/epg_list.xml index dd44a8b..205dce0 100644 --- a/vdrmanager/res/layout/epg_list.xml +++ b/vdrmanager/res/layout/epg_list.xml @@ -46,5 +46,24 @@ 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> diff --git a/vdrmanager/res/layout/event_epg_list.xml b/vdrmanager/res/layout/event_epg_list.xml new file mode 100644 index 0000000..aadb591 --- /dev/null +++ b/vdrmanager/res/layout/event_epg_list.xml @@ -0,0 +1,49 @@ +<?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"> + + <Spinner + android:id="@+id/epg_list_channel_spinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/epg_list_channel_spinner"/> + + <ListView + android:id="@+id/whatson_list" + 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> diff --git a/vdrmanager/res/layout/event_item.xml b/vdrmanager/res/layout/event_item.xml deleted file mode 100644 index aab354a..0000000 --- a/vdrmanager/res/layout/event_item.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/timer_item" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dp"> - - <ImageView - android:id="@+id/timer_item_state" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true"/> - - <TextView - android:id="@+id/timer_item_time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/timer_item_state" - android:gravity="left"/> - - <TextView - android:id="@+id/timer_item_channel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_toRightOf="@id/timer_item_time" - android:gravity="right"/> - - <TextView - android:id="@+id/timer_item_title" - android:ellipsize="end" - android:gravity="left" - android:layout_toRightOf="@id/timer_item_state" - android:layout_below="@id/timer_item_time" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - -</RelativeLayout>
\ No newline at end of file diff --git a/vdrmanager/res/layout/recording_detail.xml b/vdrmanager/res/layout/recording_detail.xml new file mode 100644 index 0000000..0aa5da7 --- /dev/null +++ b/vdrmanager/res/layout/recording_detail.xml @@ -0,0 +1,99 @@ +<?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"> + + <ScrollView + android:id="@+id/timer_detail_scroll" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="0.5"> + + <LinearLayout + android:id="@+id/timer_detail_layout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/timer_detail_channel_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="bold" + android:text="@string/timer_detail_channel_title"/> + + <EditText + android:id="@+id/timer_detail_channel" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:editable="false"/> + + <TextView + android:id="@+id/timer_detail_title_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="bold" + android:text="@string/timer_detail_title_title"/> + + <EditText + android:id="@+id/timer_detail_title" + android:layout_width="fill_parent" + android:layout_height="wrap_content"/> + + <TextView + android:id="@+id/timer_detail_start_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/timer_detail_start_title"/> + + <LinearLayout + android:id="@+id/timer_detail_start_daytime" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <EditText + android:id="@+id/timer_detail_start" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:editable="false"/> + + <EditText + android:id="@+id/timer_detail_day" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:editable="false"/> + + </LinearLayout> + + <TextView + android:id="@+id/timer_detail_end_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/timer_detail_end_title"/> + + <EditText + android:id="@+id/timer_detail_end" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:editable="false"/> + + <TextView + android:id="@+id/timer_detail_fill" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_weight="0.5"/> + + </LinearLayout> + + </ScrollView> + + <Button + android:id="@+id/timer_details_save" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/timer_details_create_title"/> + +</LinearLayout> diff --git a/vdrmanager/res/layout/recording_list.xml b/vdrmanager/res/layout/recording_list.xml new file mode 100644 index 0000000..1dabd2c --- /dev/null +++ b/vdrmanager/res/layout/recording_list.xml @@ -0,0 +1,31 @@ +<?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"> + <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" + android:id="@+id/recording_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" 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>
\ No newline at end of file diff --git a/vdrmanager/res/layout/time_epg_list.xml b/vdrmanager/res/layout/time_epg_list.xml new file mode 100644 index 0000000..c45f9ba --- /dev/null +++ b/vdrmanager/res/layout/time_epg_list.xml @@ -0,0 +1,63 @@ +<?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"> + + <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"/> + + <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"/> + + </LinearLayout> + + <ListView + android:id="@+id/whatson_list" + 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> diff --git a/vdrmanager/res/layout/timer_list.xml b/vdrmanager/res/layout/timer_list.xml index 13cff32..2416767 100644 --- a/vdrmanager/res/layout/timer_list.xml +++ b/vdrmanager/res/layout/timer_list.xml @@ -1,11 +1,31 @@ <?xml version="1.0" encoding="utf-8"?> -<ListView - xmlns:android="http://schemas.android.com/apk/res/android" - 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 xmlns:android="http://schemas.android.com/apk/res/android" + 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" + 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" 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>
\ No newline at end of file |