diff options
Diffstat (limited to 'build/android/src')
12 files changed, 99 insertions, 56 deletions
diff --git a/build/android/src/debug/AndroidManifest.xml b/build/android/src/debug/AndroidManifest.xml new file mode 100644 index 000000000..a3815b9f8 --- /dev/null +++ b/build/android/src/debug/AndroidManifest.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android"> + <uses-permission android:name="android.permission.SET_DEBUG_APP" /> +</manifest> diff --git a/build/android/src/main/AndroidManifest.xml b/build/android/src/main/AndroidManifest.xml new file mode 100644 index 000000000..df218fb33 --- /dev/null +++ b/build/android/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="net.minetest.minetest" + android:installLocation="auto"> + <uses-feature android:glEsVersion="0x00010000" android:required="true"/> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <application android:icon="@drawable/irr_icon" + android:label="${project}" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:allowBackup="true"> + <activity android:name=".MtNativeActivity" + android:label="${project}" + android:launchMode="singleTask" + android:configChanges="orientation|keyboard|keyboardHidden|navigation" + android:screenOrientation="sensorLandscape" + android:clearTaskOnLaunch="true"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + <meta-data android:name="android.app.lib_name" android:value="minetest" /> + </activity> + <activity android:name=".MinetestTextEntry" + android:theme="@style/Theme.Transparent" + android:excludeFromRecents="true"> + </activity> + <activity android:name=".MinetestAssetCopy" + android:theme="@style/Theme.Transparent" + android:excludeFromRecents="true"> + </activity> + </application> +</manifest> diff --git a/build/android/src/net/minetest/minetest/MinetestAssetCopy.java b/build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java index 5776e77b5..eb92acb63 100644 --- a/build/android/src/net/minetest/minetest/MinetestAssetCopy.java +++ b/build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java @@ -254,54 +254,14 @@ public class MinetestAssetCopy extends Activity boolean shortened = false; String todisplay = m_tocopy.get(progress[0]); m_ProgressBar.setProgress(progress[0]); - - // make sure our text doesn't exceed our layout width - Rect bounds = new Rect(); - Paint textPaint = m_Filename.getPaint(); - textPaint.getTextBounds(todisplay, 0, todisplay.length(), bounds); - - while (bounds.width() > getResources().getDisplayMetrics().widthPixels * 0.7) { - if (todisplay.length() < 2) { - break; - } - todisplay = todisplay.substring(1); - textPaint.getTextBounds(todisplay, 0, todisplay.length(), bounds); - shortened = true; - } - - if (! shortened) { - m_Filename.setText(todisplay); - } - else { - m_Filename.setText(".." + todisplay); - } + m_Filename.setText(todisplay); } else { boolean shortened = false; String todisplay = m_Foldername; String full_text = "scanning " + todisplay + " ..."; - // make sure our text doesn't exceed our layout width - Rect bounds = new Rect(); - Paint textPaint = m_Filename.getPaint(); - textPaint.getTextBounds(full_text, 0, full_text.length(), bounds); - - while (bounds.width() > getResources().getDisplayMetrics().widthPixels * 0.7) { - if (todisplay.length() < 2) { - break; - } - todisplay = todisplay.substring(1); - full_text = "scanning " + todisplay + " ..."; - textPaint.getTextBounds(full_text, 0, full_text.length(), bounds); - shortened = true; - } - - if (! shortened) { - m_Filename.setText(full_text); - } - else { - m_Filename.setText("scanning .." + todisplay + " ..."); - } + m_Filename.setText(full_text); } } diff --git a/build/android/src/net/minetest/minetest/MinetestTextEntry.java b/build/android/src/main/java/net.minetest.minetest/MinetestTextEntry.java index 68dc73274..68dc73274 100644 --- a/build/android/src/net/minetest/minetest/MinetestTextEntry.java +++ b/build/android/src/main/java/net.minetest.minetest/MinetestTextEntry.java diff --git a/build/android/src/net/minetest/minetest/MtNativeActivity.java b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java index 5c1f44d17..3173a71f4 100644 --- a/build/android/src/net/minetest/minetest/MtNativeActivity.java +++ b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java @@ -12,7 +12,7 @@ public class MtNativeActivity extends NativeActivity { super.onCreate(savedInstanceState); m_MessagReturnCode = -1; m_MessageReturnValue = ""; - + } @Override @@ -20,15 +20,19 @@ public class MtNativeActivity extends NativeActivity { super.onDestroy(); } - + @Override + public void onBackPressed() { + } + + public void copyAssets() { Intent intent = new Intent(this, MinetestAssetCopy.class); startActivity(intent); } - + public void showDialog(String acceptButton, String hint, String current, int editType) { - + Intent intent = new Intent(this, MinetestTextEntry.class); Bundle params = new Bundle(); params.putString("acceptButton", acceptButton); @@ -40,37 +44,37 @@ public class MtNativeActivity extends NativeActivity { m_MessageReturnValue = ""; m_MessagReturnCode = -1; } - + public static native void putMessageBoxResult(String text); - + /* ugly code to workaround putMessageBoxResult not beeing found */ public int getDialogState() { return m_MessagReturnCode; } - + public String getDialogValue() { m_MessagReturnCode = -1; return m_MessageReturnValue; } - + public float getDensity() { return getResources().getDisplayMetrics().density; } - + public int getDisplayWidth() { return getResources().getDisplayMetrics().widthPixels; } - + public int getDisplayHeight() { return getResources().getDisplayMetrics().heightPixels; } - + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == 101) { if (resultCode == RESULT_OK) { - String text = data.getStringExtra("text"); + String text = data.getStringExtra("text"); m_MessagReturnCode = 0; m_MessageReturnValue = text; } @@ -79,7 +83,7 @@ public class MtNativeActivity extends NativeActivity { } } } - + static { System.loadLibrary("openal"); System.loadLibrary("ogg"); @@ -87,13 +91,14 @@ public class MtNativeActivity extends NativeActivity { System.loadLibrary("ssl"); System.loadLibrary("crypto"); System.loadLibrary("gmp"); + System.loadLibrary("iconv"); // We don't have to load libminetest.so ourselves, // but if we do, we get nicer logcat errors when // loading fails. System.loadLibrary("minetest"); } - + private int m_MessagReturnCode; private String m_MessageReturnValue; } diff --git a/build/android/src/main/res/drawable-hdpi/irr_icon.png b/build/android/src/main/res/drawable-hdpi/irr_icon.png Binary files differnew file mode 100644 index 000000000..0b6861a0d --- /dev/null +++ b/build/android/src/main/res/drawable-hdpi/irr_icon.png diff --git a/build/android/src/main/res/drawable-ldpi/irr_icon.png b/build/android/src/main/res/drawable-ldpi/irr_icon.png Binary files differnew file mode 100644 index 000000000..b8c5d0177 --- /dev/null +++ b/build/android/src/main/res/drawable-ldpi/irr_icon.png diff --git a/build/android/src/main/res/drawable-mdpi/irr_icon.png b/build/android/src/main/res/drawable-mdpi/irr_icon.png Binary files differnew file mode 100644 index 000000000..951a7f8c1 --- /dev/null +++ b/build/android/src/main/res/drawable-mdpi/irr_icon.png diff --git a/build/android/src/main/res/drawable-xhdpi/irr_icon.png b/build/android/src/main/res/drawable-xhdpi/irr_icon.png Binary files differnew file mode 100644 index 000000000..2ec528ef7 --- /dev/null +++ b/build/android/src/main/res/drawable-xhdpi/irr_icon.png diff --git a/build/android/src/main/res/layout/assetcopy.xml b/build/android/src/main/res/layout/assetcopy.xml new file mode 100644 index 000000000..1fcfffd65 --- /dev/null +++ b/build/android/src/main/res/layout/assetcopy.xml @@ -0,0 +1,24 @@ +<?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" > + + <ProgressBar + android:id="@+id/progressBar1" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" /> + + <TextView + android:id="@+id/textView1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="middle" + android:singleLine="true" + android:layout_gravity="center_horizontal" + android:text="@string/preparing_media" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout> diff --git a/build/android/src/main/res/values/strings.xml b/build/android/src/main/res/values/strings.xml new file mode 100644 index 000000000..b407a77c6 --- /dev/null +++ b/build/android/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="preparing_media">Preparing media...</string> +</resources> + diff --git a/build/android/src/main/res/values/styles.xml b/build/android/src/main/res/values/styles.xml new file mode 100644 index 000000000..25b8df5a3 --- /dev/null +++ b/build/android/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="Theme.Transparent" parent="android:Theme"> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:windowContentOverlay">@null</item> + <item name="android:windowNoTitle">true</item> + <item name="android:windowIsFloating">true</item> + <item name="android:backgroundDimEnabled">false</item> + </style> +</resources>
\ No newline at end of file |
