open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
a8127d29 1 parent f6885cb2

minor fixes

Inline Side-by-side
Showing 7 changed files with 106 additions and 29 deletions
...@@ -57,7 +57,6 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL ...@@ -57,7 +57,6 @@ public class CouponTransactionActivity extends Activity implements View.OnClickL
57 57
58 private void initViews() { 58 private void initViews() {
59 mIvBack.setOnClickListener(this); 59 mIvBack.setOnClickListener(this);
60 -
61 } 60 }
62 61
63 // =========================================================== 62 // ===========================================================
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="line">
4 +
5 + <stroke
6 + android:width="1dp"
7 + android:color="@color/grey2"
8 + android:dashWidth="12px"
9 + android:dashGap="12px" />
10 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item
4 + android:left="-600dp"
5 + android:right="-600dp">
6 + <rotate
7 + android:drawable="@drawable/shape_dashed"
8 + android:fromDegrees="90"
9 + android:visible="true" />
10 + </item>
11 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:layout_height="match_parent" 30 android:layout_height="match_parent"
31 android:layout_marginVertical="16dp" 31 android:layout_marginVertical="16dp"
32 android:layout_marginStart="8dp" 32 android:layout_marginStart="8dp"
33 - android:background="@color/grey2" 33 + android:background="@drawable/shape_dashed_vertical"
34 app:layout_constraintBottom_toBottomOf="parent" 34 app:layout_constraintBottom_toBottomOf="parent"
35 app:layout_constraintStart_toEndOf="@+id/iv_active_coupon" 35 app:layout_constraintStart_toEndOf="@+id/iv_active_coupon"
36 app:layout_constraintTop_toTopOf="parent" /> 36 app:layout_constraintTop_toTopOf="parent" />
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 - xmlns:tools="http://schemas.android.com/tools"
5 android:id="@+id/cl_bill_payment" 4 android:id="@+id/cl_bill_payment"
6 android:layout_width="match_parent" 5 android:layout_width="match_parent"
7 - android:layout_height="match_parent"> 6 + android:layout_height="match_parent"
7 + android:background="@android:color/white">
8 8
9 <androidx.constraintlayout.widget.ConstraintLayout 9 <androidx.constraintlayout.widget.ConstraintLayout
10 android:id="@+id/cl_bill_header" 10 android:id="@+id/cl_bill_header"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 - android:layout_height="80dp" 12 + android:layout_height="50dp"
13 app:layout_constraintTop_toTopOf="parent"> 13 app:layout_constraintTop_toTopOf="parent">
14 14
15 <ImageView 15 <ImageView
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
17 android:layout_width="21dp" 17 android:layout_width="21dp"
18 android:layout_height="20dp" 18 android:layout_height="20dp"
19 android:layout_marginStart="24dp" 19 android:layout_marginStart="24dp"
20 - android:layout_marginTop="4dp" 20 + android:src="@drawable/ic_back"
21 - android:src="@drawable/ic_close" 21 + app:layout_constraintBottom_toBottomOf="parent"
22 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
23 - app:layout_constraintTop_toTopOf="@+id/textView3" /> 23 + app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 android:id="@+id/textView3" 26 android:id="@+id/textView3"
...@@ -33,44 +33,101 @@ ...@@ -33,44 +33,101 @@
33 android:textStyle="bold" 33 android:textStyle="bold"
34 app:layout_constraintBottom_toBottomOf="parent" 34 app:layout_constraintBottom_toBottomOf="parent"
35 app:layout_constraintEnd_toEndOf="parent" 35 app:layout_constraintEnd_toEndOf="parent"
36 - app:layout_constraintHorizontal_bias="0.348" 36 + app:layout_constraintStart_toStartOf="parent"
37 - app:layout_constraintStart_toEndOf="@+id/iv_transactions_close"
38 app:layout_constraintTop_toTopOf="parent" /> 37 app:layout_constraintTop_toTopOf="parent" />
39 </androidx.constraintlayout.widget.ConstraintLayout> 38 </androidx.constraintlayout.widget.ConstraintLayout>
40 39
41 - <androidx.constraintlayout.widget.ConstraintLayout 40 + <ScrollView
42 android:layout_width="match_parent" 41 android:layout_width="match_parent"
43 - android:layout_height="807dp" 42 + android:layout_height="match_parent"
44 android:layout_below="@+id/cl_bill_header" 43 android:layout_below="@+id/cl_bill_header"
45 - android:layout_marginTop="1dp" 44 + android:background="@color/grey4"
45 + android:fillViewport="true">
46 +
47 + <RelativeLayout
48 + android:layout_width="match_parent"
49 + android:layout_height="wrap_content"
50 + android:background="@android:color/white">
51 +
52 + <include
53 + android:id="@+id/cl_tab_analysis"
54 + layout="@layout/tab_analysis"
55 + android:layout_width="match_parent"
56 + android:layout_height="wrap_content"
57 + android:layout_marginHorizontal="48dp"
58 + android:layout_marginVertical="24dp" />
59 +
60 + <LinearLayout
61 + android:id="@+id/cl_loyalty_info_view_inner"
62 + android:layout_width="match_parent"
63 + android:layout_height="match_parent"
64 + android:layout_below="@+id/cl_tab_analysis"
46 android:background="@drawable/shape_cos_loyalty" 65 android:background="@drawable/shape_cos_loyalty"
47 android:orientation="vertical" 66 android:orientation="vertical"
48 - android:paddingBottom="24dp" 67 + android:paddingBottom="24dp">
49 - tools:layout_editor_absoluteX="-2dp">
50 68
51 <include 69 <include
52 - android:id="@+id/cl_tab_analysis" 70 + layout="@layout/coupon_transaction"
53 - layout="@layout/tab_analysis_grey_bg"
54 android:layout_width="match_parent" 71 android:layout_width="match_parent"
55 - android:layout_height="25dp" 72 + android:layout_height="wrap_content"
56 - android:layout_marginTop="40dp" 73 + android:layout_marginHorizontal="16dp"
57 - android:layout_marginHorizontal="24dp" 74 + android:layout_marginTop="48dp"
58 app:layout_constraintEnd_toEndOf="parent" 75 app:layout_constraintEnd_toEndOf="parent"
59 - app:layout_constraintHorizontal_bias="0.511"
60 app:layout_constraintStart_toStartOf="parent" 76 app:layout_constraintStart_toStartOf="parent"
61 app:layout_constraintTop_toTopOf="parent" /> 77 app:layout_constraintTop_toTopOf="parent" />
62 78
63 <include 79 <include
64 - android:id="@+id/cl_transaction"
65 layout="@layout/coupon_transaction" 80 layout="@layout/coupon_transaction"
66 android:layout_width="match_parent" 81 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 82 android:layout_height="wrap_content"
68 android:layout_marginHorizontal="16dp" 83 android:layout_marginHorizontal="16dp"
69 - android:layout_marginTop="48dp" 84 + android:layout_marginTop="24dp"
70 app:layout_constraintEnd_toEndOf="parent" 85 app:layout_constraintEnd_toEndOf="parent"
71 app:layout_constraintStart_toStartOf="parent" 86 app:layout_constraintStart_toStartOf="parent"
72 - app:layout_constraintTop_toBottomOf="@+id/cl_tab_analysis" /> 87 + app:layout_constraintTop_toTopOf="parent" />
73 88
74 - </androidx.constraintlayout.widget.ConstraintLayout> 89 + <include
90 + layout="@layout/coupon_transaction"
91 + android:layout_width="match_parent"
92 + android:layout_height="wrap_content"
93 + android:layout_marginHorizontal="16dp"
94 + android:layout_marginTop="24dp"
95 + app:layout_constraintEnd_toEndOf="parent"
96 + app:layout_constraintStart_toStartOf="parent"
97 + app:layout_constraintTop_toTopOf="parent" />
98 +
99 + <include
100 + layout="@layout/coupon_transaction"
101 + android:layout_width="match_parent"
102 + android:layout_height="wrap_content"
103 + android:layout_marginHorizontal="16dp"
104 + android:layout_marginTop="24dp"
105 + app:layout_constraintEnd_toEndOf="parent"
106 + app:layout_constraintStart_toStartOf="parent"
107 + app:layout_constraintTop_toTopOf="parent" />
108 +
109 + <include
110 + layout="@layout/coupon_transaction"
111 + android:layout_width="match_parent"
112 + android:layout_height="wrap_content"
113 + android:layout_marginHorizontal="16dp"
114 + android:layout_marginTop="24dp"
115 + app:layout_constraintEnd_toEndOf="parent"
116 + app:layout_constraintStart_toStartOf="parent"
117 + app:layout_constraintTop_toTopOf="parent" />
118 +
119 + <include
120 + layout="@layout/coupon_transaction"
121 + android:layout_width="match_parent"
122 + android:layout_height="wrap_content"
123 + android:layout_marginHorizontal="16dp"
124 + android:layout_marginTop="24dp"
125 + app:layout_constraintEnd_toEndOf="parent"
126 + app:layout_constraintStart_toStartOf="parent"
127 + app:layout_constraintTop_toTopOf="parent" />
128 +
129 + </LinearLayout>
130 + </RelativeLayout>
131 + </ScrollView>
75 132
76 </RelativeLayout> 133 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
37 android:layout_width="match_parent" 37 android:layout_width="match_parent"
38 android:layout_height="match_parent" 38 android:layout_height="match_parent"
39 android:layout_below="@+id/cl_loyalty_wallet_header" 39 android:layout_below="@+id/cl_loyalty_wallet_header"
40 - android:background="@color/grey4"> 40 + android:background="@color/grey4"
41 + android:fillViewport="true">
41 42
42 <RelativeLayout 43 <RelativeLayout
43 android:layout_width="match_parent" 44 android:layout_width="match_parent"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 android:id="@+id/cl_transcation_item" 4 android:id="@+id/cl_transcation_item"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="match_parent" 6 + android:layout_height="wrap_content"
7 android:background="@drawable/banner_border_white3" 7 android:background="@drawable/banner_border_white3"
8 android:paddingVertical="5dp"> 8 android:paddingVertical="5dp">
9 9
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 android:layout_width="286dp" 40 android:layout_width="286dp"
41 android:layout_height="wrap_content" 41 android:layout_height="wrap_content"
42 android:layout_marginTop="4dp" 42 android:layout_marginTop="4dp"
43 - android:lines="2" 43 + android:maxLines="2"
44 android:text="BOX 4€ έκπτωση για την επόμενη παραγγελία σου!" 44 android:text="BOX 4€ έκπτωση για την επόμενη παραγγελία σου!"
45 android:textColor="#355168" 45 android:textColor="#355168"
46 android:textFontWeight="1000" 46 android:textFontWeight="1000"
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
54 android:id="@+id/textView20" 54 android:id="@+id/textView20"
55 android:layout_width="wrap_content" 55 android:layout_width="wrap_content"
56 android:layout_height="wrap_content" 56 android:layout_height="wrap_content"
57 - android:layout_marginTop="12dp"
58 android:text="26-11-2021" 57 android:text="26-11-2021"
59 android:textColor="#82355168" 58 android:textColor="#82355168"
60 android:textSize="12dp" 59 android:textSize="12dp"
......