open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
0676a2c0 2 parents 9226d7bb 763f19a5

Merge remote-tracking branch 'origin/cosmote' into cosmote

Inline Side-by-side
Showing 8 changed files with 32 additions and 20 deletions
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
2 <shape xmlns:android="http://schemas.android.com/apk/res/android"> 2 <shape xmlns:android="http://schemas.android.com/apk/res/android">
3 <solid android:color="#ffffffff"/> 3 <solid android:color="#ffffffff"/>
4 4
5 - <stroke
6 - android:width="1.5dp"
7 - android:color="#3C464F" />
8 -
9 <padding 5 <padding
10 android:left="1dp" 6 android:left="1dp"
11 android:top="1dp" 7 android:top="1dp"
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <stroke
4 + android:width="1.5dp"
5 + android:color="@android:color/transparent" />
6 +
7 + <corners
8 + android:topLeftRadius="20dp"
9 + android:topRightRadius="20dp"
10 + android:bottomLeftRadius="20dp"
11 + android:bottomRightRadius="20dp"/>
12 + <solid android:color="@android:color/transparent" />
13 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 xmlns:app="http://schemas.android.com/apk/res-auto" 2 xmlns:app="http://schemas.android.com/apk/res-auto"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 - android:background="@android:color/white"> 5 + android:background="#F3F3F3">
6 6
7 <androidx.constraintlayout.widget.ConstraintLayout 7 <androidx.constraintlayout.widget.ConstraintLayout
8 android:id="@+id/cl_loyalty_wallet_header" 8 android:id="@+id/cl_loyalty_wallet_header"
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
36 <ScrollView 36 <ScrollView
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="#F3F3F3">
40 41
41 <androidx.constraintlayout.widget.ConstraintLayout 42 <androidx.constraintlayout.widget.ConstraintLayout
42 android:layout_width="match_parent" 43 android:layout_width="match_parent"
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 android:layout_width="@dimen/width_full" 5 android:layout_width="@dimen/width_full"
6 android:layout_height="@dimen/height_carousel" 6 android:layout_height="@dimen/height_carousel"
7 android:layout_marginLeft="10dp" 7 android:layout_marginLeft="10dp"
8 + android:elevation="2dp"
8 android:background="@drawable/bottom_border"> 9 android:background="@drawable/bottom_border">
9 10
10 <LinearLayout 11 <LinearLayout
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
8 8
9 <RelativeLayout 9 <RelativeLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="match_parent" 11 + android:layout_height="match_parent">
12 - android:paddingBottom="24dp">
13 12
14 <androidx.constraintlayout.widget.ConstraintLayout 13 <androidx.constraintlayout.widget.ConstraintLayout
15 android:id="@+id/rl_header" 14 android:id="@+id/rl_header"
...@@ -121,8 +120,7 @@ ...@@ -121,8 +120,7 @@
121 android:id="@+id/rl_home_coupons" 120 android:id="@+id/rl_home_coupons"
122 android:layout_width="match_parent" 121 android:layout_width="match_parent"
123 android:layout_height="wrap_content" 122 android:layout_height="wrap_content"
124 - android:layout_below="@id/rl_home_campaigns" 123 + android:layout_below="@id/rl_home_campaigns">
125 - android:background="@drawable/shape_cos_gradient_coupons_bg">
126 124
127 <androidx.recyclerview.widget.RecyclerView 125 <androidx.recyclerview.widget.RecyclerView
128 android:id="@+id/rv_home_coupons" 126 android:id="@+id/rv_home_coupons"
...@@ -160,7 +158,7 @@ ...@@ -160,7 +158,7 @@
160 android:layout_height="110dp" 158 android:layout_height="110dp"
161 android:layout_below="@id/hsv_title" 159 android:layout_below="@id/hsv_title"
162 android:background="@android:color/white" 160 android:background="@android:color/white"
163 - android:paddingBottom="10dp" 161 + android:paddingBottom="15dp"
164 android:scrollbars="none"> 162 android:scrollbars="none">
165 163
166 <LinearLayout 164 <LinearLayout
......
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 +<androidx.cardview.widget.CardView 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 - android:layout_width="360dp" 4 + android:layout_width="@dimen/width_full"
5 android:layout_height="240dp" 5 android:layout_height="240dp"
6 + app:cardCornerRadius="20dp"
7 + android:layout_marginBottom="2dp"
6 android:layout_marginStart="10dp"> 8 android:layout_marginStart="10dp">
7 9
8 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
...@@ -27,9 +29,8 @@ ...@@ -27,9 +29,8 @@
27 android:id="@+id/iv_gift_item_logo" 29 android:id="@+id/iv_gift_item_logo"
28 android:layout_width="match_parent" 30 android:layout_width="match_parent"
29 android:layout_height="match_parent" 31 android:layout_height="match_parent"
30 - android:background="@drawable/shape_cos_transparent_rounded"
31 android:clipToOutline="true" 32 android:clipToOutline="true"
32 - android:scaleType="centerCrop" 33 + android:scaleType="fitXY"
33 android:src="@drawable/ic_banner_gift" 34 android:src="@drawable/ic_banner_gift"
34 app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_75_guideline" 35 app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_75_guideline"
35 app:layout_constraintEnd_toEndOf="parent" 36 app:layout_constraintEnd_toEndOf="parent"
...@@ -99,4 +100,4 @@ ...@@ -99,4 +100,4 @@
99 </androidx.constraintlayout.widget.ConstraintLayout> 100 </androidx.constraintlayout.widget.ConstraintLayout>
100 </RelativeLayout> 101 </RelativeLayout>
101 </androidx.constraintlayout.widget.ConstraintLayout> 102 </androidx.constraintlayout.widget.ConstraintLayout>
102 -</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
103 +</androidx.cardview.widget.CardView>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <androidx.constraintlayout.widget.ConstraintLayout 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" 4 xmlns:tools="http://schemas.android.com/tools"
5 - android:layout_width="360dp" 5 + android:layout_width="@dimen/width_full"
6 android:layout_height="150dp" 6 android:layout_height="150dp"
7 android:layout_marginStart="10dp" 7 android:layout_marginStart="10dp"
8 android:background="@drawable/selector_cos_campaign"> 8 android:background="@drawable/selector_cos_campaign">
......
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 +<androidx.cardview.widget.CardView 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 - android:layout_width="360dp" 4 + android:layout_width="@dimen/width_full"
5 android:layout_height="240dp" 5 android:layout_height="240dp"
6 + app:cardCornerRadius="20dp"
7 + android:layout_marginBottom="2dp"
6 android:layout_marginStart="10dp"> 8 android:layout_marginStart="10dp">
7 9
8 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
...@@ -85,4 +87,4 @@ ...@@ -85,4 +87,4 @@
85 </androidx.constraintlayout.widget.ConstraintLayout> 87 </androidx.constraintlayout.widget.ConstraintLayout>
86 </RelativeLayout> 88 </RelativeLayout>
87 </androidx.constraintlayout.widget.ConstraintLayout> 89 </androidx.constraintlayout.widget.ConstraintLayout>
88 -</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
90 +</androidx.cardview.widget.CardView>
...\ No newline at end of file ...\ No newline at end of file
......