Panagiotis Triantafyllou

tets commit 2

......@@ -32,6 +32,11 @@
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.BillPaymentActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.dexter.PermissionsActivity"
android:exported="false"
android:launchMode="singleInstance"
......
......@@ -29,7 +29,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_bill_payment);
mIvBack = findViewById(R.id.iv_back);
// mIvBack = findViewById(R.id.iv_back);
initViews();
}
......@@ -51,7 +51,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
// ===========================================================
private void initViews() {
mIvBack.setOnClickListener(this);
// mIvBack.setOnClickListener(this);
}
// ===========================================================
......
package ly.warp.sdk.fragments;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
......@@ -17,6 +18,8 @@ import androidx.recyclerview.widget.RecyclerView;
import org.json.JSONException;
import ly.warp.sdk.R;
import ly.warp.sdk.activities.BillPaymentActivity;
import ly.warp.sdk.activities.LoyaltyActivity;
import ly.warp.sdk.views.adapters.HomeCampaignAdapter;
import ly.warp.sdk.views.adapters.HomeCouponAdapter;
import ly.warp.sdk.activities.WarpViewActivity;
......@@ -117,9 +120,12 @@ public class HomeFragment extends Fragment {
mRecyclerCoupons.setAdapter(mAdapterCoupons);
mAdapterCoupons.getPositionClicks()
.doOnNext(coupon -> {
getContext().startActivity(
WarpViewActivity.createIntentFromSessionUUID(getContext(),
coupon.getCoupon()));
// getContext().startActivity(
// WarpViewActivity.createIntentFromSessionUUID(getContext(),
// coupon.getCoupon()));
Intent intent = new Intent(getContext(), BillPaymentActivity.class);
getContext().startActivity(intent);
})
.doOnError(error -> {
})
......
......@@ -52,15 +52,14 @@
app:layout_constraintStart_toStartOf="parent" />
<RelativeLayout
android:id="@+id/rl_gifts_row"
android:id="@+id/rl_coupons_row"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:background="@color/cos_cyan"
app:layout_constraintTop_toBottomOf="@+id/cl_loyalty_info_banner">
<TextView
android:id="@+id/tv_gifts_loyalty_title"
android:id="@+id/tv_coupons_loyalty_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
......@@ -73,7 +72,7 @@
android:id="@+id/rl_home_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_gifts_loyalty_title">
android:layout_below="@id/tv_coupons_loyalty_title">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_loyalty_coupons"
......@@ -86,34 +85,36 @@
</LinearLayout>
</RelativeLayout>
<!-- <RelativeLayout-->
<!-- android:id="@+id/rl_gifts_row"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@color/cos_cyan"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/cl_loyalty_info_banner">-->
<RelativeLayout
android:id="@+id/rl_gifts_row"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cos_cyan"
app:layout_constraintTop_toBottomOf="@+id/rl_coupons_row">
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_loyalty_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/cos_gifts_loyalty_title"-->
<!-- android:textColor="@color/grey"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold" />-->
<TextView
android:id="@+id/tv_gifts_loyalty_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/cos_gifts_loyalty_title"
android:textColor="@color/grey"
android:textSize="18sp"
android:textStyle="bold" />
<!-- <HorizontalScrollView-->
<!-- android:id="@+id/ll_add"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@id/tv_gifts_loyalty_title"-->
<!-- android:background="@android:color/white"-->
<!-- android:scrollbars="none">-->
<HorizontalScrollView
android:id="@+id/ll_add"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_gifts_loyalty_title"
android:background="@android:color/white"
android:scrollbars="none">
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="400dp"-->
<!-- android:layout_height="200dp"-->
<!-- android:layout_marginStart="10dp">-->
<RelativeLayout
android:layout_width="360dp"
android:layout_height="200dp"
android:layout_marginStart="10dp"
android:background="@color/cos_cyan">
<!-- <androidx.constraintlayout.widget.Guideline-->
<!-- android:id="@+id/gl_horizontal_80_guideline"-->
......@@ -186,9 +187,9 @@
<!-- android:textFontWeight="600" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </HorizontalScrollView>-->
<!-- </RelativeLayout>-->
</RelativeLayout>
</HorizontalScrollView>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</RelativeLayout>
......