SDL tries to load file "logo.png" from assets, and use it as a startu…

…p logo, if it fails it reverts to the usual SDL logo
pelya · May 20, 2011 · 6e9ca5f · 6e9ca5f
1 parent c418f7d
commit 6e9ca5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
@@ -27,6 +27,7 @@ Java source code (C) 2009-2011 Sergii Pylypenko
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.FrameLayout;
+import android.graphics.drawable.Drawable;
 import android.content.res.Configuration;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -93,7 +94,14 @@ public void onClick(View v)
 		ImageView img = new ImageView(this);
 
 		img.setScaleType(ImageView.ScaleType.FIT_CENTER /* FIT_XY */ );
-		img.setImageResource(R.drawable.publisherlogo);
+		try
+		{
+			img.setImageDrawable(Drawable.createFromStream(getAssets().open("logo.png"), "logo.png"));
+		}
+		catch(Exception e)
+		{
+			img.setImageResource(R.drawable.publisherlogo);
+		}
 		img.setLayoutParams(new ViewGroup.LayoutParams( ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT));
 		_layout.addView(img);
 

diff --git a/project/jni/application/ufoai/AndroidData/logo.png b/project/jni/application/ufoai/AndroidData/logo.png