open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
c91f4210 1 parent 16a8f47f

tets commit 2

Inline Side-by-side
Showing 4 changed files with 124 additions and 112 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,109 +85,111 @@ ...@@ -86,109 +85,111 @@
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"
104 - 103 + android:textStyle="bold" />
105 - <!-- <HorizontalScrollView--> 104 +
106 - <!-- android:id="@+id/ll_add"--> 105 + <HorizontalScrollView
107 - <!-- android:layout_width="match_parent"--> 106 + android:id="@+id/ll_add"
108 - <!-- android:layout_height="wrap_content"--> 107 + android:layout_width="match_parent"
109 - <!-- android:layout_below="@id/tv_gifts_loyalty_title"--> 108 + android:layout_height="wrap_content"
110 - <!-- android:background="@android:color/white"--> 109 + android:layout_below="@id/tv_gifts_loyalty_title"
111 - <!-- android:scrollbars="none">--> 110 + android:background="@android:color/white"
112 - 111 + android:scrollbars="none">
113 - <!-- <androidx.constraintlayout.widget.ConstraintLayout--> 112 +
114 - <!-- android:layout_width="400dp"--> 113 + <RelativeLayout
115 - <!-- android:layout_height="200dp"--> 114 + android:layout_width="360dp"
116 - <!-- android:layout_marginStart="10dp">--> 115 + android:layout_height="200dp"
117 - 116 + android:layout_marginStart="10dp"
118 - <!-- <androidx.constraintlayout.widget.Guideline--> 117 + android:background="@color/cos_cyan">
119 - <!-- android:id="@+id/gl_horizontal_80_guideline"--> 118 +
120 - <!-- android:layout_width="wrap_content"--> 119 + <!-- <androidx.constraintlayout.widget.Guideline-->
121 - <!-- android:layout_height="wrap_content"--> 120 + <!-- android:id="@+id/gl_horizontal_80_guideline"-->
122 - <!-- android:orientation="horizontal"--> 121 + <!-- android:layout_width="wrap_content"-->
123 - <!-- app:layout_constraintGuide_percent="0.8" />--> 122 + <!-- android:layout_height="wrap_content"-->
124 - 123 + <!-- android:orientation="horizontal"-->
125 - <!-- <androidx.constraintlayout.widget.Guideline--> 124 + <!-- app:layout_constraintGuide_percent="0.8" />-->
126 - <!-- android:id="@+id/gl_horizontal_55_guideline"--> 125 +
127 - <!-- android:layout_width="wrap_content"--> 126 + <!-- <androidx.constraintlayout.widget.Guideline-->
128 - <!-- android:layout_height="wrap_content"--> 127 + <!-- android:id="@+id/gl_horizontal_55_guideline"-->
129 - <!-- android:orientation="horizontal"--> 128 + <!-- android:layout_width="wrap_content"-->
130 - <!-- app:layout_constraintGuide_percent="0.55" />--> 129 + <!-- android:layout_height="wrap_content"-->
131 - 130 + <!-- android:orientation="horizontal"-->
132 - <!-- <ImageView--> 131 + <!-- app:layout_constraintGuide_percent="0.55" />-->
133 - <!-- android:id="@+id/iv_gift_item_logo"--> 132 +
134 - <!-- android:layout_width="match_parent"--> 133 + <!-- <ImageView-->
135 - <!-- android:layout_height="0dp"--> 134 + <!-- android:id="@+id/iv_gift_item_logo"-->
136 - <!-- android:scaleType="centerCrop"--> 135 + <!-- android:layout_width="match_parent"-->
137 - <!-- android:src="@drawable/ic_banner_gift"--> 136 + <!-- android:layout_height="0dp"-->
138 - <!-- app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_80_guideline"--> 137 + <!-- android:scaleType="centerCrop"-->
139 - <!-- app:layout_constraintEnd_toEndOf="parent"--> 138 + <!-- android:src="@drawable/ic_banner_gift"-->
140 - <!-- app:layout_constraintStart_toStartOf="parent"--> 139 + <!-- app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_80_guideline"-->
141 - <!-- app:layout_constraintTop_toTopOf="parent" />--> 140 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
142 - 141 + <!-- app:layout_constraintStart_toStartOf="parent"-->
143 - <!-- <RelativeLayout--> 142 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
144 - <!-- android:layout_width="0dp"--> 143 +
145 - <!-- android:layout_height="0dp"--> 144 + <!-- <RelativeLayout-->
146 - <!-- android:background="@color/cos_cyan"--> 145 + <!-- android:layout_width="0dp"-->
147 - <!-- app:layout_constraintBottom_toBottomOf="parent"--> 146 + <!-- android:layout_height="0dp"-->
148 - <!-- app:layout_constraintEnd_toEndOf="parent"--> 147 + <!-- android:background="@color/cos_cyan"-->
149 - <!-- app:layout_constraintStart_toStartOf="parent"--> 148 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
150 - <!-- app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_55_guideline">--> 149 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
151 - 150 + <!-- app:layout_constraintStart_toStartOf="parent"-->
152 - <!-- <LinearLayout--> 151 + <!-- app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_55_guideline">-->
153 - <!-- android:id="@+id/ll_loyalty_item1"--> 152 +
154 - <!-- android:layout_width="match_parent"--> 153 + <!-- <LinearLayout-->
155 - <!-- android:layout_height="wrap_content"--> 154 + <!-- android:id="@+id/ll_loyalty_item1"-->
156 - <!-- android:background="@color/white_tr3"--> 155 + <!-- android:layout_width="match_parent"-->
157 - <!-- android:paddingVertical="4dp">--> 156 + <!-- android:layout_height="wrap_content"-->
158 - 157 + <!-- android:background="@color/white_tr3"-->
159 - <!-- <TextView--> 158 + <!-- android:paddingVertical="4dp">-->
160 - <!-- android:layout_width="wrap_content"--> 159 +
161 - <!-- android:layout_height="wrap_content"--> 160 + <!-- <TextView-->
162 - <!-- android:text="Αποκλειστικά για σένα"--> 161 + <!-- android:layout_width="wrap_content"-->
163 - <!-- android:textColor="@color/grey"--> 162 + <!-- android:layout_height="wrap_content"-->
164 - <!-- android:textStyle="bold" />--> 163 + <!-- android:text="Αποκλειστικά για σένα"-->
165 - <!-- </LinearLayout>--> 164 + <!-- android:textColor="@color/grey"-->
166 - 165 + <!-- android:textStyle="bold" />-->
167 - <!-- <LinearLayout--> 166 + <!-- </LinearLayout>-->
168 - <!-- android:layout_width="match_parent"--> 167 +
169 - <!-- android:layout_height="match_parent"--> 168 + <!-- <LinearLayout-->
170 - <!-- android:layout_below="@+id/ll_loyalty_item1"--> 169 + <!-- android:layout_width="match_parent"-->
171 - <!-- android:background="@android:color/white"--> 170 + <!-- android:layout_height="match_parent"-->
172 - <!-- android:orientation="vertical">--> 171 + <!-- android:layout_below="@+id/ll_loyalty_item1"-->
173 - 172 + <!-- android:background="@android:color/white"-->
174 - <!-- <TextView--> 173 + <!-- android:orientation="vertical">-->
175 - <!-- android:layout_width="match_parent"--> 174 +
176 - <!-- android:layout_height="wrap_content"--> 175 + <!-- <TextView-->
177 - <!-- android:maxLines="2"--> 176 + <!-- android:layout_width="match_parent"-->
178 - <!-- android:text="2 ώρες δωρεάν απεριόριστα data όποτε θέλεις εσύ, κάθε μήνα!" />--> 177 + <!-- android:layout_height="wrap_content"-->
179 - 178 + <!-- android:maxLines="2"-->
180 - <!-- <TextView--> 179 + <!-- android:text="2 ώρες δωρεάν απεριόριστα data όποτε θέλεις εσύ, κάθε μήνα!" />-->
181 - <!-- android:layout_width="wrap_content"--> 180 +
182 - <!-- android:layout_height="wrap_content"--> 181 + <!-- <TextView-->
183 - <!-- android:background="@drawable/shape_cos_gradient2"--> 182 + <!-- android:layout_width="wrap_content"-->
184 - <!-- android:text="Πάρε το δώρο σου"--> 183 + <!-- android:layout_height="wrap_content"-->
185 - <!-- android:textColor="@android:color/white"--> 184 + <!-- android:background="@drawable/shape_cos_gradient2"-->
186 - <!-- android:textFontWeight="600" />--> 185 + <!-- android:text="Πάρε το δώρο σου"-->
187 - <!-- </LinearLayout>--> 186 + <!-- android:textColor="@android:color/white"-->
188 - <!-- </RelativeLayout>--> 187 + <!-- android:textFontWeight="600" />-->
189 - <!-- </androidx.constraintlayout.widget.ConstraintLayout>--> 188 + <!-- </LinearLayout>-->
190 - <!-- </HorizontalScrollView>--> 189 + <!-- </RelativeLayout>-->
191 - <!-- </RelativeLayout>--> 190 + </RelativeLayout>
191 + </HorizontalScrollView>
192 + </RelativeLayout>
192 </androidx.constraintlayout.widget.ConstraintLayout> 193 </androidx.constraintlayout.widget.ConstraintLayout>
193 </ScrollView> 194 </ScrollView>
194 </RelativeLayout> 195 </RelativeLayout>
......