viewpager

1 files changed, 144 insertions, 151 deletions

diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index 629e035..fd6ed22 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -1,168 +1,161 @@
 <?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"
+    android:padding="2dip" >
+
+    <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" />
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/epg_detail_time_channel"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical" >
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
 
         <TextView
-            android:id="@+id/epg_detail_title"
-            android:layout_width="fill_parent"
+            android:id="@+id/epg_detail_time"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Unterwegs nach Cold Mountain"
-            android:textAppearance="?android:textAppearanceMedium"
-            android:textStyle="bold" />
+            android:gravity="left"
+            android:text="20:10-20-15"
+            android:textAppearance="?android:textAppearanceSmall" />
 
-        <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: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"
+        <TextView
+            android:id="@+id/epg_detail_duration"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="0dip"
-            android:orientation="horizontal"
-            android:padding="3dip"
-            android:paddingBottom="1dip" >
-
-            <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_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>
+            android:layout_weight="1"
+            android:gravity="right"
+            android:paddingLeft="10dip"
+            android:text="2/123min"
+            android:textAppearance="?android:textAppearanceSmall" />
 
         <TextView
-            android:id="@+id/epg_detail_separator_0"
-            android:layout_width="fill_parent"
-            android:layout_height="2sp" />
+            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>
 
-        <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" />
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="0dip"
+        android:orientation="horizontal"
+        android:padding="3dip"
+        android:paddingBottom="1dip" >
+
+        <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" />
 
-        <ScrollView
-            android:id="@+id/epg_detail_description_scroll"
+        <TextView
+            android:id="@+id/epg_detail_shorttext"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content" android:padding="5dip"
-            android:layout_weight="1" >
+            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" />
 
-            <TextView
-                android:id="@+id/epg_detail_description"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:textSize="16dip" >
-            </TextView>
-        </ScrollView>
+    <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" />
 
-        <TextView
-            android:id="@+id/epg_detail_separator_2"
-            android:layout_width="fill_parent"
-            android:layout_height="1sp" />
+    <ScrollView
+        android:id="@+id/epg_detail_description_scroll"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:padding="5dip" >
 
         <TextView
-            android:id="@+id/epg_detail_separator_3"
+            android:id="@+id/epg_detail_description"
             android:layout_width="fill_parent"
-            android:layout_height="4sp" />
+            android:layout_height="fill_parent"
+            android:textSize="16dip" >
+        </TextView>
+    </ScrollView>
 
-        <LinearLayout
-            android:layout_width="fill_parent"
+    <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" />
+   <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="*"
+      android:background="#000000">
+  <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:gravity="center"
-            android:orientation="horizontal" >
+            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_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" />
 
-            <!-- -->
-    <ImageButton
-      android:id="@+id/epg_event_left"
-      android:src="@drawable/ic_menu_back"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:gravity="left"
-      android:background="@android:drawable/list_selector_background"/>
-            <!-- -->
-
-<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>
-            <!--
+</TableRow>
+        </TableLayout>
+
+    <!--
      <ImageButton
       android:id="@+id/epg_event_share"
       android:src="@android:drawable/ic_menu_share"
@@ -173,10 +166,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"
@@ -187,15 +180,15 @@
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_create_timer_text"/>
-            -->
-            <!-- -->
-     <ImageButton
+    -->
+    <!--
+     <ImageButton android:visibility="gone"
       android:id="@+id/epg_event_right"
       android:src="@drawable/ic_menu_forward"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:background="@android:drawable/list_selector_background"/>
-          
+    -->
+    
 
-        </LinearLayout>
-    </LinearLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file