Skip to content
Snippets Groups Projects
Commit 8878219f authored by Christian Dresen's avatar Christian Dresen
Browse files

FlatDesign für Buttons

parent f73a1684
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 106 additions and 282 deletions
WarpDrinkApp/app/src/main/res/drawable/btn_blue.xml deleted 100644 → 0
+ 0
− 53
View file @ f73a1684
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<solid
android:color="#449def" />
<stroke
android:width="1dp"
android:color="#2f6699" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item android:state_enabled="false">
<shape>
<solid
android:color="#bbbbbb" />
<stroke
android:width="1dp"
android:color="#bbbbbb" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="#449def"
android:endColor="#2f6699"
android:angle="270" />
<stroke
android:width="1dp"
android:color="#2f6699" />
<corners
android:radius="4dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>
\ No newline at end of file
WarpDrinkApp/app/src/main/res/drawable/btn_green.xml deleted 100644 → 0
+ 0
− 53
View file @ f73a1684
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<solid
android:color="#70c656" />
<stroke
android:width="1dp"
android:color="#53933f" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item android:state_enabled="false">
<shape>
<solid
android:color="#bbbbbb" />
<stroke
android:width="1dp"
android:color="#bbbbbb" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="#70c656"
android:endColor="#53933f"
android:angle="270" />
<stroke
android:width="1dp"
android:color="#53933f" />
<corners
android:radius="4dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>
\ No newline at end of file
WarpDrinkApp/app/src/main/res/drawable/btn_red.xml deleted 100644 → 0
+ 0
− 53
View file @ f73a1684
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<solid
android:color="#ef4444" />
<stroke
android:width="1dp"
android:color="#992f2f" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item android:state_enabled="false">
<shape>
<solid
android:color="#bbbbbb" />
<stroke
android:width="1dp"
android:color="#bbbbbb" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="#ef4444"
android:endColor="#992f2f"
android:angle="270" />
<stroke
android:width="1dp"
android:color="#992f2f" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>
\ No newline at end of file
WarpDrinkApp/app/src/main/res/drawable/btn_yellow.xml deleted 100644 → 0
+ 0
− 53
View file @ f73a1684
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<solid
android:color="#f3ae1b" />
<stroke
android:width="1dp"
android:color="#bb6008" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item android:state_enabled="false">
<shape>
<solid
android:color="#bbbbbb" />
<stroke
android:width="1dp"
android:color="#bbbbbb" />
<corners
android:radius="3dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="#f3ae1b"
android:endColor="#bb6008"
android:angle="270" />
<stroke
android:width="1dp"
android:color="#bb6008" />
<corners
android:radius="4dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>
\ No newline at end of file
WarpDrinkApp/app/src/main/res/layout/activity_main.xml
+ 60
− 34
View file @ 8878219f
......@@ -41,24 +41,39 @@
android:layout_height="20px" />
<AutoCompleteTextView
android:layout_width="340dp"
android:layout_height="wrap_content"
android:layout_width="254dp"
android:layout_height="match_parent"
android:id="@+id/atxvName"
android:imeOptions="actionNext"
android:singleLine="true"
android:layout_columnSpan="1"
android:layout_row="0"
android:layout_column="0"
android:layout_weight="0.54" />
android:layout_column="0" />
<Space
android:layout_width="8dp"
android:layout_height="wrap_content"
android:layout_weight="0.43" />
<Button
android:id="@+id/btnGuest"
android:layout_width="72dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:text="Gast" />
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.52" />
<ImageButton
android:layout_width="30dp"
android:layout_height="30dp"
android:id="@+id/btnRefresh"
android:scaleType="fitXY"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_gravity="center_vertical"
android:background="@drawable/ic_menu_refresh"
android:onClick="onClick"
android:layout_gravity="center_vertical" />
android:onClick="onClick" />
</LinearLayout>
<Space
......@@ -90,37 +105,46 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="60dp">
android:layout_height="60dp"
android:orientation="horizontal">
<Space
android:layout_width="20px"
android:layout_height="20px" />
<TextView
android:id="@+id/txtCredit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:text="Guthaben: "
android:id="@+id/txtCredit"
android:layout_gravity="center_vertical" />
<View android:layout_width="0dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<Space
android:layout_width="20px"
android:layout_height="20px"
android:layout_weight="1" />
<Button
style="@style/ButtonText"
android:text="@string/btnLogout"
android:id="@+id/btnLogout"
android:background="@drawable/btn_red"
android:layout_row="3"
style="@style/ButtonText"
android:layout_width="140dp"
android:layout_height="30dp"
android:layout_column="1"
android:layout_gravity="center_vertical"
android:layout_row="3"
android:width="10dp"
android:layout_width="140dp"
android:layout_height="50dp"
android:layout_gravity="right"
android:background="@color/flatui_red"
android:onClick="onClick"
android:text="@string/btnLogout"
android:textSize="20dp" />
</LinearLayout>
<ListView
......@@ -159,32 +183,34 @@
android:layout_height="match_parent">
<Button
style="@style/ButtonText"
android:text="@string/btnCharge"
android:id="@+id/btnCharge"
android:background="@drawable/btn_yellow"
android:layout_row="40"
style="@style/ButtonText"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_column="1"
android:layout_gravity="center_vertical"
android:layout_row="40"
android:width="10dp"
android:layout_width="300dp"
android:background="@color/flatui_yellow"
android:onClick="onClick"
android:layout_height="60dp" />
android:text="@string/btnCharge" />
<Space
android:layout_width="200px"
android:layout_height="20px" />
<Button
style="@style/ButtonText"
android:text="@string/btn_pay"
android:id="@+id/btnPay"
android:background="@drawable/btn_green"
android:layout_row="4"
style="@style/ButtonText"
android:layout_width="355dp"
android:layout_height="50dp"
android:layout_column="0"
android:layout_gravity="center_vertical"
android:layout_row="4"
android:width="10dp"
android:layout_width="355dp"
android:background="@color/flatui_green"
android:onClick="onClick"
android:layout_height="wrap_content" />
android:text="@string/btn_pay" />
</LinearLayout>
<EditText
......
WarpDrinkApp/app/src/main/res/layout/charge_custom_dialog.xml
+ 6
− 6
View file @ 8878219f
......@@ -10,15 +10,15 @@
android:id="@+id/numPick" />
<Button
style="@style/ButtonText"
android:text="@string/btnCharge"
android:id="@+id/btnCustomCharge"
android:background="@drawable/btn_blue"
android:layout_row="3"
style="@style/ButtonText"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="3"
android:width="10dp"
android:layout_width="300dp"
android:layout_height="wrap_content" />
android:background="@color/flatui_blue"
android:text="@string/btnCharge" />
</LinearLayout>
\ No newline at end of file
WarpDrinkApp/app/src/main/res/layout/charge_dialog.xml
+ 24
− 24
View file @ 8878219f
......@@ -9,26 +9,26 @@
android:layout_height="wrap_content">
<Button
style="@style/ButtonText"
android:text="@string/btnFiveEuro"
android:id="@+id/btnFiveEuro"
android:background="@drawable/btn_blue"
android:layout_row="3"
style="@style/ButtonText"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="3"
android:width="10dp"
android:layout_width="300dp"
android:layout_height="wrap_content" />
android:background="@color/flatui_blue"
android:text="@string/btnFiveEuro" />
<Button
style="@style/ButtonText"
android:text="@string/btnTenEuro"
android:id="@+id/btnTenEuro"
android:background="@drawable/btn_blue"
android:layout_row="3"
style="@style/ButtonText"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="3"
android:width="10dp"
android:layout_width="300dp"
android:layout_height="wrap_content" />
android:background="@color/flatui_blue"
android:text="@string/btnTenEuro" />
</LinearLayout>
<LinearLayout
......@@ -37,26 +37,26 @@
android:layout_height="fill_parent" >
<Button
style="@style/ButtonText"
android:text="@string/btnTwentyEuro"
android:id="@+id/btnTwentyEuro"
android:background="@drawable/btn_blue"
android:layout_row="3"
style="@style/ButtonText"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="3"
android:width="10dp"
android:layout_width="300dp"
android:layout_height="wrap_content" />
android:background="@color/flatui_blue"
android:text="@string/btnTwentyEuro" />
<Button
style="@style/ButtonText"
android:text="@string/btnOther"
android:id="@+id/btnOther"
android:background="@drawable/btn_blue"
android:layout_row="3"
style="@style/ButtonText"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="3"
android:width="10dp"
android:layout_width="300dp"
android:layout_height="wrap_content" />
android:background="@color/flatui_blue"
android:text="@string/btnOther" />
</LinearLayout>
......
WarpDrinkApp/app/src/main/res/layout/order_list_item.xml
+ 9
− 6
View file @ 8878219f
......@@ -6,8 +6,9 @@
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="384dp"
android:layout_height="match_parent"
android:layout_weight="0.25">
<TextView
android:layout_width="wrap_content"
......@@ -27,10 +28,12 @@
<ImageButton
android:id="@+id/btnRemoveOrder"
android:layout_width="20dp"
android:layout_height="fill_parent"
android:layout_width="123dp"
android:layout_height="50dp"
android:layout_gravity="right"
android:background="@color/flatui_red"
android:contentDescription="@string/app_name"
android:onClick="removeOrderOnClickHandler"
android:src="@android:drawable/ic_menu_delete"
android:layout_gravity="right" />
android:src="@android:drawable/ic_menu_delete" />
</LinearLayout>
\ No newline at end of file
WarpDrinkApp/app/src/main/res/values/colors.xml 0 → 100644
+ 7
− 0
View file @ 8878219f
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="flatui_red">#e74c3c</color>
<color name="flatui_blue">#2980b9</color>
<color name="flatui_green">#27ae60</color>
<color name="flatui_yellow">#f1c40f</color>
</resources>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment