From f7c1ec6764e211b15dc83ba3b3fecd4cd715af79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sat, 15 Aug 2020 11:49:29 +0300 Subject: [PATCH] voucher fixes --- .idea/caches/build_file_checksums.ser | Bin 542 -> 542 bytes .../android/fragment/ProfileFragment.java | 12 +++++++++++- .../res/layout/row_personal_coupon_code.xml | 8 ++++---- app/src/main/res/values/strings.xml | 8 ++++---- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a62c29bf654bc33f8ccb12933081b7bbd8798992..90694c22fa1e788513a88a5c58aced33deb97725 100644 GIT binary patch delta 15 XcmbQoGLL1#43>`$&#E`hX<`HbG_wZN delta 15 XcmbQoGLL1#43=9myW%&_X<`HbF>3}; diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java index 3d9bcd1..bcab97c 100644 --- a/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java @@ -299,14 +299,24 @@ public class ProfileFragment extends BaseFragment { } private void initPersonalCouponCodesRecyclerView(ArrayList personalCouponList){ + if(personalCouponList == null || personalCouponList.isEmpty()){ personalCouponCodesTextView.setVisibility(View.GONE); personalCouponCodesRecyclerView.setVisibility(View.GONE); return; } + + ArrayList filteredPersonalCouponList = new ArrayList<>(); + for(PersonalCouponModel personalCouponModel: personalCouponList){ + if(filteredPersonalCouponList.size() == 10){ + break; + } + filteredPersonalCouponList.add(personalCouponModel); + } + personalCouponCodesTextView.setVisibility(View.VISIBLE); personalCouponCodesRecyclerView.setVisibility(View.VISIBLE); - personalCouponCodesRecyclerAdapter = new PersonalCouponCodesRecyclerAdapter(BaseActivity.currentActivity, personalCouponList); + personalCouponCodesRecyclerAdapter = new PersonalCouponCodesRecyclerAdapter(BaseActivity.currentActivity, filteredPersonalCouponList); personalCouponCodesRecyclerView.setLayoutManager(new LinearLayoutManager(BaseActivity.currentActivity)); personalCouponCodesRecyclerView.setNestedScrollingEnabled(false); personalCouponCodesRecyclerView.setAdapter(personalCouponCodesRecyclerAdapter); diff --git a/app/src/main/res/layout/row_personal_coupon_code.xml b/app/src/main/res/layout/row_personal_coupon_code.xml index dd9d0e9..97810dc 100644 --- a/app/src/main/res/layout/row_personal_coupon_code.xml +++ b/app/src/main/res/layout/row_personal_coupon_code.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" fontPath="fonts/Quicksand-Regular.ttf" android:textColor="@color/black" - android:textSize="12sp" + android:textSize="10sp" android:text="@string/voucher_code"/> Postleitzahl Ändern     Möchten Sie sich abmelden? Abmelden  - VOUCHERS  + GUTSCHEINE  Code:  - Total:  - Remaining:  - Active:  + Belastet:  + Restguthaben:  + Aktiv: