Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge avec la branche UI
authorDa Risk <darisk972@gmail.com>
Tue, 17 Mar 2009 22:02:07 +0100
changeset 16 da30cff7f9ce
parent 15 3a9afe18996e (current diff)
parent 5 accfe4a4010f (diff)
child 17 afd3a080d318
Merge avec la branche UI
AndroidManifest.xml file | annotate | diff | comparison | revisions
src/com/beem/project/beem/Beem.java file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue Mar 17 22:02:07 2009 +0100
@@ -0,0 +1,2 @@
+bin/*
+R.java
--- a/AndroidManifest.xml	Mon Mar 16 14:32:06 2009 +0100
+++ b/AndroidManifest.xml	Tue Mar 17 22:02:07 2009 +0100
@@ -11,5 +11,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    </application>
+    <service android:name="BeemService" android:enabled="true" android:permission="android.permission.INTERNET" android:label="Beem Service"></service>
+</application>
 </manifest> 
Binary file res/drawable/logo.jpg has changed
--- a/res/layout/main.xml	Mon Mar 16 14:32:06 2009 +0100
+++ b/res/layout/main.xml	Tue Mar 17 22:02:07 2009 +0100
@@ -1,13 +1,39 @@
 <?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:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="Hello World, Beem"
-    />
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<ImageView android:id="@+id/logo"
+		android:src="@drawable/logo"
+		android:adjustViewBounds="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
+		
+	<TextView android:text="Jabber ID"
+		android:textSize="25sp"
+		android:paddingLeft="100sp"
+		android:paddingTop="50sp"
+		android:paddingBottom="15sp"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+		
+	<EditText android:id="@+id/jid"
+		android:singleLine="true"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:scrollHorizontally="true" />
+	
+	<TextView
+		android:layout_width="fill_parent"
+		android:layout_height="10sp"/>
+
+	<Button android:id="@+id/connection"
+		android:textSize="20sp"
+		android:singleLine="true"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="Connection" />
+
 </LinearLayout>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout/settings.xml	Tue Mar 17 22:02:07 2009 +0100
@@ -0,0 +1,90 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+            >
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Host/Port:"
+                android:minWidth="70dp"
+                />
+                
+        <EditText android:id="@+id/host"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textSize="16sp"
+                  android:autoText="false"
+                  android:capitalize="none"
+                  android:minWidth="150dp"
+                  android:scrollHorizontally="true"/>
+        <EditText android:id="@+id/port"
+                  android:layout_width="wrap_content"