open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
ace8843c 1 parent 4ca9f1fb

my rewards fragment ui changes

Inline Side-by-side
Showing 9 changed files with 291 additions and 129 deletions
......@@ -10,6 +10,7 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -52,14 +53,15 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
// Fields
// ===========================================================
private TextView mTvUserBadge,
private TextView mTvUserBadge, mTvUserBadgeCentered,
mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge,
mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle;
private ConstraintLayout mLlHistory,
mLlQuestionnaire, mLlUserBadge;
private ConstraintLayout mLlQuestionnaireCentered,
mLlQuestionnaire, mLlUserBadge, mLlUserBadgeCentered;
private LinearLayout mLlEmptyWallet,
mLlBannerInfo, mLlVouchers, mLlVouchersSpinner,
mLlVouchersDisabled;
private ImageView mIvHistory;
private AlertDialog mAlertDialogNonTelco, mAlertDialogVouchersService;
private int mTimer = 0;
private Handler mSecondsHandler;
......@@ -91,10 +93,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mSecondsHandler = new Handler();
mLlQuestionnaire = view.findViewById(R.id.ll_user_questionnaire);
mLlQuestionnaireCentered = view.findViewById(R.id.ll_user_questionnaire_centered);
mLlUserBadge = view.findViewById(R.id.ll_user_badge);
mTvUserBadge = view.findViewById(R.id.tv_type);
mLlUserBadgeCentered = view.findViewById(R.id.ll_user_badge_centered);
mTvUserBadgeCentered = view.findViewById(R.id.tv_type_centered);
mLlEmptyWallet = view.findViewById(R.id.ll_empty_wallet);
mLlHistory = view.findViewById(R.id.ll_loyalty_history);
mIvHistory = view.findViewById(R.id.iv_loyalty_history);
mTvDealsCountBadge = view.findViewById(R.id.tv_deals_count);
mTvUnifiedCountBadge = view.findViewById(R.id.tv_sm_count);
mTvGiftsCountBadge = view.findViewById(R.id.tv_gifts_count);
......@@ -172,7 +177,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
@Override
public void onClick(View view) {
if (view.getId() == R.id.ll_user_questionnaire || view.getId() == R.id.ll_user_badge) {
if (view.getId() == R.id.ll_user_questionnaire
|| view.getId() == R.id.ll_user_badge
|| view.getId() == R.id.ll_user_badge_centered
|| view.getId() == R.id.ll_user_questionnaire_centered) {
if (!WarplyManagerHelper.noInternetDialog(getContext(), true)) {
if (getActivity() != null && !getActivity().isFinishing()) {
WarplyManagerHelper.noInternetDialog(getActivity());
......@@ -281,7 +289,23 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
return;
}
/** New History */
if (view.getId() == R.id.ll_loyalty_history) {
// if (view.getId() == R.id.ll_loyalty_history) {
// if (!mHistoryBadgePressed) {
// WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
// .concat(":")
// .concat("LoyaltyHistoryBadge"));
//
// LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
// analyticsEvent.setEventName("did_tap_history_badge");
// analyticsEvent.setParameter("screen", "Loyalty Wallet");
// EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
//
// Intent intent = new Intent(getContext(), LoyaltyHistoryActivity.class);
// startActivity(intent);
// }
// return;
// }
if (view.getId() == R.id.iv_loyalty_history) {
if (!mHistoryBadgePressed) {
WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
.concat(":")
......@@ -337,17 +361,36 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
// super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 1000) {
if (resultCode == RESULT_OK) {
if (mLlEmptyWallet.getVisibility() == View.VISIBLE) {
if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
mTvUserBadgeCentered.setText(WarplyManagerHelper.getUserTag(getContext()));
mLlQuestionnaire.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.GONE);
mLlUserBadge.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.VISIBLE);
} else {
mLlUserBadge.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.GONE);
mLlQuestionnaire.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.VISIBLE);
}
} else {
if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
mLlQuestionnaire.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.GONE);
mLlUserBadge.setVisibility(View.VISIBLE);
} else {
mLlUserBadge.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.GONE);
mLlQuestionnaire.setVisibility(View.VISIBLE);
}
}
}
}
}
@Subscribe()
public void onMessageEvent(WarplyEventBusManager event) {
......@@ -370,7 +413,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size()));
else
mTvUnifiedCountBadge.setText("0");
checkHistoryEmpty();
// checkHistoryEmpty();
checkForEmpty();
});
return;
......@@ -382,7 +425,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mTvGiftsCountBadge.setText(String.valueOf(WarplyManagerHelper.getCouponList().size()));
else
mTvGiftsCountBadge.setText("0");
checkHistoryEmpty();
// checkHistoryEmpty();
checkForEmpty();
});
}
......@@ -418,28 +461,62 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mTvDealsCountBadge.setText("0");
/** Deals Badge */
// if (WarplyManagerHelper.getConsumer() != null) {
// if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
// mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
// mLlQuestionnaire.setVisibility(View.GONE);
// mLlUserBadge.setVisibility(View.VISIBLE);
// } else {
// mLlUserBadge.setVisibility(View.GONE);
// mLlQuestionnaire.setVisibility(View.VISIBLE);
// }
// }
/** History View */
// checkHistoryEmpty();
/** History View */
/** Empty View */
checkForEmpty();
/** Empty View */
if (mLlEmptyWallet.getVisibility() == View.VISIBLE) {
if (WarplyManagerHelper.getConsumer() != null) {
if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
mTvUserBadgeCentered.setText(WarplyManagerHelper.getUserTag(getContext()));
mLlQuestionnaire.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.GONE);
mLlUserBadge.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.VISIBLE);
} else {
mLlUserBadge.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.GONE);
mLlQuestionnaire.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.VISIBLE);
}
}
} else {
if (WarplyManagerHelper.getConsumer() != null) {
if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
mLlQuestionnaire.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.GONE);
mLlUserBadge.setVisibility(View.VISIBLE);
} else {
mLlUserBadge.setVisibility(View.GONE);
mLlUserBadgeCentered.setVisibility(View.GONE);
mLlQuestionnaireCentered.setVisibility(View.GONE);
mLlQuestionnaire.setVisibility(View.VISIBLE);
}
}
/** History View */
checkHistoryEmpty();
/** History View */
/** Empty View */
checkForEmpty();
/** Empty View */
}
mLlQuestionnaire.setOnClickListener(this);
mLlQuestionnaireCentered.setOnClickListener(this);
mLlUserBadge.setOnClickListener(this);
mLlHistory.setOnClickListener(this);
mLlUserBadgeCentered.setOnClickListener(this);
mIvHistory.setOnClickListener(this);
mRlDeals.setOnClickListener(this);
mRlUnified.setOnClickListener(this);
mRlGifts.setOnClickListener(this);
......@@ -484,7 +561,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mLlVouchersSpinner.setVisibility(View.GONE);
if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
&& (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
&& (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
&& (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)
&& checkHistoryEmpty()) {
/** Hide all and show empty view */
mLlVouchers.setVisibility(View.GONE);
// mLlVouchersSpinner.setVisibility(View.GONE);
......@@ -512,7 +590,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mLlVouchersDisabled.setVisibility(View.GONE);
if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
&& (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
&& (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
&& (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)
&& checkHistoryEmpty()) {
/** Hide loyalty banners and hide separator */
mLlBannerInfo.setVisibility(View.GONE);
} else {
......@@ -534,7 +613,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mLlVouchersDisabled.setVisibility(View.VISIBLE);
if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
&& (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
&& (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
&& (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)
&& checkHistoryEmpty()) {
/** Hide loyalty banners and hide empty view and hide disabled separator */
mLlBannerInfo.setVisibility(View.GONE);
mLlEmptyWallet.setVisibility(View.GONE);
......@@ -546,7 +626,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
}
}
private void checkHistoryEmpty() {
private boolean checkHistoryEmpty() {
mIsDealsEmpty = WarplyManagerHelper.getDealsCouponsSum() == 0;
if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
......@@ -574,11 +654,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mIsCouponsEmpty = WarplyManagerHelper.getLoyaltyBadge().getValue() == 0;
}
if (mIsDealsEmpty && mIsMarketsEmpty && mIsCouponsEmpty) {
mLlHistory.setVisibility(View.GONE);
} else {
mLlHistory.setVisibility(View.VISIBLE);
}
// if (mIsDealsEmpty && mIsMarketsEmpty && mIsCouponsEmpty) {
// mLlHistory.setVisibility(View.GONE);
// } else {
// mLlHistory.setVisibility(View.VISIBLE);
// }
return (mIsDealsEmpty && mIsMarketsEmpty && mIsCouponsEmpty);
}
// ===========================================================
......
......@@ -3,8 +3,6 @@ package ly.warp.sdk.services;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
import androidx.work.Worker;
import androidx.work.WorkerParameters;
......@@ -12,17 +10,11 @@ import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import ly.warp.sdk.Warply;
import ly.warp.sdk.activities.CouponsetInfoActivity;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.CampaignList;
import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.io.models.CouponsEventModel;
import ly.warp.sdk.io.models.LoyaltyEventModel;
import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
import ly.warp.sdk.io.request.WarplyGetCampaignsRequest;
import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
import ly.warp.sdk.utils.managers.WarplyManager;
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<stroke android:width="1dp" android:color="@color/cos_green12" />
<corners android:radius="12dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<stroke android:width="1dp" android:color="@color/cos_green6_tr" />
<corners android:radius="12dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/round_border_green3_tr" android:state_pressed="true" />
<item android:drawable="@drawable/round_border_green3" android:state_pressed="false" />
</selector>
\ No newline at end of file
......@@ -85,9 +85,10 @@
<LinearLayout
android:id="@+id/ll_get_gift"
android:layout_width="140dp"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="27dp"
android:layout_marginHorizontal="12dp"
android:background="@drawable/selector_button_green"
android:gravity="center"
android:orientation="horizontal">
......@@ -98,7 +99,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/cos_redeem_coupon"
android:text="@string/cos_redeem_coupon2"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
......
......@@ -22,17 +22,34 @@
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1">
<TextView
android:id="@+id/tv_coupons_header"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:includeFontPadding="false"
android:maxLines="1"
android:text="@string/cos_coupons_header"
android:textColor="@color/cos_light_black"
android:textSize="20sp" />
<ImageView
android:id="@+id/iv_loyalty_history"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_history_black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -305,135 +322,214 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_empty_wallet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="32dp"
android:layout_marginBottom="12dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="gone">
<ImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:src="@drawable/ic_empty_wallet" />
<TextView
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/cos_empty_wallet"
android:textColor="@color/cos_light_black"
android:textSize="14sp" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_user_badge"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="start"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_grey_border"
android:background="@drawable/selector_button_green_border2"
android:elevation="1dp"
android:gravity="center"
android:paddingHorizontal="16dp"
android:elevation="1dp"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<TextView
android:id="@+id/tv_type"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:includeFontPadding="false"
android:textColor="@color/cos_light_black"
android:textColor="@color/cos_green12"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_right_questionnaire_answered"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/cos_profile_preferences_placeholder" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/iv_right_questionnaire_answered"
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_right_black"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_user_badge_centered"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_green_border2"
android:elevation="1dp"
android:gravity="center"
android:paddingHorizontal="16dp"
android:visibility="gone"
tools:visibility="gone">
<TextView
android:id="@+id/tv_type_centered"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/cos_green12"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/cos_profile_preferences_placeholder" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_user_questionnaire"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="start"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_grey_border"
android:background="@drawable/selector_button_green_border2"
android:elevation="1dp"
android:gravity="center"
android:paddingHorizontal="16dp"
android:visibility="gone"
android:elevation="1dp"
tools:visibility="visible">
tools:visibility="gone">
<ImageView
android:id="@+id/iv_plus_questionnaire"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_plus_sign_blue"
android:src="@drawable/sv_plus_sign_green"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_questionnaire"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginStart="8dp"
android:includeFontPadding="false"
android:text="@string/cos_profile_preferences"
android:textColor="@color/cos_light_black"
android:textColor="@color/cos_green12"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_right_questionnaire"
app:layout_constraintStart_toEndOf="@+id/iv_plus_questionnaire"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_right_questionnaire"
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_right_black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_plus_questionnaire"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_loyalty_history"
android:layout_width="match_parent"
android:layout_height="56dp"
android:id="@+id/ll_user_questionnaire_centered"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="6dp"
android:background="@drawable/selector_button_grey_border"
android:gravity="center"
android:layout_marginTop="20dp"
android:background="@drawable/selector_button_green_border2"
android:elevation="1dp"
android:paddingHorizontal="16dp">
android:gravity="center"
android:paddingHorizontal="16dp"
android:visibility="gone"
tools:visibility="gone">
<ImageView
android:id="@+id/iv_history_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_history_blue"
android:id="@+id/iv_plus_questionnaire_centered"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/sv_plus_sign_green"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:id="@+id/tv_questionnaire_centered"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginStart="8dp"
android:includeFontPadding="false"
android:text="@string/cos_profile_history"
android:textColor="@color/cos_light_black"
android:text="@string/cos_profile_preferences"
android:textColor="@color/cos_green12"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_right_history"
app:layout_constraintStart_toEndOf="@+id/iv_history_icon"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_right_history"
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_right_black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_plus_questionnaire_centered"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/ll_loyalty_history"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="56dp"-->
<!-- android:layout_marginHorizontal="14dp"-->
<!-- android:layout_marginTop="6dp"-->
<!-- android:background="@drawable/selector_button_grey_border"-->
<!-- android:elevation="1dp"-->
<!-- android:gravity="center"-->
<!-- android:paddingHorizontal="16dp">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_history_icon"-->
<!-- android:layout_width="24dp"-->
<!-- android:layout_height="24dp"-->
<!-- android:src="@drawable/ic_history_blue"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- fontPath="fonts/PeridotPE-Regular.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_profile_history"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="16sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toStartOf="@+id/iv_right_history"-->
<!-- app:layout_constraintStart_toEndOf="@+id/iv_history_icon"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_right_history"-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:src="@drawable/ic_right_black"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<LinearLayout
android:id="@+id/ll_vouchers_spinner"
android:layout_width="match_parent"
......@@ -443,7 +539,7 @@
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<ProgressBar
android:id="@+id/pb_vouchers"
......@@ -460,7 +556,7 @@
android:layout_marginTop="32dp"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<TextView
android:id="@+id/tv_vouchers_title"
......@@ -535,7 +631,7 @@
android:layout_marginTop="32dp"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<TextView
android:id="@+id/tv_vouchers_title_disabled"
......@@ -624,32 +720,5 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_empty_wallet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="32dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:src="@drawable/ic_empty_wallet" />
<TextView
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/cos_empty_wallet"
android:textColor="@color/cos_light_black"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
......
......@@ -39,6 +39,7 @@
<string name="cos_coupons_title">ΚΟΥΠΟΝΙΑ</string>
<string name="cos_coupon_terms_title">Όροι χρήσης</string>
<string name="cos_redeem_coupon">Απόκτησέ το</string>
<string name="cos_redeem_coupon2">Απόκτησέ το δωρεάν</string>
<string name="cos_dlg_success_subtitle">Το κουπόνι εξαργυρώθηκε με επιτυχία</string>
<string name="cos_dlg_error_title">Αποτυχία</string>
<string name="cos_dlg_error_title2">Αποτυχία αποστολής</string>
......@@ -113,7 +114,7 @@
<string name="cos_dlg_negative_button3">Αποστολή</string>
<string name="cos_dlg_error_subtitle2">Παρακαλούμε συμπλήρωσε σωστά τα πεδία.</string>
<string name="cos_dlg_success_couponset_title">Επιτυχής ενεργοποίηση</string>
<string name="cos_dlg_success_couponset_subtitle">Το κουπόνι σου έχει ενεργοποιηθεί στην ενότητα My Rewards.</string>
<string name="cos_dlg_success_couponset_subtitle">Το κουπόνι σου έχει ενεργοποιηθεί και βρίσκεται στην ενότητα My Rewards.</string>
<string name="cos_dlg_activate_telco_title">Ενεργοποίηση υπηρεσίας</string>
<string name="cos_dlg_activate_telco_subtitle">Θέλετε να γίνει ενεργοποίηση στο Κινητό μου;</string>
<string name="cos_dlg_activate_success_title">Το αίτημά σου ολοκληρώθηκε επιτυχώς!</string>
......