From 7da6cf017bb1838b59e9cd3b2f73c37cb820d8a5 Mon Sep 17 00:00:00 2001 From: cimenmus Date: Wed, 29 Aug 2018 00:33:16 +0300 Subject: [PATCH] badge icon fix --- .idea/caches/build_file_checksums.ser | Bin 538 -> 538 bytes app/build.gradle | 4 +-- app/release/output.json | 2 +- .../android/activity/MainActivity.java | 23 ++++++++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 4aea71d9052804d20e0a2f3b888cc7dccf95a301..173eba682fbdf7275484b6ae1f8c74873c6e995a 100644 GIT binary patch delta 32 ocmbQmGK*!xOy=T-vW;_c83nyIZZS$%F4Pxzr*m+#Rw`=+0L+mLQvd(} delta 32 qcmV+*0N?+b1eyepnFCu)x3QdU0TJG-^qfR-^lGCoShooEQPFtmTn{$@ diff --git a/app/build.gradle b/app/build.gradle index b38aad9..c537f4d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "ch.pizzapp.capri" minSdkVersion 16 targetSdkVersion 27 - versionCode 17 // play store'daki version --> canlı: 16 - dahili test: 15 - versionName "2.19" // play store'daki version --> canlı: 2.18 - dahili test: 2.17 + versionCode 18 // play store'daki version --> canlı: 17 - dahili test: 15 + versionName "2.20" // play store'daki version --> canlı: 2.19 - dahili test: 2.17 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = [ diff --git a/app/release/output.json b/app/release/output.json index 1f7ce39..1572e41 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":16,"versionName":"2.18","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":17,"versionName":"2.19","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/pizzapp/android/activity/MainActivity.java b/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java index 58668f5..7f907fd 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java @@ -192,6 +192,11 @@ public class MainActivity extends BaseActivity { shoppingCartImageView.setImageDrawable(whiteCartDrawable); shoppingCartTextView.setTextColor(whiteColor); + if(!SessionHelper.isCustomerLoggedIn()) { + cartTotalRelativeLayout.setVisibility(View.GONE); + return true; + } + if(!SharedPrefsHelper.getCartTotalPrice().equals("0") && !SharedPrefsHelper.getCartTotalPrice().equals("0.0") && !SharedPrefsHelper.getCartTotalPrice().equals("0.00")){ @@ -466,6 +471,12 @@ public class MainActivity extends BaseActivity { */ private void updateCartTotalRelativeLayout() { + + if(!SessionHelper.isCustomerLoggedIn()) { + cartTotalRelativeLayout.setVisibility(View.GONE); + return; + } + if(SharedPrefsHelper.getCartTotalPrice().equals("0") || SharedPrefsHelper.getCartTotalPrice().equals("0.0") || SharedPrefsHelper.getCartTotalPrice().equals("0.00")){ @@ -479,6 +490,12 @@ public class MainActivity extends BaseActivity { } public void updateBadge(){ + + if(!SessionHelper.isCustomerLoggedIn()) { + badgeLayout.setVisibility(View.GONE); + return; + } + int count = SharedPrefsHelper.getCartItemCount(); badgeTextView.setText(String.valueOf(count)); @@ -496,6 +513,12 @@ public class MainActivity extends BaseActivity { } public void setCartTotalLayoutVisibility(boolean isVisible){ + + if(!SessionHelper.isCustomerLoggedIn()) { + cartTotalRelativeLayout.setVisibility(View.GONE); + return; + } + if(isVisible){ cartTotalRelativeLayout.setVisibility(View.VISIBLE); }