From f70f7875e2a2e49f80470832ae97e73f171d6460 Mon Sep 17 00:00:00 2001
From: Maksim <MoNTE48@mail.ua>
Date: Mon, 3 Dec 2018 00:39:35 +0100
Subject: 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).
---
 .../src/main/res/drawable-hdpi/irr_icon.png        | Bin 5490 -> 0 bytes
 .../src/main/res/drawable-ldpi/irr_icon.png        | Bin 2262 -> 0 bytes
 .../src/main/res/drawable-mdpi/irr_icon.png        | Bin 3110 -> 0 bytes
 .../src/main/res/drawable-xhdpi/irr_icon.png       | Bin 7610 -> 0 bytes
 build/android/src/main/res/drawable/background.png | Bin 0 -> 83 bytes
 build/android/src/main/res/drawable/bg.xml         |   4 +++
 build/android/src/main/res/layout/assetcopy.xml    |  40 ++++++++++-----------
 build/android/src/main/res/mipmap/ic_launcher.png  | Bin 0 -> 5780 bytes
 build/android/src/main/res/values-v21/styles.xml   |  12 +++++++
 build/android/src/main/res/values/strings.xml      |   6 ++--
 build/android/src/main/res/values/styles.xml       |  13 +++----
 11 files changed, 46 insertions(+), 29 deletions(-)
 delete mode 100644 build/android/src/main/res/drawable-hdpi/irr_icon.png
 delete mode 100644 build/android/src/main/res/drawable-ldpi/irr_icon.png
 delete mode 100644 build/android/src/main/res/drawable-mdpi/irr_icon.png
 delete mode 100644 build/android/src/main/res/drawable-xhdpi/irr_icon.png
 create mode 100644 build/android/src/main/res/drawable/background.png
 create mode 100644 build/android/src/main/res/drawable/bg.xml
 create mode 100644 build/android/src/main/res/mipmap/ic_launcher.png
 create mode 100644 build/android/src/main/res/values-v21/styles.xml

(limited to 'build/android/src/main/res')

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
Binary files a/build/android/src/main/res/drawable-hdpi/irr_icon.png and /dev/null 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
Binary files a/build/android/src/main/res/drawable-ldpi/irr_icon.png and /dev/null 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
Binary files a/build/android/src/main/res/drawable-mdpi/irr_icon.png and /dev/null 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
Binary files a/build/android/src/main/res/drawable-xhdpi/irr_icon.png and /dev/null 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
Binary files /dev/null and b/build/android/src/main/res/drawable/background.png 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
Binary files /dev/null and b/build/android/src/main/res/mipmap/ic_launcher.png 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
-- 
cgit v1.2.3