diff --git a/.gitignore b/.gitignore index aa3b6c3..eb6546e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules bower_components server_config +my-release-key.keystore \ No newline at end of file diff --git a/README.md b/README.md index a4bd4bb..cf208ed 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,76 @@ -Android -======= +## Welcome to Happy Meter. -Android mobile app. +Happy Meter is an interface that provides insight into employee sentiment. -JavaScript Style Guide: https://github.com/airbnb/javascript +### For Employees... -Angualr.js Style Guide: http://blog.angularjs.org/2014/02/an-angularjs-style-guide-and-best.html +Happy Meter allows you and your co-workers to anonymously broadcast your sentiments about +the workplace in real-time. Employees can submit their opinion once per day with a simple +touch and hold interface. +### ... And Employers! +View the general opinion of your company from within the company itself. Track results +over time and compare data to important company decisions to see how the choices you make affect +the overall outlook of your employees. + +![Happy Meter GUI](http://orgcurrent.github.io/Android/Happy%20Meter_files/finalpage.jpg) + +Visit the landing page: http://orgcurrent.github.io/Android/ + +Visit the screencast walkthrough: http://screencast.com/t/xNtDvSMhdO + +### Made With... + +Happy Meter was developed using the MEAN stack, starring: + +#### [The Ionic Framework](http://ionicframework.com/) + +The beautiful, open source front-end framework for developing hybrid mobile apps with HTML5. + +#### [MongoDB](http://www.mongodb.org/): + +(from "humongous") An open-source document database, and the leading NoSQL database. + +#### [Express.js](http://expressjs.com/): + +A minimal and flexible node.js web application framework, providing a robust set of features for building single and multi-page, and hybrid web applications. + +#### [AngularJS](https://angularjs.org/): + +A structural framework for dynamic web apps. It lets you use HTML as your template language and lets you extend HTML's syntax to express your application's components clearly and succinctly. + +#### [Node.js](http://nodejs.org/): + +A platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient, perfect for data-intensive real-time applications that run across distributed devices. + +With a guest appearance by: + +#### [D3.js](http://d3js.org/): + +A JavaScript library for manipulating documents based on data. D3 helps you bring data to life using HTML, SVG and CSS. + +### Codebase + +The back-end Expressjs and Mongoose code can be found in the server folder. + +The front-end Angular.js and D3.js code can be found in the www/modules folders. The front-end folder structure is modularized by ui-router state, i.e. an Angular controller and html template combination, usually pertaining to a specific section of the app flow. + + +### Developed By... + +#### Ryan Stellar + +Ryan Stellar is the man with the plan. During the few moments when he's not busy shifting paradigms, he is cracking jokes and stacking stacks. + +#### [Andrew Jones](http://andrewjones.us) + +Andrew Jones is a full-stack software engineer from San Francisco. When he's not developing, he seeks out epic long-distance running, hiking, and biking sufferfests. + +#### [Steve Hall](https://github.com/sghall) + +Steve Hall is a full-stack JavaScript engineer in the San Francisco Bay Area. Away from the keyboard, he enjoys traveling the world, hiking in the great outdoors, and playing guitar. + +#### [Keith Grout](http://keithgrout.com) + +Keith Grout is a full-stack developer from beautiful Southern California. In addition to keeping up with the latest technologies, he enjoys spending time at the beach and exploring Los Angeles! diff --git a/config.xml b/config.xml index 57d78d2..05bfae7 100644 --- a/config.xml +++ b/config.xml @@ -1,11 +1,11 @@ - - HelloCordova + + Happy Meter - An Ionic Framework and Cordova project. + The best way to understand the sentiments of you and your coworkers - - Ionic Framework Team + + Hack Reactor diff --git a/package.json b/package.json index e5e03ed..6e2554c 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,11 @@ "bugs": { "url": "https://github.com/OrgCurrent/Android/issues" }, - "homepage": "https://github.com/OrgCurrent/Android", + "homepage": "http://orgcurrent.github.io/Android/", "dependencies": { - "bluebird": "^1.2.4", + "cors": "^2.3.1", "email-templates": "^0.1.8", + "es6-promise": "^1.0.0", "express": "3.x.x", "gulp": "^3.5.6", "gulp-concat": "^2.2.0", diff --git a/platforms/android/AndroidManifest.xml b/platforms/android/AndroidManifest.xml index 958000c..3ff98a2 100644 --- a/platforms/android/AndroidManifest.xml +++ b/platforms/android/AndroidManifest.xml @@ -1,8 +1,8 @@ - + - + diff --git a/platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d b/platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d index 1c05d1f..002cfd0 100644 --- a/platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d +++ b/platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d @@ -1,2 +1,2 @@ -/Users/user/Desktop/happyMeter/platforms/android/CordovaLib/ant-build/AndroidManifest.xml : \ -/Users/user/Desktop/happyMeter/platforms/android/CordovaLib/AndroidManifest.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/CordovaLib/ant-build/AndroidManifest.xml : \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/CordovaLib/AndroidManifest.xml \ diff --git a/platforms/android/CordovaLib/ant-build/build.prop b/platforms/android/CordovaLib/ant-build/build.prop index bb9db09..9f73f83 100644 --- a/platforms/android/CordovaLib/ant-build/build.prop +++ b/platforms/android/CordovaLib/ant-build/build.prop @@ -1,10 +1,10 @@ #Last build type -#Mon, 26 May 2014 16:20:27 -0700 +#Sat, 07 Jun 2014 15:25:39 -0700 -build.last.target=debug +build.last.target=release build.last.is.instrumented=false -build.last.is.packaging.debug=true +build.last.is.packaging.debug=false -build.last.is.signing.debug=true +build.last.is.signing.debug=false diff --git a/platforms/android/CordovaLib/ant-build/classes.jar b/platforms/android/CordovaLib/ant-build/classes.jar index 4ddf314..e8f918f 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes.jar and b/platforms/android/CordovaLib/ant-build/classes.jar differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/ErrorCode.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/ErrorCode.class index 9efb454..146a3d0 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/ErrorCode.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/ErrorCode.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$HeaderEntry.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$HeaderEntry.class index 4482165..9f8e820 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$HeaderEntry.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$HeaderEntry.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Reader.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Reader.class index 7e65afb..58b6465 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Reader.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Reader.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Writer.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Writer.class index a33b736..6cf6c3e 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Writer.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Writer.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack.class index 1e3ff20..803c1e8 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$1.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$1.class index eb8bfe9..7f86c59 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$1.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$1.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$2.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$2.class index f57cf98..f1d39fe 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$2.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$2.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$FillableInflaterInputStream.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$FillableInflaterInputStream.class index 1312053..ba46bab 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$FillableInflaterInputStream.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$FillableInflaterInputStream.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader.class b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader.class index 2b8baee..1e68a78 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader.class and b/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/BuildConfig.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/BuildConfig.class index e16995d..44480ad 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/BuildConfig.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/BuildConfig.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Config.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Config.class index 6e3003d..9bcdcc5 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Config.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Config.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$4.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$4.class index 90ca122..b044cdb 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$4.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$4.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$5.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$5.class index 12e7ff3..55274b9 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$5.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$5.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$6.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$6.class index b7439b4..fe4348f 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$6.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$6.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$7.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$7.class index 8fca9e8..7fcad64 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$7.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$7.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$8.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$8.class index 53826d4..53f62c8 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$8.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$8.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$9.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$9.class index e2ce6c9..dc8981e 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$9.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$9.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient.class index dfff9cc..798bb2e 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi$OpenForReadResult.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi$OpenForReadResult.class index 72779ce..a9c58b4 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi$OpenForReadResult.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi$OpenForReadResult.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi.class index 9c812a6..7d67429 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$4.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$4.class index 46a97bd..ad17d9a 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$4.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$4.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$Level16Apis.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$Level16Apis.class index c79abf0..cd71035 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$Level16Apis.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$Level16Apis.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView.class index 7006aa6..d7fd8d7 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1$1.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1$1.class index 967d38a..51de1e7 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1$1.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1$1.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1.class index 7159f60..338690e 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient.class index 5674f87..af8c305 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/IceCreamCordovaWebViewClient.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/IceCreamCordovaWebViewClient.class index e48d116..e1bf9c3 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/IceCreamCordovaWebViewClient.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/IceCreamCordovaWebViewClient.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$BridgeMode.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$BridgeMode.class index 4914a0c..08e1d98 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$BridgeMode.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$BridgeMode.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$JsMessage.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$JsMessage.class index 389327c..aae9894 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$JsMessage.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$JsMessage.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode$1.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode$1.class index 1d640f7..bff9887 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode$1.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode$1.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode.class index 5b5f281..4a96cc7 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$1.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$1.class index ce334f5..dbd082a 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$1.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$1.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode.class index efc679b..f3e368b 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PollingBridgeMode.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PollingBridgeMode.class new file mode 100644 index 0000000..b601cf2 Binary files /dev/null and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PollingBridgeMode.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PrivateApiBridgeMode.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PrivateApiBridgeMode.class index 28f3cf8..912ab05 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PrivateApiBridgeMode.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PrivateApiBridgeMode.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue.class index 38f30d6..f9ae9df 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService$1.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService$1.class index 750bb50..fea28d8 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService$1.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService$1.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService.class index a2381c0..561d2b9 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager.class index bf48a26..7d4eba4 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist$URLPattern.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist$URLPattern.class index f9e8e8c..0ae6882 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist$URLPattern.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist$URLPattern.class differ diff --git a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist.class b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist.class index d2b4a39..a6df91e 100644 Binary files a/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist.class and b/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist.class differ diff --git a/platforms/android/CordovaLib/ant-gen/R.java.d b/platforms/android/CordovaLib/ant-gen/R.java.d index 6657e54..9d36876 100644 --- a/platforms/android/CordovaLib/ant-gen/R.java.d +++ b/platforms/android/CordovaLib/ant-gen/R.java.d @@ -1 +1 @@ - : /Users/user/Desktop/happyMeter/platforms/android/CordovaLib/ant-build/AndroidManifest.xml \ + : /Users/Priscilla/Documents/HackReactor/Android/platforms/android/CordovaLib/ant-build/AndroidManifest.xml \ diff --git a/platforms/android/CordovaLib/ant-gen/org/apache/cordova/BuildConfig.java b/platforms/android/CordovaLib/ant-gen/org/apache/cordova/BuildConfig.java index ac0852d..bba60a1 100644 --- a/platforms/android/CordovaLib/ant-gen/org/apache/cordova/BuildConfig.java +++ b/platforms/android/CordovaLib/ant-gen/org/apache/cordova/BuildConfig.java @@ -2,5 +2,5 @@ package org.apache.cordova; public final class BuildConfig { - public final static boolean DEBUG = true; + public final static boolean DEBUG = false; } \ No newline at end of file diff --git a/platforms/android/CordovaLib/local.properties b/platforms/android/CordovaLib/local.properties index 3f92b0e..8908e10 100644 --- a/platforms/android/CordovaLib/local.properties +++ b/platforms/android/CordovaLib/local.properties @@ -7,4 +7,4 @@ # location of the SDK. This is only used by Ant # For customization when using a Version Control System, please read the # header note. -sdk.dir=/Users/user/Developer/resources/adt-bundle-mac-x86_64-20140321/sdk +sdk.dir=/Users/Priscilla/Documents/Development/adt-bundle/sdk diff --git a/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/ErrorCode.java b/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/ErrorCode.java index d3a32e1..04d7bb8 100755 --- a/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/ErrorCode.java +++ b/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/ErrorCode.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.squareup.okhttp.internal.spdy; public enum ErrorCode { diff --git a/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/Hpack.java b/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/Hpack.java index c3ca8f1..29f4189 100755 --- a/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/Hpack.java +++ b/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/Hpack.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.squareup.okhttp.internal.spdy; import java.io.DataInputStream; diff --git a/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java b/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java index b95d013..1b07e8f 100755 --- a/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java +++ b/platforms/android/CordovaLib/src/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.squareup.okhttp.internal.spdy; import com.squareup.okhttp.internal.Util; diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/Config.java b/platforms/android/CordovaLib/src/org/apache/cordova/Config.java index 0185338..31a1370 100644 --- a/platforms/android/CordovaLib/src/org/apache/cordova/Config.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/Config.java @@ -204,6 +204,7 @@ else if (strNode.equals("content")) { */ public static void addWhiteListEntry(String origin, boolean subdomains) { if (self == null) { + Log.e(TAG, "Config was not initialised. Did you forget to Config.init(this)?"); return; } self.whitelist.addWhiteListEntry(origin, subdomains); @@ -217,6 +218,7 @@ public static void addWhiteListEntry(String origin, boolean subdomains) { */ public static boolean isUrlWhiteListed(String url) { if (self == null) { + Log.e(TAG, "Config was not initialised. Did you forget to Config.init(this)?"); return false; } return self.whitelist.isUrlWhiteListed(url); diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaChromeClient.java b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaChromeClient.java index 5977e00..54c8948 100755 --- a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaChromeClient.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaChromeClient.java @@ -139,7 +139,6 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) { return true; } }); - dlg.create(); dlg.show(); return true; } @@ -188,7 +187,6 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) { return true; } }); - dlg.create(); dlg.show(); return true; } @@ -280,7 +278,6 @@ public void onClick(DialogInterface dialog, int which) { res.cancel(); } }); - dlg.create(); dlg.show(); } return true; diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaResourceApi.java b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaResourceApi.java index ea2a90d..f1770fd 100644 --- a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaResourceApi.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaResourceApi.java @@ -45,6 +45,27 @@ Licensed to the Apache Software Foundation (ASF) under one import java.nio.channels.FileChannel; import java.util.Locale; +/** + * What this class provides: + * 1. Helpers for reading & writing to URLs. + * - E.g. handles assets, resources, content providers, files, data URIs, http[s] + * - E.g. Can be used to query for mime-type & content length. + * + * 2. To allow plugins to redirect URLs (via remapUrl). + * - All plugins should call remapUrl() on URLs they receive from JS *before* + * passing the URL onto other utility functions in this class. + * - For an example usage of this, refer to the org.apache.cordova.file plugin. + * + * 3. It exposes a way to use the OkHttp library that ships with Cordova. + * - Through createHttpConnection(). + * + * Future Work: + * - Consider using a Cursor to query content URLs for their size (like the file plugin does). + * - Allow plugins to remapUri to "cdv-plugin://plugin-name/$ID", which CordovaResourceApi + * would then delegate to pluginManager.getPlugin(plugin-name).openForRead($ID) + * - Currently, plugins *can* do this by remapping to a data: URL, but it's inefficient + * for large payloads. + */ public class CordovaResourceApi { @SuppressWarnings("unused") private static final String LOG_TAG = "CordovaResourceApi"; @@ -346,6 +367,10 @@ public void copyResource(Uri sourceUri, OutputStream outputStream) throws IOExce copyResource(openForRead(sourceUri), outputStream); } + // Added in 3.5.0. + public void copyResource(Uri sourceUri, Uri dstUri) throws IOException { + copyResource(openForRead(sourceUri), openOutputStream(dstUri)); + } private void assertBackgroundThread() { if (threadCheckingEnabled) { diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java index 4dfeb55..ef1c057 100755 --- a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java @@ -68,7 +68,7 @@ Licensed to the Apache Software Foundation (ASF) under one public class CordovaWebView extends WebView { public static final String TAG = "CordovaWebView"; - public static final String CORDOVA_VERSION = "3.4.0"; + public static final String CORDOVA_VERSION = "3.5.0"; private ArrayList keyDownCodes = new ArrayList(); private ArrayList keyUpCodes = new ArrayList(); @@ -494,8 +494,7 @@ public void run() { // Load url this.cordova.getActivity().runOnUiThread(new Runnable() { public void run() { - Thread thread = new Thread(timeoutCheck); - thread.start(); + cordova.getThreadPool().execute(timeoutCheck); me.loadUrlNow(url); } }); @@ -542,6 +541,11 @@ public void loadUrlIntoView(final String url, final int time) { this.loadUrlIntoView(url); } + @Override + public void stopLoading() { + viewClient.isCurrentlyLoading = false; + super.stopLoading(); + } public void onScrollChanged(int l, int t, int oldl, int oldt) { diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebViewClient.java b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebViewClient.java index e465ffa..407c1fb 100755 --- a/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebViewClient.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebViewClient.java @@ -62,6 +62,7 @@ public class CordovaWebViewClient extends WebViewClient { CordovaInterface cordova; CordovaWebView appView; private boolean doClearHistory = false; + boolean isCurrentlyLoading; /** The authorization tokens. */ private Hashtable authenticationTokens = new Hashtable(); @@ -266,7 +267,9 @@ public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, Str */ @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { - + super.onPageStarted(view, url, favicon); + isCurrentlyLoading = true; + LOG.d(TAG, "onPageStarted(" + url + ")"); // Flush stale messages. this.appView.jsMessageQueue.reset(); @@ -290,6 +293,11 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) { @Override public void onPageFinished(WebView view, String url) { super.onPageFinished(view, url); + // Ignore excessive calls. + if (!isCurrentlyLoading) { + return; + } + isCurrentlyLoading = false; LOG.d(TAG, "onPageFinished(" + url + ")"); /** @@ -344,6 +352,10 @@ public void run() { */ @Override public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { + // Ignore error due to stopLoading(). + if (!isCurrentlyLoading) { + return; + } LOG.d(TAG, "CordovaWebViewClient.onReceivedError: Error code=%s Description=%s URL=%s", errorCode, description, failingUrl); // Clear timeout flag diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/IceCreamCordovaWebViewClient.java b/platforms/android/CordovaLib/src/org/apache/cordova/IceCreamCordovaWebViewClient.java index 7eb759e..63cfb91 100644 --- a/platforms/android/CordovaLib/src/org/apache/cordova/IceCreamCordovaWebViewClient.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/IceCreamCordovaWebViewClient.java @@ -59,7 +59,7 @@ public WebResourceResponse shouldInterceptRequest(WebView view, String url) { // Allow plugins to intercept WebView requests. Uri remappedUri = resourceApi.remapUri(origUri); - if (!origUri.equals(remappedUri) || needsSpecialsInAssetUrlFix(origUri)) { + if (!origUri.equals(remappedUri) || needsSpecialsInAssetUrlFix(origUri) || needsKitKatContentUrlFix(origUri)) { OpenForReadResult result = resourceApi.openForRead(remappedUri, true); return new WebResourceResponse(result.mimeType, "UTF-8", result.inputStream); } @@ -74,6 +74,10 @@ public WebResourceResponse shouldInterceptRequest(WebView view, String url) { } } + private static boolean needsKitKatContentUrlFix(Uri uri) { + return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT && "content".equals(uri.getScheme()); + } + private static boolean needsSpecialsInAssetUrlFix(Uri uri) { if (CordovaResourceApi.getUriType(uri) != CordovaResourceApi.URI_TYPE_ASSET) { return false; diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/NativeToJsMessageQueue.java b/platforms/android/CordovaLib/src/org/apache/cordova/NativeToJsMessageQueue.java index ce8e9b2..5d0c061 100755 --- a/platforms/android/CordovaLib/src/org/apache/cordova/NativeToJsMessageQueue.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/NativeToJsMessageQueue.java @@ -83,7 +83,7 @@ public NativeToJsMessageQueue(CordovaWebView webView, CordovaInterface cordova) this.cordova = cordova; this.webView = webView; registeredListeners = new BridgeMode[4]; - registeredListeners[0] = null; // Polling. Requires no logic. + registeredListeners[0] = new PollingBridgeMode(); registeredListeners[1] = new LoadUrlBridgeMode(); registeredListeners[2] = new OnlineEventsBridgeMode(); registeredListeners[3] = new PrivateApiBridgeMode(); @@ -102,7 +102,8 @@ public void setBridgeMode(int value) { synchronized (this) { activeListenerIndex = value; BridgeMode activeListener = registeredListeners[value]; - if (!paused && !queue.isEmpty() && activeListener != null) { + activeListener.reset(); + if (!paused && !queue.isEmpty()) { activeListener.onNativeToJsMessageAvailable(); } } @@ -117,6 +118,7 @@ public void reset() { synchronized (this) { queue.clear(); setBridgeMode(DEFAULT_BRIDGE_MODE); + registeredListeners[activeListenerIndex].reset(); } } @@ -249,7 +251,7 @@ public void addPluginResult(PluginResult result, String callbackId) { private void enqueueMessage(JsMessage message) { synchronized (this) { queue.add(message); - if (!paused && registeredListeners[activeListenerIndex] != null) { + if (!paused) { registeredListeners[activeListenerIndex].onNativeToJsMessageAvailable(); } } @@ -264,7 +266,7 @@ public void setPaused(boolean value) { paused = value; if (!value) { synchronized (this) { - if (!queue.isEmpty() && registeredListeners[activeListenerIndex] != null) { + if (!queue.isEmpty()) { registeredListeners[activeListenerIndex].onNativeToJsMessageAvailable(); } } @@ -278,8 +280,15 @@ public boolean getPaused() { private abstract class BridgeMode { abstract void onNativeToJsMessageAvailable(); void notifyOfFlush(boolean fromOnlineEvent) {} + void reset() {} } - + + /** Uses JS polls for messages on a timer.. */ + private class PollingBridgeMode extends BridgeMode { + @Override void onNativeToJsMessageAvailable() { + } + } + /** Uses webView.loadUrl("javascript:") to execute messages. */ private class LoadUrlBridgeMode extends BridgeMode { final Runnable runnable = new Runnable() { @@ -298,7 +307,7 @@ public void run() { /** Uses online/offline events to tell the JS when to poll for messages. */ private class OnlineEventsBridgeMode extends BridgeMode { - boolean online = false; + private boolean online; final Runnable runnable = new Runnable() { public void run() { if (!queue.isEmpty()) { @@ -306,7 +315,8 @@ public void run() { } } }; - OnlineEventsBridgeMode() { + @Override void reset() { + online = false; webView.setNetworkAvailable(true); } @Override void onNativeToJsMessageAvailable() { @@ -484,9 +494,22 @@ void encodeAsJsMessage(StringBuilder sb) { .append(success) .append(",") .append(status) - .append(",[") - .append(pluginResult.getMessage()) - .append("],") + .append(",["); + switch (pluginResult.getMessageType()) { + case PluginResult.MESSAGE_TYPE_BINARYSTRING: + sb.append("atob('") + .append(pluginResult.getMessage()) + .append("')"); + break; + case PluginResult.MESSAGE_TYPE_ARRAYBUFFER: + sb.append("cordova.require('cordova/base64').toArrayBuffer('") + .append(pluginResult.getMessage()) + .append("')"); + break; + default: + sb.append(pluginResult.getMessage()); + } + sb.append("],") .append(pluginResult.getKeepCallback()) .append(");"); } diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/PluginManager.java b/platforms/android/CordovaLib/src/org/apache/cordova/PluginManager.java index e9795e8..f095722 100755 --- a/platforms/android/CordovaLib/src/org/apache/cordova/PluginManager.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/PluginManager.java @@ -236,22 +236,25 @@ private void execHelper(final String service, final String action, final String app.sendPluginResult(cr, callbackId); return; } + CallbackContext callbackContext = new CallbackContext(callbackId, app); try { - CallbackContext callbackContext = new CallbackContext(callbackId, app); long pluginStartTime = System.currentTimeMillis(); boolean wasValidAction = plugin.execute(action, rawArgs, callbackContext); long duration = System.currentTimeMillis() - pluginStartTime; - + if (duration > SLOW_EXEC_WARNING_THRESHOLD) { Log.w(TAG, "THREAD WARNING: exec() call to " + service + "." + action + " blocked the main thread for " + duration + "ms. Plugin should use CordovaInterface.getThreadPool()."); } if (!wasValidAction) { PluginResult cr = new PluginResult(PluginResult.Status.INVALID_ACTION); - app.sendPluginResult(cr, callbackId); + callbackContext.sendPluginResult(cr); } } catch (JSONException e) { PluginResult cr = new PluginResult(PluginResult.Status.JSON_EXCEPTION); - app.sendPluginResult(cr, callbackId); + callbackContext.sendPluginResult(cr); + } catch (Exception e) { + Log.e(TAG, "Uncaught exception from plugin", e); + callbackContext.error(e.getMessage()); } } diff --git a/platforms/android/CordovaLib/src/org/apache/cordova/Whitelist.java b/platforms/android/CordovaLib/src/org/apache/cordova/Whitelist.java index a868a77..a01d7aa 100644 --- a/platforms/android/CordovaLib/src/org/apache/cordova/Whitelist.java +++ b/platforms/android/CordovaLib/src/org/apache/cordova/Whitelist.java @@ -55,14 +55,14 @@ public URLPattern(String scheme, String host, String port, String path) throws M if (scheme == null || "*".equals(scheme)) { this.scheme = null; } else { - this.scheme = Pattern.compile(regexFromPattern(scheme, false)); + this.scheme = Pattern.compile(regexFromPattern(scheme, false), Pattern.CASE_INSENSITIVE); } if ("*".equals(host)) { this.host = null; } else if (host.startsWith("*.")) { - this.host = Pattern.compile("([a-z0-9.-]*\\.)?" + regexFromPattern(host.substring(2), false)); + this.host = Pattern.compile("([a-z0-9.-]*\\.)?" + regexFromPattern(host.substring(2), false), Pattern.CASE_INSENSITIVE); } else { - this.host = Pattern.compile(regexFromPattern(host, false)); + this.host = Pattern.compile(regexFromPattern(host, false), Pattern.CASE_INSENSITIVE); } if (port == null || "*".equals(port)) { this.port = null; @@ -120,7 +120,7 @@ public void addWhiteListEntry(String origin, boolean subdomains) { whiteList = null; } else { // specific access - Pattern parts = Pattern.compile("^((\\*|[a-z-]+)://)?(\\*|((\\*\\.)?[^*/:]+))?(:(\\d+))?(/.*)?"); + Pattern parts = Pattern.compile("^((\\*|[A-Za-z-]+)://)?(\\*|((\\*\\.)?[^*/:]+))?(:(\\d+))?(/.*)?"); Matcher m = parts.matcher(origin); if (m.matches()) { String scheme = m.group(2); diff --git a/platforms/android/ant-build/AndroidManifest.cordova.xml b/platforms/android/ant-build/AndroidManifest.cordova.xml index 958000c..3ff98a2 100644 --- a/platforms/android/ant-build/AndroidManifest.cordova.xml +++ b/platforms/android/ant-build/AndroidManifest.cordova.xml @@ -1,8 +1,8 @@ - + - + diff --git a/platforms/android/ant-build/AndroidManifest.xml.d b/platforms/android/ant-build/AndroidManifest.xml.d index 17c9fdc..c61a388 100644 --- a/platforms/android/ant-build/AndroidManifest.xml.d +++ b/platforms/android/ant-build/AndroidManifest.xml.d @@ -1,2 +1,2 @@ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/AndroidManifest.xml : \ -/Users/user/Desktop/happyMeter/platforms/android/AndroidManifest.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/AndroidManifest.xml : \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/AndroidManifest.xml \ diff --git a/platforms/android/ant-build/HelloCordova-debug-unaligned.apk b/platforms/android/ant-build/HelloCordova-debug-unaligned.apk deleted file mode 100644 index a2f942e..0000000 Binary files a/platforms/android/ant-build/HelloCordova-debug-unaligned.apk and /dev/null differ diff --git a/platforms/android/ant-build/HelloCordova-debug-unaligned.apk.d b/platforms/android/ant-build/HelloCordova-debug-unaligned.apk.d deleted file mode 100644 index 0d3480d..0000000 --- a/platforms/android/ant-build/HelloCordova-debug-unaligned.apk.d +++ /dev/null @@ -1,4 +0,0 @@ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/HelloCordova-debug-unaligned.apk : \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/HelloCordova.ap_ \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes.dex \ -/Users/user/Desktop/happyMeter/platforms/android/CordovaLib/ant-build/classes.jar \ diff --git a/platforms/android/ant-build/HelloCordova-debug.apk b/platforms/android/ant-build/HelloCordova-debug.apk deleted file mode 100644 index 7bb7c7a..0000000 Binary files a/platforms/android/ant-build/HelloCordova-debug.apk and /dev/null differ diff --git a/platforms/android/ant-build/HelloCordova-release-unsigned.apk b/platforms/android/ant-build/HelloCordova-release-unsigned.apk new file mode 100644 index 0000000..15ad44d Binary files /dev/null and b/platforms/android/ant-build/HelloCordova-release-unsigned.apk differ diff --git a/platforms/android/ant-build/HelloCordova-release-unsigned.apk.d b/platforms/android/ant-build/HelloCordova-release-unsigned.apk.d new file mode 100644 index 0000000..275dd2f --- /dev/null +++ b/platforms/android/ant-build/HelloCordova-release-unsigned.apk.d @@ -0,0 +1,4 @@ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/HelloCordova-release-unsigned.apk : \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/HelloCordova.ap_ \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes.dex \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/CordovaLib/ant-build/classes.jar \ diff --git a/platforms/android/ant-build/HelloCordova.ap_ b/platforms/android/ant-build/HelloCordova.ap_ index a51e088..d46aff5 100644 Binary files a/platforms/android/ant-build/HelloCordova.ap_ and b/platforms/android/ant-build/HelloCordova.ap_ differ diff --git a/platforms/android/ant-build/HelloCordova.ap_.d b/platforms/android/ant-build/HelloCordova.ap_.d index 488bb84..0cbeaba 100644 --- a/platforms/android/ant-build/HelloCordova.ap_.d +++ b/platforms/android/ant-build/HelloCordova.ap_.d @@ -1,99 +1,244 @@ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/HelloCordova.ap_ \ - : /Users/user/Desktop/happyMeter/platforms/android/res/drawable/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-hdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-ldpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-mdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-xhdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/values/strings.xml \ -/Users/user/Desktop/happyMeter/platforms/android/res/xml/config.xml \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-hdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-ldpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-mdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-xhdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/assets/_where-is-www.txt \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/cordova.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/cordova_plugins.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/css \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/img \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/index.html \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/plugins \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/README.md \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/css/style.css \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/img/ionic.png \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/js/app.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/css \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/fonts \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/version.json \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/css/ionic.css \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/css/ionic.min.css \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/fonts/ionicons.eot \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/fonts/ionicons.svg \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/fonts/ionicons.ttf \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/fonts/ionicons.woff \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular-ui \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/ionic-angular.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/ionic-angular.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/ionic.bundle.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/ionic.bundle.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/ionic.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/ionic.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular-animate.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular-animate.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular-resource.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular-resource.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular-sanitize.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular-sanitize.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular/angular.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular-ui/angular-ui-router.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/js/angular-ui/angular-ui-router.min.js \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_action-sheet.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_animations.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_backdrop.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_badge.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_bar.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_button-bar.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_button.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_checkbox.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_form.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_grid.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_items.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_list.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_loading.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_menu.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_mixins.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_modal.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_platform.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_popup.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_progress.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_radio.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_range.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_reset.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_scaffolding.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_select.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_slide-box.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_split-pane.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_tabs.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_toggle.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_type.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_util.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/_variables.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/ionic.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/ionicons \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-animation.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-font.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-icons.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-variables.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/lib/ionic/scss/ionicons/ionicons.scss \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/plugins/org.apache.cordova.device \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/plugins/org.apache.cordova.device/www \ -/Users/user/Desktop/happyMeter/platforms/android/assets/www/plugins/org.apache.cordova.device/www/device.js \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/AndroidManifest.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/HelloCordova.ap_ \ + : /Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable/android_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable/default_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-hdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-ldpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-mdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-xhdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/values/strings.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/xml/config.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable/android_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable/default_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-hdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-ldpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-mdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-xhdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/_where-is-www.txt \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/cordova.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/cordova_plugins.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/img \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/index.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/plugins \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3 \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3/composer.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3/CONTRIBUTING.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3/d3.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3/d3.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3/LICENSE \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/d3/README.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/api.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/API.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/CHANGELOG.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/component.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/CONTRIBUTING.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/docs \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/index.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/index.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/LICENSE \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/Makefile \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/package.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/README.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/README.test.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/SEEALSO.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/src \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/docs/docco.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/docs/simple_statistics.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/src/simple_statistics.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/index.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/lib \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/lib/chai.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/lib/mocha.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/lib/mocha.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/bayes.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/bernoulli_distribution.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/binomial_distribution.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/chi_squared_goodness_of_fit.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/cumulative.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/factorial.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/geometric_mean.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/harmonic_mean.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/iqr.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/jenks.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/linear_regression.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/mad.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/mean.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/median.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/minmax.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/mixin.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/mode.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/normal_distribution.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/poisson_distribution.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/quantile.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/quantilesorted.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/r_squared.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/sample_correlation.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/sample_covariance.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/sample_skewness.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/sample_standard_deviation.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/sample_variance.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/standard_deviation.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/standard_normal_table.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/sum.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/t_test.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/bower_components/simple-statistics/test/spec/variance.test.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/css/ionic.app.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/css/ionic.app.min.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/css/style.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/img/ionic.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-animate \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-sanitize \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular/angular-csp.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular/angular.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular/angular.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular/angular.min.js.gzip \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular/angular.min.js.map \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular/README.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-animate/angular-animate.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-animate/angular-animate.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-animate/angular-animate.min.js.map \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-animate/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-animate/README.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-sanitize/angular-sanitize.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-sanitize/angular-sanitize.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-sanitize/angular-sanitize.min.js.map \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-sanitize/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-sanitize/README.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/CHANGELOG.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/LICENSE \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/README.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/release \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/release/angular-ui-router.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/release/angular-ui-router.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/common.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/compat.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/resolve.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/state.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/stateDirectives.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/stateFilters.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/templateFactory.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/urlMatcherFactory.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/urlRouter.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/view.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/viewDirective.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/angular-ui-router/src/viewScroll.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/bower.json \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/fonts \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/README.md \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/css/ionic.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/css/ionic.min.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/fonts/ionicons.eot \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/fonts/ionicons.svg \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/fonts/ionicons.ttf \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/fonts/ionicons.woff \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/js/ionic-angular.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/js/ionic-angular.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/js/ionic.bundle.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/js/ionic.bundle.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/js/ionic.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/js/ionic.min.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_action-sheet.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_animations.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_backdrop.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_badge.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_bar.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_button-bar.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_button.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_checkbox.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_form.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_grid.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_items.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_list.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_loading.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_menu.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_mixins.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_modal.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_platform.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_popup.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_progress.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_radio.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_range.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_reset.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_scaffolding.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_select.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_slide-box.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_split-pane.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_tabs.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_toggle.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_type.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_util.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/_variables.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/ionic.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/ionicons \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-animation.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-font.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-icons.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/ionicons/_ionicons-variables.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/lib/ionic/scss/ionicons/ionicons.scss \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/API \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/app \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/email \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/graph \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/invite \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/root \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/settingsSide \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/verify \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/API/http.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/app/app.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/email/email.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/email/email.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/graph/opinion.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/graph/opinion.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/graph/visuals \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/graph/visuals/graph.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/graph/visuals/graphGraphics.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/invite/invite.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/invite/invite.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/root/headers.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/root/home.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/root/home.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/root/loading.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/root/workflow.css \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/settingsSide/settings.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/settingsSide/settings.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/verify/verify.html \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/modules/verify/verify.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/plugins/org.apache.cordova.device \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/plugins/org.apache.cordova.device/www \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/assets/www/plugins/org.apache.cordova.device/www/device.js \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/AndroidManifest.xml \ diff --git a/platforms/android/ant-build/R.txt b/platforms/android/ant-build/R.txt index a2dbe13..3759228 100644 --- a/platforms/android/ant-build/R.txt +++ b/platforms/android/ant-build/R.txt @@ -1,3 +1,6 @@ -int drawable icon 0x7f020000 +int drawable android_icon 0x7f020000 +int drawable default_icon 0x7f020001 +int drawable icon 0x7f020002 +int drawable screen 0x7f020003 int string app_name 0x7f040000 int xml config 0x7f030000 diff --git a/platforms/android/ant-build/build.prop b/platforms/android/ant-build/build.prop index 81f4929..dfaf46a 100644 --- a/platforms/android/ant-build/build.prop +++ b/platforms/android/ant-build/build.prop @@ -1,10 +1,10 @@ #Last build type -#Mon, 26 May 2014 16:20:36 -0700 +#Sat, 07 Jun 2014 15:25:42 -0700 -build.last.target=debug +build.last.target=release build.last.is.instrumented=false -build.last.is.packaging.debug=true +build.last.is.packaging.debug=false -build.last.is.signing.debug=true +build.last.is.signing.debug=false diff --git a/platforms/android/ant-build/classes.dex b/platforms/android/ant-build/classes.dex index 12e2426..c3e16c9 100644 Binary files a/platforms/android/ant-build/classes.dex and b/platforms/android/ant-build/classes.dex differ diff --git a/platforms/android/ant-build/classes.dex.d b/platforms/android/ant-build/classes.dex.d index 1fc52b0..47146b9 100644 --- a/platforms/android/ant-build/classes.dex.d +++ b/platforms/android/ant-build/classes.dex.d @@ -1,10 +1,10 @@ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes.dex : \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/com/ionicframework/starter/BuildConfig.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/com/ionicframework/starter/HelloCordova.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/com/ionicframework/starter/R$attr.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/com/ionicframework/starter/R$drawable.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/com/ionicframework/starter/R$string.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/com/ionicframework/starter/R$xml.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/com/ionicframework/starter/R.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/classes/org/apache/cordova/device/Device.class \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/dexedLibs/classes-d1b3d8b6168a81ebbfb599b8ac991ad0.jar \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes.dex : \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/com/stellar/ryan/BuildConfig.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/com/stellar/ryan/HelloCordova.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/com/stellar/ryan/R$attr.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/com/stellar/ryan/R$drawable.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/com/stellar/ryan/R$string.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/com/stellar/ryan/R$xml.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/com/stellar/ryan/R.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/classes/org/apache/cordova/device/Device.class \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/dexedLibs/classes-d996505db71ae2b9cc425f43161b4972.jar \ diff --git a/platforms/android/ant-build/classes/com/ionicframework/starter/BuildConfig.class b/platforms/android/ant-build/classes/com/ionicframework/starter/BuildConfig.class deleted file mode 100644 index bf4e34f..0000000 Binary files a/platforms/android/ant-build/classes/com/ionicframework/starter/BuildConfig.class and /dev/null differ diff --git a/platforms/android/ant-build/classes/com/ionicframework/starter/HelloCordova.class b/platforms/android/ant-build/classes/com/ionicframework/starter/HelloCordova.class deleted file mode 100644 index 6e41a44..0000000 Binary files a/platforms/android/ant-build/classes/com/ionicframework/starter/HelloCordova.class and /dev/null differ diff --git a/platforms/android/ant-build/classes/com/ionicframework/starter/R$attr.class b/platforms/android/ant-build/classes/com/ionicframework/starter/R$attr.class deleted file mode 100644 index 160f0d2..0000000 Binary files a/platforms/android/ant-build/classes/com/ionicframework/starter/R$attr.class and /dev/null differ diff --git a/platforms/android/ant-build/classes/com/ionicframework/starter/R$drawable.class b/platforms/android/ant-build/classes/com/ionicframework/starter/R$drawable.class deleted file mode 100644 index e790044..0000000 Binary files a/platforms/android/ant-build/classes/com/ionicframework/starter/R$drawable.class and /dev/null differ diff --git a/platforms/android/ant-build/classes/com/ionicframework/starter/R$string.class b/platforms/android/ant-build/classes/com/ionicframework/starter/R$string.class deleted file mode 100644 index eccd5c7..0000000 Binary files a/platforms/android/ant-build/classes/com/ionicframework/starter/R$string.class and /dev/null differ diff --git a/platforms/android/ant-build/classes/com/ionicframework/starter/R$xml.class b/platforms/android/ant-build/classes/com/ionicframework/starter/R$xml.class deleted file mode 100644 index 7d860a4..0000000 Binary files a/platforms/android/ant-build/classes/com/ionicframework/starter/R$xml.class and /dev/null differ diff --git a/platforms/android/ant-build/classes/com/ionicframework/starter/R.class b/platforms/android/ant-build/classes/com/ionicframework/starter/R.class deleted file mode 100644 index 6476347..0000000 Binary files a/platforms/android/ant-build/classes/com/ionicframework/starter/R.class and /dev/null differ diff --git a/platforms/android/ant-build/classes/com/stellar/ryan/BuildConfig.class b/platforms/android/ant-build/classes/com/stellar/ryan/BuildConfig.class new file mode 100644 index 0000000..07d8b40 Binary files /dev/null and b/platforms/android/ant-build/classes/com/stellar/ryan/BuildConfig.class differ diff --git a/platforms/android/ant-build/classes/com/stellar/ryan/HelloCordova.class b/platforms/android/ant-build/classes/com/stellar/ryan/HelloCordova.class new file mode 100644 index 0000000..b8f26b3 Binary files /dev/null and b/platforms/android/ant-build/classes/com/stellar/ryan/HelloCordova.class differ diff --git a/platforms/android/ant-build/classes/com/stellar/ryan/R$attr.class b/platforms/android/ant-build/classes/com/stellar/ryan/R$attr.class new file mode 100644 index 0000000..d7e1af0 Binary files /dev/null and b/platforms/android/ant-build/classes/com/stellar/ryan/R$attr.class differ diff --git a/platforms/android/ant-build/classes/com/stellar/ryan/R$drawable.class b/platforms/android/ant-build/classes/com/stellar/ryan/R$drawable.class new file mode 100644 index 0000000..3a73a82 Binary files /dev/null and b/platforms/android/ant-build/classes/com/stellar/ryan/R$drawable.class differ diff --git a/platforms/android/ant-build/classes/com/stellar/ryan/R$string.class b/platforms/android/ant-build/classes/com/stellar/ryan/R$string.class new file mode 100644 index 0000000..3bfd32f Binary files /dev/null and b/platforms/android/ant-build/classes/com/stellar/ryan/R$string.class differ diff --git a/platforms/android/ant-build/classes/com/stellar/ryan/R$xml.class b/platforms/android/ant-build/classes/com/stellar/ryan/R$xml.class new file mode 100644 index 0000000..5690478 Binary files /dev/null and b/platforms/android/ant-build/classes/com/stellar/ryan/R$xml.class differ diff --git a/platforms/android/ant-build/classes/com/stellar/ryan/R.class b/platforms/android/ant-build/classes/com/stellar/ryan/R.class new file mode 100644 index 0000000..ce5cdbb Binary files /dev/null and b/platforms/android/ant-build/classes/com/stellar/ryan/R.class differ diff --git a/platforms/android/ant-build/dexedLibs/classes-d1b3d8b6168a81ebbfb599b8ac991ad0.jar b/platforms/android/ant-build/dexedLibs/classes-d1b3d8b6168a81ebbfb599b8ac991ad0.jar deleted file mode 100644 index f9b6ca9..0000000 Binary files a/platforms/android/ant-build/dexedLibs/classes-d1b3d8b6168a81ebbfb599b8ac991ad0.jar and /dev/null differ diff --git a/platforms/android/ant-build/dexedLibs/classes-d996505db71ae2b9cc425f43161b4972.jar b/platforms/android/ant-build/dexedLibs/classes-d996505db71ae2b9cc425f43161b4972.jar new file mode 100644 index 0000000..9b1d84e Binary files /dev/null and b/platforms/android/ant-build/dexedLibs/classes-d996505db71ae2b9cc425f43161b4972.jar differ diff --git a/platforms/android/ant-build/proguard.txt b/platforms/android/ant-build/proguard.txt index 786dac7..5bd9305 100644 --- a/platforms/android/ant-build/proguard.txt +++ b/platforms/android/ant-build/proguard.txt @@ -1,3 +1,3 @@ # view AndroidManifest.xml #generated:6 --keep class com.ionicframework.starter.HelloCordova { (...); } +-keep class com.stellar.ryan.HelloCordova { (...); } diff --git a/platforms/android/ant-build/res/drawable-land-hdpi/screen.png b/platforms/android/ant-build/res/drawable-land-hdpi/screen.png new file mode 100644 index 0000000..f0d8afa Binary files /dev/null and b/platforms/android/ant-build/res/drawable-land-hdpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable-land-ldpi/screen.png b/platforms/android/ant-build/res/drawable-land-ldpi/screen.png new file mode 100644 index 0000000..3751eec Binary files /dev/null and b/platforms/android/ant-build/res/drawable-land-ldpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable-land-mdpi/screen.png b/platforms/android/ant-build/res/drawable-land-mdpi/screen.png new file mode 100644 index 0000000..319bd20 Binary files /dev/null and b/platforms/android/ant-build/res/drawable-land-mdpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable-land-xhdpi/screen.png b/platforms/android/ant-build/res/drawable-land-xhdpi/screen.png new file mode 100644 index 0000000..547418e Binary files /dev/null and b/platforms/android/ant-build/res/drawable-land-xhdpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable-port-hdpi/screen.png b/platforms/android/ant-build/res/drawable-port-hdpi/screen.png new file mode 100644 index 0000000..3558586 Binary files /dev/null and b/platforms/android/ant-build/res/drawable-port-hdpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable-port-ldpi/screen.png b/platforms/android/ant-build/res/drawable-port-ldpi/screen.png new file mode 100644 index 0000000..f772a1c Binary files /dev/null and b/platforms/android/ant-build/res/drawable-port-ldpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable-port-mdpi/screen.png b/platforms/android/ant-build/res/drawable-port-mdpi/screen.png new file mode 100644 index 0000000..1391602 Binary files /dev/null and b/platforms/android/ant-build/res/drawable-port-mdpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable-port-xhdpi/screen.png b/platforms/android/ant-build/res/drawable-port-xhdpi/screen.png new file mode 100644 index 0000000..156b413 Binary files /dev/null and b/platforms/android/ant-build/res/drawable-port-xhdpi/screen.png differ diff --git a/platforms/android/ant-build/res/drawable/android_icon.png b/platforms/android/ant-build/res/drawable/android_icon.png new file mode 100644 index 0000000..cf4352e Binary files /dev/null and b/platforms/android/ant-build/res/drawable/android_icon.png differ diff --git a/platforms/android/ant-build/res/drawable/icon.png b/platforms/android/ant-build/res/drawable/default_icon.png similarity index 100% rename from platforms/android/ant-build/res/drawable/icon.png rename to platforms/android/ant-build/res/drawable/default_icon.png diff --git a/platforms/android/ant-gen/R.java.d b/platforms/android/ant-gen/R.java.d index 67b3858..5399857 100644 --- a/platforms/android/ant-gen/R.java.d +++ b/platforms/android/ant-gen/R.java.d @@ -1,14 +1,32 @@ -/Users/user/Desktop/happyMeter/platforms/android/ant-gen/com/ionicframework/starter/R.java \ - : /Users/user/Desktop/happyMeter/platforms/android/res/drawable/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-hdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-ldpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-mdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/drawable-xhdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/res/values/strings.xml \ -/Users/user/Desktop/happyMeter/platforms/android/res/xml/config.xml \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-hdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-ldpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-mdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/res/drawable-xhdpi/icon.png \ -/Users/user/Desktop/happyMeter/platforms/android/ant-build/AndroidManifest.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-gen/com/stellar/ryan/R.java \ + : /Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable/android_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable/default_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-hdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-land-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-ldpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-mdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-port-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/drawable-xhdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/values/strings.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/res/xml/config.xml \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable/android_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable/default_icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-hdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-land-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-ldpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-mdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-hdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-ldpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-mdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-port-xhdpi/screen.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/res/drawable-xhdpi/icon.png \ +/Users/Priscilla/Documents/HackReactor/Android/platforms/android/ant-build/AndroidManifest.xml \ diff --git a/platforms/android/ant-gen/com/ionicframework/starter/BuildConfig.java b/platforms/android/ant-gen/com/stellar/ryan/BuildConfig.java similarity index 51% rename from platforms/android/ant-gen/com/ionicframework/starter/BuildConfig.java rename to platforms/android/ant-gen/com/stellar/ryan/BuildConfig.java index c2f0f0c..e12c143 100644 --- a/platforms/android/ant-gen/com/ionicframework/starter/BuildConfig.java +++ b/platforms/android/ant-gen/com/stellar/ryan/BuildConfig.java @@ -1,6 +1,6 @@ /** Automatically generated file. DO NOT MODIFY */ -package com.ionicframework.starter; +package com.stellar.ryan; public final class BuildConfig { - public final static boolean DEBUG = true; + public final static boolean DEBUG = false; } \ No newline at end of file diff --git a/platforms/android/ant-gen/com/ionicframework/starter/R.java b/platforms/android/ant-gen/com/stellar/ryan/R.java similarity index 67% rename from platforms/android/ant-gen/com/ionicframework/starter/R.java rename to platforms/android/ant-gen/com/stellar/ryan/R.java index 492873d..1e9b85b 100644 --- a/platforms/android/ant-gen/com/ionicframework/starter/R.java +++ b/platforms/android/ant-gen/com/stellar/ryan/R.java @@ -5,13 +5,16 @@ * should not be modified by hand. */ -package com.ionicframework.starter; +package com.stellar.ryan; public final class R { public static final class attr { } public static final class drawable { - public static final int icon=0x7f020000; + public static final int android_icon=0x7f020000; + public static final int default_icon=0x7f020001; + public static final int icon=0x7f020002; + public static final int screen=0x7f020003; } public static final class string { public static final int app_name=0x7f040000; diff --git a/platforms/android/assets/www/README.md b/platforms/android/assets/www/README.md deleted file mode 100644 index 1987e13..0000000 --- a/platforms/android/assets/www/README.md +++ /dev/null @@ -1,32 +0,0 @@ -This is an addon starter template for the [Ionic Framework](http://ionicframework.com/). - -## How to use this template - -*This template does not work on its own*. It is missing the Ionic library, and AngularJS. - -To use this, either create a new ionic project using the ionic node.js utility, or copy and paste this into an existing Cordova project and download a release of Ionic separately. - -### With the Ionic tool: - -Take the name after `ionic-starter-`, and that is the name of the template to be used when using the `ionic start` command below: - -```bash -$ sudo npm install -g ionic cordova -$ ionic start myApp blank -``` - -Then, to run it, cd into `myApp` and run: - -```bash -$ ionic platform add ios -$ ionic build ios -$ ionic emulate ios -``` - -Substitute ios for android if not on a Mac, but if you can, the ios development toolchain is a lot easier to work with until you need to do anything custom to Android. - -## Demo -http://plnkr.co/edit/tpl:IUU30p?p=preview - -## Issues -Issues have been disabled on this repo, if you do find an issue or have a question consider posting it on the [Ionic Forum](http://forum.ionicframework.com/). Or else if there is truly an error, follow our guidelines for [submitting an issue](http://ionicframework.com/contribute/#issues) to the main Ionic repository. On the other hand, pull requests are welcome here! diff --git a/platforms/android/assets/www/bower.json b/platforms/android/assets/www/bower.json new file mode 100644 index 0000000..abb495e --- /dev/null +++ b/platforms/android/assets/www/bower.json @@ -0,0 +1,20 @@ +{ + "name": "www", + "version": "0.0.0", + "homepage": "https://github.com/OrgCurrent/Android", + "authors": [ + "Andrew Jones " + ], + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "d3": "~3.4.8", + "simple-statistics": "~0.8.1" + } +} diff --git a/platforms/android/assets/www/cordova.js b/platforms/android/assets/www/cordova.js index 1a9f5d9..b2103fb 100644 --- a/platforms/android/assets/www/cordova.js +++ b/platforms/android/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// 3.4.0 +// 3.5.0 /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -19,7 +19,7 @@ under the License. */ ;(function() { -var CORDOVA_JS_BUILD_LABEL = '3.4.0'; +var CORDOVA_JS_BUILD_LABEL = '3.5.0'; // file: src/scripts/require.js /*jshint -W079 */ @@ -437,6 +437,16 @@ base64.fromArrayBuffer = function(arrayBuffer) { return uint8ToBase64(array); }; +base64.toArrayBuffer = function(str) { + var decodedStr = typeof atob != 'undefined' ? atob(str) : new Buffer(str,'base64').toString('binary'); + var arrayBuffer = new ArrayBuffer(decodedStr.length); + var array = new Uint8Array(arrayBuffer); + for (var i=0, len=decodedStr.length; i < len; i++) { + array[i] = decodedStr.charCodeAt(i); + } + return arrayBuffer; +}; + //------------------------------------------------------------------------------ /* This code is based on the performance tests at http://jsperf.com/b64tests @@ -815,6 +825,7 @@ channel.createSticky('onNativeReady'); channel.createSticky('onCordovaReady'); // Event to indicate that all automatically loaded JS plugins are loaded and ready. +// FIXME remove this channel.createSticky('onPluginsReady'); // Event to indicate that Cordova is ready @@ -919,7 +930,7 @@ function androidExec(success, fail, service, action, args) { androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT); return; } else { - androidExec.processMessages(messages); + androidExec.processMessages(messages, true); } } } @@ -963,7 +974,6 @@ androidExec.nativeToJsModes = nativeToJsModes; androidExec.setJsToNativeBridgeMode = function(mode) { if (mode == jsToNativeModes.JS_OBJECT && !window._cordovaNative) { - console.log('Falling back on PROMPT mode since _cordovaNative is missing. Expected for Android 3.2 and lower only.'); mode = jsToNativeModes.PROMPT; } nativeApiProvider.setPreferPrompt(mode == jsToNativeModes.PROMPT); @@ -1028,48 +1038,64 @@ function processMessage(message) { } cordova.callbackFromNative(callbackId, success, status, [payload], keepCallback); } else { - console.log("processMessage failed: invalid message:" + message); + console.log("processMessage failed: invalid message: " + JSON.stringify(message)); } } catch (e) { - console.log("processMessage failed: Message: " + message); console.log("processMessage failed: Error: " + e); console.log("processMessage failed: Stack: " + e.stack); + console.log("processMessage failed: Message: " + message); } } +var isProcessing = false; + // This is called from the NativeToJsMessageQueue.java. -androidExec.processMessages = function(messages) { +androidExec.processMessages = function(messages, opt_useTimeout) { if (messages) { messagesFromNative.push(messages); - // Check for the reentrant case, and enqueue the message if that's the case. - if (messagesFromNative.length > 1) { - return; - } + } + // Check for the reentrant case. + if (isProcessing) { + return; + } + if (opt_useTimeout) { + window.setTimeout(androidExec.processMessages, 0); + return; + } + isProcessing = true; + try { + // TODO: add setImmediate polyfill and process only one message at a time. while (messagesFromNative.length) { - // Don't unshift until the end so that reentrancy can be detected. - messages = messagesFromNative[0]; + var msg = popMessageFromQueue(); // The Java side can send a * message to indicate that it // still has messages waiting to be retrieved. - if (messages == '*') { - messagesFromNative.shift(); - window.setTimeout(pollOnce, 0); + if (msg == '*' && messagesFromNative.length === 0) { + setTimeout(pollOnce, 0); return; } - - var spaceIdx = messages.indexOf(' '); - var msgLen = +messages.slice(0, spaceIdx); - var message = messages.substr(spaceIdx + 1, msgLen); - messages = messages.slice(spaceIdx + msgLen + 1); - processMessage(message); - if (messages) { - messagesFromNative[0] = messages; - } else { - messagesFromNative.shift(); - } + processMessage(msg); } + } finally { + isProcessing = false; } }; +function popMessageFromQueue() { + var messageBatch = messagesFromNative.shift(); + if (messageBatch == '*') { + return '*'; + } + + var spaceIdx = messageBatch.indexOf(' '); + var msgLen = +messageBatch.slice(0, spaceIdx); + var message = messageBatch.substr(spaceIdx + 1, msgLen); + messageBatch = messageBatch.slice(spaceIdx + msgLen + 1); + if (messageBatch) { + messagesFromNative.unshift(messageBatch); + } + return message; +} + module.exports = androidExec; }); @@ -1191,9 +1217,13 @@ modulemapper.clobbers('cordova/exec', 'Cordova.exec'); // Call the platform-specific initialization. platform.bootstrap && platform.bootstrap(); -pluginloader.load(function() { - channel.onPluginsReady.fire(); -}); +// Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js. +// The delay allows the attached modules to be defined before the plugin loader looks for them. +setTimeout(function() { + pluginloader.load(function() { + channel.onPluginsReady.fire(); + }); +}, 0); /** * Create all cordova objects once native side is ready. @@ -1216,6 +1246,111 @@ channel.join(function() { }, platformInitChannelsArray); +}); + +// file: src/common/init_b.js +define("cordova/init_b", function(require, exports, module) { + +var channel = require('cordova/channel'); +var cordova = require('cordova'); +var platform = require('cordova/platform'); + +var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeReady]; + +// setting exec +cordova.exec = require('cordova/exec'); + +function logUnfiredChannels(arr) { + for (var i = 0; i < arr.length; ++i) { + if (arr[i].state != 2) { + console.log('Channel not fired: ' + arr[i].type); + } + } +} + +window.setTimeout(function() { + if (channel.onDeviceReady.state != 2) { + console.log('deviceready has not fired after 5 seconds.'); + logUnfiredChannels(platformInitChannelsArray); + logUnfiredChannels(channel.deviceReadyChannelsArray); + } +}, 5000); + +// Replace navigator before any modules are required(), to ensure it happens as soon as possible. +// We replace it so that properties that can't be clobbered can instead be overridden. +function replaceNavigator(origNavigator) { + var CordovaNavigator = function() {}; + CordovaNavigator.prototype = origNavigator; + var newNavigator = new CordovaNavigator(); + // This work-around really only applies to new APIs that are newer than Function.bind. + // Without it, APIs such as getGamepads() break. + if (CordovaNavigator.bind) { + for (var key in origNavigator) { + if (typeof origNavigator[key] == 'function') { + newNavigator[key] = origNavigator[key].bind(origNavigator); + } + } + } + return newNavigator; +} +if (window.navigator) { + window.navigator = replaceNavigator(window.navigator); +} + +if (!window.console) { + window.console = { + log: function(){} + }; +} +if (!window.console.warn) { + window.console.warn = function(msg) { + this.log("warn: " + msg); + }; +} + +// Register pause, resume and deviceready channels as events on document. +channel.onPause = cordova.addDocumentEventHandler('pause'); +channel.onResume = cordova.addDocumentEventHandler('resume'); +channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready'); + +// Listen for DOMContentLoaded and notify our channel subscribers. +if (document.readyState == 'complete' || document.readyState == 'interactive') { + channel.onDOMContentLoaded.fire(); +} else { + document.addEventListener('DOMContentLoaded', function() { + channel.onDOMContentLoaded.fire(); + }, false); +} + +// _nativeReady is global variable that the native side can set +// to signify that the native code is ready. It is a global since +// it may be called before any cordova JS is ready. +if (window._nativeReady) { + channel.onNativeReady.fire(); +} + +// Call the platform-specific initialization. +platform.bootstrap && platform.bootstrap(); + +/** + * Create all cordova objects once native side is ready. + */ +channel.join(function() { + + platform.initialize && platform.initialize(); + + // Fire event to notify that all objects are created + channel.onCordovaReady.fire(); + + // Fire onDeviceReady event once page has fully loaded, all + // constructors have run and cordova info has been received from native + // side. + channel.join(function() { + require('cordova').fireDocumentEvent('deviceready'); + }, channel.deviceReadyChannelsArray); + +}, platformInitChannelsArray); + }); // file: src/common/modulemapper.js @@ -1444,43 +1579,51 @@ var modulemapper = require('cordova/modulemapper'); var urlutil = require('cordova/urlutil'); // Helper function to inject a - - + + + + - + + + + + + + + + + + + - + + - -

