diff options
Diffstat (limited to 'vdrmanager/res')
36 files changed, 660 insertions, 413 deletions
diff --git a/vdrmanager/res/drawable-hdpi/action_search.png b/vdrmanager/res/drawable-hdpi/action_search.png Binary files differnew file mode 100755 index 0000000..f12e005 --- /dev/null +++ b/vdrmanager/res/drawable-hdpi/action_search.png diff --git a/vdrmanager/res/drawable-hdpi/drawer_shadow.9.png b/vdrmanager/res/drawable-hdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 0000000..224cc4f --- /dev/null +++ b/vdrmanager/res/drawable-hdpi/drawer_shadow.9.png diff --git a/vdrmanager/res/drawable-hdpi/ic_drawer.png b/vdrmanager/res/drawable-hdpi/ic_drawer.png Binary files differnew file mode 100644 index 0000000..ff7b1de --- /dev/null +++ b/vdrmanager/res/drawable-hdpi/ic_drawer.png diff --git a/vdrmanager/res/drawable-mdpi/action_search.png b/vdrmanager/res/drawable-mdpi/action_search.png Binary files differnew file mode 100755 index 0000000..587d9e0 --- /dev/null +++ b/vdrmanager/res/drawable-mdpi/action_search.png diff --git a/vdrmanager/res/drawable-mdpi/drawer_shadow.9.png b/vdrmanager/res/drawable-mdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 0000000..3797f99 --- /dev/null +++ b/vdrmanager/res/drawable-mdpi/drawer_shadow.9.png diff --git a/vdrmanager/res/drawable-mdpi/ic_drawer.png b/vdrmanager/res/drawable-mdpi/ic_drawer.png Binary files differnew file mode 100644 index 0000000..fb681ba --- /dev/null +++ b/vdrmanager/res/drawable-mdpi/ic_drawer.png diff --git a/vdrmanager/res/drawable-xhdpi/action_search.png b/vdrmanager/res/drawable-xhdpi/action_search.png Binary files differnew file mode 100755 index 0000000..3549f84 --- /dev/null +++ b/vdrmanager/res/drawable-xhdpi/action_search.png diff --git a/vdrmanager/res/drawable-xhdpi/drawer_shadow.9.png b/vdrmanager/res/drawable-xhdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 0000000..fa3d853 --- /dev/null +++ b/vdrmanager/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/vdrmanager/res/drawable-xhdpi/ic_drawer.png b/vdrmanager/res/drawable-xhdpi/ic_drawer.png Binary files differnew file mode 100644 index 0000000..b9bc3d7 --- /dev/null +++ b/vdrmanager/res/drawable-xhdpi/ic_drawer.png 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 diff --git a/vdrmanager/res/menu/channellist.xml b/vdrmanager/res/menu/channellist.xml index 29cf2d8..4f2695a 100644 --- a/vdrmanager/res/menu/channellist.xml +++ b/vdrmanager/res/menu/channellist.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/channels_recent_channels" android:alphabeticShortcut="r" android:icon="@drawable/ic_menu_recent_history" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:title="@string/recent_channels"/> <item android:id="@+id/channels_groupby" android:alphabeticShortcut="g" android:icon="@android:drawable/ic_menu_sort_alphabetically" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:title="@string/menu_groupby"/> </menu>
\ No newline at end of file diff --git a/vdrmanager/res/menu/epg_details.xml b/vdrmanager/res/menu/epg_details.xml index 4353b0b..6ce238a 100644 --- a/vdrmanager/res/menu/epg_details.xml +++ b/vdrmanager/res/menu/epg_details.xml @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:v7="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android" > <item android:id="@+id/epg_details_menu_search_repeat" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:icon="@drawable/ic_menu_view" android:title="@string/search_reapt"/> <item - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:id="@+id/epg_details_menu_share" android:icon="@android:drawable/ic_menu_share" android:title="@string/share"/> <item - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:id="@+id/epg_details_menu_add_to_cal" android:icon="@android:drawable/ic_menu_month" android:title="@string/addtocal"/> <item + v7:showAsAction="ifRoom" android:id="@+id/epg_details_menu_switch" android:icon="@drawable/ic_menu_goto" android:title="@string/switch_to_channel"/> diff --git a/vdrmanager/res/menu/epg_event_list_menu.xml b/vdrmanager/res/menu/epg_event_list_menu.xml index c0615e9..4796a13 100644 --- a/vdrmanager/res/menu/epg_event_list_menu.xml +++ b/vdrmanager/res/menu/epg_event_list_menu.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <!-- <item @@ -16,8 +16,8 @@ <!-- --> <item + v7:showAsAction="ifRoom" android:id="@+id/epg_list_stream" android:icon="@drawable/ic_menu_play_clip" - android:showAsAction="ifRoom" android:title="@string/livetv"/> </menu>
\ No newline at end of file diff --git a/vdrmanager/res/menu/epg_list_menu.xml b/vdrmanager/res/menu/epg_list_menu.xml index ebbefa9..2e1b029 100644 --- a/vdrmanager/res/menu/epg_list_menu.xml +++ b/vdrmanager/res/menu/epg_list_menu.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <!-- <item @@ -18,7 +18,7 @@ <item android:id="@+id/epg_list_sort_menu" android:icon="@android:drawable/ic_menu_sort_alphabetically" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:title="@string/sort"/> </menu>
\ No newline at end of file diff --git a/vdrmanager/res/menu/epg_search_menu.xml b/vdrmanager/res/menu/epg_search_menu.xml index e4bf9d0..22a69ee 100644 --- a/vdrmanager/res/menu/epg_search_menu.xml +++ b/vdrmanager/res/menu/epg_search_menu.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <!-- --> <item android:id="@+id/epg_search" android:icon="@android:drawable/ic_menu_search" android:alphabeticShortcut="s" - android:showAsAction="always" + v7:showAsAction="always" android:title="@string/action_menu_search"/> </menu>
\ No newline at end of file diff --git a/vdrmanager/res/menu/main_menu.xml b/vdrmanager/res/menu/main_menu.xml index 5e452cb..f08a1fd 100644 --- a/vdrmanager/res/menu/main_menu.xml +++ b/vdrmanager/res/menu/main_menu.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/main_menu_goto" android:icon="@drawable/ic_menu_goto" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:title="@string/main_menu_goto"/> <item android:id="@+id/menu_search" - android:actionViewClass="com.actionbarsherlock.widget.SearchView" + v7:actionViewClass="android.support.v7.widget.SearchView" android:icon="@android:drawable/ic_menu_search" - android:showAsAction="always" + v7:showAsAction="always" android:title="@string/search"/> <item android:id="@+id/main_menu_preferences" android:icon="@android:drawable/ic_menu_preferences" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:title="@string/main_menu_preferences"/> <item android:id="@+id/main_menu_clear_search" diff --git a/vdrmanager/res/menu/recording_list_item_menu.xml b/vdrmanager/res/menu/recording_list_item_menu.xml index b375ba0..1da52d5 100644 --- a/vdrmanager/res/menu/recording_list_item_menu.xml +++ b/vdrmanager/res/menu/recording_list_item_menu.xml @@ -1,8 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/recording_item_menu_delete" + android:title="@string/recording_item_menu_delete"/> + <item + android:id="@+id/recording_item_menu_stream" + android:title="@string/recording_item_menu_stream"/> + <item + android:id="@+id/epg_item_menu_live_tv" + android:title="@string/livetv" + android:visible="false"/> + <item + android:id="@+id/epg_item_menu_switchto" + android:title="@string/switch_to_channel" + android:visible="true"/> - <item android:id="@+id/recording_item_menu_delete" android:title="@string/recording_item_menu_delete"/> - <item android:id="@+id/recording_item_menu_stream" android:title="@string/recording_item_menu_stream"/> - <item android:id="@+id/epg_item_menu_live_tv" android:title="@string/livetv" android:visible="false" /> - <item android:id="@+id/epg_item_menu_switchto" android:title="@string/switch_to_channel" android:visible="true" /> </menu>
\ No newline at end of file diff --git a/vdrmanager/res/menu/refresh_filter_menu.xml b/vdrmanager/res/menu/refresh_filter_menu.xml index a8065b5..0046707 100644 --- a/vdrmanager/res/menu/refresh_filter_menu.xml +++ b/vdrmanager/res/menu/refresh_filter_menu.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/list_refresh" android:alphabeticShortcut="r" android:icon="@drawable/ic_menu_refresh" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:title="@string/refresh"/> <item android:id="@+id/list_filter" android:alphabeticShortcut="f" android:icon="@drawable/ic_menu_filter" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:title="@string/filter"/> </menu>
\ No newline at end of file diff --git a/vdrmanager/res/menu/refresh_menu.xml b/vdrmanager/res/menu/refresh_menu.xml index 1d8dcad..79626b9 100644 --- a/vdrmanager/res/menu/refresh_menu.xml +++ b/vdrmanager/res/menu/refresh_menu.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/list_refresh" android:alphabeticShortcut="r" - android:showAsAction="ifRoom" + v7:showAsAction="ifRoom" android:icon="@drawable/ic_menu_refresh" android:title="@string/refresh"/> </menu>
\ No newline at end of file diff --git a/vdrmanager/res/menu/vdrlist.xml b/vdrmanager/res/menu/vdrlist.xml index 70d670d..f156173 100644 --- a/vdrmanager/res/menu/vdrlist.xml +++ b/vdrmanager/res/menu/vdrlist.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:v7="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/main_menu_vdrlist_add" android:icon="@android:drawable/ic_menu_add" - android:showAsAction="always" + v7:showAsAction="always" android:title="@string/new_vdr"/> <item android:id="@+id/main_menu_vdrlist_restore" diff --git a/vdrmanager/res/values-de/strings.xml b/vdrmanager/res/values-de/strings.xml index e39997e..bdb1994 100644 --- a/vdrmanager/res/values-de/strings.xml +++ b/vdrmanager/res/values-de/strings.xml @@ -305,8 +305,9 @@ herrlado<herrlado@gmail.com></string> <item>EXTERN (veraltet)</item> </string-array> <string-array name="recstream_entries"> - <item>VDR Live plugin</item> + <item>VDR live plugin</item> <item>VDR streamdev plugin</item> + <item>VDR smattvweb plugin</item> </string-array> <string-array name="recent_channels_order_entries"> <item>Am meisten genutzt</item> diff --git a/vdrmanager/res/values-it/strings.xml b/vdrmanager/res/values-it/strings.xml index 5f5425f..74a4573 100644 --- a/vdrmanager/res/values-it/strings.xml +++ b/vdrmanager/res/values-it/strings.xml @@ -267,6 +267,8 @@ </string-array> <string-array name="recstream_entries"> <item>Plugin VDR Live</item> + <item>Plugin VDR Streamdev</item> + <item>Plugin VDR Smattvweb</item> </string-array> diff --git a/vdrmanager/res/values-uk/strings.xml b/vdrmanager/res/values-uk/strings.xml index b32c461..37725ca 100644 --- a/vdrmanager/res/values-uk/strings.xml +++ b/vdrmanager/res/values-uk/strings.xml @@ -262,6 +262,8 @@ herrlado<herrlado@gmail.com> </string-array> <string-array name="recstream_entries"> <item>Додаток VDR live</item> + <item>Додаток VDR streamdev</item> + <item>Додаток VDR smattvweb</item> </string-array> <!-- EPG Content --> diff --git a/vdrmanager/res/values-v14/abs__themes.xml b/vdrmanager/res/values-v14/abs__themes.xml deleted file mode 100644 index a22caa7..0000000 --- a/vdrmanager/res/values-v14/abs__themes.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> -<style name="Sherlock.__Theme" parent="android:Theme.Holo"> - <item name="textColorPrimary">@color/abs__primary_text_holo_light</item> - <item name="textColorPrimaryInverse">@color/abs__primary_text_holo_dark</item> -</style> -</resources>
\ No newline at end of file diff --git a/vdrmanager/res/values/arrays.xml b/vdrmanager/res/values/arrays.xml index 6fb2fea..4f68ddd 100644 --- a/vdrmanager/res/values/arrays.xml +++ b/vdrmanager/res/values/arrays.xml @@ -32,13 +32,19 @@ <string-array name="recstream_entry_values"> <item>vdr-live</item> <item>vdr-streamdev</item> + <item>vdr-smarttvweb</item> </string-array> <string-array name="recent_channels_order_entry_values"> <item>most</item> <item>last</item> </string-array> - + <array name="recstream_smarttvweb_entry_values"> + <item>progressive</item> + <item>has</item> + <item>hls</item> + </array> + diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml index 3666e98..03880f3 100644 --- a/vdrmanager/res/values/strings.xml +++ b/vdrmanager/res/values/strings.xml @@ -96,7 +96,7 @@ <string name="new_timer">New timer</string> <string name="vdr_error_text">The communication with VDR has caused an error: %1$s</string> <string name="livetv">Live TV</string> - <string name="settings_livetv_summary">Needs streamdev-server on VDR and an external + <string name="settings_livetv_summary">Needs streamdev-server on VDR and an external player such as VPlayer</string> <string name="settings_livetv_streamformat">Streamformat</string> <string name="settings_livetv_port">Streaming Port</string> @@ -110,7 +110,6 @@ <item>PS</item> </string-array> - <string name="key_remux_enable">remux_enable</string> <string name="key_remux_command">remux_command</string> <string name="key_remux_parameter">remux_parameter</string> @@ -264,8 +263,17 @@ <string name="recstream_enable_summary">Enable Streaming of recordings</string> <string-array name="recstream_entries"> - <item>VDR live plugin</item> - <item>VDR streamdev plugin</item> + <item>live plugin</item> + <item>streamdev plugin</item> + <item>smarttvweb plugin</item> + </string-array> + + + + <string-array name="recstream_smarttvweb_entries"> + <item>Progressive</item> + <item>MPEG-DASH</item> + <item>Apple HLS</item> </string-array> <string name="recstream_method_title">Streaming method</string> @@ -355,8 +363,7 @@ <item>Time</item> <item>Alphabet</item> </string-array> - - <string-array name="epg_sort_by_time_alpha_channel"> + <string-array name="epg_sort_by_time_alpha_channel"> <item>Time</item> <item>Alphabet</item> <item>Channel</item> @@ -388,133 +395,129 @@ </string-array> <string name="filter">Filter</string> - <string name="audio_tracks_template">Audio Tracks: %1$s</string> <string name="audio_track_dolby">D</string> - <string name="vdr_timezone_summary">The time zone used on the server. It is important if you travel and modify timers from another time zone.</string> <string name="vdr_timezone_title">Select server time zone</string> <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string> <string name="zone_list_menu_sort_by_timezone">Sort by time zone</string> <string name="probing">Probing %1$s …</string> - <string name="no_results">No results…</string> - <string name="recording_started">Recording started</string> - <string name="set_time">Set time</string> - <!-- … --> + <string name="no_results">No results…</string> + <string name="recording_started">Recording started</string> + <string name="set_time">Set time</string> + <!-- … --> - <!-- - SSL related messages - --> +<!-- SSL related messages --> - <string name="certificate_problem_message_title">Certificate warning</string> -<string name="certificate_problem_message_text"> -The server certificate was not accepted:\n\n + <string name="certificate_problem_message_title">Certificate warning</string> + <string name="certificate_problem_message_text">The server certificate was not accepted:\n\n Hostname:\n %1$s\n Valid from:\n %2$s\n Valid until:\n %3$s\n\n -What do you want to do? - </string> - <string name="certificate_accept_once">Accept once</string> - <string name="certificate_accepted_forever">Accept forever</string> - <string name="certificate_not_accepted">Abort</string> - -<!-- EPG Content --> -<string name="Content$Movie__Drama">Movie/Drama</string> -<string name="Content$Detective__Thriller">Detective/Thriller</string> -<string name="Content$Adventure__Western__War">Adventure/Western/War</string> -<string name="Content$Science_Fiction__Fantasy__Horror">Science Fiction/Fantasy/Horror</string> -<string name="Content$Comedy">Comedy</string> -<string name="Content$Soap__Melodrama__Folkloric">Soap/Melodrama/Folkloric</string> -<string name="Content$Romance">Romance</string> -<string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Serious/Classical/Religious/Historical Movie/Drama</string> -<string name="Content$Adult_Movie__Drama">Adult Movie/Drama</string> -<string name="Content$News__Current_Affairs">News/Current Affairs</string> -<string name="Content$News__Weather_Report">News/Weather Report</string> -<string name="Content$News_Magazine">News Magazine</string> -<string name="Content$Documentary">Documentary</string> -<string name="Content$Discussion__Inverview__Debate">Discussion/Inverview/Debate</string> -<string name="Content$Show__Game_Show">Show/Game Show</string> -<string name="Content$Game_Show__Quiz__Contest">Game Show/Quiz/Contest</string> -<string name="Content$Variety_Show">Variety Show</string> -<string name="Content$Talk_Show">Talk Show</string> -<string name="Content$Sports">Sports</string> -<string name="Content$Special_Event">Special Event</string> -<string name="Content$Sport_Magazine">Sport Magazine</string> -<string name="Content$Football__Soccer">Football/Soccer</string> -<string name="Content$Tennis__Squash">Tennis/Squash</string> -<string name="Content$Team_Sports">Team Sports</string> -<string name="Content$Athletics">Athletics</string> -<string name="Content$Motor_Sport">Motor Sport</string> -<string name="Content$Water_Sport">Water Sport</string> -<string name="Content$Winter_Sports">Winter Sports</string> -<string name="Content$Equestrian">Equestrian</string> -<string name="Content$Martial_Sports">Martial Sports</string> -<string name="Content$Childrens__Youth_Programme">Children\'s/Youth Programme</string> -<string name="Content$Preschool_Childrens_Programme">Pre-school Children\'s Programme</string> -<string name="Content$Entertainment_Programme_for_6_to_14">Entertainment Programme for 6 to 14</string> -<string name="Content$Entertainment_Programme_for_10_to_16">Entertainment Programme for 10 to 16</string> -<string name="Content$Informational__Educational__School_Programme">Informational/Educational/School Programme</string> -<string name="Content$Cartoons__Puppets">Cartoons/Puppets</string> -<string name="Content$Music__Ballet__Dance">Music/Ballet/Dance</string> -<string name="Content$Rock__Pop">Rock/Pop</string> -<string name="Content$Serious__Classical_Music">Serious/Classical Music</string> -<string name="Content$Folk__Tradional_Music">Folk/Tradional Music</string> -<string name="Content$Jazz">Jazz</string> -<string name="Content$Musical__Opera">Musical/Opera</string> -<string name="Content$Ballet">Ballet</string> -<string name="Content$Arts__Culture">Arts/Culture</string> -<string name="Content$Performing_Arts">Performing Arts</string> -<string name="Content$Fine_Arts">Fine Arts</string> -<string name="Content$Religion">Religion</string> -<string name="Content$Popular_Culture__Traditional_Arts">Popular Culture/Traditional Arts</string> -<string name="Content$Literature">Literature</string> -<string name="Content$Film__Cinema">Film/Cinema</string> -<string name="Content$Experimental_Film__Video">Experimental Film/Video</string> -<string name="Content$Broadcasting__Press">Broadcasting/Press</string> -<string name="Content$New_Media">New Media</string> -<string name="Content$Arts__Culture_Magazine">Arts/Culture Magazine</string> -<string name="Content$Fashion">Fashion</string> -<string name="Content$Social__Political__Economics">Social/Political/Economics</string> -<string name="Content$Magazine__Report__Documentary">Magazine/Report/Documentary</string> -<string name="Content$Economics__Social_Advisory">Economics/Social Advisory</string> -<string name="Content$Remarkable_People">Remarkable People</string> -<string name="Content$Education__Science__Factual">Education/Science/Factual</string> -<string name="Content$Nature__Animals__Environment">Nature/Animals/Environment</string> -<string name="Content$Technology__Natural_Sciences">Technology/Natural Sciences</string> -<string name="Content$Medicine__Physiology__Psychology">Medicine/Physiology/Psychology</string> -<string name="Content$Foreign_Countries__Expeditions">Foreign Countries/Expeditions</string> -<string name="Content$Social__Spiritual_Sciences">Social/Spiritual Sciences</string> -<string name="Content$Further_Education">Further Education</string> -<string name="Content$Languages">Languages</string> -<string name="Content$Leisure__Hobbies">Leisure/Hobbies</string> -<string name="Content$Tourism__Travel">Tourism/Travel</string> -<string name="Content$Handicraft">Handicraft</string> -<string name="Content$Motoring">Motoring</string> -<string name="Content$Fitness_and_Health">Fitness & Health</string> -<string name="Content$Cooking">Cooking</string> -<string name="Content$Advertisement__Shopping">Advertisement/Shopping</string> -<string name="Content$Gardening">Gardening</string> -<string name="Content$Original_Language">Original Language</string> -<string name="Content$Black_and_White">Black & White</string> -<string name="Content$Unpublished">Unpublished</string> -<string name="Content$Live_Broadcast">Live Broadcas</string> -<string name="Content$Unknown"></string> -<!-- EPG Content END --> -<string name="type_to_filter">type to filter</string> - -<string name="drive_info">Free %1$s GB of %2$s GB (%3$s%%)</string> -<string name="drive_img">Drive</string> -<string name="sad_img">Sad</string> -<string name="search">Search</string> - -<string name="clear_term_after_search_title">Clear Term after Search</string> -<string name="clear_term_after_search_summary_off">Search term remains after peforming search</string> -<string name="clear_term_after_search_summary_on">Term gets cleared after performing search</string> - - - +What do you want to do?</string> + <string name="certificate_accept_once">Accept once</string> + <string name="certificate_accepted_forever">Accept forever</string> + <string name="certificate_not_accepted">Abort</string> + + <!-- EPG Content --> + <string name="Content$Movie__Drama">Movie/Drama</string> + <string name="Content$Detective__Thriller">Detective/Thriller</string> + <string name="Content$Adventure__Western__War">Adventure/Western/War</string> + <string name="Content$Science_Fiction__Fantasy__Horror">Science Fiction/Fantasy/Horror</string> + <string name="Content$Comedy">Comedy</string> + <string name="Content$Soap__Melodrama__Folkloric">Soap/Melodrama/Folkloric</string> + <string name="Content$Romance">Romance</string> + <string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Serious/Classical/Religious/Historical Movie/Drama</string> + <string name="Content$Adult_Movie__Drama">Adult Movie/Drama</string> + <string name="Content$News__Current_Affairs">News/Current Affairs</string> + <string name="Content$News__Weather_Report">News/Weather Report</string> + <string name="Content$News_Magazine">News Magazine</string> + <string name="Content$Documentary">Documentary</string> + <string name="Content$Discussion__Inverview__Debate">Discussion/Inverview/Debate</string> + <string name="Content$Show__Game_Show">Show/Game Show</string> + <string name="Content$Game_Show__Quiz__Contest">Game Show/Quiz/Contest</string> + <string name="Content$Variety_Show">Variety Show</string> + <string name="Content$Talk_Show">Talk Show</string> + <string name="Content$Sports">Sports</string> + <string name="Content$Special_Event">Special Event</string> + <string name="Content$Sport_Magazine">Sport Magazine</string> + <string name="Content$Football__Soccer">Football/Soccer</string> + <string name="Content$Tennis__Squash">Tennis/Squash</string> + <string name="Content$Team_Sports">Team Sports</string> + <string name="Content$Athletics">Athletics</string> + <string name="Content$Motor_Sport">Motor Sport</string> + <string name="Content$Water_Sport">Water Sport</string> + <string name="Content$Winter_Sports">Winter Sports</string> + <string name="Content$Equestrian">Equestrian</string> + <string name="Content$Martial_Sports">Martial Sports</string> + <string name="Content$Childrens__Youth_Programme">Children\'s/Youth Programme</string> + <string name="Content$Preschool_Childrens_Programme">Pre-school Children\'s Programme</string> + <string name="Content$Entertainment_Programme_for_6_to_14">Entertainment Programme for 6 to 14</string> + <string name="Content$Entertainment_Programme_for_10_to_16">Entertainment Programme for 10 to 16</string> + <string name="Content$Informational__Educational__School_Programme">Informational/Educational/School Programme</string> + <string name="Content$Cartoons__Puppets">Cartoons/Puppets</string> + <string name="Content$Music__Ballet__Dance">Music/Ballet/Dance</string> + <string name="Content$Rock__Pop">Rock/Pop</string> + <string name="Content$Serious__Classical_Music">Serious/Classical Music</string> + <string name="Content$Folk__Tradional_Music">Folk/Tradional Music</string> + <string name="Content$Jazz">Jazz</string> + <string name="Content$Musical__Opera">Musical/Opera</string> + <string name="Content$Ballet">Ballet</string> + <string name="Content$Arts__Culture">Arts/Culture</string> + <string name="Content$Performing_Arts">Performing Arts</string> + <string name="Content$Fine_Arts">Fine Arts</string> + <string name="Content$Religion">Religion</string> + <string name="Content$Popular_Culture__Traditional_Arts">Popular Culture/Traditional Arts</string> + <string name="Content$Literature">Literature</string> + <string name="Content$Film__Cinema">Film/Cinema</string> + <string name="Content$Experimental_Film__Video">Experimental Film/Video</string> + <string name="Content$Broadcasting__Press">Broadcasting/Press</string> + <string name="Content$New_Media">New Media</string> + <string name="Content$Arts__Culture_Magazine">Arts/Culture Magazine</string> + <string name="Content$Fashion">Fashion</string> + <string name="Content$Social__Political__Economics">Social/Political/Economics</string> + <string name="Content$Magazine__Report__Documentary">Magazine/Report/Documentary</string> + <string name="Content$Economics__Social_Advisory">Economics/Social Advisory</string> + <string name="Content$Remarkable_People">Remarkable People</string> + <string name="Content$Education__Science__Factual">Education/Science/Factual</string> + <string name="Content$Nature__Animals__Environment">Nature/Animals/Environment</string> + <string name="Content$Technology__Natural_Sciences">Technology/Natural Sciences</string> + <string name="Content$Medicine__Physiology__Psychology">Medicine/Physiology/Psychology</string> + <string name="Content$Foreign_Countries__Expeditions">Foreign Countries/Expeditions</string> + <string name="Content$Social__Spiritual_Sciences">Social/Spiritual Sciences</string> + <string name="Content$Further_Education">Further Education</string> + <string name="Content$Languages">Languages</string> + <string name="Content$Leisure__Hobbies">Leisure/Hobbies</string> + <string name="Content$Tourism__Travel">Tourism/Travel</string> + <string name="Content$Handicraft">Handicraft</string> + <string name="Content$Motoring">Motoring</string> + <string name="Content$Fitness_and_Health">Fitness & Health</string> + <string name="Content$Cooking">Cooking</string> + <string name="Content$Advertisement__Shopping">Advertisement/Shopping</string> + <string name="Content$Gardening">Gardening</string> + <string name="Content$Original_Language">Original Language</string> + <string name="Content$Black_and_White">Black & White</string> + <string name="Content$Unpublished">Unpublished</string> + <string name="Content$Live_Broadcast">Live Broadcas</string> + <string name="Content$Unknown"></string> + <!-- EPG Content END --> + <string name="type_to_filter">type to filter</string> + <string name="drive_info">Free %1$s GB of %2$s GB (%3$s%%)</string> + <string name="drive_img">Drive</string> + <string name="sad_img">Sad</string> + <string name="search">Search</string> + <string name="clear_term_after_search_title">Clear Term after Search</string> + <string name="clear_term_after_search_summary_off">Search term remains after peforming search</string> + <string name="clear_term_after_search_summary_on">Term gets cleared after performing search</string> + <string name="drawer_open">Open navigation drawer</string> + <string name="drawer_close">Close navigation drawer</string> + <string name="action_websearch">Web search</string> + <string name="settings_smarttvweb_port_summary">VDR smarttvweb plugin has default port 8000</string> + <string name="settings_smarttvweb_port">Smarttvweb port</string> + <string name="recstream_smarttvweb_method_title">Smarttvweb Stream Type</string> + <string name="recstream_smarttvweb_method_summary">Supported methods: \'Progressive\', \'MPEG-DASH \/ OIPF HAS\', \'Apple HLS\'</string> </resources>
\ No newline at end of file diff --git a/vdrmanager/res/values/styles.xml b/vdrmanager/res/values/styles.xml index 70ece1a..4139961 100644 --- a/vdrmanager/res/values/styles.xml +++ b/vdrmanager/res/values/styles.xml @@ -77,5 +77,7 @@ <item name="android:layout_marginBottom">1dp</item> <item name="android:background">@drawable/line_gradient</item> </style> + + <style name="AppTheme" parent="@style/Theme.AppCompat"/> </resources>
\ No newline at end of file diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml index 4cbd861..1135eab 100644 --- a/vdrmanager/res/xml/vdr_prefs.xml +++ b/vdrmanager/res/xml/vdr_prefs.xml @@ -176,6 +176,23 @@ android:key="key_live_port" android:summary="@string/settings_live_port_summary" android:title="@string/settings_live_port" /> + + + <ListPreference + android:dependency="key_rec_stream_enable" + android:entries="@array/recstream_smarttvweb_entries" + android:entryValues="@array/recstream_smarttvweb_entry_values" + android:key="key_smarttvweb_recstream_method" + android:summary="@string/recstream_smarttvweb_method_summary" + android:title="@string/recstream_smarttvweb_method_title" /> + + <EditTextPreference + android:defaultValue="8000" + android:dependency="key_rec_stream_enable" + android:inputType="number" + android:key="key_smarttvweb_port" + android:summary="@string/settings_smarttvweb_port_summary" + android:title="@string/settings_smarttvweb_port" /> </PreferenceCategory> <PreferenceScreen android:title="Advanced" > |
