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

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

2
app/src/main/java/ch/pizzapp/android/activity/MainActivity.java
View File

@@ -162,7 +162,7 @@ public class MainActivity extends BaseActivity {
bottomNavigationView.setCurrentItem(1);
}
else {
openProductsScreen(categoryList.get(2));
openProductsScreen(categoryList.get(3));
}
}
private void initBottomNavigationView(){

7
app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
View File

@@ -158,6 +158,13 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
}
}
for(PaymentMethodModel paymentMethodModel : paymentMethodModels){
if(paymentMethodModel.getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT){
paymentMethodModels.remove(paymentMethodModel);
break;
}
}
/*
// dummy //

2
app/src/main/java/ch/pizzapp/android/view/AppButton.java
View File

@@ -56,7 +56,7 @@ public class AppButton extends LinearLayout {
private void setButtonAppearance(Context context){
if(isEnabled){
pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_enabled));
pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_enabled_red));
pizzalinkButton.setTextColor(ContextCompat.getColor(context, R.color.colorPrimary));
}else {
pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_disabled));

2
app/src/main/java/ch/pizzapp/android/view/AppEditText.java
View File

@@ -58,7 +58,7 @@ public class AppEditText extends LinearLayout implements View.OnClickListener {
TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppEditText, 0, 0);
try {
hint = a.getString(R.styleable.AppEditText_hint);
characterCount = a.getInt(R.styleable.AppEditText_characterCount, 5-1);
characterCount = a.getInt(R.styleable.AppEditText_characterCount, -1);
inputType = a.getString(R.styleable.AppEditText_inputType);
edittextTheme = a.getString(R.styleable.AppEditText_edittextTheme);
} finally {

9
app/src/main/res/drawable/background_button_enabled_gray.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<stroke
android:color="@color/main_black"
android:width="1dp"/>
<corners android:radius="1dp"/>
</shape>

0
app/src/main/res/drawable/background_button_enabled.xml → app/src/main/res/drawable/background_button_enabled_red.xml
View File

8
app/src/main/res/drawable/background_button_pizzapp_gray.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/main_black"/>
<corners android:radius="8dp"/>
</shape>

2
app/src/main/res/layout/activity_add_address.xml
View File

@@ -109,7 +109,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:text="@string/add"
android:layout_alignParentBottom="true" />

2
app/src/main/res/layout/activity_campaign_product_details.xml
View File

@@ -117,7 +117,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="@string/add_to_cart"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"/>

2
app/src/main/res/layout/activity_create_order.xml
View File

@@ -55,6 +55,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:stpi_indicatorColor="@color/red"
app:stpi_lineDoneColor="@color/red"
app:stpi_labels="@array/stepperLabels" />
<View

2
app/src/main/res/layout/activity_forgot_password.xml
View File

@@ -58,7 +58,7 @@
<Button
android:id="@+id/resetPasswordButton"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginBottom="16dp"

4
app/src/main/res/layout/activity_login.xml
View File

@@ -67,7 +67,7 @@
<Button
android:id="@+id/loginButton"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginBottom="16dp"
@@ -84,7 +84,7 @@
<Button
android:id="@+id/registerButton"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginBottom="16dp"

2
app/src/main/res/layout/activity_my_addresses.xml
View File

@@ -51,7 +51,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:text="@string/add_new_address"
android:layout_alignParentBottom="true"/>

2
app/src/main/res/layout/activity_product_details.xml
View File

@@ -116,7 +116,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="@string/add_to_cart"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"/>

2
app/src/main/res/layout/activity_register.xml
View File

@@ -131,7 +131,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:text="@string/button_register"
android:layout_alignParentBottom="true" />

2
app/src/main/res/layout/activity_update_password.xml
View File

@@ -76,7 +76,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:text="@string/update_app" />
</LinearLayout>

2
app/src/main/res/layout/activity_update_profile.xml
View File

@@ -87,7 +87,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:text="@string/update_app"
android:layout_alignParentBottom="true" />

4
app/src/main/res/layout/fragment_cart.xml
View File

@@ -93,7 +93,7 @@
android:layout_marginRight="6dp"
android:layout_marginEnd="6dp"
android:text="@string/clear_cart"
style="@style/PizzalinkRedWithoutMargin"
style="@style/PizzappGrayButtonWithoutMargin"
android:layout_weight="1"/>
<Button
@@ -104,7 +104,7 @@
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:text="@string/continue_cart"
style="@style/PizzalinkRedWithoutMargin"
style="@style/PizzappGrayButtonWithoutMargin"
android:layout_weight="1"/>
</LinearLayout>

2
app/src/main/res/layout/fragment_shipping_address.xml
View File

@@ -19,7 +19,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:text="@string/add_new_address"
android:layout_above="@+id/ordersBottomLayout"/>

4
app/src/main/res/layout/layout_bottomsheet.xml
View File

@@ -61,7 +61,6 @@
android:textColor="@color/black"
android:textSize="18sp"
android:padding="12sp"
android:text="Pizza Formaggio"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_gravity="center"
android:gravity="center" />
@@ -71,7 +70,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:text="CHF 25.00"
android:textSize="18sp"
android:paddingBottom="12dp"
android:paddingLeft="12dp"
@@ -91,7 +89,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="@string/add_to_cart"
style="@style/PizzalinkRedButton"
style="@style/PizzappGrayButton"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"/>

2
app/src/main/res/layout/layout_pizzalink_button.xml
View File

@@ -15,6 +15,6 @@
android:layout_marginRight="24dp"
android:layout_marginEnd="24dp"
android:textColor="@color/white"
android:background="@drawable/background_button_enabled"/>
android:background="@drawable/background_button_enabled_red"/>
</LinearLayout>

2
app/src/main/res/layout/layout_pizzalink_view.xml
View File

@@ -12,7 +12,6 @@
android:id="@+id/descriptionTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/order_person_fullname"
android:textColor="@color/black"
android:textSize="12sp"
fontPath="fonts/Quicksand-Bold.ttf" />
@@ -23,7 +22,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="Aytaç Cici"
android:textColor="@color/red" />
</LinearLayout>

4
app/src/main/res/layout/row_cart.xml
View File

@@ -31,7 +31,6 @@
android:id="@+id/cartProductCountTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2 x "
android:textColor="@color/black" />
</LinearLayout>
@@ -67,7 +66,6 @@
android:id="@+id/cartProductNameTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Pizza Formaggio"
android:textSize="16sp"
android:textColor="@color/black"
android:padding="12dp"
@@ -81,7 +79,6 @@
android:id="@+id/cartProductTotalPriceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 25.00"
android:textColor="@color/black"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
@@ -95,7 +92,6 @@
android:id="@+id/cartProductInfoTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gross"
android:textColor="@color/black"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"

6
app/src/main/res/layout/row_menu_product.xml
View File

@@ -20,7 +20,6 @@
android:layout_height="match_parent"
android:textColor="@color/black"
android:textSize="16sp"
android:text="Anatoliajefjefje\nwhufjechfuhefu"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_centerInParent="true"
@@ -61,10 +60,10 @@
android:layout_height="match_parent"
android:background="@color/row_product_ingredients_background"
android:padding="8dp"
android:textSize="12sp"
android:textColor="@color/black"
android:gravity="center"
android:layout_centerInParent="true"
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
android:layout_centerInParent="true" />
</RelativeLayout>
@@ -78,7 +77,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:text="CHF 25.00"
android:padding="17dp"
android:gravity="center_horizontal"
fontPath="fonts/Quicksand-Bold.ttf"

1
app/src/main/res/layout/row_my_address.xml
View File

@@ -25,7 +25,6 @@
android:layout_toLeftOf="@+id/deleteAddressImageView"
android:layout_toStartOf="@+id/deleteAddressImageView"
android:layout_centerVertical="true"
android:text="Test Address"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black" />

4
app/src/main/res/layout/row_option_checkbox.xml
View File

@@ -14,7 +14,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:text="Klein"
android:textColor="@color/black"
fontPath="fonts/Quicksand-Bold.ttf"/>
@@ -30,8 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"
android:text="CHF 14.00"/>
android:textColor="@color/black" />
</RelativeLayout>

4
app/src/main/res/layout/row_option_radio.xml
View File

@@ -13,7 +13,6 @@
android:id="@+id/productOptionRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Klein"
android:clickable="false"
android:textColor="@color/black"
fontPath="fonts/Quicksand-Bold.ttf"/>
@@ -30,8 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"
android:text="CHF 14.00"/>
android:textColor="@color/black" />
</RelativeLayout>

2
app/src/main/res/layout/row_order_history.xml
View File

@@ -24,7 +24,6 @@
android:id="@+id/orderDateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="5 Oct. 2017"
android:textColor="@color/red"
android:padding="8dp"
fontPath="fonts/Quicksand-Bold.ttf"
@@ -42,7 +41,6 @@
android:id="@+id/orderTotalTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 25.00"
android:textColor="@color/black"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"

1
app/src/main/res/layout/row_payment_method.xml
View File

@@ -13,7 +13,6 @@
android:id="@+id/paymentMethodRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gel ad"
android:clickable="false"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"/>

1
app/src/main/res/layout/row_shipment_address.xml
View File

@@ -13,7 +13,6 @@
android:id="@+id/shipmentAddressRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gel ad"
android:clickable="false"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"/>

2
app/src/main/res/layout/row_shipment_method.xml
View File

@@ -13,7 +13,6 @@
android:id="@+id/shipmentMethodRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gel ad"
android:clickable="false"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"/>
@@ -29,7 +28,6 @@
android:id="@+id/shipmentMethodPriceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="CHF 14.00"
fontPath="fonts/Quicksand-Bold.ttf"
android:textColor="@color/black"/>

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>