Showing
4 changed files
with
49 additions
and
37 deletions
| ... | @@ -32,6 +32,11 @@ | ... | @@ -32,6 +32,11 @@ |
| 32 | android:screenOrientation="portrait" /> | 32 | android:screenOrientation="portrait" /> |
| 33 | 33 | ||
| 34 | <activity | 34 | <activity |
| 35 | + android:name="ly.warp.sdk.activities.BillPaymentActivity" | ||
| 36 | + android:exported="false" | ||
| 37 | + android:screenOrientation="portrait" /> | ||
| 38 | + | ||
| 39 | + <activity | ||
| 35 | android:name="ly.warp.sdk.dexter.PermissionsActivity" | 40 | android:name="ly.warp.sdk.dexter.PermissionsActivity" |
| 36 | android:exported="false" | 41 | android:exported="false" |
| 37 | android:launchMode="singleInstance" | 42 | android:launchMode="singleInstance" | ... | ... |
| ... | @@ -29,7 +29,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene | ... | @@ -29,7 +29,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene |
| 29 | super.onCreate(savedInstanceState); | 29 | super.onCreate(savedInstanceState); |
| 30 | setContentView(R.layout.fragment_bill_payment); | 30 | setContentView(R.layout.fragment_bill_payment); |
| 31 | 31 | ||
| 32 | - mIvBack = findViewById(R.id.iv_back); | 32 | +// mIvBack = findViewById(R.id.iv_back); |
| 33 | 33 | ||
| 34 | initViews(); | 34 | initViews(); |
| 35 | } | 35 | } |
| ... | @@ -51,7 +51,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene | ... | @@ -51,7 +51,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene |
| 51 | // =========================================================== | 51 | // =========================================================== |
| 52 | 52 | ||
| 53 | private void initViews() { | 53 | private void initViews() { |
| 54 | - mIvBack.setOnClickListener(this); | 54 | +// mIvBack.setOnClickListener(this); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | // =========================================================== | 57 | // =========================================================== | ... | ... |
| 1 | package ly.warp.sdk.fragments; | 1 | package ly.warp.sdk.fragments; |
| 2 | 2 | ||
| 3 | +import android.content.Intent; | ||
| 3 | import android.os.Bundle; | 4 | import android.os.Bundle; |
| 4 | import android.util.Log; | 5 | import android.util.Log; |
| 5 | import android.view.LayoutInflater; | 6 | import android.view.LayoutInflater; |
| ... | @@ -17,6 +18,8 @@ import androidx.recyclerview.widget.RecyclerView; | ... | @@ -17,6 +18,8 @@ import androidx.recyclerview.widget.RecyclerView; |
| 17 | import org.json.JSONException; | 18 | import org.json.JSONException; |
| 18 | 19 | ||
| 19 | import ly.warp.sdk.R; | 20 | import ly.warp.sdk.R; |
| 21 | +import ly.warp.sdk.activities.BillPaymentActivity; | ||
| 22 | +import ly.warp.sdk.activities.LoyaltyActivity; | ||
| 20 | import ly.warp.sdk.views.adapters.HomeCampaignAdapter; | 23 | import ly.warp.sdk.views.adapters.HomeCampaignAdapter; |
| 21 | import ly.warp.sdk.views.adapters.HomeCouponAdapter; | 24 | import ly.warp.sdk.views.adapters.HomeCouponAdapter; |
| 22 | import ly.warp.sdk.activities.WarpViewActivity; | 25 | import ly.warp.sdk.activities.WarpViewActivity; |
| ... | @@ -117,9 +120,12 @@ public class HomeFragment extends Fragment { | ... | @@ -117,9 +120,12 @@ public class HomeFragment extends Fragment { |
| 117 | mRecyclerCoupons.setAdapter(mAdapterCoupons); | 120 | mRecyclerCoupons.setAdapter(mAdapterCoupons); |
| 118 | mAdapterCoupons.getPositionClicks() | 121 | mAdapterCoupons.getPositionClicks() |
| 119 | .doOnNext(coupon -> { | 122 | .doOnNext(coupon -> { |
| 120 | - getContext().startActivity( | 123 | +// getContext().startActivity( |
| 121 | - WarpViewActivity.createIntentFromSessionUUID(getContext(), | 124 | +// WarpViewActivity.createIntentFromSessionUUID(getContext(), |
| 122 | - coupon.getCoupon())); | 125 | +// coupon.getCoupon())); |
| 126 | + | ||
| 127 | + Intent intent = new Intent(getContext(), BillPaymentActivity.class); | ||
| 128 | + getContext().startActivity(intent); | ||
| 123 | }) | 129 | }) |
| 124 | .doOnError(error -> { | 130 | .doOnError(error -> { |
| 125 | }) | 131 | }) | ... | ... |
| ... | @@ -52,15 +52,14 @@ | ... | @@ -52,15 +52,14 @@ |
| 52 | app:layout_constraintStart_toStartOf="parent" /> | 52 | app:layout_constraintStart_toStartOf="parent" /> |
| 53 | 53 | ||
| 54 | <RelativeLayout | 54 | <RelativeLayout |
| 55 | - android:id="@+id/rl_gifts_row" | 55 | + android:id="@+id/rl_coupons_row" |
| 56 | android:layout_width="match_parent" | 56 | android:layout_width="match_parent" |
| 57 | android:layout_height="wrap_content" | 57 | android:layout_height="wrap_content" |
| 58 | android:layout_marginTop="32dp" | 58 | android:layout_marginTop="32dp" |
| 59 | - android:background="@color/cos_cyan" | ||
| 60 | app:layout_constraintTop_toBottomOf="@+id/cl_loyalty_info_banner"> | 59 | app:layout_constraintTop_toBottomOf="@+id/cl_loyalty_info_banner"> |
| 61 | 60 | ||
| 62 | <TextView | 61 | <TextView |
| 63 | - android:id="@+id/tv_gifts_loyalty_title" | 62 | + android:id="@+id/tv_coupons_loyalty_title" |
| 64 | android:layout_width="wrap_content" | 63 | android:layout_width="wrap_content" |
| 65 | android:layout_height="wrap_content" | 64 | android:layout_height="wrap_content" |
| 66 | android:layout_marginStart="10dp" | 65 | android:layout_marginStart="10dp" |
| ... | @@ -73,7 +72,7 @@ | ... | @@ -73,7 +72,7 @@ |
| 73 | android:id="@+id/rl_home_coupons" | 72 | android:id="@+id/rl_home_coupons" |
| 74 | android:layout_width="match_parent" | 73 | android:layout_width="match_parent" |
| 75 | android:layout_height="wrap_content" | 74 | android:layout_height="wrap_content" |
| 76 | - android:layout_below="@id/tv_gifts_loyalty_title"> | 75 | + android:layout_below="@id/tv_coupons_loyalty_title"> |
| 77 | 76 | ||
| 78 | <androidx.recyclerview.widget.RecyclerView | 77 | <androidx.recyclerview.widget.RecyclerView |
| 79 | android:id="@+id/rv_loyalty_coupons" | 78 | android:id="@+id/rv_loyalty_coupons" |
| ... | @@ -86,34 +85,36 @@ | ... | @@ -86,34 +85,36 @@ |
| 86 | </LinearLayout> | 85 | </LinearLayout> |
| 87 | </RelativeLayout> | 86 | </RelativeLayout> |
| 88 | 87 | ||
| 89 | - <!-- <RelativeLayout--> | 88 | + <RelativeLayout |
| 90 | - <!-- android:id="@+id/rl_gifts_row"--> | 89 | + android:id="@+id/rl_gifts_row" |
| 91 | - <!-- android:layout_width="match_parent"--> | 90 | + android:layout_width="match_parent" |
| 92 | - <!-- android:layout_height="wrap_content"--> | 91 | + android:layout_height="wrap_content" |
| 93 | - <!-- android:background="@color/cos_cyan"--> | 92 | + android:background="@color/cos_cyan" |
| 94 | - <!-- app:layout_constraintTop_toBottomOf="@+id/cl_loyalty_info_banner">--> | 93 | + app:layout_constraintTop_toBottomOf="@+id/rl_coupons_row"> |
| 95 | 94 | ||
| 96 | - <!-- <TextView--> | 95 | + <TextView |
| 97 | - <!-- android:id="@+id/tv_gifts_loyalty_title"--> | 96 | + android:id="@+id/tv_gifts_loyalty_title" |
| 98 | - <!-- android:layout_width="wrap_content"--> | 97 | + android:layout_width="wrap_content" |
| 99 | - <!-- android:layout_height="wrap_content"--> | 98 | + android:layout_height="wrap_content" |
| 100 | - <!-- android:text="@string/cos_gifts_loyalty_title"--> | 99 | + android:layout_marginStart="10dp" |
| 101 | - <!-- android:textColor="@color/grey"--> | 100 | + android:text="@string/cos_gifts_loyalty_title" |
| 102 | - <!-- android:textSize="18sp"--> | 101 | + android:textColor="@color/grey" |
| 103 | - <!-- android:textStyle="bold" />--> | 102 | + android:textSize="18sp" |
| 103 | + android:textStyle="bold" /> | ||
| 104 | 104 | ||
| 105 | - <!-- <HorizontalScrollView--> | 105 | + <HorizontalScrollView |
| 106 | - <!-- android:id="@+id/ll_add"--> | 106 | + android:id="@+id/ll_add" |
| 107 | - <!-- android:layout_width="match_parent"--> | 107 | + android:layout_width="match_parent" |
| 108 | - <!-- android:layout_height="wrap_content"--> | 108 | + android:layout_height="wrap_content" |
| 109 | - <!-- android:layout_below="@id/tv_gifts_loyalty_title"--> | 109 | + android:layout_below="@id/tv_gifts_loyalty_title" |
| 110 | - <!-- android:background="@android:color/white"--> | 110 | + android:background="@android:color/white" |
| 111 | - <!-- android:scrollbars="none">--> | 111 | + android:scrollbars="none"> |
| 112 | 112 | ||
| 113 | - <!-- <androidx.constraintlayout.widget.ConstraintLayout--> | 113 | + <RelativeLayout |
| 114 | - <!-- android:layout_width="400dp"--> | 114 | + android:layout_width="360dp" |
| 115 | - <!-- android:layout_height="200dp"--> | 115 | + android:layout_height="200dp" |
| 116 | - <!-- android:layout_marginStart="10dp">--> | 116 | + android:layout_marginStart="10dp" |
| 117 | + android:background="@color/cos_cyan"> | ||
| 117 | 118 | ||
| 118 | <!-- <androidx.constraintlayout.widget.Guideline--> | 119 | <!-- <androidx.constraintlayout.widget.Guideline--> |
| 119 | <!-- android:id="@+id/gl_horizontal_80_guideline"--> | 120 | <!-- android:id="@+id/gl_horizontal_80_guideline"--> |
| ... | @@ -186,9 +187,9 @@ | ... | @@ -186,9 +187,9 @@ |
| 186 | <!-- android:textFontWeight="600" />--> | 187 | <!-- android:textFontWeight="600" />--> |
| 187 | <!-- </LinearLayout>--> | 188 | <!-- </LinearLayout>--> |
| 188 | <!-- </RelativeLayout>--> | 189 | <!-- </RelativeLayout>--> |
| 189 | - <!-- </androidx.constraintlayout.widget.ConstraintLayout>--> | 190 | + </RelativeLayout> |
| 190 | - <!-- </HorizontalScrollView>--> | 191 | + </HorizontalScrollView> |
| 191 | - <!-- </RelativeLayout>--> | 192 | + </RelativeLayout> |
| 192 | </androidx.constraintlayout.widget.ConstraintLayout> | 193 | </androidx.constraintlayout.widget.ConstraintLayout> |
| 193 | </ScrollView> | 194 | </ScrollView> |
| 194 | </RelativeLayout> | 195 | </RelativeLayout> | ... | ... |
-
Please register or login to post a comment