Layoutanpassungen

This commit is contained in:
Akki 2016-01-22 00:17:04 +01:00
parent 7c683d7450
commit df472e938d
215 changed files with 306 additions and 267 deletions

View File

@ -5,7 +5,7 @@
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.7" /> <option name="gradleJvm" value="1.8" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

View File

@ -10,7 +10,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </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" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
@ -20,7 +20,7 @@
<states> <states>
<state key="ProjectJDKs.UI"> <state key="ProjectJDKs.UI">
<settings> <settings>
<last-edited>1.7</last-edited> <last-edited>1.8</last-edited>
<splitter-proportions> <splitter-proportions>
<option name="proportions"> <option name="proportions">
<list> <list>

View File

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="AndroidLogFilters"> <component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="raataar_wrk.db" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="INFO" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" /> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1a60bf2a-41b9-42f3-a21a-2b8a537063de" name="Default" comment="" /> <list default="true" id="6d97dcaf-d210-45f5-9bbe-225ff30e10e5" name="Default" comment="" />
<ignored path="android.iws" /> <ignored path="android.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -26,11 +24,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="app.js" pinned="false" current-in-tab="true"> <file leaf-file-name="tab-dash.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/assets/www/js/app.js"> <entry file="file://$PROJECT_DIR$/assets/www/templates/tab-dash.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.46703297"> <state vertical-scroll-proportion="0.0">
<caret line="50" column="48" selection-start-line="50" selection-start-column="48" selection-end-line="50" selection-end-column="48" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -50,14 +48,14 @@
</key> </key>
<value> <value>
<list> <list>
<ExternalProjectPojo>
<option name="name" value="android" />
<option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo>
<ExternalProjectPojo> <ExternalProjectPojo>
<option name="name" value=":CordovaLib" /> <option name="name" value=":CordovaLib" />
<option name="path" value="$PROJECT_DIR$/CordovaLib" /> <option name="path" value="$PROJECT_DIR$/CordovaLib" />
</ExternalProjectPojo> </ExternalProjectPojo>
<ExternalProjectPojo>
<option name="name" value="android" />
<option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo>
</list> </list>
</value> </value>
</entry> </entry>
@ -959,7 +957,7 @@
</option> </option>
<option name="modificationStamps"> <option name="modificationStamps">
<map> <map>
<entry key="C:\Ionic\Ionic\git\wolle-rosen-kaufen\platforms\android" value="5805882473891" /> <entry key="$PROJECT_DIR$" value="5808797010675" />
</map> </map>
</option> </option>
<option name="projectBuildClasspath"> <option name="projectBuildClasspath">
@ -1123,7 +1121,7 @@
</entry> </entry>
</map> </map>
</option> </option>
<option name="name" value="android" /> <option name="name" value="CordovaLib" />
<option name="projectBuildClasspath"> <option name="projectBuildClasspath">
<list> <list>
<option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2.1-all/5qsup9soslr7wk0t6dtlfiiz/gradle-2.2.1/src/announce" /> <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2.1-all/5qsup9soslr7wk0t6dtlfiiz/gradle-2.2.1/src/announce" />
@ -1241,21 +1239,14 @@
<projects_view /> <projects_view />
</option> </option>
</component> </component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/assets/www/js/app.js" />
</list>
</option>
</component>
<component name="NamedScopeManager"> <component name="NamedScopeManager">
<order /> <order />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="1912" /> <option name="x" value="149" />
<option name="y" value="-8" /> <option name="y" value="76" />
<option name="width" value="1696" /> <option name="width" value="1936" />
<option name="height" value="1066" /> <option name="height" value="1100" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
@ -1280,8 +1271,10 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="ProjectPane" /> <pane id="ProjectPane" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="Scope" />
<pane id="AndroidView"> <pane id="AndroidView">
<subPane> <subPane>
<PATH> <PATH>
@ -1326,7 +1319,7 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="js" /> <option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -1340,27 +1333,14 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </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="CordovaLib" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="android.sdk.path" value="C:/Program Files (x86)/Android/android-sdk" />
<property name="recentsLimit" value="5" /> <property name="recentsLimit" value="5" />
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="CB5A1UMZYM" /> <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="520025ebbe783257" />
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="MyAvd0" /> <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_22_x86" />
</component> </component>
<component name="RunManager" selected="Android Application.android"> <component name="RunManager" selected="Android Application.android">
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
@ -1381,45 +1361,10 @@
<option name="CLEAR_LOGCAT" value="false" /> <option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> <option name="SELECTED_MATRIX_CONFIGURATION_ID" value="0" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> <option name="SELECTED_CLOUD_PROJECT_ID" value="" />
<option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> <option name="IS_VALID_CLOUD_SELECTION" value="false" />
<option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> <option name="INVALID_CLOUD_SELECTION_ERROR" 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="" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="Application" factoryName="Application"> <configuration default="true" type="Application" factoryName="Application">
@ -1458,11 +1403,6 @@
<patterns /> <patterns />
<method /> <method />
</configuration> </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"> <configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" /> <option name="SERVER_MODE" value="false" />
@ -1517,15 +1457,10 @@
<option name="CLEAR_LOGCAT" value="false" /> <option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> <option name="SELECTED_MATRIX_CONFIGURATION_ID" value="0" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> <option name="SELECTED_CLOUD_PROJECT_ID" value="" />
<option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> <option name="IS_VALID_CLOUD_SELECTION" value="false" />
<option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> <option name="INVALID_CLOUD_SELECTION_ERROR" 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 /> <method />
</configuration> </configuration>
<list size="1"> <list size="1">
@ -1547,32 +1482,32 @@
<component name="ShelveChangesManager" show_recycled="false" /> <component name="ShelveChangesManager" show_recycled="false" />
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="1a60bf2a-41b9-42f3-a21a-2b8a537063de" name="Default" comment="" /> <changelist id="6d97dcaf-d210-45f5-9bbe-225ff30e10e5" name="Default" comment="" />
<created>1452811340653</created> <created>1453406244146</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1452811340653</updated> <updated>1453406244146</updated>
</task> </task>
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1912" y="-8" width="1696" height="1066" extended-state="6" /> <frame x="149" y="76" width="1936" height="1100" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <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="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.32941177" sideWeight="0.49573562" order="-1" 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&#9;" 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="Palette&#9;" 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="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="true" weight="0.36923078" sideWeight="0.34963325" 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="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="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="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.32941177" sideWeight="0.5" order="2" 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.32941177" sideWeight="0.4978678" order="-1" 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="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.32941177" sideWeight="0.5042644" order="-1" side_tool="true" 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.36923078" sideWeight="0.6503667" order="-1" side_tool="false" 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="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.28667483" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <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" /> <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" />
<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="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="-1" side_tool="true" 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="-1" side_tool="true" content_ui="tabs" />
@ -1594,10 +1529,10 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/assets/www/js/app.js"> <entry file="file://$PROJECT_DIR$/assets/www/templates/tab-dash.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.46703297"> <state vertical-scroll-proportion="0.0">
<caret line="50" column="48" selection-start-line="50" selection-start-column="48" selection-end-line="50" selection-end-column="48" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>

