refactoring

1 files changed, 257 insertions, 137 deletions

diff --git a/vdrmanager/res/xml/preferences.xml b/vdrmanager/res/xml/preferences.xml
index 001b2f9..a24ecaa 100644
--- a/vdrmanager/res/xml/preferences.xml
+++ b/vdrmanager/res/xml/preferences.xml
@@ -1,138 +1,258 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<PreferenceCategory android:title="@string/vdr_preferences"
-		android:key="vdr_preferences">
-
-		<EditTextPreference android:key="@string/vdr_host_key"
-			android:title="@string/vdr_host_title" android:summary="@string/vdr_host_summary" />
-		<EditTextPreference android:key="@string/vdr_port_key"
-			android:title="@string/vdr_port_title" android:summary="@string/vdr_port_summary"
-			android:defaultValue="@string/vdr_port_default" />
-		<EditTextPreference android:key="@string/vdr_password_key"
-			android:title="@string/vdr_password_title" android:summary="@string/vdr_password_summary"
-			android:password="true" />
-		<CheckBoxPreference android:key="@string/vdr_ssl_key"
-			android:title="@string/vdr_ssl_title" android:summary="@string/vdr_ssl_summary" />
-		<PreferenceScreen android:title="Advanced">
-			<EditTextPreference android:key="@string/vdr_conntimeout_key" android:title="@string/vdr_conntimeout_title" android:summary="@string/vdr_conntimeout_sum"  android:defaultValue="10" 	android:inputType="number" />
-			<EditTextPreference android:key="@string/vdr_readtimeout_key" android:title="@string/vdr_readtimeout_title" android:summary="@string/vdr_readtimeout_sum" android:defaultValue="10"  	android:inputType="number" />
-			<EditTextPreference android:key="@string/vdr_timeout_key"     android:title="@string/vdr_timeout_title" android:summary="@string/vdr_timeout_sum"  android:defaultValue="120"	android:inputType="number" />
-		</PreferenceScreen>
-	</PreferenceCategory>
-
-
-	<PreferenceCategory android:title="@string/channel_filter_preferences"
-		android:key="filter_preferences">
-		<CheckBoxPreference android:key="@string/channel_filter_filter_key"
-			android:title="@string/channel_filter_filter_title" android:summary="@string/channel_filter_filter_summary" />
-		<EditTextPreference android:key="@string/channel_filter_last_key"
-			android:title="@string/channel_filter_last_title" android:summary="@string/channel_filter_last_summary"
-			android:dependency="@string/channel_filter_filter_key"
-			android:defaultValue="1" />
-	</PreferenceCategory>
-
-	<PreferenceCategory android:title="@string/wakeup_preferences"
-		android:key="wakeup_preferences">
-		<CheckBoxPreference android:key="@string/wakeup_enabled_key"
-			android:title="@string/wakeup_enabled_title" android:summary="@string/wakeup_enabled_summary" />
-		<ListPreference android:key="@string/wakeup_method_key"
-			android:title="@string/wakeup_method_title" android:summary="@string/wakeup_method_summary"
-			android:entries="@array/wakeup_methods" android:entryValues="@array/wakeup_methods_values"
-			android:defaultValue="@string/default_wakeup_method"
-			android:dependency="@string/wakeup_enabled_key" />
-		<EditTextPreference android:key="@string/wakeup_url_key"
-			android:title="@string/wakeup_url_title" android:summary="@string/wakeup_url_summary"
-			android:dependency="@string/wakeup_enabled_key" />
-		<EditTextPreference android:key="@string/wakeup_user_key"
-			android:title="@string/wakeup_user_title" android:summary="@string/wakeup_user_summary"
-			android:dependency="@string/wakeup_enabled_key" />
-		<EditTextPreference android:key="@string/wakeup_password_key"
-			android:password="true"
-			android:title="@string/wakeup_password_title" android:summary="@string/wakeup_password_summary"
-			android:dependency="@string/wakeup_enabled_key" />
-		<EditTextPreference android:key="@string/wakeup_wol_mac_key"
-			android:title="@string/wakeup_wol_mac_title" android:summary="@string/wakeup_wol_mac_summary"
-			android:dependency="@string/wakeup_enabled_key" />
-		<EditTextPreference android:key="@string/wakeup_wol_custom_broadcast_key"
-			android:title="@string/wakeup_wol_custom_boradcast_title"
-			android:summaryOn="@string/wakeup_wol_custom_boradcast_summary"
-			android:dependency="@string/wakeup_enabled_key" android:defaultValue="255.255.255.255" />
-	</PreferenceCategory>
-
-	<PreferenceCategory android:title="@string/timer_preferences"
-		android:key="timer_preferences">
-		<EditTextPreference android:key="@string/timer_pre_start_buffer_key"
-			android:title="@string/timer_pre_start_buffer_title" android:summary="@string/timer_pre_start_buffer_summary"
-			android:defaultValue="5" />
-		<EditTextPreference android:key="@string/timer_post_end_buffer_key"
-			android:title="@string/timer_post_end_buffer_title" android:summary="@string/timer_post_end_buffer_summary"
-			android:defaultValue="30" />
-		<EditTextPreference android:key="@string/timer_default_lifetime_key"
-			android:title="@string/timer_default_lifetime_title" android:summary="@string/timer_default_lifetime_summary"
-			android:defaultValue="99" />
-		<EditTextPreference android:key="@string/timer_default_priority_key"
-			android:title="@string/timer_default_priority_title" android:summary="@string/timer_default_priority_summary"
-			android:defaultValue="50" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/gui_preferences"
-		android:key="gui_preferences">
-		<CheckBoxPreference android:key="@string/gui_channels_show_channel_numbers_key"
-			android:title="@string/gui_channels_show_channel_numbers_title"
-			android:summary="@string/gui_channels_show_channel_numbers_summary"
-			android:defaultValue="false" />
-		<CheckBoxPreference android:key="@string/gui_enable_24h_format_key"
-			android:title="@string/gui_enable_24h_format_title"
-			android:summaryOn="@string/gui_enable_24h_format_summary_on"
-			android:summaryOff="@string/gui_enable_24h_format_summary_off" />
-
-		<CheckBoxPreference android:key="@string/qui_show_imdb_button_key"
-			android:title="@string/qui_show_imdb_button_title" android:summaryOn="@string/qui_show_imdb_button_summary_on"
-			android:summaryOff="@string/qui_show_imdb_button_summary_off"
-			android:defaultValue="true" />
-
-		<ListPreference android:key="@string/qui_imdb_url_key"
-			android:title="@string/qui_imdb_url_title" android:summaryOn="@string/qui_imdb_url_summary"
-			android:entries="@array/imdb_urls_values" android:entryValues="@array/imdb_urls"
-			android:dependency="@string/qui_show_imdb_button_key"
-			android:defaultValue="akas.imdb.com" />
-
-		<CheckBoxPreference android:key="@string/qui_quit_on_back_key"
-			android:title="@string/gui_quit_on_back_title"
-			android:summaryOn="@string/gui_quit_on_back_summary_on"
-			android:summaryOff="@string/gui_quit_on_back_summary_off"
-			android:defaultValue="true" />
-		
-		<ListPreference android:key="@string/gui_custom_locale_key"
-				android:title="@string/gui_custom_locale_title" android:summary="@string/gui_custom_locale_sum"
-				android:entries="@array/lang" android:entryValues="@array/lang_values" android:defaultValue="DEFAULT" />	
-	
-	</PreferenceCategory>
-	
-	<PreferenceCategory android:title="@string/livetv">
-		<EditTextPreference android:key="streamingport"
-			android:inputType="number" android:title="@string/settings_livetv_port"
-			android:summary="@string/settings_livetv_port_summary"
-			android:defaultValue="3000" />
-
-		<ListPreference android:key="livetv_streamformat"
-			android:title="@string/settings_livetv_streamformat"
-			android:defaultValue="TS" android:entries="@array/livetv_streamformat"
-			android:entryValues="@array/livetv_streamformat_values" />
-
-		<CheckBoxPreference android:key="remux_enable"
-			android:title="@string/remux_enable_title" android:summary="@string/remux_enable_summary" />
-		
-		<EditTextPreference android:dependency="remux_enable"
-			android:key="remux_command" android:title="@string/remux_command_title"
-			android:defaultValue="EXT" android:summary="@string/remux_command_summary" />
-
-		<EditTextPreference android:dependency="remux_enable"
-			android:key="remux_parameter" android:title="@string/remux_parameter_title"
-			android:summary="@string/remux_parameter_summary"
-			android:defaultValue="QUALITY=DSL1000" />
-
-
-	</PreferenceCategory>
-
-</PreferenceScreen>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <PreferenceScreen
+        android:summary="Define one or more VDR Devices. (comming soon)"
+        android:title="VDR Devices" android:enabled="false">
+
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetClass="de.bjusystems.vdrmanager.gui.VdrPreferencesActivity"
+            android:targetPackage="de.bjusystems.vdrmanager" />
+    </PreferenceScreen>
+
+    <PreferenceCategory
+        android:key="vdr_preferences"
+        android:title="@string/vdr_preferences" >
+
+        <EditTextPreference
+            android:key="@string/vdr_host_key"
+            android:summary="@string/vdr_host_summary"
+            android:title="@string/vdr_host_title" />
+
+        <EditTextPreference
+            android:defaultValue="@string/vdr_port_default"
+            android:key="@string/vdr_port_key"
+            android:summary="@string/vdr_port_summary"
+            android:title="@string/vdr_port_title" />
+
+        <EditTextPreference
+            android:key="@string/vdr_password_key"
+            android:password="true"
+            android:summary="@string/vdr_password_summary"
+            android:title="@string/vdr_password_title" />
+
+        <CheckBoxPreference
+            android:key="@string/vdr_ssl_key"
+            android:summary="@string/vdr_ssl_summary"
+            android:title="@string/vdr_ssl_title" android:enabled="false" />
+
+        <PreferenceScreen android:title="Advanced" >
+
+            <EditTextPreference
+                android:defaultValue="10"
+                android:inputType="number"
+                android:key="@string/vdr_conntimeout_key"
+                android:summary="@string/vdr_conntimeout_sum"
+                android:title="@string/vdr_conntimeout_title" />
+
+            <EditTextPreference
+                android:defaultValue="10"
+                android:inputType="number"
+                android:key="@string/vdr_readtimeout_key"
+                android:summary="@string/vdr_readtimeout_sum"
+                android:title="@string/vdr_readtimeout_title" />
+
+            <EditTextPreference
+                android:defaultValue="120"
+                android:inputType="number"
+                android:key="@string/vdr_timeout_key"
+                android:summary="@string/vdr_timeout_sum"
+                android:title="@string/vdr_timeout_title" />
+        </PreferenceScreen>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="filter_preferences"
+        android:title="@string/channel_filter_preferences" >
+
+        <CheckBoxPreference
+            android:key="@string/channel_filter_filter_key"
+            android:summary="@string/channel_filter_filter_summary"
+            android:title="@string/channel_filter_filter_title" />
+
+        <EditTextPreference
+            android:defaultValue="1"
+            android:dependency="@string/channel_filter_filter_key"
+            android:key="@string/channel_filter_last_key"
+            android:summary="@string/channel_filter_last_summary"
+            android:title="@string/channel_filter_last_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="wakeup_preferences"
+        android:title="@string/wakeup_preferences" >
+
+        <CheckBoxPreference
+            android:key="@string/wakeup_enabled_key"
+            android:summary="@string/wakeup_enabled_summary"
+            android:title="@string/wakeup_enabled_title" />
+
+        <ListPreference
+            android:defaultValue="@string/default_wakeup_method"
+            android:dependency="@string/wakeup_enabled_key"
+            android:entries="@array/wakeup_methods"
+            android:entryValues="@array/wakeup_methods_values"
+            android:key="@string/wakeup_method_key"
+            android:summary="@string/wakeup_method_summary"
+            android:title="@string/wakeup_method_title" />
+
+        <EditTextPreference
+            android:dependency="@string/wakeup_enabled_key"
+            android:key="@string/wakeup_url_key"
+            android:summary="@string/wakeup_url_summary"
+            android:title="@string/wakeup_url_title" />
+
+        <EditTextPreference
+            android:dependency="@string/wakeup_enabled_key"
+            android:key="@string/wakeup_user_key"
+            android:summary="@string/wakeup_user_summary"
+            android:title="@string/wakeup_user_title" />
+
+        <EditTextPreference
+            android:dependency="@string/wakeup_enabled_key"
+            android:key="@string/wakeup_password_key"
+            android:password="true"
+            android:summary="@string/wakeup_password_summary"
+            android:title="@string/wakeup_password_title" />
+
+        <EditTextPreference
+            android:dependency="@string/wakeup_enabled_key"
+            android:key="@string/wakeup_wol_mac_key"
+            android:summary="@string/wakeup_wol_mac_summary"
+            android:title="@string/wakeup_wol_mac_title" />
+
+        <EditTextPreference
+            android:defaultValue="255.255.255.255"
+            android:dependency="@string/wakeup_enabled_key"
+            android:key="@string/wakeup_wol_custom_broadcast_key"
+            android:summaryOn="@string/wakeup_wol_custom_boradcast_summary"
+            android:title="@string/wakeup_wol_custom_boradcast_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="timer_preferences"
+        android:title="@string/timer_preferences" >
+
+        <EditTextPreference
+            android:defaultValue="5"
+            android:key="@string/timer_pre_start_buffer_key"
+            android:summary="@string/timer_pre_start_buffer_summary"
+            android:title="@string/timer_pre_start_buffer_title" />
+
+        <EditTextPreference
+            android:defaultValue="30"
+            android:key="@string/timer_post_end_buffer_key"
+            android:summary="@string/timer_post_end_buffer_summary"
+            android:title="@string/timer_post_end_buffer_title" />
+
+        <EditTextPreference
+            android:defaultValue="99"
+            android:key="@string/timer_default_lifetime_key"
+            android:summary="@string/timer_default_lifetime_summary"
+            android:title="@string/timer_default_lifetime_title" />
+
+        <EditTextPreference
+            android:defaultValue="50"
+            android:key="@string/timer_default_priority_key"
+            android:summary="@string/timer_default_priority_summary"
+            android:title="@string/timer_default_priority_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="gui_preferences"
+        android:title="@string/gui_preferences" >
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/gui_channels_show_channel_numbers_key"
+            android:summary="@string/gui_channels_show_channel_numbers_summary"
+            android:title="@string/gui_channels_show_channel_numbers_title" />
+
+        <CheckBoxPreference
+            android:key="@string/gui_enable_24h_format_key"
+            android:summaryOff="@string/gui_enable_24h_format_summary_off"
+            android:summaryOn="@string/gui_enable_24h_format_summary_on"
+            android:title="@string/gui_enable_24h_format_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/qui_show_imdb_button_key"
+            android:summaryOff="@string/qui_show_imdb_button_summary_off"
+            android:summaryOn="@string/qui_show_imdb_button_summary_on"
+            android:title="@string/qui_show_imdb_button_title" />
+
+        <ListPreference
+            android:defaultValue="akas.imdb.com"
+            android:dependency="@string/qui_show_imdb_button_key"
+            android:entries="@array/imdb_urls_values"
+            android:entryValues="@array/imdb_urls"
+            android:key="@string/qui_imdb_url_key"
+            android:summaryOn="@string/qui_imdb_url_summary"
+            android:title="@string/qui_imdb_url_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/qui_quit_on_back_key"
+            android:summaryOff="@string/gui_quit_on_back_summary_off"
+            android:summaryOn="@string/gui_quit_on_back_summary_on"
+            android:title="@string/gui_quit_on_back_title" />
+
+        <ListPreference
+            android:defaultValue="DEFAULT"
+            android:entries="@array/lang"
+            android:entryValues="@array/lang_values"
+            android:key="@string/gui_custom_locale_key"
+            android:summary="@string/gui_custom_locale_sum"
+            android:title="@string/gui_custom_locale_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/livetv" >
+
+        <EditTextPreference
+            android:defaultValue="3000"
+            android:inputType="number"
+            android:key="streamingport"
+            android:summary="@string/settings_livetv_port_summary"
+            android:title="@string/settings_livetv_port" />
+        
+         <EditTextPreference
+            android:key="@string/streaming_username_key"
+            android:summary="@string/streaming_username_sum"
+            android:title="@string/streaming_username_title" />
+         
+         <EditTextPreference
+            android:password="true"
+            android:key="@string/streaming_password_key"
+            android:summary="@string/streaming_password_sum"
+            android:title="@string/streaming_password_title" />
+         
+
+        <ListPreference
+            android:defaultValue="TS"
+            android:entries="@array/livetv_streamformat"
+            android:entryValues="@array/livetv_streamformat_values"
+            android:key="livetv_streamformat"
+            android:title="@string/settings_livetv_streamformat" />
+
+        <CheckBoxPreference
+            android:key="remux_enable"
+            android:summary="@string/remux_enable_summary"
+            android:title="@string/remux_enable_title" />
+
+        <EditTextPreference
+            android:defaultValue="EXT"
+            android:dependency="remux_enable"
+            android:key="remux_command"
+            android:summary="@string/remux_command_summary"
+            android:title="@string/remux_command_title" />
+
+        <EditTextPreference
+            android:defaultValue="QUALITY=DSL1000"
+            android:dependency="remux_enable"
+            android:key="remux_parameter"
+            android:summary="@string/remux_parameter_summary"
+            android:title="@string/remux_parameter_title" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file