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 2cf0e7e..b4dafe1 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 3f0a712..20c1503 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 a02f017..24d5abf 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/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 2dede05..4998162 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/.idea/misc.xml b/platforms/android/.idea/misc.xml index 56a3c17..22b2cf0 100644 --- a/platforms/android/.idea/misc.xml +++ b/platforms/android/.idea/misc.xml @@ -1,5 +1,32 @@ + + + + + + + diff --git a/platforms/android/.idea/workspace.xml b/platforms/android/.idea/workspace.xml index f09adb5..c46545f 100644 --- a/platforms/android/.idea/workspace.xml +++ b/platforms/android/.idea/workspace.xml @@ -42,11 +42,9 @@ - - - - - + + + @@ -56,6 +54,7 @@ - + @@ -1896,11 +1871,9 @@ - - - - - + + + diff --git a/platforms/android/android-release.apk b/platforms/android/android-release.apk index eafc916..1b20f6b 100644 Binary files a/platforms/android/android-release.apk and b/platforms/android/android-release.apk differ diff --git a/platforms/android/assets/www/css/style.css b/platforms/android/assets/www/css/style.css index a25d01b..c27b865 100644 --- a/platforms/android/assets/www/css/style.css +++ b/platforms/android/assets/www/css/style.css @@ -43,6 +43,7 @@ } .bar-custom{ + background-color: #A50505 !important; background-image: linear-gradient( hsla(0, 94%, 33%, 1) 20%, hsl(0,94%,54%) 90% diff --git a/platforms/android/assets/www/js/controllers.js b/platforms/android/assets/www/js/controllers.js index b256899..fa92dc8 100644 --- a/platforms/android/assets/www/js/controllers.js +++ b/platforms/android/assets/www/js/controllers.js @@ -11,16 +11,16 @@ angular.module('starter.controllers', []) $scope.backgroundpic = "1"; $scope.backgrounds = [ - { id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image="http://api.raataar.de/rosen/bg_1.png"}, - { id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image="http://api.raataar.de/rosen/bg_2.png"}, - { id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image="http://api.raataar.de/rosen/bg_3.png"}, - { id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image="http://api.raataar.de/rosen/bg_4.png"}, - { id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image="http://api.raataar.de/rosen/bg_5.png"}, - { id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image="http://api.raataar.de/rosen/bg_6.png"}, - { id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image="http://api.raataar.de/rosen/bg_7.png"}, - { id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image="http://api.raataar.de/rosen/bg_8.png"}, - { id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image="http://api.raataar.de/rosen/bg_9.png"}, - { id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image="http://api.raataar.de/rosen/bg_10.png"}, + { id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image: "http://api.raataar.de/rosen/bg/bg_1.png"}, + { id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image: "http://api.raataar.de/rosen/bg/bg_2.png"}, + { id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image: "http://api.raataar.de/rosen/bg/bg_3.png"}, + { id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image: "http://api.raataar.de/rosen/bg/bg_4.png"}, + { id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image: "http://api.raataar.de/rosen/bg/bg_5.png"}, + { id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image: "http://api.raataar.de/rosen/bg/bg_6.png"}, + { id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image: "http://api.raataar.de/rosen/bg/bg_7.png"}, + { id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image: "http://api.raataar.de/rosen/bg/bg_8.png"}, + { id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image: "http://api.raataar.de/rosen/bg/bg_9.png"}, + { id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image: "http://api.raataar.de/rosen/bg/bg_10.png"}, ]; diff --git a/platforms/android/assets/www/templates/tab-dash.html b/platforms/android/assets/www/templates/tab-dash.html index c8058a1..7a04cd5 100644 --- a/platforms/android/assets/www/templates/tab-dash.html +++ b/platforms/android/assets/www/templates/tab-dash.html @@ -11,7 +11,7 @@ -
@@ -47,12 +47,14 @@
-
diff --git a/platforms/android/build/intermediates/assets/debug/www/css/style.css b/platforms/android/build/intermediates/assets/debug/www/css/style.css index a25d01b..c27b865 100644 --- a/platforms/android/build/intermediates/assets/debug/www/css/style.css +++ b/platforms/android/build/intermediates/assets/debug/www/css/style.css @@ -43,6 +43,7 @@ } .bar-custom{ + background-color: #A50505 !important; background-image: linear-gradient( hsla(0, 94%, 33%, 1) 20%, hsl(0,94%,54%) 90% 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 b256899..fa92dc8 100644 --- a/platforms/android/build/intermediates/assets/debug/www/js/controllers.js +++ b/platforms/android/build/intermediates/assets/debug/www/js/controllers.js @@ -11,16 +11,16 @@ angular.module('starter.controllers', []) $scope.backgroundpic = "1"; $scope.backgrounds = [ - { id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image="http://api.raataar.de/rosen/bg_1.png"}, - { id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image="http://api.raataar.de/rosen/bg_2.png"}, - { id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image="http://api.raataar.de/rosen/bg_3.png"}, - { id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image="http://api.raataar.de/rosen/bg_4.png"}, - { id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image="http://api.raataar.de/rosen/bg_5.png"}, - { id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image="http://api.raataar.de/rosen/bg_6.png"}, - { id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image="http://api.raataar.de/rosen/bg_7.png"}, - { id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image="http://api.raataar.de/rosen/bg_8.png"}, - { id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image="http://api.raataar.de/rosen/bg_9.png"}, - { id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image="http://api.raataar.de/rosen/bg_10.png"}, + { id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image: "http://api.raataar.de/rosen/bg/bg_1.png"}, + { id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image: "http://api.raataar.de/rosen/bg/bg_2.png"}, + { id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image: "http://api.raataar.de/rosen/bg/bg_3.png"}, + { id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image: "http://api.raataar.de/rosen/bg/bg_4.png"}, + { id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image: "http://api.raataar.de/rosen/bg/bg_5.png"}, + { id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image: "http://api.raataar.de/rosen/bg/bg_6.png"}, + { id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image: "http://api.raataar.de/rosen/bg/bg_7.png"}, + { id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image: "http://api.raataar.de/rosen/bg/bg_8.png"}, + { id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image: "http://api.raataar.de/rosen/bg/bg_9.png"}, + { id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image: "http://api.raataar.de/rosen/bg/bg_10.png"}, ]; 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 c8058a1..7a04cd5 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 @@ -11,7 +11,7 @@ -
@@ -47,12 +47,14 @@
-
diff --git a/platforms/android/build/intermediates/assets/release/www/css/style.css b/platforms/android/build/intermediates/assets/release/www/css/style.css index a25d01b..c27b865 100644 --- a/platforms/android/build/intermediates/assets/release/www/css/style.css +++ b/platforms/android/build/intermediates/assets/release/www/css/style.css @@ -43,6 +43,7 @@ } .bar-custom{ + background-color: #A50505 !important; background-image: linear-gradient( hsla(0, 94%, 33%, 1) 20%, hsl(0,94%,54%) 90% diff --git a/platforms/android/build/intermediates/assets/release/www/js/controllers.js b/platforms/android/build/intermediates/assets/release/www/js/controllers.js index b256899..fa92dc8 100644 --- a/platforms/android/build/intermediates/assets/release/www/js/controllers.js +++ b/platforms/android/build/intermediates/assets/release/www/js/controllers.js @@ -11,16 +11,16 @@ angular.module('starter.controllers', []) $scope.backgroundpic = "1"; $scope.backgrounds = [ - { id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image="http://api.raataar.de/rosen/bg_1.png"}, - { id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image="http://api.raataar.de/rosen/bg_2.png"}, - { id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image="http://api.raataar.de/rosen/bg_3.png"}, - { id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image="http://api.raataar.de/rosen/bg_4.png"}, - { id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image="http://api.raataar.de/rosen/bg_5.png"}, - { id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image="http://api.raataar.de/rosen/bg_6.png"}, - { id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image="http://api.raataar.de/rosen/bg_7.png"}, - { id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image="http://api.raataar.de/rosen/bg_8.png"}, - { id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image="http://api.raataar.de/rosen/bg_9.png"}, - { id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image="http://api.raataar.de/rosen/bg_10.png"}, + { id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image: "http://api.raataar.de/rosen/bg/bg_1.png"}, + { id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image: "http://api.raataar.de/rosen/bg/bg_2.png"}, + { id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image: "http://api.raataar.de/rosen/bg/bg_3.png"}, + { id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image: "http://api.raataar.de/rosen/bg/bg_4.png"}, + { id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image: "http://api.raataar.de/rosen/bg/bg_5.png"}, + { id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image: "http://api.raataar.de/rosen/bg/bg_6.png"}, + { id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image: "http://api.raataar.de/rosen/bg/bg_7.png"}, + { id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image: "http://api.raataar.de/rosen/bg/bg_8.png"}, + { id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image: "http://api.raataar.de/rosen/bg/bg_9.png"}, + { id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image: "http://api.raataar.de/rosen/bg/bg_10.png"}, ]; diff --git a/platforms/android/build/intermediates/assets/release/www/templates/tab-dash.html b/platforms/android/build/intermediates/assets/release/www/templates/tab-dash.html index c8058a1..7a04cd5 100644 --- a/platforms/android/build/intermediates/assets/release/www/templates/tab-dash.html +++ b/platforms/android/build/intermediates/assets/release/www/templates/tab-dash.html @@ -11,7 +11,7 @@ -
@@ -47,12 +47,14 @@
-
diff --git a/platforms/android/build/intermediates/gradle_project_sync_data.bin b/platforms/android/build/intermediates/gradle_project_sync_data.bin index fd3a3e4..b3b0a3d 100644 Binary files a/platforms/android/build/intermediates/gradle_project_sync_data.bin and b/platforms/android/build/intermediates/gradle_project_sync_data.bin differ diff --git a/platforms/android/build/intermediates/res/resources-debug.ap_ b/platforms/android/build/intermediates/res/resources-debug.ap_ index bdbf225..83b5234 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/res/resources-release.ap_ b/platforms/android/build/intermediates/res/resources-release.ap_ index 2bc58ec..5bfc227 100644 Binary files a/platforms/android/build/intermediates/res/resources-release.ap_ and b/platforms/android/build/intermediates/res/resources-release.ap_ differ diff --git a/platforms/android/build/outputs/apk/android-debug-unaligned.apk b/platforms/android/build/outputs/apk/android-debug-unaligned.apk index 10d179f..3cb517b 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 e27422c..e5d9fa6 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/platforms/android/build/outputs/apk/android-release-unaligned.apk b/platforms/android/build/outputs/apk/android-release-unaligned.apk index a2e4f65..5538b4e 100644 Binary files a/platforms/android/build/outputs/apk/android-release-unaligned.apk and b/platforms/android/build/outputs/apk/android-release-unaligned.apk differ diff --git a/platforms/android/build/outputs/lint-results-release-fatal.html b/platforms/android/build/outputs/lint-results-release-fatal.html index f681d8a..15e81c7 100644 --- a/platforms/android/build/outputs/lint-results-release-fatal.html +++ b/platforms/android/build/outputs/lint-results-release-fatal.html @@ -18,7 +18,7 @@ document.getElementById(id+'Link').style.display = 'none';

Lint Report

-Check performed at Thu Feb 04 20:56:54 CET 2016.
+Check performed at Thu Feb 04 21:44:26 CET 2016.
6 errors and 0 warnings found:

Correctness diff --git a/platforms/android/local.properties b/platforms/android/local.properties index 0d8df14..456c89a 100644 --- a/platforms/android/local.properties +++ b/platforms/android/local.properties @@ -7,5 +7,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Thu Feb 04 20:55:02 CET 2016 +#Thu Feb 04 21:43:58 CET 2016 sdk.dir=C\:\\Program Files (x86)\\Android\\android-sdk diff --git a/www/templates/tab-dash.html b/www/templates/tab-dash.html index 65080bf..1fdbb95 100644 --- a/www/templates/tab-dash.html +++ b/www/templates/tab-dash.html @@ -51,15 +51,15 @@ {{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
-
-

{{option.name}}

{{option.beschreibung}}

+
+

{{option.name}}

{{option.beschreibung}}

-
+
Rosen jetzt kaufen?
@@ -74,6 +74,5 @@
-