smarttvweb and compat lib. removed actionbar sherloch

3 files changed, 131 insertions, 120 deletions

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 &amp; 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 &amp; 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 &amp; 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 &amp; 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