diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1ae4716..9a3a5f4 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 8c34d95..e606072 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index 802f79f..5daf099 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,8 @@ android { applicationId "ch.pizzaleu.android" minSdkVersion 16 targetSdkVersion 28 - versionCode 18 // play store'daki version --> canlı: 0 - dahili test: 17 - versionName "1.20" // play store'daki version --> canlı: 0.00 - dahili test: 1.17 + versionCode 19 // play store'daki version --> canlı: 0 - dahili test: 17 + versionName "1.25" // play store'daki version --> canlı: 0.00 - dahili test: 1.17 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ diff --git a/app/release/output.json b/app/release/output.json index 47037a4..88ecfaa 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":18,"versionName":"1.20","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.25","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java index ebc6730..a69e3cc 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java @@ -17,6 +17,9 @@ public class CartTotalModel implements Serializable { } public String getTitle() { + if(title == null){ + title = ""; + } return title; } @@ -25,6 +28,9 @@ public class CartTotalModel implements Serializable { } public String getText() { + if(text == null){ + text = ""; + } return text; }