Ionic Blank Starter

- - - + - + + \ No newline at end of file diff --git a/platforms/android/assets/www/js/app.js b/platforms/android/assets/www/js/app.js deleted file mode 100644 index 7ef4d4e..0000000 --- a/platforms/android/assets/www/js/app.js +++ /dev/null @@ -1,19 +0,0 @@ -// Ionic Starter App - -// angular.module is a global place for creating, registering and retrieving Angular modules -// 'starter' is the name of this angular module example (also set in a attribute in index.html) -// the 2nd parameter is an array of 'requires' -angular.module('starter', ['ionic']) - -.run(function($ionicPlatform) { - $ionicPlatform.ready(function() { - // Hide the accessory bar by default (remove this to show the accessory bar above the keyboard - // for form inputs) - if(window.cordova && window.cordova.plugins.Keyboard) { - cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); - } - if(window.StatusBar) { - StatusBar.styleDefault(); - } - }); -}) diff --git a/platforms/android/assets/www/lib/angular-animate/.bower.json b/platforms/android/assets/www/lib/angular-animate/.bower.json new file mode 100644 index 0000000..573a477 --- /dev/null +++ b/platforms/android/assets/www/lib/angular-animate/.bower.json @@ -0,0 +1,18 @@ +{ + "name": "angular-animate", + "version": "1.2.16", + "main": "./angular-animate.js", + "dependencies": { + "angular": "1.2.16" + }, + "homepage": "https://github.com/angular/bower-angular-animate", + "_release": "1.2.16", + "_resolution": { + "type": "version", + "tag": "v1.2.16", + "commit": "4eccd8ec8356a33bf3a98958d7a73b71290d3985" + }, + "_source": "git://github.com/angular/bower-angular-animate.git", + "_target": "~1.2.12", + "_originalSource": "angular-animate" +} \ No newline at end of file diff --git a/platforms/android/assets/www/lib/angular-animate/README.md b/platforms/android/assets/www/lib/angular-animate/README.md new file mode 100644 index 0000000..de4c61b --- /dev/null +++ b/platforms/android/assets/www/lib/angular-animate/README.md @@ -0,0 +1,54 @@ +# bower-angular-animate + +This repo is for distribution on `bower`. The source for this module is in the +[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngAnimate). +Please file issues and pull requests against that repo. + +## Install + +Install with `bower`: + +```shell +bower install angular-animate +``` + +Add a ` +``` + +And add `ngAnimate` as a dependency for your app: + +```javascript +angular.module('myApp', ['ngAnimate']); +``` + +## Documentation + +Documentation is available on the +[AngularJS docs site](http://docs.angularjs.org/api/ngAnimate). + +## License + +The MIT License + +Copyright (c) 2010-2012 Google, Inc. http://angularjs.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/platforms/android/assets/www/lib/ionic/js/angular/angular-animate.js b/platforms/android/assets/www/lib/angular-animate/angular-animate.js similarity index 70% rename from platforms/android/assets/www/lib/ionic/js/angular/angular-animate.js rename to platforms/android/assets/www/lib/angular-animate/angular-animate.js index 38af3f0..9a0af80 100644 --- a/platforms/android/assets/www/lib/ionic/js/angular/angular-animate.js +++ b/platforms/android/assets/www/lib/angular-animate/angular-animate.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.2.12 + * @license AngularJS v1.2.16 * (c) 2010-2014 Google, Inc. http://angularjs.org * License: MIT */ @@ -8,7 +8,7 @@ /* jshint maxlen: false */ /** - * @ngdoc overview + * @ngdoc module * @name ngAnimate * @description * @@ -16,7 +16,6 @@ * * The `ngAnimate` module provides support for JavaScript, CSS3 transition and CSS3 keyframe animation hooks within existing core and custom directives. * - * {@installModule animate} * *
* @@ -38,12 +37,14 @@ * | {@link ng.directive:ngIf#usage_animations ngIf} | enter and leave | * | {@link ng.directive:ngClass#usage_animations ngClass} | add and remove | * | {@link ng.directive:ngShow#usage_animations ngShow & ngHide} | add and remove (the ng-hide class value) | + * | {@link ng.directive:form#usage_animations form} | add and remove (dirty, pristine, valid, invalid & all other validations) | + * | {@link ng.directive:ngModel#usage_animations ngModel} | add and remove (dirty, pristine, valid, invalid & all other validations) | * * You can find out more information about animations upon visiting each directive page. * * Below is an example of how to apply animations to a directive that supports animation hooks: * - * 
+ * ```html
  * 
+       

          userType: 
          Required!

          userType = {{userType}}

@@ -15583,8 +16054,8 @@ function FormController(element, attrs) {
          myForm.$valid = {{myForm.$valid}}

          myForm.$error.required = {{!!myForm.$error.required}}

         

-      
-      
+      
+      
         it('should initialize to model', function() {
           var userType = element(by.binding('userType'));
           var valid = element(by.binding('myForm.input.$valid'));
@@ -15604,8 +16075,9 @@ function FormController(element, attrs) {
           expect(userType.getText()).toEqual('userType =');
           expect(valid.getText()).toContain('false');
         });
-      
-    
+      
+    
+ *
  */
 var formDirectiveFactory = function(isNgForm) {
   return ['$timeout', function($timeout) {
@@ -15682,8 +16154,8 @@ var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
 var inputType = {
 
   /**
-   * @ngdoc inputType
-   * @name ng.directive:input.text
+   * @ngdoc input
+   * @name input[text]
    *
    * @description
    * Standard HTML text input with angular data binding.
@@ -15706,8 +16178,8 @@ var inputType = {
    * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
    *
    * @example
-      
-        
+      
+        
          
+       
+       Update input to see transitions when valid/invalid.
+       Integer is a valid value.
+       

+         
+       

+     
+ * 
  */
 var ngModelDirective = function() {
   return {
@@ -16913,7 +17472,7 @@ var ngModelDirective = function() {
 
 /**
  * @ngdoc directive
- * @name ng.directive:ngChange
+ * @name ngChange
  *
  * @description
  * Evaluate the given expression when the user changes the input.
@@ -16929,8 +17488,8 @@ var ngModelDirective = function() {
  * in input value.
  *
  * @example
- * 
- *   
+ * 
+ *   
  *     
 
       Load inlined template
       

-    
-    
+    
+    
       it('should load template defined inside script tag', function() {
         element(by.css('#tpl-link')).click();
         expect(element(by.css('#tpl-content')).getText()).toMatch(/Content of the template/);
       });
-    
-  
+    
+  
  */
 var scriptDirective = ['$templateCache', function($templateCache) {
   return {
@@ -20151,7 +20805,7 @@ var scriptDirective = ['$templateCache', function($templateCache) {
 var ngOptionsMinErr = minErr('ngOptions');
 /**
  * @ngdoc directive
- * @name ng.directive:select
+ * @name select
  * @restrict E
  *
  * @description
@@ -20169,7 +20823,7 @@ var ngOptionsMinErr = minErr('ngOptions');
  *
  * 

  * **Note:** `ngModel` compares by reference, not value. This is important when binding to an
- * array of objects. See an example {@link http://jsfiddle.net/qWzTb/ in this jsfiddle}.
+ * array of objects. See an example [in this jsfiddle](http://jsfiddle.net/qWzTb/).
  * 

  *
  * Optionally, a single hard-coded `