diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 8df849e..7db03c5 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index 90c0550..b5359d0 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index a398df1..cb77756 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin index f5eeb8f..d6093d4 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index e340cc7..52f707c 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar index 92fcece..7444f87 100644 Binary files a/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar and b/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar differ diff --git a/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml b/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml index b8623cb..2b02a51 100644 --- a/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml +++ b/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml b/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml index c8a6d9b..f24ae51 100644 --- a/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml +++ b/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar index 0bdd8ff..6ba8fb1 100644 Binary files a/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar and b/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar differ diff --git a/platforms/android/assets/www/index.html b/platforms/android/assets/www/index.html index 387514f..b4066a8 100644 --- a/platforms/android/assets/www/index.html +++ b/platforms/android/assets/www/index.html @@ -25,7 +25,7 @@ - + diff --git a/platforms/android/assets/www/js/controllers.js b/platforms/android/assets/www/js/controllers.js index ab8f6b9..d2641b8 100644 --- a/platforms/android/assets/www/js/controllers.js +++ b/platforms/android/assets/www/js/controllers.js @@ -1,6 +1,6 @@ angular.module('starter.controllers', []) -.controller('DashCtrl', function($scope,$ionicPopup) { +.controller('DashCtrl', function($scope,$ionicPopup,$http) { $scope.preis=""; $scope.name=""; @@ -18,7 +18,16 @@ angular.module('starter.controllers', []) if (showAlert==1){ $scope.showAlert(); + return; } + + var link = 'http://api.raataar.de/rosen/vorschau.php'; + + $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){ + $scope.response = res.data; + window.open($scope.response, '_system', 'location=yes'); + return false; + }); }; diff --git a/platforms/android/assets/www/templates/tab-dash.html b/platforms/android/assets/www/templates/tab-dash.html index 7fb2836..58e55ac 100644 --- a/platforms/android/assets/www/templates/tab-dash.html +++ b/platforms/android/assets/www/templates/tab-dash.html @@ -39,8 +39,8 @@
-
-
+
+
diff --git a/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java b/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java index b3b3637..42e746a 100644 --- a/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java +++ b/platforms/android/build/generated/source/aidl/debug/com/android/vending/billing/IInAppBillingService.java @@ -1,6 +1,6 @@ /* * This file is auto-generated. DO NOT MODIFY. - * Original file: C:\\Ionic\\Ionic\\wollerosenkaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl + * Original file: C:\\Ionic\\Ionic\\git\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl */ package com.android.vending.billing; /** diff --git a/platforms/android/build/generated/source/r/debug/com/raataar/wolle_rosen_kaufen/R.java b/platforms/android/build/generated/source/r/debug/com/raataar/wolle_rosen_kaufen/R.java index 8e5f8c4..4961838 100644 --- a/platforms/android/build/generated/source/r/debug/com/raataar/wolle_rosen_kaufen/R.java +++ b/platforms/android/build/generated/source/r/debug/com/raataar/wolle_rosen_kaufen/R.java @@ -11,8 +11,11 @@ public final class R { public static final class attr { } public static final class drawable { - public static final int icon=0x7f020000; - public static final int screen=0x7f020001; + public static final int ic_action_next_item=0x7f020000; + public static final int ic_action_previous_item=0x7f020001; + public static final int ic_action_remove=0x7f020002; + public static final int icon=0x7f020003; + public static final int screen=0x7f020004; } public static final class string { public static final int activity_name=0x7f040000; diff --git a/platforms/android/build/intermediates/assets/debug/www/cordova_plugins.js b/platforms/android/build/intermediates/assets/debug/www/cordova_plugins.js index ee86bb1..d0dae10 100644 --- a/platforms/android/build/intermediates/assets/debug/www/cordova_plugins.js +++ b/platforms/android/build/intermediates/assets/debug/www/cordova_plugins.js @@ -46,6 +46,15 @@ module.exports = [ "cordova.plugins.Keyboard" ], "runs": true + }, + { + "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js", + "id": "cordova-plugin-inappbrowser.inappbrowser", + "pluginId": "cordova-plugin-inappbrowser", + "clobbers": [ + "cordova.InAppBrowser.open", + "window.open" + ] } ]; module.exports.metadata = @@ -57,7 +66,8 @@ module.exports.metadata = "cordova-plugin-splashscreen": "3.0.0", "cordova-plugin-statusbar": "2.0.0", "cordova-plugin-whitelist": "1.2.0", - "ionic-plugin-keyboard": "1.0.8" + "ionic-plugin-keyboard": "1.0.8", + "cordova-plugin-inappbrowser": "1.1.1" } // BOTTOM OF METADATA }); \ No newline at end of file diff --git a/platforms/android/build/intermediates/assets/debug/www/js/controllers.js b/platforms/android/build/intermediates/assets/debug/www/js/controllers.js index 9ff6f7d..d2641b8 100644 --- a/platforms/android/build/intermediates/assets/debug/www/js/controllers.js +++ b/platforms/android/build/intermediates/assets/debug/www/js/controllers.js @@ -1,6 +1,6 @@ angular.module('starter.controllers', []) -.controller('DashCtrl', function($scope,$ionicPopup) { +.controller('DashCtrl', function($scope,$ionicPopup,$http) { $scope.preis=""; $scope.name=""; @@ -18,7 +18,16 @@ angular.module('starter.controllers', []) if (showAlert==1){ $scope.showAlert(); + return; } + + var link = 'http://api.raataar.de/rosen/vorschau.php'; + + $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){ + $scope.response = res.data; + window.open($scope.response, '_system', 'location=yes'); + return false; + }); }; @@ -32,7 +41,11 @@ angular.module('starter.controllers', []) }); }; - function successHandler (result) { + function buysuccessHandler (result) { + inappbilling.consumePurchase(successHandler, errorHandler, "3xrose"); + } + + function successHandler (result) { var strResult = ""; if(typeof result === 'object') { strResult = JSON.stringify(result); @@ -40,25 +53,18 @@ angular.module('starter.controllers', []) strResult = result; } alert("SUCCESS: \r\n"+strResult ); - } + } - function errorHandler (error) { + function errorHandler (error) { alert("ERROR: \r\n"+error ); } $scope.buyAdFree = function() { - - + alert($scope.preis); if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") { - - - alert($scope.preis); - inappbilling.buy(successHandler, errorHandler,"3xrose"); - inappbilling.consumePurchase(successHandler, errorHandler, "3xrose"); - - + inappbilling.buy(buysuccessHandler, errorHandler,"3xrose"); } } diff --git a/platforms/android/build/intermediates/assets/debug/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js b/platforms/android/build/intermediates/assets/debug/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js new file mode 100644 index 0000000..6c7a844 --- /dev/null +++ b/platforms/android/build/intermediates/assets/debug/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js @@ -0,0 +1,112 @@ +cordova.define("cordova-plugin-inappbrowser.inappbrowser", function(require, exports, module) { /* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + * +*/ + +// special patch to correctly work on Ripple emulator (CB-9760) +if (window.parent && !!window.parent.ripple) { // https://gist.github.com/triceam/4658021 + module.exports = window.open.bind(window); // fallback to default window.open behaviour + return; +} + +var exec = require('cordova/exec'); +var channel = require('cordova/channel'); +var modulemapper = require('cordova/modulemapper'); +var urlutil = require('cordova/urlutil'); + +function InAppBrowser() { + this.channels = { + 'loadstart': channel.create('loadstart'), + 'loadstop' : channel.create('loadstop'), + 'loaderror' : channel.create('loaderror'), + 'exit' : channel.create('exit') + }; +} + +InAppBrowser.prototype = { + _eventHandler: function (event) { + if (event && (event.type in this.channels)) { + this.channels[event.type].fire(event); + } + }, + close: function (eventname) { + exec(null, null, "InAppBrowser", "close", []); + }, + show: function (eventname) { + exec(null, null, "InAppBrowser", "show", []); + }, + addEventListener: function (eventname,f) { + if (eventname in this.channels) { + this.channels[eventname].subscribe(f); + } + }, + removeEventListener: function(eventname, f) { + if (eventname in this.channels) { + this.channels[eventname].unsubscribe(f); + } + }, + + executeScript: function(injectDetails, cb) { + if (injectDetails.code) { + exec(cb, null, "InAppBrowser", "injectScriptCode", [injectDetails.code, !!cb]); + } else if (injectDetails.file) { + exec(cb, null, "InAppBrowser", "injectScriptFile", [injectDetails.file, !!cb]); + } else { + throw new Error('executeScript requires exactly one of code or file to be specified'); + } + }, + + insertCSS: function(injectDetails, cb) { + if (injectDetails.code) { + exec(cb, null, "InAppBrowser", "injectStyleCode", [injectDetails.code, !!cb]); + } else if (injectDetails.file) { + exec(cb, null, "InAppBrowser", "injectStyleFile", [injectDetails.file, !!cb]); + } else { + throw new Error('insertCSS requires exactly one of code or file to be specified'); + } + } +}; + +module.exports = function(strUrl, strWindowName, strWindowFeatures, callbacks) { + // Don't catch calls that write to existing frames (e.g. named iframes). + if (window.frames && window.frames[strWindowName]) { + var origOpenFunc = modulemapper.getOriginalSymbol(window, 'open'); + return origOpenFunc.apply(window, arguments); + } + + strUrl = urlutil.makeAbsolute(strUrl); + var iab = new InAppBrowser(); + + callbacks = callbacks || {}; + for (var callbackName in callbacks) { + iab.addEventListener(callbackName, callbacks[callbackName]); + } + + var cb = function(eventname) { + iab._eventHandler(eventname); + }; + + strWindowFeatures = strWindowFeatures || ""; + + exec(cb, cb, "InAppBrowser", "open", [strUrl, strWindowName, strWindowFeatures]); + return iab; +}; + + +}); diff --git a/platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html b/platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html index ba8da55..58e55ac 100644 --- a/platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html +++ b/platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html @@ -20,9 +20,9 @@
Wählen Sie Ihre Rosen aus
-

1 Rose

Preis: 0,50 €

-

3 Rosen

Preis: 1,00 €

-

9 Rosen

Preis: 2,00 €

+

1 Rose

Preis: 0,50 € (inkl. Mwst 0,59 €)

+

3 Rosen

Preis: 1,00 € (inkl. Mwst 1,19 €)

+

9 Rosen

Preis: 2,00 € (inkl. Mwst 2,38 €)

diff --git a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$drawable.class b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$drawable.class index 0f83248..53447dc 100644 Binary files a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$drawable.class and b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$drawable.class differ diff --git a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$string.class b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$string.class index 69551ff..f69a576 100644 Binary files a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$string.class and b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$string.class differ diff --git a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$xml.class b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$xml.class index dc71f1a..ac8c4ff 100644 Binary files a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$xml.class and b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R$xml.class differ diff --git a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R.class b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R.class index e03de1d..b4bb57b 100644 Binary files a/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R.class and b/platforms/android/build/intermediates/classes/debug/com/raataar/wolle_rosen_kaufen/R.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$1.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$1.class new file mode 100644 index 0000000..db7d93f Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$1.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$2.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$2.class new file mode 100644 index 0000000..d988ef4 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$2.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$3.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$3.class new file mode 100644 index 0000000..bd1fc40 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$3.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4$1.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4$1.class new file mode 100644 index 0000000..0d9c3d0 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4$1.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4.class new file mode 100644 index 0000000..eb382a1 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$4.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$1.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$1.class new file mode 100644 index 0000000..148e990 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$1.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$2.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$2.class new file mode 100644 index 0000000..a80445d Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$2.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$3.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$3.class new file mode 100644 index 0000000..31c13f1 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$3.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$4.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$4.class new file mode 100644 index 0000000..373940e Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5$4.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5.class new file mode 100644 index 0000000..86343ef Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$5.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$InAppBrowserClient.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$InAppBrowserClient.class new file mode 100644 index 0000000..eb021a4 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser$InAppBrowserClient.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser.class new file mode 100644 index 0000000..168d23b Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowser.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowserDialog.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowserDialog.class new file mode 100644 index 0000000..44f30e5 Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppBrowserDialog.class differ diff --git a/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppChromeClient.class b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppChromeClient.class new file mode 100644 index 0000000..186508b Binary files /dev/null and b/platforms/android/build/intermediates/classes/debug/org/apache/cordova/inappbrowser/InAppChromeClient.class differ diff --git a/platforms/android/build/intermediates/dex-cache/cache.xml b/platforms/android/build/intermediates/dex-cache/cache.xml index b777d5c..059aa8f 100644 --- a/platforms/android/build/intermediates/dex-cache/cache.xml +++ b/platforms/android/build/intermediates/dex-cache/cache.xml @@ -15,5 +15,12 @@ sha1="565e3f24555b91a41efb1022e4b38d97307ce180"> + + + diff --git a/platforms/android/build/intermediates/dex/debug/classes.dex b/platforms/android/build/intermediates/dex/debug/classes.dex index c3c8dab..217831e 100644 Binary files a/platforms/android/build/intermediates/dex/debug/classes.dex and b/platforms/android/build/intermediates/dex/debug/classes.dex differ diff --git a/platforms/android/build/intermediates/exploded-aar/android/CordovaLib/unspecified/debug/classes.jar b/platforms/android/build/intermediates/exploded-aar/android/CordovaLib/unspecified/debug/classes.jar index 92fcece..7444f87 100644 Binary files a/platforms/android/build/intermediates/exploded-aar/android/CordovaLib/unspecified/debug/classes.jar and b/platforms/android/build/intermediates/exploded-aar/android/CordovaLib/unspecified/debug/classes.jar differ diff --git a/platforms/android/build/intermediates/incremental/aidl/debug/dependency.store b/platforms/android/build/intermediates/incremental/aidl/debug/dependency.store index 4bacae7..c3986e1 100644 Binary files a/platforms/android/build/intermediates/incremental/aidl/debug/dependency.store and b/platforms/android/build/intermediates/incremental/aidl/debug/dependency.store differ diff --git a/platforms/android/build/intermediates/incremental/mergeAssets/debug/merger.xml b/platforms/android/build/intermediates/incremental/mergeAssets/debug/merger.xml index bc4e00e..1f166af 100644 --- a/platforms/android/build/intermediates/incremental/mergeAssets/debug/merger.xml +++ b/platforms/android/build/intermediates/incremental/mergeAssets/debug/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platforms/android/build/intermediates/incremental/mergeResources/debug/merger.xml b/platforms/android/build/intermediates/incremental/mergeResources/debug/merger.xml index da97277..49cf6b3 100644 --- a/platforms/android/build/intermediates/incremental/mergeResources/debug/merger.xml +++ b/platforms/android/build/intermediates/incremental/mergeResources/debug/merger.xml @@ -1,2 +1,2 @@ -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnmmtV3BOmcyoYAGFakzJWpM07n3F2SmaQnjyaZsENaAq6vb7ziam6bS5LqZgMTaXSO2T4QeYoi3UZEIwuQiQ0N6BYCUca3tCa/aT1pbvVOD67cIpM+Z14UFYBnOo1RVvf4KKGZ8zJ6qUm5vsDuIboZ7P4dyXzpxRBSO3R1jDWhVCT8dyAdfQwf1Dp6mPg0sv5Q6UjAO3Jg4sMjOZID6WcAHQFxB1lDgVGmf70WZwWuGh7gQy2SvnuFcDAxT73hGjSH1j1xZB0Wr0T/vvoGpcBwj+Tjt3BbqwY2R3VbbImsuBCrkbFTIojQ8hyqxSrhftCfLyn4h/2mauo8IRVi+RrwIDAQABWolle Rosen kaufen@string/launcher_name@string/app_name \ No newline at end of file +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnmmtV3BOmcyoYAGFakzJWpM07n3F2SmaQnjyaZsENaAq6vb7ziam6bS5LqZgMTaXSO2T4QeYoi3UZEIwuQiQ0N6BYCUca3tCa/aT1pbvVOD67cIpM+Z14UFYBnOo1RVvf4KKGZ8zJ6qUm5vsDuIboZ7P4dyXzpxRBSO3R1jDWhVCT8dyAdfQwf1Dp6mPg0sv5Q6UjAO3Jg4sMjOZID6WcAHQFxB1lDgVGmf70WZwWuGh7gQy2SvnuFcDAxT73hGjSH1j1xZB0Wr0T/vvoGpcBwj+Tjt3BbqwY2R3VbbImsuBCrkbFTIojQ8hyqxSrhftCfLyn4h/2mauo8IRVi+RrwIDAQAB@string/launcher_nameWolle Rosen kaufen@string/app_name \ No newline at end of file diff --git a/platforms/android/build/intermediates/pre-dexed/debug/classes-ec055bf14dc687da3d1b2ed76b77548ddec8270d.jar b/platforms/android/build/intermediates/pre-dexed/debug/classes-ec055bf14dc687da3d1b2ed76b77548ddec8270d.jar new file mode 100644 index 0000000..120ecf8 Binary files /dev/null and b/platforms/android/build/intermediates/pre-dexed/debug/classes-ec055bf14dc687da3d1b2ed76b77548ddec8270d.jar differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_next_item.png b/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_next_item.png new file mode 100644 index 0000000..a1bdcae Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_next_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_previous_item.png b/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_previous_item.png new file mode 100644 index 0000000..c7bf035 Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_previous_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_remove.png b/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_remove.png new file mode 100644 index 0000000..600d2ca Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-hdpi-v4/ic_action_remove.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_next_item.png b/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_next_item.png new file mode 100644 index 0000000..b885c38 Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_next_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_previous_item.png b/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_previous_item.png new file mode 100644 index 0000000..cee3336 Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_previous_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_remove.png b/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_remove.png new file mode 100644 index 0000000..dd5627f Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-mdpi-v4/ic_action_remove.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_next_item.png b/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_next_item.png new file mode 100644 index 0000000..ef7cf75 Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_next_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_previous_item.png b/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_previous_item.png new file mode 100644 index 0000000..e82ba4c Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_previous_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_remove.png b/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_remove.png new file mode 100644 index 0000000..4084da0 Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-xhdpi-v4/ic_action_remove.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_next_item.png b/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_next_item.png new file mode 100644 index 0000000..e587c8b Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_next_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_previous_item.png b/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_previous_item.png new file mode 100644 index 0000000..31ebee5 Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_previous_item.png differ diff --git a/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_remove.png b/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_remove.png new file mode 100644 index 0000000..c806744 Binary files /dev/null and b/platforms/android/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_action_remove.png differ diff --git a/platforms/android/build/intermediates/res/debug/values/values.xml b/platforms/android/build/intermediates/res/debug/values/values.xml index a87e5c1..60d0484 100644 --- a/platforms/android/build/intermediates/res/debug/values/values.xml +++ b/platforms/android/build/intermediates/res/debug/values/values.xml @@ -1,13 +1,13 @@ - + @string/launcher_name Wolle Rosen kaufen - + MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnmmtV3BOmcyoYAGFakzJWpM07n3F2SmaQnjyaZsENaAq6vb7ziam6bS5LqZgMTaXSO2T4QeYoi3UZEIwuQiQ0N6BYCUca3tCa/aT1pbvVOD67cIpM+Z14UFYBnOo1RVvf4KKGZ8zJ6qUm5vsDuIboZ7P4dyXzpxRBSO3R1jDWhVCT8dyAdfQwf1Dp6mPg0sv5Q6UjAO3Jg4sMjOZID6WcAHQFxB1lDgVGmf70WZwWuGh7gQy2SvnuFcDAxT73hGjSH1j1xZB0Wr0T/vvoGpcBwj+Tjt3BbqwY2R3VbbImsuBCrkbFTIojQ8hyqxSrhftCfLyn4h/2mauo8IRVi+RrwIDAQAB - + @string/app_name \ No newline at end of file diff --git a/platforms/android/build/intermediates/res/debug/xml/config.xml b/platforms/android/build/intermediates/res/debug/xml/config.xml index 29d8fb2..7949c1c 100644 --- a/platforms/android/build/intermediates/res/debug/xml/config.xml +++ b/platforms/android/build/intermediates/res/debug/xml/config.xml @@ -23,6 +23,9 @@ + + + @@ -58,4 +61,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platforms/android/build/intermediates/res/resources-debug.ap_ b/platforms/android/build/intermediates/res/resources-debug.ap_ index fa6bdfa..d14eb82 100644 Binary files a/platforms/android/build/intermediates/res/resources-debug.ap_ and b/platforms/android/build/intermediates/res/resources-debug.ap_ differ diff --git a/platforms/android/build/intermediates/symbols/debug/R.txt b/platforms/android/build/intermediates/symbols/debug/R.txt index 362ac56..fbf65f5 100644 --- a/platforms/android/build/intermediates/symbols/debug/R.txt +++ b/platforms/android/build/intermediates/symbols/debug/R.txt @@ -1,5 +1,8 @@ -int drawable icon 0x7f020000 -int drawable screen 0x7f020001 +int drawable ic_action_next_item 0x7f020000 +int drawable ic_action_previous_item 0x7f020001 +int drawable ic_action_remove 0x7f020002 +int drawable icon 0x7f020003 +int drawable screen 0x7f020004 int string activity_name 0x7f040000 int string app_name 0x7f040001 int string billing_key_param 0x7f040002 diff --git a/platforms/android/build/intermediates/tmp/dex/debug/inputList.txt b/platforms/android/build/intermediates/tmp/dex/debug/inputList.txt index 7504ce2..5fda9e8 100644 --- a/platforms/android/build/intermediates/tmp/dex/debug/inputList.txt +++ b/platforms/android/build/intermediates/tmp/dex/debug/inputList.txt @@ -1,2 +1,2 @@ -C:\Ionic\Ionic\wollerosenkaufen\platforms\android\build\intermediates\classes\debug -C:\Ionic\Ionic\wollerosenkaufen\platforms\android\build\intermediates\pre-dexed\debug\classes-a0342bad41111596f8436cda33b5a5ee045fab74.jar +C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\build\intermediates\classes\debug +C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\build\intermediates\pre-dexed\debug\classes-ec055bf14dc687da3d1b2ed76b77548ddec8270d.jar diff --git a/platforms/android/build/outputs/apk/android-debug-unaligned.apk b/platforms/android/build/outputs/apk/android-debug-unaligned.apk index 7e7e3c9..778e1b3 100644 Binary files a/platforms/android/build/outputs/apk/android-debug-unaligned.apk and b/platforms/android/build/outputs/apk/android-debug-unaligned.apk differ diff --git a/platforms/android/build/outputs/apk/android-debug.apk b/platforms/android/build/outputs/apk/android-debug.apk index 970df9e..c39bc25 100644 Binary files a/platforms/android/build/outputs/apk/android-debug.apk and b/platforms/android/build/outputs/apk/android-debug.apk differ diff --git a/www/js/controllers.js b/www/js/controllers.js index d2641b8..ede80bd 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -5,21 +5,8 @@ angular.module('starter.controllers', []) $scope.preis=""; $scope.name=""; $scope.freitext=""; - var showAlert=0; $scope.validate = function() { - showAlert=0; - if ($scope.name.length < 1){ - showAlert=1; - } - if ($scope.freitext.length < 1){ - showAlert=1; - } - - if (showAlert==1){ - $scope.showAlert(); - return; - } var link = 'http://api.raataar.de/rosen/vorschau.php'; @@ -31,18 +18,9 @@ angular.module('starter.controllers', []) }; - $scope.showAlert = function() { - var alertPopup = $ionicPopup.alert({ - title: 'Uuuupppsssiii', - template: 'Bitte prüfe deine Eingaben.' - }); - alertPopup.then(function(res) { - console.log('Thank you for not eating my delicious ice cream cone'); - }); - }; function buysuccessHandler (result) { - inappbilling.consumePurchase(successHandler, errorHandler, "3xrose"); + inappbilling.consumePurchase(successHandler, errorHandler, $scope.preis); } function successHandler (result) { @@ -64,7 +42,7 @@ angular.module('starter.controllers', []) alert($scope.preis); if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") { - inappbilling.buy(buysuccessHandler, errorHandler,"3xrose"); + inappbilling.buy(buysuccessHandler, errorHandler, $scope.preis); } } diff --git a/www/templates/tab-dash.html b/www/templates/tab-dash.html index 7fb2836..58e55ac 100644 --- a/www/templates/tab-dash.html +++ b/www/templates/tab-dash.html @@ -39,8 +39,8 @@
-
-
+
+