From b6138129e668681d2c16146dea3d66b0ea2f0381 Mon Sep 17 00:00:00 2001
From: faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Sat, 18 Aug 2012 21:00:51 +0000
Subject: Android: I'm probably using a lot of bad practices, but the app looks
 somewhat better now and polls the server status Android: Put quite some
 testing code in ToJava.h and app-android.cpp ... I still can't send log
 messages to Java. The issue is threads, I can't use JNI stuff from threads
 that were not created by Java (at least not easily)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@752 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 res/layout/main.xml    | 36 +++++++++++++++++++++++++++++++++++-
 res/values/strings.xml |  7 ++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout/main.xml b/res/layout/main.xml
index e24cd5f23..b270bca03 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -2,12 +2,46 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:gravity="center_horizontal"
     android:orientation="vertical" >
-

+
     <TextView
         android:id="@+id/textView1"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/hello" />
 
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+



+    <Button
+        android:id="@+id/start_server"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/start" />
+





+    <Button
+        android:id="@+id/stop_server"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:enabled="true"
+        android:text="@string/stop" />
+


+    <TextView
+        android:id="@+id/server_status_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/mcserver_is_not_running"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+


+    <TextView
+        android:id="@+id/ip_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/your_ip" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8c782a739..9fce753a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,6 +2,11 @@
 <resources>
 
     <string name="hello">Hello World, MCServerActivity!</string>
-    <string name="app_name">MCServer</string>
+    <string name="app_name">MCServer</string>
+    <string name="start">Start</string>
+    <string name="stop">Stop</string>
+    <string name="mcserver_is_running">MCServer is running</string>
+    <string name="mcserver_is_not_running">MCServer is not running</string>
+    <string name="your_ip">Your IP …</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3