From de8105c2d03e3cfeaaee0fe3e3d0f7eebabb1f54 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Fri, 26 Jun 2015 11:29:13 +0200
Subject: [PATCH] no message
---
WarpDrinkApp/.idea/.name | 2 +-
WarpDrinkApp/.idea/misc.xml | 3 ---
WarpDrinkApp/.idea/modules.xml | 2 +-
WarpDrinkApp/.idea/vcs.xml | 2 +-
WarpDrinkApp/WarpDrinkApp.iml | 19 +++++++++++++++++++
WarpDrinkApp/app/app.iml | 2 +-
.../app/src/main/res/layout/activity_main.xml | 18 +++++++++++++++++-
.../app/src/main/res/values/strings.xml | 1 +
8 files changed, 41 insertions(+), 8 deletions(-)
create mode 100644 WarpDrinkApp/WarpDrinkApp.iml
diff --git a/WarpDrinkApp/.idea/.name b/WarpDrinkApp/.idea/.name
index c753d8b..8aa88ae 100644
--- a/WarpDrinkApp/.idea/.name
+++ b/WarpDrinkApp/.idea/.name
@@ -1 +1 @@
-WarpDrink
\ No newline at end of file
+WarpDrinkApp
\ No newline at end of file
diff --git a/WarpDrinkApp/.idea/misc.xml b/WarpDrinkApp/.idea/misc.xml
index e284b1d..1d9d626 100644
--- a/WarpDrinkApp/.idea/misc.xml
+++ b/WarpDrinkApp/.idea/misc.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
diff --git a/WarpDrinkApp/.idea/modules.xml b/WarpDrinkApp/.idea/modules.xml
index cd7337b..a61baee 100644
--- a/WarpDrinkApp/.idea/modules.xml
+++ b/WarpDrinkApp/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/WarpDrink.iml" filepath="$PROJECT_DIR$/WarpDrink.iml" />
+ <module fileurl="file://$PROJECT_DIR$/WarpDrinkApp.iml" filepath="$PROJECT_DIR$/WarpDrinkApp.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
diff --git a/WarpDrinkApp/.idea/vcs.xml b/WarpDrinkApp/.idea/vcs.xml
index 6564d52..6c0b863 100644
--- a/WarpDrinkApp/.idea/vcs.xml
+++ b/WarpDrinkApp/.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="" vcs="" />
+ <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/WarpDrinkApp/WarpDrinkApp.iml b/WarpDrinkApp/WarpDrinkApp.iml
new file mode 100644
index 0000000..ce931f9
--- /dev/null
+++ b/WarpDrinkApp/WarpDrinkApp.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="WarpDrinkApp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="java-gradle" name="Java-Gradle">
+ <configuration>
+ <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+ <option name="BUILDABLE" value="false" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/WarpDrinkApp/app/app.iml b/WarpDrinkApp/app/app.iml
index eef5e4b..99f036f 100644
--- a/WarpDrinkApp/app/app.iml
+++ b/WarpDrinkApp/app/app.iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="WarpDrink" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="WarpDrinkApp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
diff --git a/WarpDrinkApp/app/src/main/res/layout/activity_main.xml b/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
index 12ddf7d..1e826e7 100644
--- a/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
+++ b/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
@@ -22,7 +22,8 @@
<AutoCompleteTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/autoCompleteTextView" />
+ android:id="@+id/autoCompleteTextView"
+ android:layout_columnSpan="13" />
<Button android:text="@string/btn_oneEuro" android:id="@+id/button1" android:background="@drawable/btn_blue" style="@style/ButtonText"
android:layout_row="4"
@@ -71,6 +72,21 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Medium Text"
android:id="@+id/textView" />
+
+ <Space
+ android:layout_width="20px"
+ android:layout_height="50px" />
+
+ <Button
+ style="@style/ButtonText"
+ android:text="@string/btn_pay"
+ android:id="@+id/button2"
+ android:background="@drawable/btn_blue"
+ android:layout_row="4"
+ android:layout_column="0"
+ android:width="10dp"
+ android:layout_width="314dp"
+ android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
diff --git a/WarpDrinkApp/app/src/main/res/values/strings.xml b/WarpDrinkApp/app/src/main/res/values/strings.xml
index b0d094f..9c321da 100644
--- a/WarpDrinkApp/app/src/main/res/values/strings.xml
+++ b/WarpDrinkApp/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
<string name="btn_oneEuro">1 €</string>
<string name="btn_fiftyCent">0,50 €</string>
+ <string name="btn_pay">Bezahlen</string>
<style name="ButtonText">
--
GitLab