openlp-android team mailing list archive

[Samuel Sjöbergsson <samster9312@xxxxxxxxx>]

Samuel Sjöbergsson has proposed merging lp:~samster9312/openlp/android into lp:openlp/android.

Requested reviews:
  OpenLP Android Developers (openlp-android)

For more details, see:
https://code.launchpad.net/~samster9312/openlp/android/+merge/60076

A new landscape view better adapted layout
-- 
https://code.launchpad.net/~samster9312/openlp/android/+merge/60076
Your team OpenLP Android Developers is requested to review the proposed merge of lp:~samster9312/openlp/android into lp:openlp/android.

=== modified file '.bzrignore' (properties changed: -x to +x)
=== modified file 'OpenLP.apk' (properties changed: -x to +x)
=== added directory 'res/layout-land'
=== added file 'res/layout-land/listitem.xml'
--- res/layout-land/listitem.xml	1970-01-01 00:00:00 +0000
+++ res/layout-land/listitem.xml	2011-05-05 15:19:32 +0000
@@ -0,0 +1,13 @@
+<?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">
+    <LinearLayout
+    android:orientation="vertical"
+    android:layout_width="0dip" android:layout_weight="1"
+    android:layout_height="fill_parent">
+        <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/listitem" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

=== added file 'res/layout-land/main.xml'
--- res/layout-land/main.xml	1970-01-01 00:00:00 +0000
+++ res/layout-land/main.xml	2011-05-05 15:19:32 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android";
+    android:id="@android:id/tabhost"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:padding="5dp">
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:padding="5dp" />
+    </LinearLayout>
+</TabHost>
+

=== added file 'res/layout-land/misc.xml'
--- res/layout-land/misc.xml	1970-01-01 00:00:00 +0000
+++ res/layout-land/misc.xml	2011-05-05 15:19:32 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    <LinearLayout android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+<Button android:text="@string/blank"
+android:id="@+id/blank"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"></Button>
+<Button android:text="@string/unblank"
+android:id="@+id/unblank"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<!--  <TextView android:text="@string/alert"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"/>
+<EditText android:id="@+id/alert"
+android:layout_height="wrap_content"
+android:text=""
+android:layout_width="match_parent"></EditText>
+<Button android:text="@string/send"
+android:id="@+id/send"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"></Button>-->
+</LinearLayout>
+

=== added file 'res/layout-land/service.xml'
--- res/layout-land/service.xml	1970-01-01 00:00:00 +0000
+++ res/layout-land/service.xml	2011-05-05 15:19:32 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    >
+   	<LinearLayout android:orientation="vertical"
+   	android:layout_width="wrap_content"
+   	android:layout_height="fill_parent"
+   	>
+<Button android:text="@string/prev"
+android:id="@+id/prev"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"></Button>
+<Button android:text="@string/next"
+android:id="@+id/next"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<TextView
+android:id="@+id/services"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"></TextView>
+<ListView android:layout_width="wrap_content"
+android:id="@+id/list"
+android:layout_height="wrap_content"></ListView>
+</LinearLayout>

=== added file 'res/layout-land/settings.xml'
--- res/layout-land/settings.xml	1970-01-01 00:00:00 +0000
+++ res/layout-land/settings.xml	2011-05-05 15:19:32 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView android:text="@string/url"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"/>
+<EditText android:id="@+id/url"
+android:layout_height="wrap_content"
+android:text="192.168.1."
+android:inputType="number"
+android:layout_width="match_parent"></EditText>
+<TextView android:text="@string/port"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"/>
+<EditText android:id="@+id/port"
+android:layout_height="wrap_content"
+android:text="4316"
+android:layout_width="match_parent"
+android:inputType="number"></EditText>
+<Button android:text="@string/save"
+android:id="@+id/save"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"></Button>
+</LinearLayout>
+

=== added file 'res/layout-land/slide.xml'
--- res/layout-land/slide.xml	1970-01-01 00:00:00 +0000
+++ res/layout-land/slide.xml	2011-05-05 15:19:32 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    >
+   	<LinearLayout android:orientation="vertical"
+   	android:layout_width="wrap_content"
+   	android:layout_height="fill_parent"
+   	>
+<Button android:text="@string/prev"
+android:id="@+id/prev"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"></Button>
+<Button android:text="@string/next"
+android:id="@+id/next"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<TextView
+android:id="@+id/slides"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"></TextView>
+<ListView android:layout_width="wrap_content"
+android:id="@+id/list"
+android:layout_height="wrap_content"></ListView>
+</LinearLayout>
+

=== added file 'src/org/openlp/android/openlp.java.OTHER'
--- src/org/openlp/android/openlp.java.OTHER	1970-01-01 00:00:00 +0000
+++ src/org/openlp/android/openlp.java.OTHER	2011-05-05 15:19:32 +0000
@@ -0,0 +1,42 @@
+package org.openlp.android;
+
+import android.app.TabActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.TabHost;
+
+public class openlp extends TabActivity {
+	/** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.main);
+
+		TabHost tabHost = getTabHost(); // The activity TabHost
+		TabHost.TabSpec spec; // Reusable TabSpec for each tab
+		Intent intent; // Reusable Intent for each tab
+
+		// Create an Intent to launch an Activity for the tab (to be reused)
+		intent = new Intent().setClass(this, slide.class);
+
+		// Initialise a TabSpec for each tab and add it to the TabHost
+		spec = tabHost.newTabSpec("slide").setIndicator("Slide")
+				.setContent(intent);
+		tabHost.addTab(spec);
+		tabHost.setCurrentTab(1);
+
+		// Do the same for the other tabs
+		intent = new Intent().setClass(this, service.class);
+		spec = tabHost.newTabSpec("service").setIndicator("Service")
+				.setContent(intent);
+		tabHost.addTab(spec);
+
+		// Do the same for the other tabs
+		intent = new Intent().setClass(this, misc.class);
+		spec = tabHost.newTabSpec("misc").setIndicator("Misc")
+				.setContent(intent);
+		tabHost.addTab(spec);
+
+	}
+}
\ No newline at end of file