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

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