flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Made beds placeable

Browse Source 
Android: Updated some stuff and set default view distance lower

git-svn-id: http://mc-server.googlecode.com/svn/trunk@900 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth
2012-09-29 13:41:47 +00:00
parent cead22a206
commit fe61687b97
13 changed files with 220 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android/gen/com/mcserver/R.java
View File

@@ -14,11 +14,12 @@ public final class R {
public static final int ic_launcher=0x7f020000;
}
public static final class id {
public static final int ip_address=0x7f050004;
public static final int listView1=0x7f050005;
public static final int server_status_text=0x7f050003;
public static final int start_server=0x7f050001;
public static final int stop_server=0x7f050002;
public static final int configure_server=0x7f050003;
public static final int ip_address=0x7f050005;
public static final int listView1=0x7f050006;
public static final int server_status_text=0x7f050004;
public static final int start_server=0x7f050002;
public static final int stop_server=0x7f050001;
public static final int textView2=0x7f050000;
}
public static final class layout {
@@ -27,6 +28,7 @@ public final class R {
}
public static final class string {
public static final int app_name=0x7f040001;
public static final int configure=0x7f040007;
public static final int hello=0x7f040000;
public static final int mcserver_is_not_running=0x7f040005;
public static final int mcserver_is_running=0x7f040004;

1
Android/jni/Android.mk
View File

@@ -17,7 +17,6 @@ LOCAL_CFLAGS := -DANDROID_NDK \
-funroll-loops \
-mfloat-abi=softfp -mfpu=neon \
-fexceptions \
-D_DEBUG \
LOCAL_STATIC_LIBRARIES := cpufeatures

37
Android/res/layout/main.xml
View File

@@ -11,19 +11,34 @@
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceLarge" />
<Button
android:id="@+id/start_server"
<LinearLayout
android:layout_height="wrap_content"
android:text="@string/start" />
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/stop_server"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="true"
android:text="@string/stop" />
<Button
android:id="@+id/start_server"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
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" />
<Button
android:id="@+id/configure_server"
android:layout_width="wrap_content"

1
Android/res/values/strings.xml
View File

@@ -8,5 +8,6 @@
<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>
<string name="configure">Configure</string>
</resources>

11
Android/src/com/mcserver/MCServerActivity.java
View File

@@ -10,7 +10,9 @@ import java.util.ArrayList;
import java.util.Enumeration;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
@@ -55,6 +57,13 @@ public class MCServerActivity extends Activity {
}
});
((Button)findViewById(R.id.configure_server)).setOnClickListener( new View.OnClickListener() {
public void onClick(View v) {
Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://localhost:8081/webadmin/"));
startActivity( myIntent );
}
});
ListView lv = (ListView)this.findViewById(R.id.listView1);
@@ -162,11 +171,13 @@ public class MCServerActivity extends Activity {
((TextView)findViewById(R.id.server_status_text)).setTextColor(Color.GREEN);
((Button)findViewById(R.id.stop_server)).setEnabled(true);
((Button)findViewById(R.id.start_server)).setEnabled(false);
((Button)findViewById(R.id.configure_server)).setEnabled(true);
} else {
((TextView)findViewById(R.id.server_status_text)).setText(R.string.mcserver_is_not_running);
((TextView)findViewById(R.id.server_status_text)).setTextColor(Color.RED);
((Button)findViewById(R.id.stop_server)).setEnabled(false);
((Button)findViewById(R.id.start_server)).setEnabled(true);
((Button)findViewById(R.id.configure_server)).setEnabled(false);
}
}