open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
111cc51b 1 parent 5548a79d

ui changes

Inline Side-by-side
Showing 20 changed files with 136 additions and 51 deletions
......@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
public void onWarplyReady() {
if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
.setGuid("7000000900"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons
.setGuid("6012049139"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons
mLoginReceiver);
} else {
startNextActivity();
......
......@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
ext {
PUBLISH_GROUP_ID = 'ly.warp'
PUBLISH_VERSION = '4.5.4-cosbeta69'
PUBLISH_VERSION = '4.5.4-cosbeta70'
PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
}
......
......@@ -26,66 +26,79 @@
<activity
android:name="ly.warp.sdk.activities.WarpViewActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.LoyaltyAnalysisActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.CouponInfoActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.ActiveCouponsActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.GiftsForYouActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.MoreForYouActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.CouponsetInfoActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.LoyaltyWallet"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.ActiveGiftsActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.ShopsActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.CouponShareActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.TelcoActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.ContextualActivity"
android:exported="false"
android:theme="@style/SDKAppTheme"
android:screenOrientation="portrait" />
<activity
......
......@@ -51,7 +51,7 @@ import ly.warp.sdk.utils.managers.WarplyEventBusManager;
import ly.warp.sdk.views.adapters.ActiveCouponAdapter;
public class LoyaltyWallet extends Activity implements View.OnClickListener {
public class LoyaltyWallet extends Activity implements View.OnClickListener, View.OnScrollChangeListener {
// ===========================================================
// Constants
......@@ -66,14 +66,14 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate,
mTvActiveTitle, mTvActiveCouponsHeader;
private ConstraintLayout mClDealsBanner, mClDealsView,
mClGiftsBanner;
mClGiftsBanner, mClToolbar;
private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet;
FlowLayout mLlActiveCodesView;
private float couponDfyValue = 0.0f;
private RecyclerView mRecyclerCoupons;
private ActiveCouponAdapter mAdapterCoupons;
private AlertDialog mAlertDialogNonTelco;
private ScrollView mScActiveCodes;
private ScrollView mScActiveCodes, mSvLoyaltyWallet;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -105,6 +105,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
mLlEmptyWallet = findViewById(R.id.ll_empty_wallet);
mLlActiveCodesView = findViewById(R.id.ll_active_deals_codes_view);
mScActiveCodes = findViewById(R.id.sv_active_deals_codes_view);
mSvLoyaltyWallet = findViewById(R.id.sv_loyalty_wallet);
mClToolbar = findViewById(R.id.cl_loyalty_wallet_header);
// ArrayList<ActiveDFYCouponModel> dlist = new ArrayList<>();
// ActiveDFYCouponModel model = new ActiveDFYCouponModel();
......@@ -214,6 +216,19 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
}
@Override
public void onScrollChange(View view, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
if (scrollY > oldScrollY) {
mClToolbar.setElevation(14);
}
if (scrollY < oldScrollY) {
mClToolbar.setElevation(14);
}
if (scrollY == 0) {
mClToolbar.setElevation(0);
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == 1000) {
if (resultCode == RESULT_OK) {
......@@ -469,6 +484,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
mClDealsBanner.setOnClickListener(this);
mClGiftsBanner.setOnClickListener(this);
mClDealsView.setOnClickListener(this);
mSvLoyaltyWallet.setOnScrollChangeListener(this);
}
private void nonTelcoDialog() {
......

470 Bytes | W: | H:

412 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.01 KB | W: | H:

369 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="27dp" />
<solid android:color="@color/white" />
<solid android:color="@android:color/white" />
</shape>
\ No newline at end of file
......
......@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_marginBottom="16dp"
android:background="@drawable/ic_coupon_background">
<androidx.constraintlayout.widget.Guideline
......
......@@ -10,7 +10,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bill_header"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="50dp"
android:background="@android:color/white">
<ImageView
......@@ -39,21 +39,29 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- android:background="@drawable/shape_cos_loyalty"-->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty"
android:orientation="vertical">
android:orientation="vertical"
android:background="@color/cos_grey5">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_active_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="0.5dp"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingTop="44dp"
android:overScrollMode="never"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_line">
</LinearLayout>
</RelativeLayout>
<TextView
......
......@@ -44,27 +44,36 @@
android:layout_height="match_parent"
android:background="@android:color/white">
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty_white"
android:paddingBottom="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.github.siyamed.shapeimageview.mask.PorterShapeImageView
<ImageView
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="224dp"
android:layout_marginTop="4dp"
android:layout_marginTop="0.5dp"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:siShape="@drawable/shape_top_left_rounded"
tools:src="@drawable/carousel_banner" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_line"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView6">
</LinearLayout>
<TextView
android:id="@+id/textView13"
android:layout_width="match_parent"
......
......@@ -45,27 +45,36 @@
android:layout_height="match_parent"
android:background="@android:color/white">
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty_white"
android:paddingBottom="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.github.siyamed.shapeimageview.mask.PorterShapeImageView
<ImageView
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="224dp"
android:layout_marginTop="4dp"
android:layout_marginTop="0.5dp"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:siShape="@drawable/shape_top_left_rounded"
tools:src="@drawable/carousel_banner" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_line"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView6">
</LinearLayout>
<TextView
android:id="@+id/textView13"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
......
......@@ -44,27 +44,36 @@
android:layout_height="match_parent"
android:background="@android:color/white">
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty_white"
android:paddingBottom="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.github.siyamed.shapeimageview.mask.PorterShapeImageView
<ImageView
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="224dp"
android:layout_marginTop="4dp"
android:layout_marginTop="0.5dp"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:siShape="@drawable/shape_top_left_rounded"
tools:src="@drawable/carousel_banner" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_line"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView6">
</LinearLayout>
<TextView
android:id="@+id/textView13"
android:layout_width="match_parent"
......
......@@ -22,12 +22,12 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_info_title"
android:textColor="@color/grey"
android:textSize="17sp"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -45,28 +45,38 @@
android:layout_height="match_parent"
android:background="@android:color/white">
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty_white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.github.siyamed.shapeimageview.mask.PorterShapeImageView
<ImageView
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="224dp"
android:layout_marginTop="4dp"
android:layout_marginTop="0.5dp"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:siShape="@drawable/shape_top_left_rounded"
tools:src="@drawable/carousel_banner" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_line"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView6">
</LinearLayout>
<TextView
android:id="@+id/textView13"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
......@@ -74,7 +84,6 @@
android:paddingHorizontal="32dp"
android:textColor="#415564"
android:textSize="18sp"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.509"
app:layout_constraintStart_toStartOf="parent"
......@@ -83,6 +92,7 @@
<TextView
android:id="@+id/textView14"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
......@@ -90,7 +100,6 @@
android:paddingHorizontal="32dp"
android:textColor="#415564"
android:textSize="16sp"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13"
......@@ -110,13 +119,13 @@
app:layout_constraintStart_toStartOf="parent">
<TextView
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cos_redeem_coupon"
android:textColor="@color/white"
android:textSize="17dp"
fontPath="fonts/pf_square_sans_pro_medium.ttf" />
android:textSize="17dp" />
</LinearLayout>
<RelativeLayout
......@@ -139,11 +148,11 @@
<TextView
android:id="@+id/tv_terms"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_terms_title"
android:textColor="#415564"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:textSize="15sp" />
<ImageView
......@@ -157,13 +166,13 @@
<TextView
android:id="@+id/tv_terms_value"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
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"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
tools:text="@string/cos_coupon_date"
tools:visibility="visible" />
</RelativeLayout>
......
......@@ -34,10 +34,17 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ScrollView
android:id="@+id/sv_loyalty_wallet"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:fillViewport="true"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:orientation="vertical">
<LinearLayout
......@@ -111,17 +118,9 @@
</LinearLayout>
</LinearLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="-24dp"
android:fillViewport="true"
android:overScrollMode="never">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp">
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/ll_second_view"
......@@ -391,7 +390,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="2dp"
android:paddingBottom="40dp" />
android:paddingBottom="40dp"
android:overScrollMode="never"/>
<LinearLayout
android:id="@+id/ll_empty_wallet"
......@@ -420,6 +420,6 @@
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</ScrollView>
</LinearLayout>
</ScrollView>
</RelativeLayout>
......
......@@ -46,28 +46,34 @@
android:layout_height="match_parent"
android:background="@android:color/white">
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<RelativeLayout
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty_white"
android:paddingBottom="48dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.github.siyamed.shapeimageview.mask.PorterShapeImageView
<ImageView
android:id="@+id/imageView6"
android:layout_width="match_parent"
android:layout_height="224dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="4dp"
android:layout_marginTop="0.5dp"
android:scaleType="centerCrop"
app:siShape="@drawable/shape_top_left_rounded"
tools:src="@drawable/carousel_banner" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_line">
</LinearLayout>
<LinearLayout
android:id="@+id/ll_telco_gift_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -62,4 +62,6 @@
<color name="cos_blue5">#0D81B8</color>
<color name="cos_grey9">#757575</color>
<color name="cos_grey10">#53626E</color>
<color name="cos_green11">#78BE6D</color>
<color name="cos_skyblue3">#0FABD6</color>
</resources>
\ No newline at end of file
......
......@@ -13,7 +13,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">Tα προνόμιά μου</string>
<string name="cos_profile_title">Rewards</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>
......
......@@ -27,4 +27,9 @@
<item name="android:windowMinWidthMinor">90%</item>
</style>
<style name="SDKAppTheme" parent="Theme.AppCompat.Light">
<item name="android:statusBarColor">@android:color/white</item>
<item name="android:windowLightStatusBar">true</item>
</style>
</resources>
\ No newline at end of file
......