View File

@ -12,19 +12,17 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> <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="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" /> <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<afterSyncTasks> <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<task>generateDebugSources</task>
<task>generateDebugTestSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="" /> <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="LIBRARY_PROJECT" value="true" /> <option name="LIBRARY_PROJECT" value="true" />
</configuration> </configuration>
</facet> </facet>
</component> </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 url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output /> <exclude-output />

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?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>

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?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>

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?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>

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?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>

View File

@ -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>

View File

@ -12,18 +12,16 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> <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="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" /> <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<afterSyncTasks> <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<task>generateDebugSources</task>
<task>generateDebugTestSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" /> <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
</configuration> </configuration>
</facet> </facet>
</component> </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 url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output /> <exclude-output />

View File

@ -65,3 +65,16 @@
font-size: 1.3em !important; 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;
}

View 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>

View File

@ -1,29 +1,32 @@
<ion-view view-title="Gekaufte Rosen"> <ion-view view-title="Gekaufte Rosen">
<ion-content class="padding"> <ion-content class="padding">
<div style="padding-bottom:15px;"> <div style="padding-bottom:20px;"></div>
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
<ul class="list card">
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div> <a href="#" ></a>
<a class="item item-thumbnail-left item-button-right" href="#" ng-repeat="i in items" ng-model="items"> <ion-card ng-repeat="i in items" ng-model="items">
<img src="img/rose1.png">
<h1>{{i.name}}</h1> <div class="list card">
<p>{{i.freitext}} </p> <div class="item item-avatar"> <img src="img/rose1.png">
<div class="buttons" style="margin-top:30px;"> <h2>{{i.name}}</h2>
<button class="button button-small" >
<i class="icon ion-image"> Vorschau</i>
</button>
<button class="button button-small">
<i class="icon ion-android-share-alt"> Teilen</i>
</button>
</div>
</a>
</ul>
</div> </div>
<div class="item item-body">
{{i.freitext}}
</div>
<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-content>
</ion-view> </ion-view>

