open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
1c4e20b8 1 parent bb158ef7

minor fixes

Inline Side-by-side
Showing 16 changed files with 146 additions and 126 deletions
......@@ -35,7 +35,7 @@ PushIcon=ic_notify
SendPackages=false
# The app language
#Language=el
Language=el
# The merchant id for some requests
MerchantId=20113
......
......@@ -76,7 +76,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
}
private void showDialog() {
Dialog dialog = new Dialog(this);
Dialog dialog = new Dialog(this, R.style.PopUpDialog);
dialog.setContentView(R.layout.payment_success_dialog);
dialog.getWindow().setBackgroundDrawableResource(R.drawable.banner_border_white);
dialog.show();
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.app.Dialog;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Coupon;
public class CouponInfoActivity extends Activity implements View.OnClickListener {
......@@ -24,9 +31,10 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
// Fields
// ===========================================================
private ImageView mIvBack;
private TextView mTvTerms, mTvCouponCode;
private ImageView mIvBack, mIvCoupoPhoto;
private TextView mTvTerms, mTvCouponCode, mTvCouponTitle, mTvCouponSubtitle, mTvCouponDate;
private LinearLayout mLlGiftIt;
private Coupon mCoupon;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -37,10 +45,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_coupon_info);
mCoupon = (Coupon) getIntent().getSerializableExtra("coupon");
mIvBack = findViewById(R.id.iv_coupon_info_back);
mTvTerms = findViewById(R.id.tv_terms);
mLlGiftIt = findViewById(R.id.ll_gift_it);
mTvCouponCode = findViewById(R.id.textView16);
mTvCouponTitle = findViewById(R.id.textView13);
mTvCouponSubtitle = findViewById(R.id.textView14);
mTvCouponDate = findViewById(R.id.textView17);
mIvCoupoPhoto = findViewById(R.id.imageView6);
initViews();
}
......@@ -69,6 +83,33 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
// ===========================================================
private void initViews() {
mTvCouponCode.setText(mCoupon.getCoupon());
mTvCouponTitle.setText(mCoupon.getName());
mTvCouponSubtitle.setText(mCoupon.getDescription());
String strCurrentDate = mCoupon.getCreated();
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
Date newDate = new Date();
try {
newDate = format.parse(strCurrentDate);
} catch (ParseException e) {
e.printStackTrace();
}
mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_coupon_date),
format.format(newDate)));
if (!TextUtils.isEmpty(mCoupon.getImage())) {
Glide.with(this)
// .setDefaultRequestOptions(
// RequestOptions
// .placeholderOf(R.drawable.ic_default_contact_photo)
// .error(R.drawable.ic_default_contact_photo))
.load(mCoupon.getImage())
.diskCacheStrategy(DiskCacheStrategy.DATA)
.into(mIvCoupoPhoto);
} else {
Glide.with(this)
.load(R.drawable.ic_cosmote_logo_horizontal_grey)
.into(mIvCoupoPhoto);
}
mIvBack.setOnClickListener(this);
mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
mLlGiftIt.setOnClickListener(this);
......
......@@ -13,12 +13,10 @@ import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.json.JSONException;
import java.io.Serializable;
import ly.warp.sdk.R;
import ly.warp.sdk.fragments.BaseFragment;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.views.adapters.HomeCouponAdapter;
......@@ -96,26 +94,16 @@ public class LoyaltyActivity extends Activity implements View.OnClickListener,
mTvUsername.setText(String.format(getResources().getString(R.string.cos_profile_loyalty_name),
BaseFragment.getConsumer().getFirstName(), BaseFragment.getConsumer().getLastName()));
/********* TEST COUPONS DATA **********/
CouponList clist = new CouponList();
try {
clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"123456789\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"12345678910\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
} catch (JSONException e) {
e.printStackTrace();
}
/********* TEST COUPONS DATA **********/
mIvBack.setOnClickListener(this);
mTvAnalysisButton.setOnClickListener(this);
mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
mAdapterCoupons = new HomeCouponAdapter(this, clist);
mAdapterCoupons = new HomeCouponAdapter(this, BaseFragment.getCouponList());
mRecyclerCoupons.setAdapter(mAdapterCoupons);
mAdapterCoupons.getPositionClicks()
.doOnNext(coupon -> {
Intent intent = new Intent(this, CouponInfoActivity.class);
intent.putExtra("coupon", (Serializable) coupon);
startActivity(intent);
})
.doOnError(error -> {
......@@ -123,7 +111,7 @@ public class LoyaltyActivity extends Activity implements View.OnClickListener,
.subscribe();
mRecyclerBurntCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
mAdapterBurntCoupons = new HomeCouponAdapter(this, clist, true);
mAdapterBurntCoupons = new HomeCouponAdapter(this, BaseFragment.getCouponList(), true);
mRecyclerBurntCoupons.setAdapter(mAdapterBurntCoupons);
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
......
......@@ -17,6 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
import org.json.JSONException;
import java.io.Serializable;
import ly.warp.sdk.R;
import ly.warp.sdk.activities.BillPaymentActivity;
import ly.warp.sdk.activities.CouponInfoActivity;
......@@ -104,25 +106,15 @@ public class HomeFragment extends BaseFragment implements View.OnClickListener {
})
.subscribe();
/********* TEST COUPONS DATA **********/
CouponList clist = new CouponList();
try {
clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"123456789\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
clist.add(new Coupon("{\"barcode\": \"a724e911a71a42408b6ba50ae6c08dbb\", \"coupon\": \"12345678910\", \"name\": \"\\u039a\\u03ac\\u03bd\\u03b5 strike\", \"description\": \"\\u03ba\\u03b1\\u03b9 \\u03ba\\u03ad\\u03c1\\u03b4\\u03b9\\u03c3\\u03b5!\", \"image\": \"https://warply.s3.amazonaws.com/artworks/034fba10ceac4e0f9338bd8e60086292/index.html\"}"));
} catch (JSONException e) {
e.printStackTrace();
}
/********* TEST COUPONS DATA **********/
mRecyclerCoupons = view.findViewById(R.id.rv_home_coupons);
mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
mAdapterCoupons = new HomeCouponAdapter(getContext(), clist);
mAdapterCoupons = new HomeCouponAdapter(getContext(), BaseFragment.getCouponList());
mRecyclerCoupons.setAdapter(mAdapterCoupons);
mAdapterCoupons.getPositionClicks()
.doOnNext(coupon -> {
Intent intent = new Intent(getContext(), CouponInfoActivity.class);
getContext().startActivity(intent);
intent.putExtra("coupon", (Serializable) coupon);
startActivity(intent);
})
.doOnError(error -> {
})
......@@ -138,7 +130,7 @@ public class HomeFragment extends BaseFragment implements View.OnClickListener {
public void onClick(View view) {
if (view.getId() == R.id.ll_bill_payment) {
Intent intent = new Intent(getContext(), BillPaymentActivity.class);
getContext().startActivity(intent);
startActivity(intent);
}
}
......
......@@ -158,7 +158,7 @@ public class LoyaltyFragment extends BaseFragment implements View.OnClickListene
public void onClick(View view) {
if (view.getId() == R.id.cl_rewards_wallet) {
Intent intent = new Intent(getContext(), LoyaltyActivity.class);
getContext().startActivity(intent);
startActivity(intent);
}
}
......
......@@ -12,6 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
......@@ -37,8 +39,8 @@ public class HomeCampaignAdapter extends RecyclerView.Adapter<HomeCampaignAdapte
public HomeCampaignViewHolder(View view) {
super(view);
ivCampaignTitle = view.findViewById(R.id.iv_campaign_logo);
tvCampaignTitle = view.findViewById(R.id.tv_campaign_title);
ivCampaignTitle = view.findViewById(R.id.imageView);
tvCampaignTitle = view.findViewById(R.id.textView);
}
}
......@@ -72,30 +74,26 @@ public class HomeCampaignAdapter extends RecyclerView.Adapter<HomeCampaignAdapte
public void onBindViewHolder(final HomeCampaignViewHolder holder, int position) {
Campaign campaignItem = mCampaigns.get(position);
// if (campaignItem != null) {
// if (!TextUtils.isEmpty(campaignItem.getLogoUrl())) {
// Glide.with(mContext)
//// .setDefaultRequestOptions(
//// RequestOptions
//// .placeholderOf(R.drawable.ic_default_contact_photo)
//// .error(R.drawable.ic_default_contact_photo))
// .load(campaignItem.getLogoUrl())
// .diskCacheStrategy(DiskCacheStrategy.DATA)
// .into(holder.ivCampaignTitle);
// } else {
// Glide.with(mContext)
// .load(R.drawable.ic_cosmote_logo_horizontal_grey)
// .into(holder.ivCampaignTitle);
// }
//
// holder.tvCampaignTitle.setText(campaignItem.getTitle());
//
// holder.itemView.setOnClickListener(v -> onClickSubject.onNext(campaignItem));
// }
if (campaignItem != null) {
if (!TextUtils.isEmpty(campaignItem.getLogoUrl())) {
Glide.with(mContext)
.load(campaignItem.getLogoUrl())
.transform(new CenterCrop(), new RoundedCorners(10))
.diskCacheStrategy(DiskCacheStrategy.DATA)
.into(holder.ivCampaignTitle);
} else {
Glide.with(mContext)
.load(R.drawable.ic_cosmote_logo_horizontal_grey)
.into(holder.ivCampaignTitle);
}
holder.tvCampaignTitle.setText(campaignItem.getTitle());
holder.itemView.setOnClickListener(v -> onClickSubject.onNext(campaignItem));
}
}
public Observable<Campaign> getPositionClicks() {
return onClickSubject.cache();
}
}
......
......@@ -46,7 +46,7 @@ public class HomeCouponAdapter extends RecyclerView.Adapter<HomeCouponAdapter.Ho
public HomeCouponViewHolder(View view) {
super(view);
ivCouponBackground = view.findViewById(R.id.imageView2);
// tvCouponTitle = view.findViewById(R.id.tv_coupon_subtitle);
tvCouponTitle = view.findViewById(R.id.tv_coupon_subtitle);
}
}
......@@ -100,7 +100,7 @@ public class HomeCouponAdapter extends RecyclerView.Adapter<HomeCouponAdapter.Ho
// .into(holder.ivCouponTitle);
// }
// holder.tvCouponTitle.setText(couponItem.getName());
holder.tvCouponTitle.setText(couponItem.getName());
if (isBurnt)
holder.ivCouponBackground.setColorFilter(ContextCompat.getColor(mContext, R.color.grey_light2), android.graphics.PorterDuff.Mode.MULTIPLY);
......
......@@ -12,6 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
......@@ -75,11 +77,8 @@ public class ProfileCampaignAdapter extends RecyclerView.Adapter<ProfileCampaign
if (campaignItem != null) {
if (!TextUtils.isEmpty(campaignItem.getLogoUrl())) {
Glide.with(mContext)
// .setDefaultRequestOptions(
// RequestOptions
// .placeholderOf(R.drawable.ic_default_contact_photo)
// .error(R.drawable.ic_default_contact_photo))
.load(campaignItem.getLogoUrl())
.transform(new CenterCrop(), new RoundedCorners(4))
.diskCacheStrategy(DiskCacheStrategy.DATA)
.into(holder.ivCampaignTitle);
} else {
......
......@@ -80,7 +80,7 @@
android:gravity="center_horizontal"
android:inputType="textPersonName"
android:text="0€"
android:textSize="25dp"
android:textSize="26sp"
android:textColor="#2F4455"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintEnd_toEndOf="@+id/view"
......@@ -95,8 +95,9 @@
android:layout_height="54dp"
android:ems="10"
android:hint="Αριθμός Λογαριασμού"
android:inputType="textPersonName"
android:textSize="15dp"
android:inputType="text"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintEnd_toEndOf="@+id/view"
app:layout_constraintHorizontal_bias="0.47"
......@@ -111,6 +112,7 @@
android:layout_marginBottom="28dp"
android:background="@drawable/round_border_green"
android:text="Πληρωμή"
android:textStyle="bold"
android:textAllCaps="false"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@+id/view"
......
......@@ -2,6 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@android:color/white">
<androidx.constraintlayout.widget.ConstraintLayout
......@@ -69,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:paddingHorizontal="32dp"
android:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!"
tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!"
android:textColor="#415564"
android:textSize="18sp"
android:textStyle="bold"
......@@ -84,7 +85,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:paddingHorizontal="32dp"
android:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης"
tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης"
android:textColor="#415564"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
......@@ -113,7 +114,7 @@
android:layout_marginTop="12dp"
android:background="@drawable/banner_border_light_blue"
android:gravity="center"
android:text="1A2C378"
tools:text="1A2C378"
android:textColor="#415564"
android:textSize="25dp"
android:textStyle="bold"
......@@ -126,7 +127,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Το κουπόνι ισχύει έως 05/12/2022"
tools:text="@string/cos_coupon_date"
android:textColor="#415564"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
......@@ -19,8 +19,8 @@
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/carousel_banner"
android:scaleType="fitXY"
tools:src="@drawable/carousel_banner"
android:scaleType="centerCrop"
tools:layout_editor_absoluteY="-44dp" />
</LinearLayout>
......@@ -33,7 +33,7 @@
android:textSize="15sp"
android:textStyle="bold"
android:textColor="@color/grey"
android:text="Χρόνια πολλά με υγεία! Σου κάνουμε δώρο 5GB για τη γιορτή σου!"
tools:text="Χρόνια πολλά με υγεία! Σου κάνουμε δώρο 5GB για τη γιορτή σου!"
app:layout_constraintTop_toBottomOf="@+id/ll_carousel_icon"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
......@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/width_full"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_marginStart="10dp">
<androidx.constraintlayout.widget.Guideline
......@@ -72,7 +73,7 @@
android:layout_marginBottom="24dp"
android:maxLines="2"
android:layout_marginTop="8dp"
android:text="10€ έκπτωση στα ψώνια σου στα supermarket Σκλαβενίτης!"
tools:text="10€ έκπτωση στα ψώνια σου στα supermarket Σκλαβενίτης!"
android:textColor="@color/grey"
android:textFontWeight="600"
android:textSize="16sp"
......
......@@ -3,58 +3,55 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="550dp"
android:layout_gravity="center_horizontal">
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingHorizontal="16dp"
android:paddingVertical="56dp">
<TextView
android:id="@+id/textView5"
android:layout_width="243dp"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="54dp"
android:layout_marginTop="38dp"
android:layout_marginEnd="63dp"
android:layout_marginHorizontal="48dp"
android:gravity="center"
android:text="Συγχαρητήρια!"
android:textColor="#0072C9"
android:textFontWeight="1000"
android:textSize="25dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.46"
tools:layout_editor_absoluteX="87dp" />
android:textSize="25sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView6"
android:layout_width="336dp"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_below="@+id/textView5"
android:layout_alignStart="@+id/textView5"
android:layout_alignEnd="@+id/textView5"
android:layout_marginStart="-16dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="-24dp"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginHorizontal="48dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="24dp"
android:gravity="center"
android:text="Κέρδισες 1GB για 7 ημέρες!"
android:textColor="#5B5B5B"
android:textSize="18dp" />
android:textFontWeight="500"
android:textSize="18sp" />
<TextView
android:id="@+id/textView7"
android:layout_width="351dp"
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_below="@+id/textView6"
android:layout_alignStart="@+id/textView6"
android:layout_alignEnd="@+id/textView6"
android:layout_marginStart="-5dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="-14dp"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginHorizontal="48dp"
android:layout_marginTop="4dp"
android:gravity="center"
android:text="Για σένα που είσαι πολλά χρόνια μαζί μας έχουμε επιπλέον δώρα!"
android:textColor="#858C96"
android:textSize="15dp"
android:textSize="16sp"
tools:layout_editor_absoluteX="26dp"
tools:layout_editor_absoluteY="177dp" />
......@@ -63,21 +60,20 @@
android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_below="@+id/textView7"
android:layout_alignStart="@+id/textView7"
android:layout_alignEnd="@+id/textView7"
android:layout_marginStart="-8dp"
android:layout_marginTop="38dp"
android:layout_marginEnd="-3dp"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="40dp"
android:background="@drawable/banner_border_grey_bg"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:paddingHorizontal="16dp">
<TextView
android:id="@+id/tv_lucky_draw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:gravity="center"
android:text="Μy Lucky Day Draw"
android:textColor="#3A5266"
android:textSize="17dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -90,23 +86,21 @@
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_below="@+id/constraintLayout"
android:layout_alignStart="@+id/constraintLayout"
android:layout_alignEnd="@+id/constraintLayout"
android:layout_marginStart="1dp"
android:layout_marginTop="33dp"
android:layout_marginEnd="3dp"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="32dp"
android:background="@drawable/banner_border_grey_bg"
android:gravity="center_vertical"
android:paddingHorizontal="5dp">
android:paddingHorizontal="16dp">
<TextView
android:id="@+id/tv_cosmote_tv_pass"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:gravity="center"
android:text="Day Free COSMOTE TV pass στο κινητό"
android:textColor="#3A5266"
android:textSize="17dp"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -117,23 +111,21 @@
android:layout_width="wrap_content"
android:layout_height="59dp"
android:layout_below="@+id/constraintLayout3"
android:layout_alignStart="@+id/constraintLayout3"
android:layout_alignEnd="@+id/constraintLayout3"
android:layout_marginStart="2dp"
android:layout_marginTop="29dp"
android:layout_marginEnd="1dp"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="32dp"
android:background="@drawable/banner_border_grey_bg"
android:gravity="center_vertical"
android:paddingHorizontal="5dp">
android:paddingHorizontal="16dp">
<TextView
android:id="@+id/tv_ikea_coupon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:gravity="center"
android:text="Δωρεάν κουπόνι ΙΚΕΑ αξίας 10€"
android:textColor="#3A5266"
android:textSize="17dp"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
......@@ -6,7 +6,7 @@
<string name="rate_dialog_negative">No, Thanks</string>
<string name="cos_profile_tab">Profile</string>
<string name="welcome_user">Γεία σου %1$s !</string>
<string name="welcome_user">Γεια σου %1$s !</string>
<string name="cos_profile_name">%1$s</string>
<string name="cos_profile_type">Traveller</string>
<string name="header_add">Προσθήκη</string>
......@@ -25,6 +25,7 @@
<string name="cos_gifts_loyalty_title">Τα δώρα μου</string>
<string name="cos_coupons_loyalty_title">Ενεργά κουπόνια</string>
<string name="cos_coupon_info_title">Εκπτωτικό κουπόνι</string>
<string name="cos_coupon_date">Το κουπόνι ισχύει έως %1$s</string>
<string-array name="coupons_array">
<item>Κουπόνια</item>
......
......@@ -32,4 +32,9 @@
<item name="android:background">@drawable/selector_spinner_arrow</item>
</style>
<style name="PopUpDialog" parent="Base.Theme.AppCompat.Dialog">
<item name="android:windowMinWidthMajor">90%</item>
<item name="android:windowMinWidthMinor">90%</item>
</style>
</resources>
\ No newline at end of file
......