Merge branch 'mrhdias-patch-1'

inclement · inclement · commit 1b338a8da2f0 · 2016-11-26T00:37:07.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -413,6 +413,10 @@ def parse_args(args=None):
     ap.add_argument('--presplash', dest='presplash',
                     help=('A jpeg file to use as a screen while the '
                           'application is loading.'))
+    ap.add_argument('--presplash-color', dest='presplash_color', default='#000000',
+                    help=('A string to set the loading screen background color. '
+                          'Suported formats are: #RRGGBB #AARRGGBB or color names '
+                          'like red, green, blue, etc.'))
     ap.add_argument('--wakelock', dest='wakelock', action='store_true',
                     help=('Indicate if the application needs the device '
                           'to stay on'))
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -30,6 +30,7 @@
 import java.io.InputStream;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
 
 import org.libsdl.app.SDLActivity;
 
@@ -356,6 +357,23 @@ protected void showLoadingScreen() {
 
         mImageView = new ImageView(this);
         mImageView.setImageBitmap(bitmap);
+
+        /*
+	 * Set the presplash loading screen background color
+         * https://developer.android.com/reference/android/graphics/Color.html
+         * Parse the color string, and return the corresponding color-int.
+         * If the string cannot be parsed, throws an IllegalArgumentException exception.
+         * Supported formats are: #RRGGBB #AARRGGBB or one of the following names:
+         * 'red', 'blue', 'green', 'black', 'white', 'gray', 'cyan', 'magenta', 'yellow',
+         * 'lightgray', 'darkgray', 'grey', 'lightgrey', 'darkgrey', 'aqua', 'fuchsia',
+         * 'lime', 'maroon', 'navy', 'olive', 'purple', 'silver', 'teal'.
+         */
+        String backgroundColor = resourceManager.getString("presplash_color");
+        if (backgroundColor != null) {
+          try {
+            mImageView.setBackgroundColor(Color.parseColor(backgroundColor));
+          } catch (IllegalArgumentException e) {}
+        }   
         mImageView.setLayoutParams(new ViewGroup.LayoutParams(
         ViewGroup.LayoutParams.FILL_PARENT,
         ViewGroup.LayoutParams.FILL_PARENT));
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/strings.tmpl.xml b/pythonforandroid/bootstraps/sdl2/build/templates/strings.tmpl.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="app_name">{{ args.name }}</string>
     <string name="private_version">0.1</string>
+    <string name="presplash_color">{{ args.presplash_color }}</string>
 </resources>
