Panagiotis Triantafyllou

redesign changes

......@@ -101,7 +101,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
e.printStackTrace();
}
simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_coupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_mycoupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
if (!TextUtils.isEmpty(mCoupon.getImage())) {
Glide.with(this)
......@@ -118,7 +118,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
.into(mIvCouponPhoto);
}
mIvBack.setOnClickListener(this);
mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
// mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
mLlGiftIt.setOnClickListener(this);
createBarcodeBitmap(mCoupon.getCoupon());
......
......@@ -2,7 +2,6 @@ package ly.warp.sdk.activities;
import android.app.Activity;
import android.app.Dialog;
import android.graphics.Paint;
import android.os.Bundle;
import android.text.Html;
import android.text.TextUtils;
......@@ -35,12 +34,13 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
// Fields
// ===========================================================
private ImageView mIvBack, mIvCouponsetPhoto;
private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle;
private ImageView mIvBack, mIvCouponsetPhoto, mIvTermsArrow;
private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle, mTvTermsValue;
private Couponset mCouponset;
private LinearLayout mLlRedeem;
private LinearLayout mLlRedeem, mLlTerms;
private ProgressBar mPbLoading;
private Coupon mCoupon;
private boolean mIsTermsPressed = false;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -60,6 +60,9 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
mIvCouponsetPhoto = findViewById(R.id.imageView6);
mLlRedeem = findViewById(R.id.ll_get_gift);
mPbLoading = findViewById(R.id.pb_loading);
mLlTerms = findViewById(R.id.ll_terms_inner);
mTvTermsValue = findViewById(R.id.tv_terms_value);
mIvTermsArrow = findViewById(R.id.iv_terms_arrow);
initViews();
}
......@@ -78,6 +81,18 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
if (view.getId() == R.id.ll_get_gift) {
mPbLoading.setVisibility(View.VISIBLE);
WarplyManager.redeemCoupon(new WarplyRedeemCouponRequest().setCouponsetUuid(mCouponset.getUuid()), mRedeemCouponCallback);
return;
}
if (view.getId() == R.id.ll_terms_inner) {
if (mIsTermsPressed) {
mIsTermsPressed = false;
mTvTermsValue.setVisibility(View.GONE);
mIvTermsArrow.setImageDrawable(getDrawable(R.drawable.ic_down_dark));
} else {
mIsTermsPressed = true;
mTvTermsValue.setVisibility(View.VISIBLE);
mIvTermsArrow.setImageDrawable(getDrawable(R.drawable.ic_up_dark));
}
}
}
......@@ -88,6 +103,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
private void initViews() {
mTvCouponsetTitle.setText(mCouponset.getName());
mTvCouponsetSubtitle.setText(Html.fromHtml(mCouponset.getDescription()));
mLlTerms.setOnClickListener(this);
mTvTermsValue.setText(Html.fromHtml(mCouponset.getTerms()));
if (!TextUtils.isEmpty(mCouponset.getImgPreview())) {
Glide.with(this)
......@@ -106,7 +123,7 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
mIvBack.setOnClickListener(this);
mLlRedeem.setOnClickListener(this);
mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
// mTvTerms.setPaintFlags(mTvTerms.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
}
private final CallbackReceiver<JSONObject> mRedeemCouponCallback = new CallbackReceiver<JSONObject>() {
......
......@@ -143,10 +143,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
mIvBack.setOnClickListener(this);
// mTvAnalysisButton.setOnClickListener(this);
mLlQuestionnaire.setOnClickListener(this);
mTvActiveCoupons.setText(String.format(getResources().getString(R.string.cos_active_coupons), String.valueOf(cpnlist)));
mTvActiveCoupons.setText(String.format(getResources().getString(R.string.cos_active_coupons), String.valueOf(cpnlist.size())));
mClActiveCoupons.setOnClickListener(this);
//TODO: change the parameter, for testing purposes only
mTvActiveRewards.setText(String.format(getResources().getString(R.string.cos_active_rewards), String.valueOf(cpnlist)));
mTvActiveRewards.setText(String.format(getResources().getString(R.string.cos_active_rewards), String.valueOf(cpnlist.size())));
mClActiveRewards.setOnClickListener(this);
mLlAnalysisButton.setOnClickListener(this);
mLlPastCoupons.setOnClickListener(this);
......
......@@ -4,12 +4,14 @@ import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import ly.warp.sdk.R;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.views.adapters.ProfileCampaignAdapter;
......@@ -24,10 +26,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
// Fields
// ===========================================================
private ImageView mIvBack;
private ImageView mIvBack, mIvPopupClose;
private RecyclerView mRecyclerMore;
private TextView mTvTitle;
private ProfileCampaignAdapter mAdapterMore;
private LinearLayout mLlMorePopup;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -40,6 +43,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
mIvBack = findViewById(R.id.iv_list_close);
mTvTitle = findViewById(R.id.textView3);
mIvPopupClose = findViewById(R.id.iv_popup_more_close);
mLlMorePopup = findViewById(R.id.ll_more_popup);
mRecyclerMore = findViewById(R.id.rv_more);
......@@ -55,6 +60,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
public void onClick(View view) {
if (view.getId() == R.id.iv_list_close) {
onBackPressed();
return;
}
if (view.getId() == R.id.iv_popup_more_close) {
mLlMorePopup.setVisibility(View.GONE);
WarpUtils.setMorePopup(this, false);
}
}
......@@ -65,6 +75,10 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
private void initViews() {
mIvBack.setOnClickListener(this);
mTvTitle.setText(getIntent().getStringExtra("title"));
mIvPopupClose.setOnClickListener(this);
if (WarpUtils.getMorePopup(this))
mLlMorePopup.setVisibility(View.VISIBLE);
if (WarplyManagerHelper.getUniqueCampaignList().get("more_for_you") != null && WarplyManagerHelper.getUniqueCampaignList().get("more_for_you").size() > 0) {
mRecyclerMore.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/cos_light_grey"/>
<corners android:radius="10dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/cos_green9"
android:endColor="@color/cos_skyblue"
android:type="linear"/>
<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"
android:shape="rectangle">
<corners android:radius="7dp" />
<corners android:radius="12dp" />
<solid
android:width="2dp"
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="7dp" />
<corners android:radius="12dp" />
<solid
android:width="2dp"
......
<?xml version="1.0" encoding="utf-8"?><!--<shape xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- android:shape="rectangle">-->
<!-- <corners android:topLeftRadius="30dp" />-->
<!-- <solid android:color="@color/grey_light" />-->
<!--&lt;!&ndash; <stroke&ndash;&gt;-->
<!--&lt;!&ndash; android:width="1dp"&ndash;&gt;-->
<!--&lt;!&ndash; android:color="@color/cos_green" />&ndash;&gt;-->
<!--</shape>-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:topLeftRadius="30dp" />
<gradient
android:angle="180"
android:endColor="@color/cos_cyan2"
android:startColor="@color/cos_green7" />
</shape>
</item>
<item android:top="4dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="30dp" />
<solid android:color="@android:color/white" />
<!-- <stroke-->
<!-- android:width="1dp"-->
<!-- android:color="@color/cos_green" />-->
</shape>
</item>
</layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1.5dp"
android:width="1dp"
android:color="@color/cos_dark_blue" />
<corners
......
......@@ -48,7 +48,7 @@
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_coupon_info"
android:background="@drawable/shape_cos_loyalty_white"
android:paddingBottom="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -58,6 +58,7 @@
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="224dp"
android:layout_marginTop="4dp"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
......@@ -69,6 +70,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:gravity="center"
android:paddingHorizontal="32dp"
android:textColor="#415564"
android:textSize="18sp"
......@@ -84,6 +86,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:paddingHorizontal="32dp"
android:textColor="#415564"
android:textSize="16sp"
......@@ -112,9 +115,9 @@
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="12dp"
android:background="@drawable/banner_border_light_blue"
android:background="@drawable/banner_border_light_grey"
android:gravity="center"
android:textColor="#415564"
android:textColor="@color/grey"
android:textSize="25dp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
......@@ -156,11 +159,11 @@
<LinearLayout
android:id="@+id/ll_gift_it"
android:layout_width="match_parent"
android:layout_width="240dp"
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="64dp"
android:background="@drawable/button_border_grey"
android:background="@drawable/selector_button_green"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
......@@ -178,10 +181,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Κάντο δώρο!"
android:textColor="@color/cos_green6"
android:textFontWeight="600"
android:textSize="17dp" />
android:text="@string/cos_gift_it"
android:textColor="@color/white"
android:textSize="17dp"
android:textStyle="bold" />
</LinearLayout>
<!-- <LinearLayout-->
......@@ -208,18 +211,42 @@
<!-- android:textStyle="bold" />-->
<!-- </LinearLayout>-->
<RelativeLayout
android:id="@+id/rl_terms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_gift_it">
<LinearLayout
android:id="@+id/ll_terms_inner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_terms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Όροι χρήσης"
android:textColor="#415564"
android:textFontWeight="600"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_gift_it" />
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_terms_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="6dp"
android:layout_marginTop="2dp"
android:src="@drawable/ic_down_dark" />
</LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/iv_barcode"
......
......@@ -49,7 +49,7 @@
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_coupon_info"
android:background="@drawable/shape_cos_loyalty_white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
......@@ -58,17 +58,19 @@
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="224dp"
android:layout_marginTop="4dp"
android:scaleType="centerCrop"
android:src="@drawable/carousel_banner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:siShape="@drawable/shape_top_left_rounded" />
app:siShape="@drawable/shape_top_left_rounded"
tools:src="@drawable/carousel_banner" />
<TextView
android:id="@+id/textView13"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:gravity="center"
android:paddingHorizontal="32dp"
android:textColor="#415564"
android:textSize="18sp"
......@@ -84,6 +86,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:paddingHorizontal="32dp"
android:textColor="#415564"
android:textSize="16sp"
......@@ -94,14 +97,14 @@
<LinearLayout
android:id="@+id/ll_get_gift"
android:layout_width="match_parent"
android:layout_width="240dp"
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
android:layout_marginBottom="32dp"
android:background="@drawable/selector_button_green"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/tv_terms"
app:layout_constraintBottom_toTopOf="@+id/rl_terms"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
......@@ -115,18 +118,53 @@
android:textStyle="bold" />
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_terms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="32dp"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/ll_terms_inner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_terms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/cos_coupon_terms_title"
android:textColor="#415564"
android:textFontWeight="600"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_terms_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="6dp"
android:layout_marginTop="2dp"
android:src="@drawable/ic_down_dark" />
</LinearLayout>
<TextView
android:id="@+id/tv_terms_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_terms_inner"
android:layout_marginTop="16dp"
android:textColor="@color/grey"
android:visibility="gone"
tools:text="@string/cos_coupon_date"
tools:visibility="visible" />
</RelativeLayout>
<ProgressBar
android:id="@+id/pb_loading"
......
......@@ -39,9 +39,9 @@
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:layout_marginVertical="24dp"
android:paddingHorizontal="24dp"
android:background="@android:color/white">
android:layout_marginBottom="24dp"
android:background="@android:color/white"
android:paddingHorizontal="24dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/iv_profile_photo"
......@@ -75,16 +75,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@drawable/shape_cos_gradient"
android:background="@drawable/shape_cos_gradient6"
android:gravity="center"
android:paddingHorizontal="4dp"
android:visibility="gone">
android:paddingHorizontal="6dp"
android:paddingVertical="2dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textFontWeight="600"
tools:text="@string/cos_profile_type" />
</LinearLayout>
......@@ -119,7 +122,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_cos_profile_gradient"
android:background="@drawable/shape_cos_loyalty"
android:orientation="vertical"
android:paddingBottom="24dp">
......@@ -378,7 +381,8 @@
android:layout_marginBottom="32dp"
android:background="@drawable/selector_button_grey"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......
......@@ -41,13 +41,59 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/cl_more_header"
android:background="@drawable/shape_cos_profile_gradient"
android:background="@drawable/shape_cos_loyalty"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_more_popup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:background="@drawable/shape_cos_gradient5"
android:orientation="vertical"
android:paddingVertical="16dp"
android:visibility="gone">
<ImageView
android:id="@+id/iv_popup_more_close"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_close_white" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:scaleType="centerInside"
android:src="@drawable/ic_gifts_for_you_white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="24dp"
android:layout_marginBottom="12dp"
android:text="@string/cos_popup_more_title"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/cos_popup_more_subtitle"
android:textColor="@android:color/white"
android:textSize="16sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_more"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ll_more_popup"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="48dp"
android:clipToPadding="false"
......
......@@ -43,4 +43,7 @@
<color name="cos_grey5">#385267</color>
<color name="cos_blue3">#03A1D6</color>
<color name="cos_green8">#3AB588</color>
<color name="cos_light_grey">#F4F4F4</color>
<color name="cos_green9">#86C15F</color>
<color name="cos_skyblue">#13ACD4</color>
</resources>
\ No newline at end of file
......
......@@ -11,7 +11,7 @@
<string name="cos_profile_type">Traveller</string>
<string name="header_add">Προσθήκη</string>
<string name="cos_profile_reward">My Loyalty\nWallet</string>
<string name="cos_profile_title">My Loyalty Wallet</string>
<string name="cos_profile_title">My loyalty wallet</string>
<string name="cos_deals_title">Deals for You</string>
<string name="cos_profile_more">Δες περισσότερα</string>
<string name="cos_gifts_title">GIFTS for YOU</string>
......@@ -54,7 +54,7 @@
<string name="cos_annual">12Μηνο</string>
<string name="cos_analysis2">Αναλυτικά</string>
<string name="euro"></string>
<string name="cos_profile_questionnaire">+ Ερωτηματολόγιο</string>
<string name="cos_profile_questionnaire">Ερωτηματολόγιο</string>
<string name="cos_active_all_coupons">Ενεργά κουπόνια</string>
<string name="cos_active_all_rewards">Όλα τα δώρα μου</string>
<string name="cos_no_active_coupons">Δεν υπάρχουν κουπόνια</string>
......@@ -63,6 +63,10 @@
<string name="cos_coupon_expired_date">Εξαργυρώθηκε την %1$s</string>
<string name="cos_popup_gifts_title">COSMOTE GIFTS FOR YOU</string>
<string name="cos_popup_gifts_subtitle">Εδώ μπορείς να βρεις τα διαθέσιμα\nδώρα και προσφορές!</string>
<string name="cos_mycoupon_date">Το κουπόνι ισχύει έως %1$s</string>
<string name="cos_gift_it">Κάντο δώρο!</string>
<string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string>
<string name="cos_popup_more_subtitle">Εδώ μπορείς να βρεις διαγωνισμούς και\nνα σε επιβραβεύσουμε για τις αθλητικές σου\nδραστηριότητες!</string>
<string-array name="coupons_array">
<item>Κουπόνια</item>
......