volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asana fixes

Browse Source
This commit is contained in:
cimenmus
2018-06-30 12:51:34 +03:00
parent dfa724cea3
commit accfe39c05
34 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/values/strings.xml
View File

@@ -135,7 +135,7 @@
<string name="done_order">FERTIG</string>    
<string-array name="stepperLabels">
<item>Lieferungsart</item>
<item>Lieferungadresse</item>        
<item>Lieferungsadresse</item>        
<item>Bezahlverfahren</item>
<item>Nachricht</item>        
<item>Betrag</item>    

37
app/src/main/res/values/styles.xml
View File

@@ -3,8 +3,8 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimary">@color/main_black</item>
<item name="colorPrimaryDark">@color/main_black</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
@@ -21,8 +21,9 @@
<item name="android:textAllCaps">false</item>
</style>
<!--
<style name="PizzalinkButtonWithoutMargin">
<item name="android:background">@drawable/background_button_enabled</item>
<item name="android:background">@drawable/background_button_enabled_red</item>
<item name="android:textColor">@color/red</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
@@ -39,7 +40,8 @@
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzalinkRedWithoutMargin">
<style name="PizzalinkRedButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzalink_red</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
@@ -56,5 +58,32 @@
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
-->
<style name="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_enabled_gray</item>
<item name="android:textColor">@color/main_black</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzappGrayButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzappGrayButton" parent="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/white</item>
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginStart">24dp</item>
<item name="android:layout_marginRight">24dp</item>
<item name="android:layout_marginEnd">24dp</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
</resources>