big refactoring

1 files changed, 160 insertions, 165 deletions

diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index d763429..fb4ed6c 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -1,167 +1,168 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-    
-    <TextView
-        android:id="@+id/epg_detail_title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:textAppearance="?android:textAppearanceMedium"
-        android:text="Unterwegs nach Cold Mountain"/>
 
     <LinearLayout
-        android:id="@+id/epg_detail_time_channel"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-    
-		    <TextView
-		        android:id="@+id/epg_detail_time"
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:gravity="left"
-		       	android:textAppearance="?android:textAppearanceSmall"
-		        android:text="20:10-20-15"
-		        />
-	   
-	       <TextView
-		        android:id="@+id/epg_detail_duration"
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:gravity="right" android:layout_weight="1"
-		        android:paddingLeft="10dip"
-		        android:text="2/123min"
-		        android:textAppearance="?android:textAppearanceSmall"
-		        />
-	
-		
-		    <TextView
-		        android:id="@+id/epg_detail_channel"
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:layout_weight="1"
-		        android:text="Sky Cinema"
-		        android:visibility="gone"
-		        android:gravity="right"/>
-		        
-    </LinearLayout>
-   
-   
-	<LinearLayout android:layout_width="fill_parent" android:padding="3dip" android:paddingBottom="1dip"
-		android:layout_height="wrap_content" android:layout_marginTop="0dip"
-		android:orientation="horizontal">
-   
-    <ImageView android:id="@+id/epg_timer_state" android:layout_marginRight="5dip"
-			android:layout_width="wrap_content"  android:layout_height="fill_parent"
-			android:layout_centerVertical="true" android:visibility="gone" />
-   
-    <TextView
-        android:id="@+id/epg_detail_shorttext"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="left"
-        android:layout_weight="1"
-        android:text="Krimikömedie"
-        android:textAppearance="?android:textAppearanceSmall"/>
-        
-   </LinearLayout>
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
 
+        <TextView
+            android:id="@+id/epg_detail_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Unterwegs nach Cold Mountain"
+            android:textAppearance="?android:textAppearanceMedium"
+            android:textStyle="bold" />
 
-    <TextView
-        android:id="@+id/epg_detail_separator_0"
-        android:layout_width="fill_parent"
-        android:layout_height="2sp"/>
-        
- 
-	
-
-		<ProgressBar
-       		    android:id="@+id/epg_detail_progress"
-       			android:layout_width="fill_parent"
-       			android:indeterminate="false"
-       			android:layout_height="2dip"
-       			android:progress="40"
-       			style="?android:attr/progressBarStyleHorizontal"/>
-
-    <ScrollView
-        android:id="@+id/epg_detail_description_scroll"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
+        <LinearLayout
+            android:id="@+id/epg_detail_time_channel"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:id="@+id/epg_detail_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="left"
+                android:text="20:10-20-15"
+                android:textAppearance="?android:textAppearanceSmall" />
 
-        <TextView      	android:textSize="16dip"
-            android:id="@+id/epg_detail_description"
+            <TextView
+                android:id="@+id/epg_detail_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingLeft="10dip"
+                android:text="2/123min"
+                android:textAppearance="?android:textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/epg_detail_channel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="Sky Cinema"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-        </TextView>
-        
-    </ScrollView>            
+            android:layout_height="wrap_content"
+            android:layout_marginTop="0dip"
+            android:orientation="horizontal"
+            android:padding="3dip"
+            android:paddingBottom="1dip" >
 
