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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
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">
-
-
list;
int pstn;
CategorySection(int pstn, String title, List 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 tempCartProductList = new ArrayList<>();
// find margherita products
- ArrayList margheritaPizzaCartProductModelList = new ArrayList<>(Collections2.filter(
- cartProductList,
- new Predicate() {
- @Override
- public boolean apply(CartProductModel cartProductModel) {
- return cartProductModel.getName().toLowerCase().equals("margherita");
- }
- }
- ));
+ ArrayList 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 @@
-
-
-
\ 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 0000000..c3cbc78
Binary files /dev/null and b/private_key.pepk differ