summaryrefslogtreecommitdiff
path: root/build/android/src/main/res
diff options
context:
space:
mode:
authorMaksim <MoNTE48@mail.ua>2018-12-03 00:39:35 +0100
committerParamat <paramat@users.noreply.github.com>2018-12-02 23:39:35 +0000
commitf70f7875e2a2e49f80470832ae97e73f171d6460 (patch)
tree6620b45d2e0dd0b5e910120d6f17bcb471370c46 /build/android/src/main/res
parent1b0fd195c614ffa1b04d687e7793fb5bb266c535 (diff)
downloadminetest-f70f7875e2a2e49f80470832ae97e73f171d6460.tar.gz
minetest-f70f7875e2a2e49f80470832ae97e73f171d6460.tar.bz2
minetest-f70f7875e2a2e49f80470832ae97e73f171d6460.zip
Update Android java code (#7820)
Targets SDK 26 as required by the playstore. Fixes screen auto-rotation closing game. Hides on-screen navigation bar if present. Update gradlew. Fix display aspect on 18+/:9 displays (like a Samsung Galaxy S9). Remove small app icons, not required. Fix xml in unpacking activity. Support Android permission: On Android 6.0+ you need to manually give write permission (as required by google). Background during unpacking (just a demo for now). Material Design: no more Android 2 interface. Immersive mode (Android 4.4+ - hide NavBar for fullscreen mode).
Diffstat (limited to 'build/android/src/main/res')
-rw-r--r--build/android/src/main/res/drawable-hdpi/irr_icon.pngbin5490 -> 0 bytes
-rw-r--r--build/android/src/main/res/drawable-ldpi/irr_icon.pngbin2262 -> 0 bytes
-rw-r--r--build/android/src/main/res/drawable-mdpi/irr_icon.pngbin3110 -> 0 bytes
-rw-r--r--build/android/src/main/res/drawable-xhdpi/irr_icon.pngbin7610 -> 0 bytes
-rw-r--r--build/android/src/main/res/drawable/background.pngbin0 -> 83 bytes
-rw-r--r--build/android/src/main/res/drawable/bg.xml4
-rw-r--r--build/android/src/main/res/layout/assetcopy.xml40
-rw-r--r--build/android/src/main/res/mipmap/ic_launcher.pngbin0 -> 5780 bytes
-rw-r--r--build/android/src/main/res/values-v21/styles.xml12
-rw-r--r--build/android/src/main/res/values/strings.xml6
-rw-r--r--build/android/src/main/res/values/styles.xml13
11 files changed, 46 insertions, 29 deletions
diff --git a/build/android/src/main/res/drawable-hdpi/irr_icon.png b/build/android/src/main/res/drawable-hdpi/irr_icon.png
deleted file mode 100644
index 0b6861a0d..000000000
--- a/build/android/src/main/res/drawable-hdpi/irr_icon.png
+++ /dev/null
Binary files differ
diff --git a/build/android/src/main/res/drawable-ldpi/irr_icon.png b/build/android/src/main/res/drawable-ldpi/irr_icon.png
deleted file mode 100644
index b8c5d0177..000000000
--- a/build/android/src/main/res/drawable-ldpi/irr_icon.png
+++ /dev/null
Binary files differ
diff --git a/build/android/src/main/res/drawable-mdpi/irr_icon.png b/build/android/src/main/res/drawable-mdpi/irr_icon.png
deleted file mode 100644
index 951a7f8c1..000000000
--- a/build/android/src/main/res/drawable-mdpi/irr_icon.png
+++ /dev/null
Binary files differ
diff --git a/build/android/src/main/res/drawable-xhdpi/irr_icon.png b/build/android/src/main/res/drawable-xhdpi/irr_icon.png
deleted file mode 100644
index 2ec528ef7..000000000
--- a/build/android/src/main/res/drawable-xhdpi/irr_icon.png
+++ /dev/null
Binary files differ
diff --git a/build/android/src/main/res/drawable/background.png b/build/android/src/main/res/drawable/background.png
new file mode 100644
index 000000000..43bd6089e
--- /dev/null
+++ b/build/android/src/main/res/drawable/background.png
Binary files differ
diff --git a/build/android/src/main/res/drawable/bg.xml b/build/android/src/main/res/drawable/bg.xml
new file mode 100644
index 000000000..c76ec372d
--- /dev/null
+++ b/build/android/src/main/res/drawable/bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/background"
+ android:tileMode="repeat" /> \ No newline at end of file
diff --git a/build/android/src/main/res/layout/assetcopy.xml b/build/android/src/main/res/layout/assetcopy.xml
index 1fcfffd65..b3da2f027 100644
--- a/build/android/src/main/res/layout/assetcopy.xml
+++ b/build/android/src/main/res/layout/assetcopy.xml
@@ -1,24 +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" >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/activity_main"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <ProgressBar
- android:id="@+id/progressBar1"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical" />
+ <ProgressBar
+ android:id="@+id/progressBar1"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="30dp"
+ android:layout_centerInParent="true"
+ android:layout_marginLeft="90dp"
+ android:layout_marginRight="90dp" />
- <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" />
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/progressBar1"
+ android:layout_centerInParent="true"
+ android:text="@string/preparing_media" />
-</LinearLayout>
+</RelativeLayout>
diff --git a/build/android/src/main/res/mipmap/ic_launcher.png b/build/android/src/main/res/mipmap/ic_launcher.png
new file mode 100644
index 000000000..88a83782c
--- /dev/null
+++ b/build/android/src/main/res/mipmap/ic_launcher.png
Binary files differ
diff --git a/build/android/src/main/res/values-v21/styles.xml b/build/android/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..efd09d274
--- /dev/null
+++ b/build/android/src/main/res/values-v21/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <style name="AppTheme" parent="@android:style/android:Theme.Material.Light.NoActionBar.Fullscreen">
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowAnimationStyle">@null</item>
+ <item name="android:background">@drawable/bg</item>
+ </style>
+
+ <style name="Theme.Dialog" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar"/>
+
+</resources> \ No newline at end of file
diff --git a/build/android/src/main/res/values/strings.xml b/build/android/src/main/res/values/strings.xml
index b407a77c6..a5eaef5d1 100644
--- a/build/android/src/main/res/values/strings.xml
+++ b/build/android/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="preparing_media">Preparing media...</string>
-</resources>
-
+ <string name="preparing_media">Preparing media&#8230;</string>
+ <string name="not_granted">Required permission wasn\'t granted, Minetest can\'t run without it</string>
+</resources> \ No newline at end of file
diff --git a/build/android/src/main/res/values/styles.xml b/build/android/src/main/res/values/styles.xml
index 25b8df5a3..8b52472a5 100644
--- a/build/android/src/main/res/values/styles.xml
+++ b/build/android/src/main/res/values/styles.xml
@@ -1,11 +1,12 @@
<?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>
+
+ <style name="AppTheme" parent="@android:style/android:Theme.Holo.Light.NoActionBar.Fullscreen">
<item name="android:windowNoTitle">true</item>
- <item name="android:windowIsFloating">true</item>
- <item name="android:backgroundDimEnabled">false</item>
+ <item name="android:windowAnimationStyle">@null</item>
+ <item name="android:background">@drawable/bg</item>
</style>
+
+ <style name="Theme.Dialog" parent="@android:style/android:Theme.Holo.Light.Dialog.NoActionBar"/>
+
</resources> \ No newline at end of file