open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
d0dff33f 1 parent a9eb43a5

minor ui fix

Inline Side-by-side
Showing 2 changed files with 39 additions and 17 deletions
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.4-cosbeta71' 5 + PUBLISH_VERSION = '4.5.4-cosbeta72'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -92,31 +92,40 @@ ...@@ -92,31 +92,40 @@
92 android:textColor="@color/cos_blue_dark" 92 android:textColor="@color/cos_blue_dark"
93 android:textSize="16sp" /> 93 android:textSize="16sp" />
94 94
95 + <ScrollView
96 + android:layout_width="match_parent"
97 + android:layout_height="wrap_content"
98 + android:layout_below="@+id/tv_expired_title"
99 + android:layout_marginTop="24dp"
100 + android:overScrollMode="never">
101 +
102 + <LinearLayout
103 + android:layout_width="match_parent"
104 + android:layout_height="wrap_content"
105 + android:orientation="vertical">
106 +
95 <androidx.recyclerview.widget.RecyclerView 107 <androidx.recyclerview.widget.RecyclerView
96 android:id="@+id/rv_expired_coupons" 108 android:id="@+id/rv_expired_coupons"
97 android:layout_width="match_parent" 109 android:layout_width="match_parent"
98 android:layout_height="wrap_content" 110 android:layout_height="wrap_content"
99 - android:layout_below="@+id/tv_expired_title"
100 android:layout_marginHorizontal="8dp" 111 android:layout_marginHorizontal="8dp"
101 - android:layout_marginTop="24dp"
102 android:orientation="vertical" 112 android:orientation="vertical"
103 - android:overScrollMode="never"/> 113 + android:overScrollMode="never" />
104 114
105 <LinearLayout 115 <LinearLayout
106 android:id="@+id/ll_show_more_expired" 116 android:id="@+id/ll_show_more_expired"
107 android:layout_width="wrap_content" 117 android:layout_width="wrap_content"
108 android:layout_height="wrap_content" 118 android:layout_height="wrap_content"
109 - android:layout_below="@+id/rv_expired_coupons" 119 + android:layout_gravity="center"
110 - android:layout_centerHorizontal="true"
111 android:layout_marginTop="20dp" 120 android:layout_marginTop="20dp"
112 - android:paddingBottom="56dp"
113 android:gravity="center" 121 android:gravity="center"
114 android:orientation="horizontal" 122 android:orientation="horizontal"
123 + android:paddingBottom="56dp"
115 android:visibility="gone" 124 android:visibility="gone"
116 tools:visibility="visible"> 125 tools:visibility="visible">
117 126
118 <TextView 127 <TextView
119 - android:id="@+id/tv_barcode" 128 + android:id="@+id/tv_expired_more"
120 fontPath="fonts/pf_square_sans_pro_medium.ttf" 129 fontPath="fonts/pf_square_sans_pro_medium.ttf"
121 android:layout_width="wrap_content" 130 android:layout_width="wrap_content"
122 android:layout_height="wrap_content" 131 android:layout_height="wrap_content"
...@@ -125,12 +134,14 @@ ...@@ -125,12 +134,14 @@
125 android:textSize="16sp" /> 134 android:textSize="16sp" />
126 135
127 <ImageView 136 <ImageView
128 - android:id="@+id/iv_barcode_arrow" 137 + android:id="@+id/iv_expired_more_arrow"
129 android:layout_width="14dp" 138 android:layout_width="14dp"
130 android:layout_height="14dp" 139 android:layout_height="14dp"
131 android:layout_marginStart="6dp" 140 android:layout_marginStart="6dp"
132 android:src="@drawable/ic_down_dark" /> 141 android:src="@drawable/ic_down_dark" />
133 </LinearLayout> 142 </LinearLayout>
143 + </LinearLayout>
144 + </ScrollView>
134 145
135 <TextView 146 <TextView
136 android:id="@+id/tv_expired_empty" 147 android:id="@+id/tv_expired_empty"
...@@ -164,31 +175,40 @@ ...@@ -164,31 +175,40 @@
164 android:textColor="@color/cos_blue_dark" 175 android:textColor="@color/cos_blue_dark"
165 android:textSize="16sp" /> 176 android:textSize="16sp" />
166 177
178 + <ScrollView
179 + android:layout_width="match_parent"
180 + android:layout_height="wrap_content"
181 + android:layout_below="@+id/tv_shared_title"
182 + android:layout_marginTop="24dp"
183 + android:overScrollMode="never">
184 +
185 + <LinearLayout
186 + android:layout_width="match_parent"
187 + android:layout_height="wrap_content"
188 + android:orientation="vertical">
189 +
167 <androidx.recyclerview.widget.RecyclerView 190 <androidx.recyclerview.widget.RecyclerView
168 android:id="@+id/rv_shared_coupons" 191 android:id="@+id/rv_shared_coupons"
169 android:layout_width="match_parent" 192 android:layout_width="match_parent"
170 android:layout_height="wrap_content" 193 android:layout_height="wrap_content"
171 - android:layout_below="@+id/tv_shared_title"
172 android:layout_marginHorizontal="8dp" 194 android:layout_marginHorizontal="8dp"
173 - android:layout_marginTop="24dp"
174 android:orientation="vertical" 195 android:orientation="vertical"
175 - android:overScrollMode="never"/> 196 + android:overScrollMode="never" />
176 197
177 <LinearLayout 198 <LinearLayout
178 android:id="@+id/ll_show_more_shared" 199 android:id="@+id/ll_show_more_shared"
179 android:layout_width="wrap_content" 200 android:layout_width="wrap_content"
180 android:layout_height="wrap_content" 201 android:layout_height="wrap_content"
181 - android:layout_below="@+id/rv_shared_coupons" 202 + android:layout_gravity="center"
182 - android:layout_centerHorizontal="true"
183 android:layout_marginTop="20dp" 203 android:layout_marginTop="20dp"
184 android:gravity="center" 204 android:gravity="center"
185 - android:paddingBottom="56dp"
186 android:orientation="horizontal" 205 android:orientation="horizontal"
206 + android:paddingBottom="56dp"
187 android:visibility="gone" 207 android:visibility="gone"
188 tools:visibility="visible"> 208 tools:visibility="visible">
189 209
190 <TextView 210 <TextView
191 - android:id="@+id/tv_barcode" 211 + android:id="@+id/tv_shared_more"
192 fontPath="fonts/pf_square_sans_pro_medium.ttf" 212 fontPath="fonts/pf_square_sans_pro_medium.ttf"
193 android:layout_width="wrap_content" 213 android:layout_width="wrap_content"
194 android:layout_height="wrap_content" 214 android:layout_height="wrap_content"
...@@ -197,12 +217,14 @@ ...@@ -197,12 +217,14 @@
197 android:textSize="16sp" /> 217 android:textSize="16sp" />
198 218
199 <ImageView 219 <ImageView
200 - android:id="@+id/iv_barcode_arrow" 220 + android:id="@+id/iv_shared_more_arrow"
201 android:layout_width="14dp" 221 android:layout_width="14dp"
202 android:layout_height="14dp" 222 android:layout_height="14dp"
203 android:layout_marginStart="6dp" 223 android:layout_marginStart="6dp"
204 android:src="@drawable/ic_down_dark" /> 224 android:src="@drawable/ic_down_dark" />
205 </LinearLayout> 225 </LinearLayout>
226 + </LinearLayout>
227 + </ScrollView>
206 228
207 <TextView 229 <TextView
208 android:id="@+id/tv_shared_empty" 230 android:id="@+id/tv_shared_empty"
......