View File

@ -3,20 +3,20 @@
<div class="list card"> <div class="list card">
<div class="item item-divider oleo">Schenken Sie einem besonderen Menschen eine außergewöhnliche Aufmerksamkeit!</div> <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"> <label class="item item-input item-stacked-label">
<span class="input-label">Name Ihres Liebsten:</span> <span class="oleo-small" class="input-label">Name Ihres Liebsten:</span>
<input type="text" placeholder="" class="oleo" ng-model="$parent.name"> <textarea placeholder="" rows="1" cols="1" class="oleo-small" ng-model="$parent.name"></textarea>
</label> </label>
<label class="item item-input item-stacked-label"> <label class="item item-input item-stacked-label">
<span class="input-label">Ihre persönliche Nachricht:</span> <span class="oleo-small" class="input-label">Ihre persönliche Nachricht:</span>
<textarea placeholder="" rows="4" cols="10" class="oleo" ng-model="$parent.freitext"></textarea> <textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
</label> </label>
</div> </div>
<div style="padding-bottom:15px;"> <div style="padding-bottom:15px;">
<div class="item item-divider oleo">Wählen Sie Ihre Rosen aus:</div> <div class="item item-divider oleo">Wählen Sie Ihre Rosen aus:</div>
<ion-list> <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="'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><p>Preis: 1,00 € (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> <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><p>Preis: 2,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> <span class="oleo-vsmall"<p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
</ion-list> </ion-list>
</div> </div>

View File

@ -1,6 +1,6 @@
/* /*
* This file is auto-generated. DO NOT MODIFY. * 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; package com.android.vending.billing;
/** /**

View File

@ -65,3 +65,16 @@
font-size: 1.3em !important; 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;
}

View File

@ -1,29 +1,32 @@
<ion-view view-title="Gekaufte Rosen"> <ion-view view-title="Gekaufte Rosen">
<ion-content class="padding"> <ion-content class="padding">
<div style="padding-bottom:15px;"> <div style="padding-bottom:20px;"></div>
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
<ul class="list card">
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div> <a href="#" ></a>
<a class="item item-thumbnail-left item-button-right" href="#" ng-repeat="i in items" ng-model="items"> <ion-card ng-repeat="i in items" ng-model="items">
<img src="img/rose1.png">
<h1>{{i.name}}</h1> <div class="list card">
<p>{{i.freitext}} </p> <div class="item item-avatar"> <img src="img/rose1.png">
<div class="buttons" style="margin-top:30px;"> <h2>{{i.name}}</h2>
<button class="button button-small" >
<i class="icon ion-image"> Vorschau</i>
</button>
<button class="button button-small">
<i class="icon ion-android-share-alt"> Teilen</i>
</button>
</div>
</a>
</ul>
</div> </div>
<div class="item item-body">
{{i.freitext}}
</div>
<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-content>
</ion-view> </ion-view>

View File

@ -3,20 +3,20 @@
<div class="list card"> <div class="list card">
<div class="item item-divider oleo">Schenken Sie einem besonderen Menschen eine außergewöhnliche Aufmerksamkeit!</div> <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"> <label class="item item-input item-stacked-label">
<span class="input-label">Name Ihres Liebsten:</span> <span class="oleo-small" class="input-label">Name Ihres Liebsten:</span>
<input type="text" placeholder="" class="oleo" ng-model="$parent.name"> <textarea placeholder="" rows="1" cols="1" class="oleo-small" ng-model="$parent.name"></textarea>
</label> </label>
<label class="item item-input item-stacked-label"> <label class="item item-input item-stacked-label">
<span class="input-label">Ihre persönliche Nachricht:</span> <span class="oleo-small" class="input-label">Ihre persönliche Nachricht:</span>
<textarea placeholder="" rows="4" cols="10" class="oleo" ng-model="$parent.freitext"></textarea> <textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
</label> </label>
</div> </div>
<div style="padding-bottom:15px;"> <div style="padding-bottom:15px;">
<div class="item item-divider oleo">Wählen Sie Ihre Rosen aus:</div> <div class="item item-divider oleo">Wählen Sie Ihre Rosen aus:</div>
<ion-list> <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="'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><p>Preis: 1,00 € (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> <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><p>Preis: 2,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> <span class="oleo-vsmall"<p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
</ion-list> </ion-list>
</div> </div>

Some files were not shown because too many files have changed in this diff Show More