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 89 additions and 67 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,45 +92,56 @@ ...@@ -92,45 +92,56 @@
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 - <androidx.recyclerview.widget.RecyclerView 95 + <ScrollView
96 - android:id="@+id/rv_expired_coupons"
97 android:layout_width="match_parent" 96 android:layout_width="match_parent"
98 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
99 android:layout_below="@+id/tv_expired_title" 98 android:layout_below="@+id/tv_expired_title"
100 - android:layout_marginHorizontal="8dp"
101 android:layout_marginTop="24dp" 99 android:layout_marginTop="24dp"
102 - android:orientation="vertical" 100 + android:overScrollMode="never">
103 - android:overScrollMode="never"/>
104 101
105 - <LinearLayout 102 + <LinearLayout
106 - android:id="@+id/ll_show_more_expired" 103 + android:layout_width="match_parent"
107 - android:layout_width="wrap_content"
108 - android:layout_height="wrap_content"
109 - android:layout_below="@+id/rv_expired_coupons"
110 - android:layout_centerHorizontal="true"
111 - android:layout_marginTop="20dp"
112 - android:paddingBottom="56dp"
113 - android:gravity="center"
114 - android:orientation="horizontal"
115 - android:visibility="gone"
116 - tools:visibility="visible">
117 -
118 - <TextView
119 - android:id="@+id/tv_barcode"
120 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
121 - android:layout_width="wrap_content"
122 android:layout_height="wrap_content" 104 android:layout_height="wrap_content"
123 - android:text="@string/cos_see_more" 105 + android:orientation="vertical">
124 - android:textColor="@color/grey" 106 +
125 - android:textSize="16sp" /> 107 + <androidx.recyclerview.widget.RecyclerView
126 - 108 + android:id="@+id/rv_expired_coupons"
127 - <ImageView 109 + android:layout_width="match_parent"
128 - android:id="@+id/iv_barcode_arrow" 110 + android:layout_height="wrap_content"
129 - android:layout_width="14dp" 111 + android:layout_marginHorizontal="8dp"
130 - android:layout_height="14dp" 112 + android:orientation="vertical"
131 - android:layout_marginStart="6dp" 113 + android:overScrollMode="never" />
132 - android:src="@drawable/ic_down_dark" /> 114 +
133 - </LinearLayout> 115 + <LinearLayout
116 + android:id="@+id/ll_show_more_expired"
117 + android:layout_width="wrap_content"
118 + android:layout_height="wrap_content"
119 + android:layout_gravity="center"
120 + android:layout_marginTop="20dp"
121 + android:gravity="center"
122 + android:orientation="horizontal"
123 + android:paddingBottom="56dp"
124 + android:visibility="gone"
125 + tools:visibility="visible">
126 +
127 + <TextView
128 + android:id="@+id/tv_expired_more"
129 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
130 + android:layout_width="wrap_content"
131 + android:layout_height="wrap_content"
132 + android:text="@string/cos_see_more"
133 + android:textColor="@color/grey"
134 + android:textSize="16sp" />
135 +
136 + <ImageView
137 + android:id="@+id/iv_expired_more_arrow"
138 + android:layout_width="14dp"
139 + android:layout_height="14dp"
140 + android:layout_marginStart="6dp"
141 + android:src="@drawable/ic_down_dark" />
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,45 +175,56 @@ ...@@ -164,45 +175,56 @@
164 android:textColor="@color/cos_blue_dark" 175 android:textColor="@color/cos_blue_dark"
165 android:textSize="16sp" /> 176 android:textSize="16sp" />
166 177
167 - <androidx.recyclerview.widget.RecyclerView 178 + <ScrollView
168 - android:id="@+id/rv_shared_coupons"
169 android:layout_width="match_parent" 179 android:layout_width="match_parent"
170 android:layout_height="wrap_content" 180 android:layout_height="wrap_content"
171 android:layout_below="@+id/tv_shared_title" 181 android:layout_below="@+id/tv_shared_title"
172 - android:layout_marginHorizontal="8dp"
173 android:layout_marginTop="24dp" 182 android:layout_marginTop="24dp"
174 - android:orientation="vertical" 183 + android:overScrollMode="never">
175 - android:overScrollMode="never"/>
176 184
177 - <LinearLayout 185 + <LinearLayout
178 - android:id="@+id/ll_show_more_shared" 186 + android:layout_width="match_parent"
179 - android:layout_width="wrap_content"
180 - android:layout_height="wrap_content"
181 - android:layout_below="@+id/rv_shared_coupons"
182 - android:layout_centerHorizontal="true"
183 - android:layout_marginTop="20dp"
184 - android:gravity="center"
185 - android:paddingBottom="56dp"
186 - android:orientation="horizontal"
187 - android:visibility="gone"
188 - tools:visibility="visible">
189 -
190 - <TextView
191 - android:id="@+id/tv_barcode"
192 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
193 - android:layout_width="wrap_content"
194 android:layout_height="wrap_content" 187 android:layout_height="wrap_content"
195 - android:text="@string/cos_see_more" 188 + android:orientation="vertical">
196 - android:textColor="@color/grey" 189 +
197 - android:textSize="16sp" /> 190 + <androidx.recyclerview.widget.RecyclerView
198 - 191 + android:id="@+id/rv_shared_coupons"
199 - <ImageView 192 + android:layout_width="match_parent"
200 - android:id="@+id/iv_barcode_arrow" 193 + android:layout_height="wrap_content"
201 - android:layout_width="14dp" 194 + android:layout_marginHorizontal="8dp"
202 - android:layout_height="14dp" 195 + android:orientation="vertical"
203 - android:layout_marginStart="6dp" 196 + android:overScrollMode="never" />
204 - android:src="@drawable/ic_down_dark" /> 197 +
205 - </LinearLayout> 198 + <LinearLayout
199 + android:id="@+id/ll_show_more_shared"
200 + android:layout_width="wrap_content"
201 + android:layout_height="wrap_content"
202 + android:layout_gravity="center"
203 + android:layout_marginTop="20dp"
204 + android:gravity="center"
205 + android:orientation="horizontal"
206 + android:paddingBottom="56dp"
207 + android:visibility="gone"
208 + tools:visibility="visible">
209 +
210 + <TextView
211 + android:id="@+id/tv_shared_more"
212 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
213 + android:layout_width="wrap_content"
214 + android:layout_height="wrap_content"
215 + android:text="@string/cos_see_more"
216 + android:textColor="@color/grey"
217 + android:textSize="16sp" />
218 +
219 + <ImageView
220 + android:id="@+id/iv_shared_more_arrow"
221 + android:layout_width="14dp"
222 + android:layout_height="14dp"
223 + android:layout_marginStart="6dp"
224 + android:src="@drawable/ic_down_dark" />
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"
......