refactoring

1 files changed, 102 insertions, 74 deletions

diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index 40dcec0..fd67d47 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -93,12 +93,39 @@
         android:layout_weight="1"
         android:padding="5dip" >
 
-        <TextView
-            android:id="@+id/epg_detail_description"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:textSize="16dip" >
-        </TextView>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/epg_detail_description"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:textSize="16dip" >
+            </TextView>
+
+            <View style="@style/Line" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <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/epg_detail_audio"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="" />
+            </LinearLayout>
+        </LinearLayout>
     </ScrollView>
 
     <TextView
@@ -111,72 +138,73 @@
         android:layout_width="fill_parent"
         android:layout_height="4sp" />
 
-  <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content" 
-      android:id="@+id/root"
-      android:stretchColumns="*"
-      style="@android:style/ButtonBar">
-      
-  <TableRow android:layout_margin="0dip"
-         android:id="@+id/first_row">
-        <ImageButton
-            android:id="@+id/epg_event_livetv"
-            style="?android:attr/buttonStyleSmall"
-           android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/tv"
-            android:text="@string/epg_eent_livetv_text" />
-
-        <ImageButton
-            android:id="@+id/epg_event_imdb"
-            style="?android:attr/buttonStyleSmall"
-        	android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/imdb"
-            android:text="@string/epg_event_imdb_text" />
-            
-        <ImageButton
-            android:id="@+id/epg_event_omdb"
-            style="?android:attr/buttonStyleSmall"
-        	android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/omdb"
-            android:text="@string/epg_event_omdb_text" />
-            
-                  
-        <ImageButton
-            android:id="@+id/epg_event_tmdb"
-            style="?android:attr/buttonStyleSmall"
-        	android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/tmdb"
-            android:text="@string/epg_event_tmdb_text" />
-
-        <ImageButton
-            android:id="@+id/epg_event_create_timer"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/timer"
-            android:text="@string/epg_event_create_timer_text" />
-
-</TableRow>
-        </TableLayout>
+    <TableLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        style="@android:style/ButtonBar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="*" >
+
+        <TableRow
+            android:id="@+id/first_row"
+            android:layout_margin="0dip" >
+
+            <ImageButton
+                android:id="@+id/epg_event_livetv"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/tv"
+                android:text="@string/epg_eent_livetv_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_imdb"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/imdb"
+                android:text="@string/epg_event_imdb_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_omdb"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/omdb"
+                android:text="@string/epg_event_omdb_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_tmdb"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/tmdb"
+                android:text="@string/epg_event_tmdb_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_create_timer"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/timer"
+                android:text="@string/epg_event_create_timer_text" />
+        </TableRow>
+    </TableLayout>
     <!--
      <ImageButton
       android:id="@+id/epg_event_share"
@@ -184,7 +212,7 @@
       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:layout_centerHorizontal="true"
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_share_text"/>
@@ -198,7 +226,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
-      android:layout_centerHorizontal="true"  android:layout_weight="1" 
+      android:layout_centerHorizontal="true"  android:layout_weight="1"
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_create_timer_text"/>