You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2014/01/16 20:34:20 UTC

[2/4] git commit: Adding the buttons

Adding the buttons


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/43f89355
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/43f89355
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/43f89355

Branch: refs/heads/dev
Commit: 43f8935541a3cbd85aa1d214e1fa511be90d8a07
Parents: 2136cad
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jan 14 15:47:01 2014 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Jan 16 11:33:44 2014 -0800

----------------------------------------------------------------------
 plugin.xml                                      |  32 +++++++++----------
 .../drawable-hdpi/ic_action_next_item.png       | Bin 593 -> 0 bytes
 .../drawable-hdpi/ic_action_previous_item.png   | Bin 599 -> 0 bytes
 res/android/drawable-hdpi/ic_action_remove.png  | Bin 438 -> 0 bytes
 .../drawable-mdpi/ic_action_next_item.png       | Bin 427 -> 0 bytes
 .../drawable-mdpi/ic_action_previous_item.png   | Bin 438 -> 0 bytes
 res/android/drawable-mdpi/ic_action_remove.png  | Bin 328 -> 0 bytes
 .../drawable-xhdpi/ic_action_next_item.png      | Bin 727 -> 0 bytes
 .../drawable-xhdpi/ic_action_previous_item.png  | Bin 744 -> 0 bytes
 res/android/drawable-xhdpi/ic_action_remove.png | Bin 536 -> 0 bytes
 .../drawable-xxhdpi/ic_action_next_item.png     | Bin 1021 -> 0 bytes
 .../drawable-xxhdpi/ic_action_previous_item.png | Bin 1038 -> 0 bytes
 .../drawable-xxhdpi/ic_action_remove.png        | Bin 681 -> 0 bytes
 src/android/InAppBrowser.java                   |  18 +++++++++--
 .../res/drawable-hdpi/ic_action_next_item.png   | Bin 0 -> 593 bytes
 .../drawable-hdpi/ic_action_previous_item.png   | Bin 0 -> 599 bytes
 .../res/drawable-hdpi/ic_action_remove.png      | Bin 0 -> 438 bytes
 .../res/drawable-mdpi/ic_action_next_item.png   | Bin 0 -> 427 bytes
 .../drawable-mdpi/ic_action_previous_item.png   | Bin 0 -> 438 bytes
 .../res/drawable-mdpi/ic_action_remove.png      | Bin 0 -> 328 bytes
 .../res/drawable-xhdpi/ic_action_next_item.png  | Bin 0 -> 727 bytes
 .../drawable-xhdpi/ic_action_previous_item.png  | Bin 0 -> 744 bytes
 .../res/drawable-xhdpi/ic_action_remove.png     | Bin 0 -> 536 bytes
 .../res/drawable-xxhdpi/ic_action_next_item.png | Bin 0 -> 1021 bytes
 .../drawable-xxhdpi/ic_action_previous_item.png | Bin 0 -> 1038 bytes
 .../res/drawable-xxhdpi/ic_action_remove.png    | Bin 0 -> 681 bytes
 26 files changed, 32 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 9510e4d..0df644e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -19,7 +19,7 @@
         <clobbers target="window.open" />
     </js-module>
     
-    <!-- android -->
+    <!--  -->
     <platform name="android">
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="InAppBrowser"> 
@@ -30,21 +30,21 @@
         <source-file src="src/android/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
         <source-file src="src/android/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
 
