diff --git a/app/build.gradle b/app/build.gradle index 383ba77..6344d9f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "ch.pizzalink.android" minSdkVersion 16 targetSdkVersion 26 - versionCode 3 // play store'daki version : 2 (beta test) - versionName "1.11" // play store'daki version : 1.1 (beta test) + versionCode 4 // play store'daki version : 3 + versionName "1.12" // play store'daki version : 1.11 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..73c0fd7 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 8a6cc96..3b5412d 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2},"path":"app-release.apk","properties":{"packageId":"ch.pizzalink.android","split":"","minSdkVersion":"16"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3},"path":"app-release.apk","properties":{"packageId":"ch.pizzalink.android","split":"","minSdkVersion":"16"}}] \ No newline at end of file diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java index fccedf0..65d27d2 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java @@ -105,9 +105,11 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { if(createOrderActivity.getSlicePizza() != null){ if(createOrderActivity.getSlicePizza()){ yesRadioButton.setChecked(true); + noRadioButton.setChecked(false); } else { - noRadioButton.setChecked(false); + noRadioButton.setChecked(true); + yesRadioButton.setChecked(false); } } } diff --git a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java b/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java index 292c4dc..c550cdf 100644 --- a/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/menu/MenuProductModel.java @@ -77,8 +77,8 @@ public class MenuProductModel implements Serializable { case 2: return ProductOptionType.RADIO_AND_CHECKBOX; default: - return ProductOptionType.NO_TYPE; - //return ProductOptionType.RADIO_AND_CHECKBOX; + //return ProductOptionType.NO_TYPE; + return ProductOptionType.RADIO_AND_CHECKBOX; } }