From 796761029a2fad587c6ade5b2d67109b9095a2ac Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Thu, 7 Apr 2016 10:09:49 -0700 Subject: [PATCH 1/5] Adding the Library Project --- src/android/InAppBrowser/.gitignore | 1 + src/android/InAppBrowser/InAppBrowser.iml | 101 ++++++++++++++++++ src/android/InAppBrowser/build.gradle | 25 +++++ src/android/InAppBrowser/proguard-rules.pro | 17 +++ .../cordova/inappbrowser/ApplicationTest.java | 13 +++ .../InAppBrowser/src/main/AndroidManifest.xml | 11 ++ .../cordova/inappbrowser}/InAppBrowser.java | 0 .../inappbrowser}/InAppBrowserDialog.java | 0 .../inappbrowser}/InAppChromeClient.java | 0 .../res/drawable-hdpi/ic_action_next_item.png | Bin .../drawable-hdpi/ic_action_previous_item.png | Bin .../res/drawable-hdpi/ic_action_remove.png | Bin .../res/drawable-mdpi/ic_action_next_item.png | Bin .../drawable-mdpi/ic_action_previous_item.png | Bin .../res/drawable-mdpi/ic_action_remove.png | Bin .../drawable-xhdpi/ic_action_next_item.png | Bin .../ic_action_previous_item.png | Bin .../res/drawable-xhdpi/ic_action_remove.png | Bin .../drawable-xxhdpi/ic_action_next_item.png | Bin .../ic_action_previous_item.png | Bin .../res/drawable-xxhdpi/ic_action_remove.png | Bin .../src/main/res/values/strings.xml | 3 + .../cordova/inappbrowser/ExampleUnitTest.java | 15 +++ 23 files changed, 186 insertions(+) create mode 100644 src/android/InAppBrowser/.gitignore create mode 100644 src/android/InAppBrowser/InAppBrowser.iml create mode 100644 src/android/InAppBrowser/build.gradle create mode 100644 src/android/InAppBrowser/proguard-rules.pro create mode 100644 src/android/InAppBrowser/src/androidTest/java/org/apache/cordova/inappbrowser/ApplicationTest.java create mode 100644 src/android/InAppBrowser/src/main/AndroidManifest.xml rename src/android/{ => InAppBrowser/src/main/java/org/apache/cordova/inappbrowser}/InAppBrowser.java (100%) rename src/android/{ => InAppBrowser/src/main/java/org/apache/cordova/inappbrowser}/InAppBrowserDialog.java (100%) rename src/android/{ => InAppBrowser/src/main/java/org/apache/cordova/inappbrowser}/InAppChromeClient.java (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-hdpi/ic_action_next_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-hdpi/ic_action_previous_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-hdpi/ic_action_remove.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-mdpi/ic_action_next_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-mdpi/ic_action_previous_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-mdpi/ic_action_remove.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-xhdpi/ic_action_next_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-xhdpi/ic_action_previous_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-xhdpi/ic_action_remove.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-xxhdpi/ic_action_next_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-xxhdpi/ic_action_previous_item.png (100%) rename src/android/{ => InAppBrowser/src/main}/res/drawable-xxhdpi/ic_action_remove.png (100%) create mode 100644 src/android/InAppBrowser/src/main/res/values/strings.xml create mode 100644 src/android/InAppBrowser/src/test/java/org/apache/cordova/inappbrowser/ExampleUnitTest.java diff --git a/src/android/InAppBrowser/.gitignore b/src/android/InAppBrowser/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/src/android/InAppBrowser/.gitignore @@ -0,0 +1 @@ +/build diff --git a/src/android/InAppBrowser/InAppBrowser.iml b/src/android/InAppBrowser/InAppBrowser.iml new file mode 100644 index 000000000..d545ea40f --- /dev/null +++ b/src/android/InAppBrowser/InAppBrowser.iml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/InAppBrowser/build.gradle b/src/android/InAppBrowser/build.gradle new file mode 100644 index 000000000..ffa27540d --- /dev/null +++ b/src/android/InAppBrowser/build.gradle @@ -0,0 +1,25 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.2" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + testCompile 'junit:junit:4.12' + compile project(path: ':CordovaLib') +} diff --git a/src/android/InAppBrowser/proguard-rules.pro b/src/android/InAppBrowser/proguard-rules.pro new file mode 100644 index 000000000..73631aff3 --- /dev/null +++ b/src/android/InAppBrowser/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/jbowser/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/src/android/InAppBrowser/src/androidTest/java/org/apache/cordova/inappbrowser/ApplicationTest.java b/src/android/InAppBrowser/src/androidTest/java/org/apache/cordova/inappbrowser/ApplicationTest.java new file mode 100644 index 000000000..5e52219a1 --- /dev/null +++ b/src/android/InAppBrowser/src/androidTest/java/org/apache/cordova/inappbrowser/ApplicationTest.java @@ -0,0 +1,13 @@ +package org.apache.cordova.inappbrowser; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/src/android/InAppBrowser/src/main/AndroidManifest.xml b/src/android/InAppBrowser/src/main/AndroidManifest.xml new file mode 100644 index 000000000..ff4380ae9 --- /dev/null +++ b/src/android/InAppBrowser/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser/src/main/java/org/apache/cordova/inappbrowser/InAppBrowser.java similarity index 100% rename from src/android/InAppBrowser.java rename to src/android/InAppBrowser/src/main/java/org/apache/cordova/inappbrowser/InAppBrowser.java diff --git a/src/android/InAppBrowserDialog.java b/src/android/InAppBrowser/src/main/java/org/apache/cordova/inappbrowser/InAppBrowserDialog.java similarity index 100% rename from src/android/InAppBrowserDialog.java rename to src/android/InAppBrowser/src/main/java/org/apache/cordova/inappbrowser/InAppBrowserDialog.java diff --git a/src/android/InAppChromeClient.java b/src/android/InAppBrowser/src/main/java/org/apache/cordova/inappbrowser/InAppChromeClient.java similarity index 100% rename from src/android/InAppChromeClient.java rename to src/android/InAppBrowser/src/main/java/org/apache/cordova/inappbrowser/InAppChromeClient.java diff --git a/src/android/res/drawable-hdpi/ic_action_next_item.png b/src/android/InAppBrowser/src/main/res/drawable-hdpi/ic_action_next_item.png similarity index 100% rename from src/android/res/drawable-hdpi/ic_action_next_item.png rename to src/android/InAppBrowser/src/main/res/drawable-hdpi/ic_action_next_item.png diff --git a/src/android/res/drawable-hdpi/ic_action_previous_item.png b/src/android/InAppBrowser/src/main/res/drawable-hdpi/ic_action_previous_item.png similarity index 100% rename from src/android/res/drawable-hdpi/ic_action_previous_item.png rename to src/android/InAppBrowser/src/main/res/drawable-hdpi/ic_action_previous_item.png diff --git a/src/android/res/drawable-hdpi/ic_action_remove.png b/src/android/InAppBrowser/src/main/res/drawable-hdpi/ic_action_remove.png similarity index 100% rename from src/android/res/drawable-hdpi/ic_action_remove.png rename to src/android/InAppBrowser/src/main/res/drawable-hdpi/ic_action_remove.png diff --git a/src/android/res/drawable-mdpi/ic_action_next_item.png b/src/android/InAppBrowser/src/main/res/drawable-mdpi/ic_action_next_item.png similarity index 100% rename from src/android/res/drawable-mdpi/ic_action_next_item.png rename to src/android/InAppBrowser/src/main/res/drawable-mdpi/ic_action_next_item.png diff --git a/src/android/res/drawable-mdpi/ic_action_previous_item.png b/src/android/InAppBrowser/src/main/res/drawable-mdpi/ic_action_previous_item.png similarity index 100% rename from src/android/res/drawable-mdpi/ic_action_previous_item.png rename to src/android/InAppBrowser/src/main/res/drawable-mdpi/ic_action_previous_item.png diff --git a/src/android/res/drawable-mdpi/ic_action_remove.png b/src/android/InAppBrowser/src/main/res/drawable-mdpi/ic_action_remove.png similarity index 100% rename from src/android/res/drawable-mdpi/ic_action_remove.png rename to src/android/InAppBrowser/src/main/res/drawable-mdpi/ic_action_remove.png diff --git a/src/android/res/drawable-xhdpi/ic_action_next_item.png b/src/android/InAppBrowser/src/main/res/drawable-xhdpi/ic_action_next_item.png similarity index 100% rename from src/android/res/drawable-xhdpi/ic_action_next_item.png rename to src/android/InAppBrowser/src/main/res/drawable-xhdpi/ic_action_next_item.png diff --git a/src/android/res/drawable-xhdpi/ic_action_previous_item.png b/src/android/InAppBrowser/src/main/res/drawable-xhdpi/ic_action_previous_item.png similarity index 100% rename from src/android/res/drawable-xhdpi/ic_action_previous_item.png rename to src/android/InAppBrowser/src/main/res/drawable-xhdpi/ic_action_previous_item.png diff --git a/src/android/res/drawable-xhdpi/ic_action_remove.png b/src/android/InAppBrowser/src/main/res/drawable-xhdpi/ic_action_remove.png similarity index 100% rename from src/android/res/drawable-xhdpi/ic_action_remove.png rename to src/android/InAppBrowser/src/main/res/drawable-xhdpi/ic_action_remove.png diff --git a/src/android/res/drawable-xxhdpi/ic_action_next_item.png b/src/android/InAppBrowser/src/main/res/drawable-xxhdpi/ic_action_next_item.png similarity index 100% rename from src/android/res/drawable-xxhdpi/ic_action_next_item.png rename to src/android/InAppBrowser/src/main/res/drawable-xxhdpi/ic_action_next_item.png diff --git a/src/android/res/drawable-xxhdpi/ic_action_previous_item.png b/src/android/InAppBrowser/src/main/res/drawable-xxhdpi/ic_action_previous_item.png similarity index 100% rename from src/android/res/drawable-xxhdpi/ic_action_previous_item.png rename to src/android/InAppBrowser/src/main/res/drawable-xxhdpi/ic_action_previous_item.png diff --git a/src/android/res/drawable-xxhdpi/ic_action_remove.png b/src/android/InAppBrowser/src/main/res/drawable-xxhdpi/ic_action_remove.png similarity index 100% rename from src/android/res/drawable-xxhdpi/ic_action_remove.png rename to src/android/InAppBrowser/src/main/res/drawable-xxhdpi/ic_action_remove.png diff --git a/src/android/InAppBrowser/src/main/res/values/strings.xml b/src/android/InAppBrowser/src/main/res/values/strings.xml new file mode 100644 index 000000000..2dcfb1f03 --- /dev/null +++ b/src/android/InAppBrowser/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + InAppBrowser + diff --git a/src/android/InAppBrowser/src/test/java/org/apache/cordova/inappbrowser/ExampleUnitTest.java b/src/android/InAppBrowser/src/test/java/org/apache/cordova/inappbrowser/ExampleUnitTest.java new file mode 100644 index 000000000..7a6af1677 --- /dev/null +++ b/src/android/InAppBrowser/src/test/java/org/apache/cordova/inappbrowser/ExampleUnitTest.java @@ -0,0 +1,15 @@ +package org.apache.cordova.inappbrowser; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * To work on unit tests, switch the Test Artifact in the Build Variants view. + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file From 899fe80c43ac2c20e05ef9ad9679e2855bf38ddd Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 6 Jun 2016 15:44:00 -0700 Subject: [PATCH 2/5] Tweaking to get framework install kinda working --- plugin.xml | 20 +------------------- src/android/InAppBrowser/build.gradle | 1 - 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/plugin.xml b/plugin.xml index 5776b6d50..25d226ae2 100644 --- a/plugin.xml +++ b/plugin.xml @@ -45,25 +45,7 @@ - - - - - - - - - - - - - - - - - - - + diff --git a/src/android/InAppBrowser/build.gradle b/src/android/InAppBrowser/build.gradle index ffa27540d..d343b8184 100644 --- a/src/android/InAppBrowser/build.gradle +++ b/src/android/InAppBrowser/build.gradle @@ -21,5 +21,4 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile project(path: ':CordovaLib') } From 8e2acd7066bafb09fe112d565ded6d1be247140c Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Tue, 7 Jun 2016 16:05:32 -0700 Subject: [PATCH 3/5] Got a gradle that makes submodules work. This took a long time to figure out. --- src/android/InAppBrowser/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/android/InAppBrowser/build.gradle b/src/android/InAppBrowser/build.gradle index d343b8184..fba1c4d75 100644 --- a/src/android/InAppBrowser/build.gradle +++ b/src/android/InAppBrowser/build.gradle @@ -19,6 +19,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' + compile project(':CordovaLib') } From a4dea54087ce922551bd13410ce6901d2edbb1dd Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Wed, 8 Jun 2016 11:01:40 -0700 Subject: [PATCH 4/5] Adding publishNonDefault for debug and non-debug builds, because Cordova will add seperate rules for both --- src/android/InAppBrowser/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/android/InAppBrowser/build.gradle b/src/android/InAppBrowser/build.gradle index fba1c4d75..0136939dc 100644 --- a/src/android/InAppBrowser/build.gradle +++ b/src/android/InAppBrowser/build.gradle @@ -10,12 +10,18 @@ android { versionCode 1 versionName "1.0" } + + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + // This is required once you specify debug and non-debug builds + publishNonDefault true + } dependencies { From 4b61238598a2c644f996354e100c482a2154eab6 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Wed, 29 Jun 2016 11:22:00 -0700 Subject: [PATCH 5/5] Attempting to make Cordova standalone so we can query dependencies --- src/android/InAppBrowser/build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/android/InAppBrowser/build.gradle b/src/android/InAppBrowser/build.gradle index 0136939dc..6fc1a36fc 100644 --- a/src/android/InAppBrowser/build.gradle +++ b/src/android/InAppBrowser/build.gradle @@ -1,3 +1,12 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.0' + } +} + apply plugin: 'com.android.library' android {