-        <!-- android drawable resources -->
-        <source-file src="res/android/drawable-hdpi/ic_action_next_item.png" target-dir="res/drawable-hdpi" />
-        <source-file src="res/android/drawable-mdpi/ic_action_next_item.png" target-dir="res/drawable-mdpi" />
-        <source-file src="res/android/drawable-xhdpi/ic_action_next_item.png" target-dir="res/drawable-xhdpi" />
-        <source-file src="res/android/drawable-xxhdpi/ic_action_next_item.png" target-dir="res/drawable-xxhdpi" />
-
-        <source-file src="res/android/drawable-hdpi/ic_action_previous_item.png" target-dir="res/drawable-hdpi" />
-        <source-file src="res/android/drawable-mdpi/ic_action_previous_item.png" target-dir="res/drawable-mdpi" />
-        <source-file src="res/android/drawable-xhdpi/ic_action_previous_item.png" target-dir="res/drawable-xhdpi" />
-        <source-file src="res/android/drawable-xxhdpi/ic_action_previous_item.png" target-dir="res/drawable-xxhdpi" />
-
-        <source-file src="res/android/drawable-hdpi/ic_action_remove.png" target-dir="res/drawable-hdpi" />
-        <source-file src="res/android/drawable-mdpi/ic_action_remove.png" target-dir="res/drawable-mdpi" />
-        <source-file src="res/android/drawable-xhdpi/ic_action_remove.png" target-dir="res/drawable-xhdpi" />
-        <source-file src="res/android/drawable-xxhdpi/ic_action_remove.png" target-dir="res/drawable-xxhdpi" />
+        <!--  drawable src/android/resources -->
+        <source-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target-dir="res/drawable-hdpi" />
+        <source-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target-dir="res/drawable-mdpi" />
+        <source-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target-dir="res/drawable-xhdpi" />
+        <source-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target-dir="res/drawable-xxhdpi" />
+
+        <source-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target-dir="res/drawable-hdpi" />
+        <source-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target-dir="res/drawable-mdpi" />
+        <source-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target-dir="res/drawable-xhdpi" />
+        <source-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target-dir="res/drawable-xxhdpi" />
+
+        <source-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target-dir="res/drawable-hdpi" />
+        <source-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target-dir="res/drawable-mdpi" />
+        <source-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target-dir="res/drawable-xhdpi" />
+        <source-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target-dir="res/drawable-xxhdpi" />
 
     </platform>
     

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-hdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-hdpi/ic_action_next_item.png b/res/android/drawable-hdpi/ic_action_next_item.png
deleted file mode 100644
index fa469d8..0000000
Binary files a/res/android/drawable-hdpi/ic_action_next_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-hdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-hdpi/ic_action_previous_item.png b/res/android/drawable-hdpi/ic_action_previous_item.png
deleted file mode 100644
index e861ecc..0000000
Binary files a/res/android/drawable-hdpi/ic_action_previous_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-hdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-hdpi/ic_action_remove.png b/res/android/drawable-hdpi/ic_action_remove.png
deleted file mode 100644
index f889617..0000000
Binary files a/res/android/drawable-hdpi/ic_action_remove.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-mdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-mdpi/ic_action_next_item.png b/res/android/drawable-mdpi/ic_action_next_item.png
deleted file mode 100644
index 47365a3..0000000
Binary files a/res/android/drawable-mdpi/ic_action_next_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-mdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-mdpi/ic_action_previous_item.png b/res/android/drawable-mdpi/ic_action_previous_item.png
deleted file mode 100644
index 4ad2df4..0000000
Binary files a/res/android/drawable-mdpi/ic_action_previous_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-mdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-mdpi/ic_action_remove.png b/res/android/drawable-mdpi/ic_action_remove.png
deleted file mode 100644
index e84853e..0000000
Binary files a/res/android/drawable-mdpi/ic_action_remove.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-xhdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-xhdpi/ic_action_next_item.png b/res/android/drawable-xhdpi/ic_action_next_item.png
deleted file mode 100644
index 5f30474..0000000
Binary files a/res/android/drawable-xhdpi/ic_action_next_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-xhdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-xhdpi/ic_action_previous_item.png b/res/android/drawable-xhdpi/ic_action_previous_item.png
deleted file mode 100644
index ed8ac91..0000000
Binary files a/res/android/drawable-xhdpi/ic_action_previous_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-xhdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-xhdpi/ic_action_remove.png b/res/android/drawable-xhdpi/ic_action_remove.png
deleted file mode 100644
index 4cd0458..0000000
Binary files a/res/android/drawable-xhdpi/ic_action_remove.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-xxhdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-xxhdpi/ic_action_next_item.png b/res/android/drawable-xxhdpi/ic_action_next_item.png
deleted file mode 100644
index 51479d8..0000000
Binary files a/res/android/drawable-xxhdpi/ic_action_next_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-xxhdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-xxhdpi/ic_action_previous_item.png b/res/android/drawable-xxhdpi/ic_action_previous_item.png
deleted file mode 100644
index bc8ff12..0000000
Binary files a/res/android/drawable-xxhdpi/ic_action_previous_item.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/res/android/drawable-xxhdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/res/android/drawable-xxhdpi/ic_action_remove.png b/res/android/drawable-xxhdpi/ic_action_remove.png
deleted file mode 100644
index 331c545..0000000
Binary files a/res/android/drawable-xxhdpi/ic_action_remove.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/InAppBrowser.java
----------------------------------------------------------------------
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
index 450b68d..394e62b 100644
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@ -23,7 +23,9 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -483,7 +485,13 @@ public class InAppBrowser extends CordovaPlugin {
                 back.setLayoutParams(backLayoutParams);
                 back.setContentDescription("Back Button");
                 back.setId(2);
+                /*
                 back.setText("<");
+                */
+                Resources activityRes = cordova.getActivity().getResources();
+                int backResId = activityRes.getIdentifier("ic_action_previous_item", "drawable", cordova.getActivity().getPackageName());
+                Drawable backIcon = activityRes.getDrawable(backResId);
+                back.setBackground(backIcon);
                 back.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
                         goBack();
@@ -497,7 +505,10 @@ public class InAppBrowser extends CordovaPlugin {
                 forward.setLayoutParams(forwardLayoutParams);
                 forward.setContentDescription("Forward Button");
                 forward.setId(3);
-                forward.setText(">");
+                //forward.setText(">");
+                int fwdResId = activityRes.getIdentifier("ic_action_next_item", "drawable", cordova.getActivity().getPackageName());
+                Drawable fwdIcon = activityRes.getDrawable(fwdResId);
+                forward.setBackground(fwdIcon);
                 forward.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
                         goForward();
@@ -534,7 +545,10 @@ public class InAppBrowser extends CordovaPlugin {
                 close.setLayoutParams(closeLayoutParams);
                 forward.setContentDescription("Close Button");
                 close.setId(5);
-                close.setText(buttonLabel);
+                //close.setText(buttonLabel);
+                int closeResId = activityRes.getIdentifier("ic_action_remove", "drawable", cordova.getActivity().getPackageName());
+                Drawable closeIcon = activityRes.getDrawable(closeResId);
+                close.setBackground(closeIcon);
                 close.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
                         closeDialog();

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-hdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-hdpi/ic_action_next_item.png b/src/android/res/drawable-hdpi/ic_action_next_item.png
new file mode 100644
index 0000000..fa469d8
Binary files /dev/null and b/src/android/res/drawable-hdpi/ic_action_next_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-hdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-hdpi/ic_action_previous_item.png b/src/android/res/drawable-hdpi/ic_action_previous_item.png
new file mode 100644
index 0000000..e861ecc
Binary files /dev/null and b/src/android/res/drawable-hdpi/ic_action_previous_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-hdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-hdpi/ic_action_remove.png b/src/android/res/drawable-hdpi/ic_action_remove.png
new file mode 100644
index 0000000..f889617
Binary files /dev/null and b/src/android/res/drawable-hdpi/ic_action_remove.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-mdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-mdpi/ic_action_next_item.png b/src/android/res/drawable-mdpi/ic_action_next_item.png
new file mode 100644
index 0000000..47365a3
Binary files /dev/null and b/src/android/res/drawable-mdpi/ic_action_next_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-mdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-mdpi/ic_action_previous_item.png b/src/android/res/drawable-mdpi/ic_action_previous_item.png
new file mode 100644
index 0000000..4ad2df4
Binary files /dev/null and b/src/android/res/drawable-mdpi/ic_action_previous_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-mdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-mdpi/ic_action_remove.png b/src/android/res/drawable-mdpi/ic_action_remove.png
new file mode 100644
index 0000000..e84853e
Binary files /dev/null and b/src/android/res/drawable-mdpi/ic_action_remove.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-xhdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-xhdpi/ic_action_next_item.png b/src/android/res/drawable-xhdpi/ic_action_next_item.png
new file mode 100644
index 0000000..5f30474
Binary files /dev/null and b/src/android/res/drawable-xhdpi/ic_action_next_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-xhdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-xhdpi/ic_action_previous_item.png b/src/android/res/drawable-xhdpi/ic_action_previous_item.png
new file mode 100644
index 0000000..ed8ac91
Binary files /dev/null and b/src/android/res/drawable-xhdpi/ic_action_previous_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-xhdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-xhdpi/ic_action_remove.png b/src/android/res/drawable-xhdpi/ic_action_remove.png
new file mode 100644
index 0000000..4cd0458
Binary files /dev/null and b/src/android/res/drawable-xhdpi/ic_action_remove.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-xxhdpi/ic_action_next_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-xxhdpi/ic_action_next_item.png b/src/android/res/drawable-xxhdpi/ic_action_next_item.png
new file mode 100644
index 0000000..51479d8
Binary files /dev/null and b/src/android/res/drawable-xxhdpi/ic_action_next_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-xxhdpi/ic_action_previous_item.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-xxhdpi/ic_action_previous_item.png b/src/android/res/drawable-xxhdpi/ic_action_previous_item.png
new file mode 100644
index 0000000..bc8ff12
Binary files /dev/null and b/src/android/res/drawable-xxhdpi/ic_action_previous_item.png differ

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/43f89355/src/android/res/drawable-xxhdpi/ic_action_remove.png
----------------------------------------------------------------------
diff --git a/src/android/res/drawable-xxhdpi/ic_action_remove.png b/src/android/res/drawable-xxhdpi/ic_action_remove.png
new file mode 100644
index 0000000..331c545
Binary files /dev/null and b/src/android/res/drawable-xxhdpi/ic_action_remove.png differ