-    <TextView
-        android:id="@+id/epg_detail_separator_2"
-        android:layout_width="fill_parent"
-        android:layout_height="1sp"/>
+            <ImageView
+                android:id="@+id/epg_timer_state"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="5dip"
+                android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/epg_detail_separator_3"
-        android:layout_width="fill_parent"
-        android:layout_height="4sp"/>
-	
-<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center">
+            <TextView
+                android:id="@+id/epg_detail_shorttext"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:text="Krimikömedie"
+                android:textAppearance="?android:textAppearanceSmall" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/epg_detail_separator_0"
+            android:layout_width="fill_parent"
+            android:layout_height="2sp" />
+
+        <ProgressBar
+            android:id="@+id/epg_detail_progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:indeterminate="false"
+            android:progress="40" />
+
+        <ScrollView
+            android:id="@+id/epg_detail_description_scroll"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+
+            <TextView
+                android:id="@+id/epg_detail_description"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:textSize="16dip" >
+            </TextView>
+        </ScrollView>
+
+        <TextView
+            android:id="@+id/epg_detail_separator_2"
+            android:layout_width="fill_parent"
+            android:layout_height="1sp" />
+
+        <TextView
+            android:id="@+id/epg_detail_separator_3"
+            android:layout_width="fill_parent"
+            android:layout_height="4sp" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal" >
 
-<!-- 
+            <!-- -->
     <ImageButton
       android:id="@+id/epg_event_left"
-      android:src="@drawable/left"
+      android:src="@drawable/ic_menu_back"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:gravity="left"
-      style="?android:attr/buttonStyleSmall"
-      android:layout_marginRight="40dip" 
       android:background="@android:drawable/list_selector_background"/>
-    
-   -->
-    
-    
-    <ImageButton
-      android:id="@+id/epg_event_livetv"
-      android:src="@drawable/tv"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_horizontal"
-      android:layout_centerHorizontal="true"
-      style="?android:attr/buttonStyleSmall" android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
-      android:background="@android:drawable/list_selector_background"
-      android:text="@string/epg_eent_livetv_text"/>
-      
-     <ImageButton
-      android:id="@+id/epg_event_create_timer"
-      android:src="@drawable/timer"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
-      android:layout_gravity="center_horizontal"
-      android:layout_centerHorizontal="true" 
-      android:background="@android:drawable/list_selector_background"
-      style="?android:attr/buttonStyleSmall"
-      android:text="@string/epg_event_create_timer_text"/>
-     
-     <ImageButton
-      android:id="@+id/epg_event_imdb"
-      android:src="@drawable/imdb"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
-      android:layout_gravity="center_horizontal"
-      android:layout_centerHorizontal="true" 
-      android:background="@android:drawable/list_selector_background"
-      style="?android:attr/buttonStyleSmall"
-      android:text="@string/epg_event_imdb_text"/>
-     
-     
-     <!-- 
+            <!-- -->
+
+<LinearLayout android:orientation="horizontal" 	android:layout_height="wrap_content" android:addStatesFromChildren="true" android:layout_weight="1.0" android:layout_width="wrap_content"  android:gravity="center_vertical"
+				android:baselineAligned="false">
+            <ImageButton android:layout_weight="1"
+                android:id="@+id/epg_event_livetv"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/tv"
+                android:text="@string/epg_eent_livetv_text" />
+
+            <ImageButton android:layout_weight="1"
+                android:id="@+id/epg_event_create_timer"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/timer"
+                android:text="@string/epg_event_create_timer_text" />
+
+            <ImageButton android:layout_weight="1"
+                android:id="@+id/epg_event_imdb"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/imdb"
+                android:text="@string/epg_event_imdb_text" />
+</LinearLayout>
+            <!--
      <ImageButton
       android:id="@+id/epg_event_share"
       android:src="@android:drawable/ic_menu_share"
@@ -172,9 +173,10 @@
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_share_text"/>
-     -->
-      
-     <!-- 
+            -->
+
+
+            <!--
      <ImageButton
       android:id="@+id/epg_event_epg"
       android:src="@drawable/epg"
@@ -185,22 +187,15 @@
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_create_timer_text"/>
-      -->
-      <!-- 
-          <ImageButton
+            -->
+            <!-- -->
+     <ImageButton
       android:id="@+id/epg_event_right"
-      android:src="@drawable/right"
+      android:src="@drawable/ic_menu_forward"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="right"
-      android:layout_centerHorizontal="true"  
-      style="?android:attr/buttonStyleSmall"
-      android:layout_marginLeft="40dip"
       android:background="@android:drawable/list_selector_background"/>
--->
-      
-      
-                  </LinearLayout>
-                  
-                  
-</LinearLayout>
+          
+
+        </LinearLayout>
+    </LinearLayout>
\ No newline at end of file