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

asana fixes

Browse Source
This commit is contained in:
cimenmus
2018-06-30 12:51:34 +03:00
parent dfa724cea3
commit accfe39c05
34 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ch/pizzapp/android/activity/MainActivity.java
View File

@@ -162,7 +162,7 @@ public class MainActivity extends BaseActivity {
bottomNavigationView.setCurrentItem(1);
}
else {
openProductsScreen(categoryList.get(2));
openProductsScreen(categoryList.get(3));
}
}
private void initBottomNavigationView(){

7
app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
View File

@@ -158,6 +158,13 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
}
}
for(PaymentMethodModel paymentMethodModel : paymentMethodModels){
if(paymentMethodModel.getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT){
paymentMethodModels.remove(paymentMethodModel);
break;
}
}
/*
// dummy //

2
app/src/main/java/ch/pizzapp/android/view/AppButton.java
View File

@@ -56,7 +56,7 @@ public class AppButton extends LinearLayout {
private void setButtonAppearance(Context context){
if(isEnabled){
pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_enabled));
pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_enabled_red));
pizzalinkButton.setTextColor(ContextCompat.getColor(context, R.color.colorPrimary));
}else {
pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_disabled));

2
app/src/main/java/ch/pizzapp/android/view/AppEditText.java
View File

@@ -58,7 +58,7 @@ public class AppEditText extends LinearLayout implements View.OnClickListener {
TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppEditText, 0, 0);
try {
hint = a.getString(R.styleable.AppEditText_hint);
characterCount = a.getInt(R.styleable.AppEditText_characterCount, 5-1);
characterCount = a.getInt(R.styleable.AppEditText_characterCount, -1);
inputType = a.getString(R.styleable.AppEditText_inputType);
edittextTheme = a.getString(R.styleable.AppEditText_edittextTheme);
} finally {