github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-20 23:56:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged code for imhotep: Cleaner way for handling splashscreens.

Browse Source 
See original commit: 1761cbb3dc
This commit is contained in:
Bryce Curtis 2010-11-11 15:59:35 -06:00
parent 49341356d7
commit 5ffe5fa3c5
3 changed files with 18 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/assets/js/splashscreen.js
View File

@ -1,13 +0,0 @@
/*
* PhoneGap is available under *either* the terms of the modified BSD license *or* the
* MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
*
* Copyright (c) 2005-2010, Nitobi Software Inc.
* Copyright (c) 2010, IBM Corporation
*/
PhoneGap.addConstructor(function() {
if (typeof navigator.splashScreen == "undefined") {
navigator.splashScreen = SplashScreen; // SplashScreen object come from native side through addJavaScriptInterface
}
});

48
framework/src/com/phonegap/DroidGap.java
View File

@ -74,7 +74,6 @@ public class DroidGap extends PhonegapActivity {
private static final String LOG_TAG = "DroidGap";
protected WebView appView; // The webview for our app
protected ImageView splashScreen;
private LinearLayout root;
private BrowserKey mKey;
@ -95,6 +94,9 @@ public class DroidGap extends PhonegapActivity {
// instead of being loaded into the web browser.
protected boolean loadInWebView = false;
// Splash screen drawable resource to display when starting app
protected int splashscreen = 0;
/**
* Called when the activity is first created.
*
@ -114,17 +116,6 @@ public class DroidGap extends PhonegapActivity {
root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
/*
splashScreen = new ImageView(this);
splashScreen.setLayoutParams(new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT,
ViewGroup.LayoutParams.FILL_PARENT,
1.0F));
splashScreen.setImageResource(R.drawable.splash);
root.addView(splashScreen);
*/
// If url was passed in to intent, then init webview, which will load the url
Bundle bundle = this.getIntent().getExtras();
if (bundle != null) {
@ -230,7 +221,14 @@ public class DroidGap extends PhonegapActivity {
* Look at activity parameters and process them.
*/
private void handleActivityParameters() {
// If spashscreen
this.splashscreen = this.getProperty("splashscreen", 0);
if (this.splashscreen != 0) {
appView.setBackgroundColor(0);
appView.setBackgroundResource(splashscreen);
}
// If loadingDialog, then show the App loading dialog
if (this.getProperty("loadingDialog", true)) {
this.pluginManager.exec("Notification", "activityStart", null, "[\"Wait\",\"Loading Application...\"]", false);
@ -242,12 +240,6 @@ public class DroidGap extends PhonegapActivity {
// If loadInWebView
this.loadInWebView = this.getProperty("loadInWebView", false);
// If spashscreen
String splashscreen = this.getProperty("splashscreen", null);
if (splashscreen != null) {
// TODO:
}
// If url specified, then load it
String url = this.getProperty("url", null);
if (url != null) {
@ -661,8 +653,6 @@ public class DroidGap extends PhonegapActivity {
* The webview client receives notifications about appView
*/
public class GapViewClient extends WebViewClient {
// TODO: hide splash screen here
DroidGap ctx;
@ -778,7 +768,13 @@ public class DroidGap extends PhonegapActivity {
// not loaded yet then just set a flag so that the onNativeReady can be fired
// from the JS side when the JS gets to that code.
appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
// If splash screen is showing, clear it
if (this.ctx.splashscreen != 0) {
this.ctx.splashscreen = 0;
appView.setBackgroundResource(0);
}
// Stop "app loading" spinner if showing
if (this.ctx.hideLoadingDialogOnPageLoad) {
this.ctx.hideLoadingDialogOnPageLoad = false;
@ -829,14 +825,6 @@ public class DroidGap extends PhonegapActivity {
return false;
}
/**
* Removes the splash screen from root view and adds the WebView
*/
public void hideSplashScreen() {
root.removeView(splashScreen);
root.addView(this.appView);
}
/**
* Any calls to Activity.startActivityForResult must use method below, so
* the result can be routed to them correctly.

21
framework/src/com/phonegap/SplashScreen.java
View File

@ -1,21 +0,0 @@
/*
* PhoneGap is available under *either* the terms of the modified BSD license *or* the
* MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
*
* Copyright (c) 2005-2010, Nitobi Software Inc.
*/
package com.phonegap;
public class SplashScreen {
private final DroidGap gap;
public SplashScreen(DroidGap gap) {
this.gap = gap;
}
public void hide() {
gap.runOnUiThread(new Runnable() {
public void run() {
gap.hideSplashScreen();
}
});
}
}