diff --git a/WarpDrinkApp/.idea/.name b/WarpDrinkApp/.idea/.name index c753d8b972c128cf08c87061eebe41cb43b4685e..8aa88ae66b5c939f0a518dc30dcaf093735328e7 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 e284b1d433234d5d0047f8cff997cafe74fb0312..1d9d62604dc2e2c42ffb3c88ee74fe91cd0df7ae 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 cd7337b4d6efaa34eeea3fc5a5e07f998725250f..a61baee671e9494f2ad424eedacd1b7f9b2cc450 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 6564d52db279c4ae8d882aacf5aa89a85e7a04de..6c0b8635858dc7ad44b93df54b762707ce49eefc 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 0000000000000000000000000000000000000000..ce931f9ff88cf72ced082490733c00a5b94cf779 --- /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 eef5e4bf9261bec39efc12b47ee1db5dba111d54..99f036f630474a56d8bdce4d426ca4e9477e4e20 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 12ddf7dc5e17ba72954d5a43baf8dbe434917fee..1e826e7e51a6e0fb0f88bf4825285758b7b6fd04 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 b0d094ffa3069381f248dd3c778f1abcad9386d8..9c321da8b637eef4f87f87ce85828570f5c3655f 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">