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

bug fixes

Browse Source
This commit is contained in:
cimenmus
2018-01-25 00:40:38 +03:00
parent 34bb2e10f3
commit 2aca6fb523
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java
View File

@@ -39,6 +39,7 @@ import ch.pizzalink.android.helper.ImageLoadHelper;
import ch.pizzalink.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.helper.TextHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddProductToBasketResponseModel;
import ch.pizzalink.android.model.AddToBasketOptionModel;
@@ -61,6 +62,7 @@ public class ProductPropertiesActivity extends BaseActivity {
@BindView(R.id.productImageView) ImageView productImageView;
@BindView(R.id.productNameTextView) TextView productNameTextView;
@BindView(R.id.productPriceTextView) TextView productPriceTextView;
@BindView(R.id.productDescriptionTextView) TextView productDescriptionTextView;
@BindView(R.id.addToCartButton) Button addToCartButton;
@BindView(R.id.radioRecyclerHeaderTextView) TextView radioRecyclerHeaderTextView;
@BindView(R.id.radioRecyclerView) RecyclerView radioRecyclerView;
@@ -230,6 +232,7 @@ public class ProductPropertiesActivity extends BaseActivity {
}
private void setFields(){
TextHelper.setTextFromHTML(productDescriptionTextView, menuProductModel.getDescription());
ImageLoadHelper.loadImage(productImageView, menuProductModel.getImageURL());
productNameTextView.setText(menuProductModel.getName());
productPriceTextView.setText(PriceHelper.getPriceWithCurreny(menuProductModel.getPrice()));

1
app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java
View File

@@ -78,6 +78,7 @@ public class MenuProductModel implements Serializable {
return ProductOptionType.RADIO_AND_CHECKBOX;
default:
return ProductOptionType.NO_TYPE;
//return ProductOptionType.RADIO_AND_CHECKBOX;
}
}

13
app/src/main/res/layout/activity_product_properties.xml
View File

@@ -96,6 +96,19 @@
</RelativeLayout>
<TextView
android:id="@+id/productDescriptionTextView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:textColor="@color/navy"
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
<Button
android:id="@+id/addToCartButton"
android:layout_width="match_parent"

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

@@ -51,7 +51,7 @@
android:layout_height="match_parent"
android:background="@color/row_product_ingredients_background"
android:padding="8dp"
android:textColor="@android:color/black"
android:textColor="@color/navy"
android:gravity="center"
android:layout_centerInParent="true"
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>

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

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