Merge branch 'master' of 192.168.178.250:raataar/wolle-rosen-kaufen
Conflicts: platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin platforms/android/.idea/workspace.xml platforms/android/assets/www/templates/tab-buys.html platforms/android/build/intermediates/assets/debug/www/templates/tab-buys.html platforms/android/build/intermediates/gradle_project_sync_data.bin platforms/android/build/intermediates/res/resources-debug.ap_ platforms/android/build/outputs/apk/android-debug-unaligned.apk platforms/android/build/outputs/apk/android-debug.apk platforms/android/local.properties www/templates/tab-buys.html
This commit is contained in:
commit
81c4347cf1
2
platforms/android/.idea/gradle.xml
generated
2
platforms/android/.idea/gradle.xml
generated
@ -5,7 +5,7 @@
|
||||
<GradleProjectSettings>
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="1.7" />
|
||||
<option name="gradleJvm" value="1.8" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
|
||||
4
platforms/android/.idea/misc.xml
generated
4
platforms/android/.idea/misc.xml
generated
@ -10,7 +10,7 @@
|
||||
<ConfirmationsSetting value="0" id="Add" />
|
||||
<ConfirmationsSetting value="0" id="Remove" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
@ -20,7 +20,7 @@
|
||||
<states>
|
||||
<state key="ProjectJDKs.UI">
|
||||
<settings>
|
||||
<last-edited>1.7</last-edited>
|
||||
<last-edited>1.8</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
|
||||
275
platforms/android/.idea/workspace.xml
generated
275
platforms/android/.idea/workspace.xml
generated
@ -1,7 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<<<<<<< HEAD
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="037b53b3-16f7-464c-81ab-ea3c4405c53b" name="Default" comment="" />
|
||||
=======
|
||||
<component name="AndroidLogFilters">
|
||||
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="6d97dcaf-d210-45f5-9bbe-225ff30e10e5" name="Default" comment="" />
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
<ignored path="android.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
@ -21,11 +29,66 @@
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<<<<<<< HEAD
|
||||
<file leaf-file-name="controllers.js" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.2505669">
|
||||
<caret line="73" column="7" selection-start-line="73" selection-start-column="7" selection-end-line="73" selection-end-column="7" />
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<file leaf-file-name="tab-dash.html" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/assets/www/templates/tab-dash.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
=======
|
||||
<file leaf-file-name="app.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/assets/www/js/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.21755028">
|
||||
<caret line="7" column="65" selection-start-line="7" selection-start-column="65" selection-end-line="7" selection-end-column="65" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="strings.xml" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/res/values/strings.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="billing_key_param.xml" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/res/values/billing_key_param.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/CordovaLib/AndroidManifest.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -50,14 +113,14 @@
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<ExternalProjectPojo>
|
||||
<option name="name" value="android" />
|
||||
<option name="path" value="$PROJECT_DIR$" />
|
||||
</ExternalProjectPojo>
|
||||
<ExternalProjectPojo>
|
||||
<option name="name" value=":CordovaLib" />
|
||||
<option name="path" value="$PROJECT_DIR$/CordovaLib" />
|
||||
</ExternalProjectPojo>
|
||||
<ExternalProjectPojo>
|
||||
<option name="name" value="android" />
|
||||
<option name="path" value="$PROJECT_DIR$" />
|
||||
</ExternalProjectPojo>
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
@ -959,7 +1022,15 @@
|
||||
</option>
|
||||
<option name="modificationStamps">
|
||||
<map>
|
||||
<<<<<<< HEAD
|
||||
<entry key="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android" value="5807086803450" />
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<entry key="$PROJECT_DIR$" value="5808797010675" />
|
||||
=======
|
||||
<entry key="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android" value="5807070785220" />
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
</map>
|
||||
</option>
|
||||
<option name="projectBuildClasspath">
|
||||
@ -1123,7 +1194,7 @@
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="name" value="android" />
|
||||
<option name="name" value="CordovaLib" />
|
||||
<option name="projectBuildClasspath">
|
||||
<list>
|
||||
<option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2.1-all/5qsup9soslr7wk0t6dtlfiiz/gradle-2.2.1/src/announce" />
|
||||
@ -1241,6 +1312,8 @@
|
||||
<projects_view />
|
||||
</option>
|
||||
</component>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
@ -1248,14 +1321,15 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
<component name="NamedScopeManager">
|
||||
<order />
|
||||
</component>
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="1912" />
|
||||
<option name="y" value="-8" />
|
||||
<option name="width" value="1696" />
|
||||
<option name="height" value="1066" />
|
||||
<option name="x" value="149" />
|
||||
<option name="y" value="76" />
|
||||
<option name="width" value="1936" />
|
||||
<option name="height" value="1100" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||
<OptionsSetting value="true" id="Add" />
|
||||
@ -1280,8 +1354,17 @@
|
||||
<sortByType />
|
||||
</navigator>
|
||||
<panes>
|
||||
<<<<<<< HEAD
|
||||
<pane id="PackagesPane" />
|
||||
=======
|
||||
<pane id="Scope" />
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
<pane id="ProjectPane" />
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
<pane id="Scratches" />
|
||||
<pane id="Scope" />
|
||||
<pane id="AndroidView">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@ -1289,20 +1372,81 @@
|
||||
<option name="myItemId" value="android" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="Gradle Scripts" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="android" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<<<<<<< HEAD
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="android" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="assets" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="www" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="templates" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="android" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="android" />
|
||||
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
=======
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="PackagesPane" />
|
||||
<<<<<<< HEAD
|
||||
<pane id="ProjectPane" />
|
||||
=======
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="android.sdk.path" value="C:/Program Files (x86)/Android/android-sdk" />
|
||||
<property name="recentsLimit" value="5" />
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="520025ebbe783257" />
|
||||
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_22_x86" />
|
||||
=======
|
||||
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="CB5A1UMZYM" />
|
||||
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="MyAvd0" />
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
<property name="last_opened_file_path" value="D:/_PROJEKTE_/Android_NAS/android-playstore-stuff/KeyStoreAPK/raataar.jks" />
|
||||
<property name="ExportApk.ApkPath" value="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android" />
|
||||
<property name="ExportApk.Flavors" value="" />
|
||||
<property name="ExportApk.BuildType" value="release" />
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<property name="FullScreen" value="false" />
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
</component>
|
||||
<component name="RunManager" selected="Android Application.android">
|
||||
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
|
||||
@ -1323,45 +1467,10 @@
|
||||
<option name="CLEAR_LOGCAT" value="false" />
|
||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
||||
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
|
||||
<option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
|
||||
<option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
|
||||
<option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
|
||||
<option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
|
||||
<module name="" />
|
||||
<option name="TESTING_TYPE" value="0" />
|
||||
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
|
||||
<option name="METHOD_NAME" value="" />
|
||||
<option name="CLASS_NAME" value="" />
|
||||
<option name="PACKAGE_NAME" value="" />
|
||||
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
|
||||
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
|
||||
<option name="PREFERRED_AVD" value="" />
|
||||
<option name="USE_COMMAND_LINE" value="true" />
|
||||
<option name="COMMAND_LINE" value="" />
|
||||
<option name="WIPE_USER_DATA" value="false" />
|
||||
<option name="DISABLE_BOOT_ANIMATION" value="false" />
|
||||
<option name="NETWORK_SPEED" value="full" />
|
||||
<option name="NETWORK_LATENCY" value="none" />
|
||||
<option name="CLEAR_LOGCAT" value="false" />
|
||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
||||
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
|
||||
<option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
|
||||
<option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
|
||||
<option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
|
||||
<option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
|
||||
<option name="SELECTED_MATRIX_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_PROJECT_ID" value="" />
|
||||
<option name="IS_VALID_CLOUD_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_SELECTION_ERROR" value="" />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="true" type="Application" factoryName="Application">
|
||||
@ -1400,11 +1509,6 @@
|
||||
<patterns />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="true" type="JarApplication" factoryName="JAR Application">
|
||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||
<envs />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="true" type="Remote" factoryName="Remote">
|
||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||
<option name="SERVER_MODE" value="false" />
|
||||
@ -1459,15 +1563,10 @@
|
||||
<option name="CLEAR_LOGCAT" value="false" />
|
||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
||||
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
|
||||
<option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
|
||||
<option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
|
||||
<option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
|
||||
<option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
|
||||
<option name="SELECTED_MATRIX_CONFIGURATION_ID" value="0" />
|
||||
<option name="SELECTED_CLOUD_PROJECT_ID" value="" />
|
||||
<option name="IS_VALID_CLOUD_SELECTION" value="false" />
|
||||
<option name="INVALID_CLOUD_SELECTION_ERROR" value="" />
|
||||
<method />
|
||||
</configuration>
|
||||
<list size="1">
|
||||
@ -1489,14 +1588,42 @@
|
||||
<component name="ShelveChangesManager" show_recycled="false" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<<<<<<< HEAD
|
||||
<changelist id="037b53b3-16f7-464c-81ab-ea3c4405c53b" name="Default" comment="" />
|
||||
<created>1453414443230</created>
|
||||
<option name="number" value="Default" />
|
||||
<updated>1453414443230</updated>
|
||||
=======
|
||||
<changelist id="6d97dcaf-d210-45f5-9bbe-225ff30e10e5" name="Default" comment="" />
|
||||
<created>1453406244146</created>
|
||||
<option name="number" value="Default" />
|
||||
<updated>1453406244146</updated>
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<<<<<<< HEAD
|
||||
<frame x="149" y="76" width="1936" height="1100" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32970026" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25635594" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
=======
|
||||
<frame x="1912" y="-8" width="1696" height="1066" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
@ -1515,6 +1642,7 @@
|
||||
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
@ -1536,7 +1664,22 @@
|
||||
<watches-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<<<<<<< HEAD
|
||||
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
|
||||
=======
|
||||
<entry file="file://$PROJECT_DIR$/assets/www/templates/tab-dash.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<<<<<<< HEAD
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
=======
|
||||
<caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
@ -1546,8 +1689,14 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< HEAD
|
||||
<state vertical-scroll-proportion="0.2505669">
|
||||
<caret line="73" column="7" selection-start-line="73" selection-start-column="7" selection-end-line="73" selection-end-column="7" />
|
||||
=======
|
||||
<state vertical-scroll-proportion="0.21755028">
|
||||
<caret line="7" column="65" selection-start-line="7" selection-start-column="65" selection-end-line="7" selection-end-column="65" />
|
||||
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
||||
@ -12,19 +12,17 @@
|
||||
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
|
||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
||||
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
|
||||
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
|
||||
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
|
||||
<afterSyncTasks>
|
||||
<task>generateDebugSources</task>
|
||||
<task>generateDebugTestSources</task>
|
||||
</afterSyncTasks>
|
||||
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="LIBRARY_PROJECT" value="true" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
||||
<exclude-output />
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="debug"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\build\intermediates\bundles\debug\assets"/></dataSet><dataSet config="main"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\src\androidTest\assets"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\intermediates\bundles\debug\assets"/></dataSet><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\androidTest\assets"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="debug"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\src\androidTest\res"/><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\test\debug"/><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\test\debug"/></dataSet><mergedItems/></merger>
|
||||
<merger version="3"><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\androidTest\res"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\test\debug"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\test\debug"/></dataSet><mergedItems/></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||
<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||
@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.apache.cordova.test">
|
||||
|
||||
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
|
||||
|
||||
<application>
|
||||
<uses-library android:name="android.test.runner" />
|
||||
</application>
|
||||
|
||||
<instrumentation android:name="android.test.InstrumentationTestRunner"
|
||||
android:targetPackage="org.apache.cordova.test"
|
||||
android:handleProfiling="false"
|
||||
android:functionalTest="false"
|
||||
android:label="Tests for org.apache.cordova.test"/>
|
||||
</manifest>
|
||||
Binary file not shown.
Binary file not shown.
@ -12,18 +12,16 @@
|
||||
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
|
||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
||||
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
|
||||
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
|
||||
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
|
||||
<afterSyncTasks>
|
||||
<task>generateDebugSources</task>
|
||||
<task>generateDebugTestSources</task>
|
||||
</afterSyncTasks>
|
||||
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
||||
<exclude-output />
|
||||
|
||||
@ -65,3 +65,16 @@
|
||||
font-size: 1.3em !important;
|
||||
}
|
||||
|
||||
.oleo-small{
|
||||
font-family: 'Bubblegum Sans', cursive;
|
||||
font-weight: 200 !important;
|
||||
font-size: 1.2em;
|
||||
|
||||
}
|
||||
|
||||
.oleo-vsmall{
|
||||
font-family: 'Bubblegum Sans', cursive;
|
||||
font-weight: 200 !important;
|
||||
font-size: 0.9em;
|
||||
|
||||
}
|
||||
|
||||
29
platforms/android/assets/www/templates/tab-buys - Kopie.html
Normal file
29
platforms/android/assets/www/templates/tab-buys - Kopie.html
Normal file
@ -0,0 +1,29 @@
|
||||
<ion-view view-title="Gekaufte Rosen">
|
||||
<ion-content class="padding">
|
||||
|
||||
<div style="padding-bottom:15px;">
|
||||
|
||||
<ul class="list card">
|
||||
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
|
||||
|
||||
<a class="item item-thumbnail-left item-button-right" href="#" ng-repeat="i in items" ng-model="items">
|
||||
<img src="img/rose1.png">
|
||||
<h2>{{i.name}}</h2>
|
||||
<p>{{i.freitext}} </p>
|
||||
<div class="buttons" style="margin-top:30px;">
|
||||
<button class="button button-small" >
|
||||
<i class="button button-icon icon ion-settings"></i>
|
||||
</button>
|
||||
<button class="button button-small">
|
||||
<i class="icon ion-android-share-alt"> Teilen</i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</a>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
@ -1,6 +1,7 @@
|
||||
<ion-view view-title="Gekaufte Rosen">
|
||||
<ion-content class="padding">
|
||||
<ion-content class="padding">
|
||||
|
||||
<<<<<<< HEAD
|
||||
<div style="padding-bottom:15px;">
|
||||
|
||||
<ul class="list card">
|
||||
@ -22,8 +23,34 @@
|
||||
</a>
|
||||
|
||||
</ul>
|
||||
=======
|
||||
<div style="padding-bottom:20px;"></div>
|
||||
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
|
||||
|
||||
<a href="#" ></a>
|
||||
|
||||
<ion-card ng-repeat="i in items" ng-model="items">
|
||||
|
||||
<div class="list card">
|
||||
<div class="item item-avatar"> <img src="img/rose1.png">
|
||||
<h2>{{i.name}}</h2>
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
</div>
|
||||
|
||||
<div class="item item-body">
|
||||
{{i.freitext}}
|
||||
</div>
|
||||
|
||||
</ion-content>
|
||||
<ion-item>
|
||||
<div class="item tabs tabs-secondary tabs-icon-left">
|
||||
<a class="tab-item" background-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-thumbsup"></i> Like </a>
|
||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-chatbox"></i> Comment </a>
|
||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-share"></i> Teilen </a>
|
||||
</div>
|
||||
</ion-item>
|
||||
</div>
|
||||
|
||||
</ion-card>
|
||||
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
||||
@ -3,20 +3,20 @@
|
||||
<div class="list card">
|
||||
<div class="item item-divider oleo">Schenken Sie einem besonderen Menschen eine außergewöhnliche Aufmerksamkeit!</div>
|
||||
<label class="item item-input item-stacked-label">
|
||||
<span class="input-label">Name Ihres Liebsten:</span>
|
||||
<input type="text" placeholder="" class="oleo" ng-model="$parent.name">
|
||||
<span class="oleo-small" class="input-label">Name Ihres Liebsten:</span>
|
||||
<textarea placeholder="" rows="1" cols="1" class="oleo-small" ng-model="$parent.name"></textarea>
|
||||
</label>
|
||||
<label class="item item-input item-stacked-label">
|
||||
<span class="input-label">Ihre persönliche Nachricht:</span>
|
||||
<textarea placeholder="" rows="4" cols="10" class="oleo" ng-model="$parent.freitext"></textarea>
|
||||
<span class="oleo-small" class="input-label">Ihre persönliche Nachricht:</span>
|
||||
<textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
|
||||
</label>
|
||||
</div>
|
||||
<div style="padding-bottom:15px;">
|
||||
<div class="item item-divider oleo">Wählen Sie Ihre Rosen aus:</div>
|
||||
<ion-list>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="oleo">1 Rose </h2><p>Preis: 0,50 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="oleo">3 Rosen</h2><p>Preis: 1,00 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="oleo">9 Rosen</h2><p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="oleo">1 Rose </h2> <span class="oleo-vsmall"<p>Preis: 0,50 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="oleo">3 Rosen</h2> <span class="oleo-vsmall"<p>Preis: 1,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="oleo">9 Rosen</h2> <span class="oleo-vsmall"<p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
|
||||
</ion-list>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* This file is auto-generated. DO NOT MODIFY.
|
||||
* Original file: C:\\Ionic\\Ionic\\git\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
|
||||
* Original file: C:\\Projekte\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
|
||||
*/
|
||||
package com.android.vending.billing;
|
||||
/**
|
||||
|
||||
@ -65,3 +65,16 @@
|
||||
font-size: 1.3em !important;
|
||||
}
|
||||
|
||||
.oleo-small{
|
||||
font-family: 'Bubblegum Sans', cursive;
|
||||
font-weight: 200 !important;
|
||||
font-size: 1.2em;
|
||||
|
||||
}
|
||||
|
||||
.oleo-vsmall{
|
||||
font-family: 'Bubblegum Sans', cursive;
|
||||
font-weight: 200 !important;
|
||||
font-size: 0.9em;
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
<ion-view view-title="Gekaufte Rosen">
|
||||
<ion-content class="padding">
|
||||
|
||||
<div style="padding-bottom:15px;">
|
||||
|
||||
<ul class="list card">
|
||||
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
|
||||
|
||||
<a class="item item-thumbnail-left item-button-right" href="#" ng-repeat="i in items" ng-model="items">
|
||||
<img src="img/rose1.png">
|
||||
<h2>{{i.name}}</h2>
|
||||
<p>{{i.freitext}} </p>
|
||||
<div class="buttons" style="margin-top:30px;">
|
||||
<button class="button button-small" >
|
||||
<i class="button button-icon icon ion-settings"></i>
|
||||
</button>
|
||||
<button class="button button-small">
|
||||
<i class="icon ion-android-share-alt"> Teilen</i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</a>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
@ -1,6 +1,7 @@
|
||||
<ion-view view-title="Gekaufte Rosen">
|
||||
<ion-content class="padding">
|
||||
<ion-content class="padding">
|
||||
|
||||
<<<<<<< HEAD
|
||||
<div style="padding-bottom:15px;">
|
||||
|
||||
<ul class="list card">
|
||||
@ -22,8 +23,34 @@
|
||||
</a>
|
||||
|
||||
</ul>
|
||||
=======
|
||||
<div style="padding-bottom:20px;"></div>
|
||||
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
|
||||
|
||||
<a href="#" ></a>
|
||||
|
||||
<ion-card ng-repeat="i in items" ng-model="items">
|
||||
|
||||
<div class="list card">
|
||||
<div class="item item-avatar"> <img src="img/rose1.png">
|
||||
<h2>{{i.name}}</h2>
|
||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
||||
</div>
|
||||
|
||||
<div class="item item-body">
|
||||
{{i.freitext}}
|
||||
</div>
|
||||
|
||||
</ion-content>
|
||||
<ion-item>
|
||||
<div class="item tabs tabs-secondary tabs-icon-left">
|
||||
<a class="tab-item" background-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-thumbsup"></i> Like </a>
|
||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-chatbox"></i> Comment </a>
|
||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-share"></i> Teilen </a>
|
||||
</div>
|
||||
</ion-item>
|
||||
</div>
|
||||
|
||||
</ion-card>
|
||||
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
||||
@ -3,20 +3,20 @@
|
||||
<div class="list card">
|
||||
<div class="item item-divider oleo">Schenken Sie einem besonderen Menschen eine außergewöhnliche Aufmerksamkeit!</div>
|
||||
<label class="item item-input item-stacked-label">
|
||||
<span class="input-label">Name Ihres Liebsten:</span>
|
||||
<input type="text" placeholder="" class="oleo" ng-model="$parent.name">
|
||||
<span class="oleo-small" class="input-label">Name Ihres Liebsten:</span>
|
||||
<textarea placeholder="" rows="1" cols="1" class="oleo-small" ng-model="$parent.name"></textarea>
|
||||
</label>
|
||||
<label class="item item-input item-stacked-label">
|
||||
<span class="input-label">Ihre persönliche Nachricht:</span>
|
||||
<textarea placeholder="" rows="4" cols="10" class="oleo" ng-model="$parent.freitext"></textarea>
|
||||
<span class="oleo-small" class="input-label">Ihre persönliche Nachricht:</span>
|
||||
<textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
|
||||
</label>
|
||||
</div>
|
||||
<div style="padding-bottom:15px;">
|
||||
<div class="item item-divider oleo">Wählen Sie Ihre Rosen aus:</div>
|
||||
<ion-list>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="oleo">1 Rose </h2><p>Preis: 0,50 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="oleo">3 Rosen</h2><p>Preis: 1,00 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="oleo">9 Rosen</h2><p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="oleo">1 Rose </h2> <span class="oleo-vsmall"<p>Preis: 0,50 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="oleo">3 Rosen</h2> <span class="oleo-vsmall"<p>Preis: 1,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
|
||||
<ion-radio ng-model="$parent.preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="oleo">9 Rosen</h2> <span class="oleo-vsmall"<p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
|
||||
</ion-list>
|
||||
</div>
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user