From a40d84bc5b18d5381fcb5e99e902065d37fa01da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Sun, 5 Dec 2021 20:22:43 +0300
Subject: [PATCH] hostname verifier fix

---
 .idea/deploymentTargetDropDown.xml            |  17 +++++
 .idea/jarRepositories.xml                     |  10 +++
 .idea/misc.xml                                |   7 ++
 app/build.gradle                              |  65 ++++++------------
 app/src/main/AndroidManifest.xml              |   5 --
 .../main/java/ch/pizzalemon/android/App.java  |  18 ++---
 .../android/activity/MainActivity.java        |  46 +++++++++----
 .../pizzalemon/android/api/ApiConstants.java  |   1 +
 .../android/fragment/CartFragment.java        |  17 ++---
 .../android/fragment/ProfileFragment.java     |   6 +-
 .../CreateOrderSummaryFragment.java           |  22 +-----
 .../android/helper/ImageLoadHelper.java       |   2 +-
 app/src/main/res/layout/activity_main.xml     |  36 +---------
 build.gradle                                  |  17 +++--
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 pizzalemon_keystore.txt                       |   3 +
 private_key.pepk                              | Bin 0 -> 1776 bytes
 17 files changed, 121 insertions(+), 153 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 private_key.pepk

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..f5c217a
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_5_API_31.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-12-05T16:56:39.036536Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 4205295..4bce59a 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,15 @@
       <option name="name" value="maven3" />
       <option name="url" value="https://maven.fabric.io/public" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://www.jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..14c6cb0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.15070921985815602" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 829cdfc..4819359 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,28 +9,21 @@ buildscript {
 
 apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
 
 repositories {
-    maven { url 'https://maven.fabric.io/public' }
     maven { url 'https://maven.google.com' }
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     defaultConfig {
         applicationId "ch.pizzalemon.android"
         minSdkVersion 16
-        targetSdkVersion 29
-        versionCode  23 // play store'daki version --> canlı: 0  - dahili test: 17
-        versionName "2.03"   // play store'daki version --> canlı: 0.00 -  dahili test: 1.17
+        targetSdkVersion 31
+        versionCode  24// play store'daki version --> canlı: 0  - dahili test: 17
+        versionName "2.04"   // play store'daki version --> canlı: 0.00 -  dahili test: 1.17
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled true
-        manifestPlaceholders = [
-                onesignal_app_id: 'd4dd9cad-7d6e-4872-b93f-0c47ab1a55ec',
-                // Project number pulled from dashboard, local value is ignored.
-                onesignal_google_project_number: 'REMOTE'
-        ]
     }
     buildTypes {
         release {
@@ -46,66 +39,50 @@ android {
 
 dependencies {
 
-    def appcompat_version = "28.0.0"
-    def play_services_version_general = "16.0.1"
-    def play_services_version_for_maps_and_locations = "16.0.0"
-    def retrofit_version = "2.3.0"
-    def okhttp_version = "3.9.1"
+    def retrofit_version = "2.9.0"
+    def okhttp_version = "4.9.1"
     def butterknife_version = "10.2.3"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
-    implementation 'androidx.core:core:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.core:core:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.multidex:multidex:2.0.0'
-
-    implementation "com.google.android.gms:play-services-base:$play_services_version_general"
-    implementation "com.google.android.gms:play-services-location:$play_services_version_for_maps_and_locations"
-    implementation "com.google.android.gms:play-services-wallet:$play_services_version_general"
-    implementation 'com.google.firebase:firebase-messaging:17.3.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.picasso:picasso:2.71828'
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
 
     implementation "com.jakewharton:butterknife:$butterknife_version"
     annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife_version"
-    implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
 
     implementation 'com.github.AndroidDeveloperLB:DialogShard:3'
-    implementation 'com.github.HITGIF:TextFieldBoxes:1.3.3'
-    implementation 'com.github.ittianyu:BottomNavigationViewEx:2.0.2' // for support library 28, use that version
-    implementation 'com.github.bumptech.glide:glide:4.5.0'
+    implementation 'com.github.HITGIF:TextFieldBoxes:1.4.5'
     implementation 'com.github.badoualy:stepper-indicator:1.0.7'
-    implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3'
+    implementation 'com.github.luizgrp:SectionedRecyclerViewAdapter:v3.2.0'
 
-    implementation 'com.onesignal:OneSignal:[3.9.1, 3.99.99]'
+    implementation 'com.onesignal:OneSignal:[4.0.0, 4.99.99]'
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     implementation 'io.github.inflationx:calligraphy3:3.1.1'
     implementation 'io.github.inflationx:viewpump:2.0.3'
-    implementation 'com.wdullaer:materialdatetimepicker:3.6.3'
-    implementation 'io.nlopez.smartlocation:library:3.3.3'
-    implementation 'q.rorbin:badgeview:1.1.0'
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation 'q.rorbin:badgeview:1.1.3'
     implementation 'com.braintreepayments.api:braintree:2.22.0'
-    implementation 'org.jsoup:jsoup:1.11.1'
-    implementation 'me.relex:circleindicator:1.3.2'
+    implementation 'org.jsoup:jsoup:1.14.2'
+    implementation 'me.relex:circleindicator:2.1.6'
     implementation('com.braintreepayments.api:drop-in:3.7.1') {
         exclude group: 'com.braintreepayments.api', module: 'braintree'
     }
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
-        transitive = true
-    }
 
-    api 'com.google.guava:guava:26.0-android'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 10bd841..adb33e6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,11 +16,6 @@
         android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme.NoActionBar">
 
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="3a1f8c7084012f6d8cb2bdebbd9bae60fd671036"
-            />
-
         <activity
             android:name="ch.pizzalemon.android.activity.SplashActivity"
             android:screenOrientation="portrait"
diff --git a/app/src/main/java/ch/pizzalemon/android/App.java b/app/src/main/java/ch/pizzalemon/android/App.java
index caffd67..6114d33 100644
--- a/app/src/main/java/ch/pizzalemon/android/App.java
+++ b/app/src/main/java/ch/pizzalemon/android/App.java
@@ -1,13 +1,11 @@
 package ch.pizzalemon.android;
 
 import androidx.multidex.MultiDexApplication;
-
-import com.crashlytics.android.Crashlytics;
-import com.jakewharton.picasso.OkHttp3Downloader;
 import com.onesignal.OneSignal;
+import com.squareup.picasso.OkHttp3Downloader;
 import com.squareup.picasso.Picasso;
 
-import io.fabric.sdk.android.Fabric;
+import ch.pizzalemon.android.api.ApiConstants;
 import io.github.inflationx.calligraphy3.CalligraphyConfig;
 import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
 import io.github.inflationx.viewpump.ViewPump;
@@ -23,7 +21,6 @@ public class App extends MultiDexApplication {
         super.onCreate();
         initCalligraphy();
         initPicasso();
-        initFabric();
         initOneSignal();
     }
 
@@ -54,14 +51,9 @@ public class App extends MultiDexApplication {
         */
     }
 
-    private void initFabric(){
-        Fabric.with(this, new Crashlytics());
-    }
-
     private void initOneSignal(){
-        OneSignal.startInit(this)
-                .inFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification)
-                .unsubscribeWhenNotificationsAreDisabled(true)
-                .init();
+        OneSignal.initWithContext(this);
+        OneSignal.setAppId(ApiConstants.ONESIGNAL_APP_ID);
+        OneSignal.unsubscribeWhenNotificationsAreDisabled(true);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java b/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java
index a482a07..f607015 100644
--- a/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java
+++ b/app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java
@@ -18,12 +18,8 @@ import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-
-import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import butterknife.BindColor;
 import butterknife.BindDrawable;
 import butterknife.BindView;
@@ -43,9 +39,9 @@ import ch.pizzalemon.android.helper.SessionHelper;
 import ch.pizzalemon.android.helper.SharedPrefsHelper;
 import ch.pizzalemon.android.model.CategoryModel;
 import ch.pizzalemon.android.view.AppToolbar;
+import io.github.luizgrp.sectionedrecyclerviewadapter.Section;
 import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
 import io.github.luizgrp.sectionedrecyclerviewadapter.SectionedRecyclerViewAdapter;
-import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection;
 
 public class MainActivity extends BaseActivity {
 
@@ -55,7 +51,7 @@ public class MainActivity extends BaseActivity {
     @BindView(R.id.cartTotalRelativeLayout) RelativeLayout cartTotalRelativeLayout;
     @BindView(R.id.cartTotalTextView) TextView cartTotalTextView;
     @BindView(R.id.minimumPriceTextView) TextView minimumPriceTextView;
-    @BindView(R.id.bottomNavigationView) BottomNavigationViewEx bottomNavigationView;
+    @BindView(R.id.bottomNavigationView) BottomNavigationView bottomNavigationView;
 
     @BindView(R.id.badgeLayout) RelativeLayout badgeLayout;
     @BindView(R.id.badgeTextView) TextView badgeTextView;
@@ -145,7 +141,7 @@ public class MainActivity extends BaseActivity {
                     DialogHelper.showNeedToLoginDialog(R.string.need_to_login_for_that_part);
                     return;
                 }
-                bottomNavigationView.setCurrentItem(2);
+                bottomNavigationView.setSelectedItemId(R.id.action_empty);
             }
         });
     }
@@ -162,10 +158,10 @@ public class MainActivity extends BaseActivity {
     private void showStartScreen(){
         fragmentManager = getSupportFragmentManager();
         if(isStartWithOrderHistory){
-            bottomNavigationView.setCurrentItem(1);
+            bottomNavigationView.setSelectedItemId(R.id.action_history);
         }
         else if(isStartWithCart){
-            bottomNavigationView.setCurrentItem(2);
+            bottomNavigationView.setSelectedItemId(R.id.action_empty);
         }
         else {
             openProductsScreen(getDefaultCategory());
@@ -173,12 +169,13 @@ public class MainActivity extends BaseActivity {
     }
     private void initBottomNavigationView(){
 
-        //bottomNavigationView.enableAnimation(false);
+        /*
         bottomNavigationView.enableShiftingMode(false);
         bottomNavigationView.setTextSize(10);
         bottomNavigationView.enableItemShiftingMode(false);
         bottomNavigationView.setTextVisibility(true);
-        bottomNavigationView.setIconSize(24, 24);
+         */
+        //bottomNavigationView.setItemIconSize(24);
 
         bottomNavigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
@@ -329,14 +326,15 @@ public class MainActivity extends BaseActivity {
         navigationMenuRecyclerView.setAdapter(sectionAdapter);
     }
 
-    private class CategorySection extends StatelessSection {
+    private class CategorySection extends Section {
 
         String title;
         List<CategoryModel> list;
         int pstn;
 
         CategorySection(int pstn, String title, List<CategoryModel> list) {
-            super(new SectionParameters.Builder(R.layout.row_subcategory)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.row_subcategory)
                     .headerResourceId(R.layout.row_category)
                     .build());
 
@@ -474,7 +472,7 @@ public class MainActivity extends BaseActivity {
 
     public void reopenCartFragment(){
         currentFragmentName = "";
-        bottomNavigationView.setCurrentItem(2);
+        bottomNavigationView.setSelectedItemId(R.id.action_empty);
     }
 
     /*
@@ -531,7 +529,25 @@ public class MainActivity extends BaseActivity {
 
     public void openFragmentAt(int position){
         currentFragmentName = "";
-        bottomNavigationView.setCurrentItem(position);
+        int menuItemId;
+        switch (position){
+            case 0:
+                menuItemId = R.id.action_menu;
+                break;
+            case 1:
+                menuItemId = R.id.action_history;
+                break;
+            case 3:
+                menuItemId = R.id.action_profile;
+                break;
+            case 4:
+                menuItemId = R.id.action_info;
+                break;
+            default:
+                menuItemId = R.id.action_empty;
+                break;
+        }
+        bottomNavigationView.setSelectedItemId(menuItemId);
     }
 
     public void setCartTotalLayoutVisibility(boolean isVisible){
diff --git a/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java b/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java
index ca6bc41..83912d3 100644
--- a/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java
+++ b/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java
@@ -40,6 +40,7 @@ public class ApiConstants {
     public static final String PRODUCT_OPTION_ID_ABEND_MENU_PIZZA_SELECTION = "869";
     public static final String PRODUCT_OPTION_ID_MITTAGS_MENU_OPTIONS = "872";
 
+    public static final String ONESIGNAL_APP_ID = "d4dd9cad-7d6e-4872-b93f-0c47ab1a55ec";
     public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed";
     public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true";
 
diff --git a/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java
index e2221f0..ce2f876 100644
--- a/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java
@@ -16,8 +16,6 @@ import android.widget.TextView;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -432,15 +430,12 @@ public class CartFragment extends BaseFragment {
         ArrayList<CartProductModel> tempCartProductList = new ArrayList<>();
 
         // find margherita products
-        ArrayList<CartProductModel> margheritaPizzaCartProductModelList = new ArrayList<>(Collections2.filter(
-                cartProductList,
-                new Predicate<CartProductModel>() {
-                    @Override
-                    public boolean apply(CartProductModel cartProductModel) {
-                        return cartProductModel.getName().toLowerCase().equals("margherita");
-                    }
-                }
-        ));
+        ArrayList<CartProductModel> margheritaPizzaCartProductModelList = new ArrayList<>();
+        for(CartProductModel cartProductModel: cartProductList){
+            if (cartProductModel.getName().toLowerCase().equals("margherita")){
+                margheritaPizzaCartProductModelList.add(cartProductModel);
+            }
+        }
 
         // remove margherita products from cartProductList
         if(!margheritaPizzaCartProductModelList.isEmpty()){
diff --git a/app/src/main/java/ch/pizzalemon/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzalemon/android/fragment/ProfileFragment.java
index 1110cea..4b7f6a3 100644
--- a/app/src/main/java/ch/pizzalemon/android/fragment/ProfileFragment.java
+++ b/app/src/main/java/ch/pizzalemon/android/fragment/ProfileFragment.java
@@ -156,9 +156,9 @@ public class ProfileFragment extends BaseFragment {
     }
 
     private void getNotificationStatus(){
-        OneSignal.getTags(new OneSignal.GetTagsHandler() {
+        OneSignal.getTags(new OneSignal.OSGetTagsHandler() {
             @Override
-            public void tagsAvailable(final JSONObject tags) {
+            public void tagsAvailable(JSONObject tags) {
                 BaseActivity.currentActivity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
@@ -204,6 +204,7 @@ public class ProfileFragment extends BaseFragment {
             }
             catch (JSONException e){
                 e.printStackTrace();
+                DialogHelper.hideLoadingDialog();
                 DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
             }
 
@@ -242,6 +243,7 @@ public class ProfileFragment extends BaseFragment {
                     getPersonalCouponCodeList();
                 }
                 else {
+                    DialogHelper.hideLoadingDialog();
                     ApiErrorUtils.parseError(response);
                 }
             }
diff --git a/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 8455709..1c2f45d 100644
--- a/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -23,7 +23,6 @@ import com.braintreepayments.api.dropin.DropInActivity;
 import com.braintreepayments.api.dropin.DropInRequest;
 import com.braintreepayments.api.dropin.DropInResult;
 import com.braintreepayments.api.models.PayPalRequest;
-import com.google.android.gms.wallet.Cart;
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
 import com.wdullaer.materialdatetimepicker.time.Timepoint;
@@ -502,7 +501,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         datePickerDialog.vibrate(false);
         datePickerDialog.setMinDate(nowDate);
         //datePickerDialog.autoDismiss(true);
-        datePickerDialog.show(BaseActivity.currentActivity.getFragmentManager(), choosetext);
+        datePickerDialog.show(BaseActivity.currentActivity.getSupportFragmentManager(), choosetext);
     }
 
     private void showTimePickerDialog(){
@@ -642,7 +641,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
 
         }
 
-        timePickerDialog.show(BaseActivity.currentActivity.getFragmentManager(), choosetext);
+        timePickerDialog.show(BaseActivity.currentActivity.getSupportFragmentManager(), choosetext);
     }
 
     private void redirectToPayment(){
@@ -997,22 +996,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         return params;
     }
 
-    private Cart getAndroidPayCart() {
-        return Cart.newBuilder()
-                .setCurrencyCode("CHF")
-                .setTotalPrice(PriceHelper.removeCurrencyFromPrice(createOrderActivity.getCartInfo().getCartTotalModel().getText()))
-                /*
-                .addLineItem(LineItem.newBuilder()
-                        .setCurrencyCode("CHF")
-                        .setDescription("Description")
-                        .setQuantity("1")
-                        .setUnitPrice("1.00")
-                        .setTotalPrice("1.00")
-                        .build())
-                        */
-                .build();
-    }
-
     /*
     private void setOrderTotalText(CartInfoModel cartInfoModel){
 
@@ -1467,7 +1450,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
             }
             catch (Exception e){
                 DialogHelper.showAlertDialog(BaseActivity.currentActivity, getString(R.string.error_message));
-                Crashlytics.logException(e);
             }
         }
     }
diff --git a/app/src/main/java/ch/pizzalemon/android/helper/ImageLoadHelper.java b/app/src/main/java/ch/pizzalemon/android/helper/ImageLoadHelper.java
index 1d98681..0039cd4 100644
--- a/app/src/main/java/ch/pizzalemon/android/helper/ImageLoadHelper.java
+++ b/app/src/main/java/ch/pizzalemon/android/helper/ImageLoadHelper.java
@@ -12,7 +12,7 @@ public class ImageLoadHelper {
         if(url == null || url.isEmpty())
             url = "empty";
 
-        Picasso.with(BaseActivity.currentActivity)
+        Picasso.get()
                 .load(url)
                 //.placeholder(R.drawable.placeholder)
                 //.placeholder(R.drawable.progress_animation)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b76804a..ec7e27a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -115,7 +115,7 @@
 
     </RelativeLayout>
 
-    <com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
+    <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottomNavigationView"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
@@ -124,6 +124,7 @@
         android:background="@color/pizzalemon_dark_green"
         app:menu="@menu/menu_bottom_navigation"
         app:itemBackground="@color/pizzalemon_dark_green"
+        app:labelVisibilityMode="labeled"
         android:layout_alignParentBottom="true"/>
 
     <LinearLayout
@@ -202,37 +203,4 @@
         android:elevation="9dp"
         android:visibility="gone"/>
 
-    <!--
-    <RelativeLayout
-        android:id="@+id/bottomNavigationViewLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_alignParentBottom="true">
-
-        <android.support.v7.widget.AppCompatImageButton
-            android:id="@+id/shoppingCartButton"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:background="@drawable/background_button_cart"
-            android:gravity="center"
-            android:src="@drawable/ic_bottom_nav_item_cart_white"
-            android:elevation="9dp"
-            android:layout_marginBottom="-12dp"
-            android:layout_centerHorizontal="true"/>
-
-        <com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx
-            android:id="@+id/bottomNavigationView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:itemIconTint="@drawable/selector_bottom_navigation_item"
-            app:itemTextColor="@drawable/selector_bottom_navigation_item"
-            android:background="@color/navy"
-            app:menu="@menu/menu_bottom_navigation"
-            app:itemBackground="@color/navy"
-            app:elevation="0dp"/>
-
-    </RelativeLayout>
-    -->
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 14bef31..4382f1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,14 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
-        maven { url 'https://maven.fabric.io/public' }
+        mavenCentral()
+        gradlePluginPortal()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
-        classpath 'io.fabric.tools:gradle:1.+'
+        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,10 +18,12 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
-        maven { url 'https://jitpack.io' }
-        maven { url "https://maven.google.com" }
         google()
+        mavenCentral()
+        jcenter()
+        //maven { url 'https://jitpack.io' } https://stackoverflow.com/questions/50791632/could-not-find-any-version-that-matches-com-google-android-gmsplay-services-bas
+        maven { url "https://www.jitpack.io" }
+        maven { url "https://maven.google.com" }
         flatDir {
             dirs 'libs'
         }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e0cc4c..d9af221 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/pizzalemon_keystore.txt b/pizzalemon_keystore.txt
index b3a9242..29dcdfb 100644
--- a/pizzalemon_keystore.txt
+++ b/pizzalemon_keystore.txt
@@ -3,3 +3,6 @@ key alias : pizzalemon
 key password :zuh07819
 
 jks dosyası "pizzalemon_jks" dosyası. Sonunda .jks uzantısı yok, bu sekilde üretti. Sonuna .jks eklenirse hata veriyor.
+
+Android app bundle exported key file: private_key.pepk dosyası
+
diff --git a/private_key.pepk b/private_key.pepk
new file mode 100644
index 0000000000000000000000000000000000000000..c3cbc78a9d9d2c81d6c6c7ba0c31be921bfff7f1
GIT binary patch
literal 1776
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
SXZDeT-Z-ldgl%7bARa1rAZJ<t

literal 0
HcmV?d00001