volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hostname verifier fix

Browse Source
This commit is contained in:
mustafa içmen
2021-12-05 20:22:43 +03:00
parent 15323463b0
commit a40d84bc5b
17 changed files with 121 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/build.gradle
View File

@@ -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'
}

5
app/src/main/AndroidManifest.xml
View File

@@ -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"

18
app/src/main/java/ch/pizzalemon/android/App.java
View File

@@ -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);
}
}

46
app/src/main/java/ch/pizzalemon/android/activity/MainActivity.java
View File

@@ -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){

1
app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java
View File

@@ -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";

17
app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java
View File

@@ -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()){

6
app/src/main/java/ch/pizzalemon/android/fragment/ProfileFragment.java
View File

@@ -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);
}
}

22
app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -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);
}
}
}

2
app/src/main/java/ch/pizzalemon/android/helper/ImageLoadHelper.java
View File

@@ -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)

36
app/src/main/res/layout/activity_main.xml
View File

@@ -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>