open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
e22b2346 1 parent 76a9aaa6

minor fixes

Inline Side-by-side
Showing 7 changed files with 114 additions and 36 deletions
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="@color/white_tr2" />
6 +
7 + <corners android:radius="1000dp" />
8 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
12 12
13 <ImageView 13 <ImageView
14 android:id="@+id/iv_back" 14 android:id="@+id/iv_back"
15 - android:layout_width="wrap_content" 15 + android:layout_width="20dp"
16 - android:layout_height="wrap_content" 16 + android:layout_height="20dp"
17 android:layout_marginStart="16dp" 17 android:layout_marginStart="16dp"
18 android:src="@drawable/ic_back" 18 android:src="@drawable/ic_back"
19 app:layout_constraintBottom_toBottomOf="parent" 19 app:layout_constraintBottom_toBottomOf="parent"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 android:layout_height="wrap_content" 25 android:layout_height="wrap_content"
26 android:text="@string/cos_profile_reward" 26 android:text="@string/cos_profile_reward"
27 android:textColor="@color/grey" 27 android:textColor="@color/grey"
28 - android:textSize="16sp" 28 + android:textSize="17sp"
29 android:textStyle="bold" 29 android:textStyle="bold"
30 app:layout_constraintBottom_toBottomOf="parent" 30 app:layout_constraintBottom_toBottomOf="parent"
31 app:layout_constraintEnd_toEndOf="parent" 31 app:layout_constraintEnd_toEndOf="parent"
...@@ -45,12 +45,77 @@ ...@@ -45,12 +45,77 @@
45 android:background="@drawable/shape_cos_loyalty"> 45 android:background="@drawable/shape_cos_loyalty">
46 46
47 <androidx.constraintlayout.widget.ConstraintLayout 47 <androidx.constraintlayout.widget.ConstraintLayout
48 - android:layout_width="300dp" 48 + android:layout_width="match_parent"
49 - android:layout_height="200dp" 49 + android:layout_height="150dp"
50 - app:layout_constraintStart_toStartOf="parent" 50 + android:paddingHorizontal="20dp"
51 + android:paddingVertical="8dp"
52 + android:layout_marginHorizontal="32dp"
53 + android:background="@drawable/shape_cos_gradient2"
51 app:layout_constraintEnd_toEndOf="parent" 54 app:layout_constraintEnd_toEndOf="parent"
52 - android:background="@drawable/shape_cos_gradient2"> 55 + app:layout_constraintStart_toStartOf="parent">
53 56
57 + <LinearLayout
58 + android:id="@+id/ll_loyalty_banner_info"
59 + android:layout_width="match_parent"
60 + android:layout_height="wrap_content"
61 + android:gravity="center_vertical"
62 + android:orientation="horizontal"
63 + android:weightSum="1"
64 + app:layout_constraintEnd_toEndOf="parent"
65 + app:layout_constraintStart_toStartOf="parent"
66 + app:layout_constraintTop_toTopOf="parent">
67 +
68 + <RelativeLayout
69 + android:layout_width="wrap_content"
70 + android:layout_height="wrap_content"
71 + android:layout_weight="0.8"
72 + android:gravity="start">
73 +
74 + <ImageView
75 + android:id="@+id/iv_loyalty_type"
76 + android:layout_width="60dp"
77 + android:layout_height="40dp"
78 + android:src="@drawable/ic_traveller_white" />
79 +
80 + <TextView
81 + android:layout_width="wrap_content"
82 + android:layout_height="wrap_content"
83 + android:layout_below="@+id/iv_loyalty_type"
84 + android:text="@string/cos_profile_loyalty_name"
85 + android:textColor="@android:color/white"
86 + android:textFontWeight="600"
87 + android:textSize="18sp" />
88 + </RelativeLayout>
89 +
90 + <RelativeLayout
91 + android:layout_width="wrap_content"
92 + android:layout_height="wrap_content"
93 + android:layout_weight="0.2"
94 + android:gravity="end">
95 +
96 + <de.hdodenhof.circleimageview.CircleImageView
97 + android:id="@+id/iv_profile_photo"
98 + android:layout_width="50dp"
99 + android:layout_height="50dp"
100 + android:src="@drawable/profile_photo"
101 + app:layout_constraintBottom_toBottomOf="parent"
102 + app:layout_constraintLeft_toLeftOf="parent"
103 + app:layout_constraintTop_toTopOf="parent" />
104 + </RelativeLayout>
105 + </LinearLayout>
106 +
107 + <TextView
108 + android:layout_width="wrap_content"
109 + android:layout_height="wrap_content"
110 + android:background="@drawable/round_border_tr"
111 + android:paddingHorizontal="8dp"
112 + android:paddingVertical="4dp"
113 + android:text="@string/cos_questionnaire"
114 + android:textColor="@android:color/white"
115 + android:textFontWeight="600"
116 + android:textSize="15sp"
117 + app:layout_constraintBottom_toBottomOf="parent"
118 + app:layout_constraintStart_toStartOf="parent" />
54 </androidx.constraintlayout.widget.ConstraintLayout> 119 </androidx.constraintlayout.widget.ConstraintLayout>
55 </androidx.constraintlayout.widget.ConstraintLayout> 120 </androidx.constraintlayout.widget.ConstraintLayout>
56 </ScrollView> 121 </ScrollView>
......
...@@ -3,13 +3,16 @@ ...@@ -3,13 +3,16 @@
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="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="215dp" 6 + android:layout_height="240dp"
7 android:background="@drawable/bottom_border"> 7 android:background="@drawable/bottom_border">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:id="@+id/ll_carousel_icon" 10 android:id="@+id/ll_carousel_icon"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 - android:layout_height="150dp"> 12 + app:layout_constraintStart_toStartOf="parent"
13 + app:layout_constraintEnd_toEndOf="parent"
14 + app:layout_constraintTop_toTopOf="parent"
15 + android:layout_height="170dp">
13 <ImageView 16 <ImageView
14 android:id="@+id/imageView" 17 android:id="@+id/imageView"
15 android:layout_width="wrap_content" 18 android:layout_width="wrap_content"
...@@ -22,10 +25,13 @@ ...@@ -22,10 +25,13 @@
22 <TextView 25 <TextView
23 android:id="@+id/textView" 26 android:id="@+id/textView"
24 android:layout_width="match_parent" 27 android:layout_width="match_parent"
25 - android:layout_height="65dp" 28 + android:layout_height="wrap_content"
26 android:paddingHorizontal="15dp" 29 android:paddingHorizontal="15dp"
27 android:paddingVertical="10dp" 30 android:paddingVertical="10dp"
31 + android:textSize="15sp"
32 + android:textStyle="bold"
33 + android:textColor="@color/grey"
28 android:text="Χρόνια πολλά με υγεία! Σου κάνουμε δώρο 5GB για τη γιορτή σου!" 34 android:text="Χρόνια πολλά με υγεία! Σου κάνουμε δώρο 5GB για τη γιορτή σου!"
29 app:layout_constraintTop_toBottomOf="@+id/ll_carousel_icon" 35 app:layout_constraintTop_toBottomOf="@+id/ll_carousel_icon"
30 - tools:layout_editor_absoluteX="-15dp" /> 36 + app:layout_constraintBottom_toBottomOf="parent" />
31 </androidx.constraintlayout.widget.ConstraintLayout> 37 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
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 +
3 +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3 xmlns:app="http://schemas.android.com/apk/res-auto" 4 xmlns:app="http://schemas.android.com/apk/res-auto"
4 xmlns:tools="http://schemas.android.com/tools" 5 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 6 android:layout_width="match_parent"
6 android:layout_height="match_parent" 7 android:layout_height="match_parent"
7 - android:background="#77B9AB"> 8 + android:background="@color/cos_cyan">
8 9
9 - <ScrollView
10 - android:layout_width="match_parent"
11 - android:layout_height="match_parent">
12 <RelativeLayout 10 <RelativeLayout
13 android:layout_width="match_parent" 11 android:layout_width="match_parent"
14 android:layout_height="match_parent" 12 android:layout_height="match_parent"
15 - android:paddingBottom="50dp"> 13 + android:paddingBottom="24dp">
16 14
17 <androidx.constraintlayout.widget.ConstraintLayout 15 <androidx.constraintlayout.widget.ConstraintLayout
18 android:id="@+id/rl_header" 16 android:id="@+id/rl_header"
19 android:layout_width="match_parent" 17 android:layout_width="match_parent"
20 - android:layout_height="150dp" 18 + android:layout_height="wrap_content"
21 android:background="@android:color/white" 19 android:background="@android:color/white"
22 - android:orientation="horizontal"
23 android:paddingHorizontal="16dp" 20 android:paddingHorizontal="16dp"
24 android:paddingVertical="16dp"> 21 android:paddingVertical="16dp">
25 22
...@@ -27,13 +24,14 @@ ...@@ -27,13 +24,14 @@
27 android:id="@+id/user_img" 24 android:id="@+id/user_img"
28 android:layout_width="60dp" 25 android:layout_width="60dp"
29 android:layout_height="60dp" 26 android:layout_height="60dp"
30 - android:src="@drawable/banner1" /> 27 + android:src="@drawable/profile_photo"
28 + app:layout_constraintStart_toStartOf="parent"
29 + app:layout_constraintTop_toTopOf="parent" />
31 30
32 <RelativeLayout 31 <RelativeLayout
33 android:id="@+id/rl_user_info" 32 android:id="@+id/rl_user_info"
34 android:layout_width="200dp" 33 android:layout_width="200dp"
35 android:layout_height="match_parent" 34 android:layout_height="match_parent"
36 - android:layout_toRightOf="@+id/user_img"
37 android:orientation="vertical" 35 android:orientation="vertical"
38 android:paddingLeft="10dp" 36 android:paddingLeft="10dp"
39 app:layout_constraintStart_toEndOf="@+id/user_img" 37 app:layout_constraintStart_toEndOf="@+id/user_img"
...@@ -86,9 +84,7 @@ ...@@ -86,9 +84,7 @@
86 android:layout_height="25dp" 84 android:layout_height="25dp"
87 android:src="@drawable/filters_icon" 85 android:src="@drawable/filters_icon"
88 app:layout_constraintEnd_toEndOf="parent" 86 app:layout_constraintEnd_toEndOf="parent"
89 - app:layout_constraintHorizontal_bias="0.663" 87 + app:layout_constraintTop_toTopOf="@+id/user_img" />
90 - app:layout_constraintStart_toEndOf="@+id/rl_user_info"
91 - tools:layout_editor_absoluteY="-1dp" />
92 </androidx.constraintlayout.widget.ConstraintLayout> 88 </androidx.constraintlayout.widget.ConstraintLayout>
93 89
94 <RelativeLayout 90 <RelativeLayout
...@@ -96,7 +92,8 @@ ...@@ -96,7 +92,8 @@
96 android:layout_width="match_parent" 92 android:layout_width="match_parent"
97 android:layout_height="wrap_content" 93 android:layout_height="wrap_content"
98 android:layout_below="@id/rl_header" 94 android:layout_below="@id/rl_header"
99 - android:paddingHorizontal="12dp"> 95 + android:layout_marginTop="16dp"
96 + android:paddingHorizontal="16dp">
100 97
101 <include layout="@layout/carousel_item" /> 98 <include layout="@layout/carousel_item" />
102 </RelativeLayout> 99 </RelativeLayout>
...@@ -108,15 +105,15 @@ ...@@ -108,15 +105,15 @@
108 android:layout_below="@id/rl_home_campaigns" 105 android:layout_below="@id/rl_home_campaigns"
109 android:layout_marginVertical="25dp" 106 android:layout_marginVertical="25dp"
110 android:paddingHorizontal="15dp"> 107 android:paddingHorizontal="15dp">
111 -<!-- <androidx.recyclerview.widget.RecyclerView--> 108 + <!-- <androidx.recyclerview.widget.RecyclerView-->
112 -<!-- android:id="@+id/rv_home_coupons"--> 109 + <!-- android:id="@+id/rv_home_coupons"-->
113 -<!-- android:layout_width="match_parent"--> 110 + <!-- android:layout_width="match_parent"-->
114 -<!-- android:layout_height="wrap_content"--> 111 + <!-- android:layout_height="wrap_content"-->
115 -<!-- android:layout_marginBottom="8dp"--> 112 + <!-- android:layout_marginBottom="8dp"-->
116 -<!-- android:clipToPadding="false"--> 113 + <!-- android:clipToPadding="false"-->
117 -<!-- android:orientation="horizontal"--> 114 + <!-- android:orientation="horizontal"-->
118 -<!-- android:paddingEnd="10dp"--> 115 + <!-- android:paddingEnd="10dp"-->
119 -<!-- />--> 116 + <!-- />-->
120 <include layout="@layout/coupon_layout" /> 117 <include layout="@layout/coupon_layout" />
121 </LinearLayout> 118 </LinearLayout>
122 119
...@@ -226,5 +223,4 @@ ...@@ -226,5 +223,4 @@
226 </LinearLayout> 223 </LinearLayout>
227 </HorizontalScrollView> 224 </HorizontalScrollView>
228 </RelativeLayout> 225 </RelativeLayout>
229 - </ScrollView> 226 +</ScrollView>
230 -</RelativeLayout>
......
...@@ -14,4 +14,5 @@ ...@@ -14,4 +14,5 @@
14 <color name="cos_green2">#52DF5A</color> 14 <color name="cos_green2">#52DF5A</color>
15 <color name="green_dark">#1DA87A</color> 15 <color name="green_dark">#1DA87A</color>
16 <color name="cos_blue2">#0478BE</color> 16 <color name="cos_blue2">#0478BE</color>
17 + <color name="white_tr2">#77FFFFFF</color>
17 </resources> 18 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -20,4 +20,6 @@ ...@@ -20,4 +20,6 @@
20 <string name="menu_shop">Shop</string> 20 <string name="menu_shop">Shop</string>
21 <string name="menu_loyalty">Loyalty</string> 21 <string name="menu_loyalty">Loyalty</string>
22 <string name="menu_profile">Προφίλ</string> 22 <string name="menu_profile">Προφίλ</string>
23 + <string name="cos_profile_loyalty_name">Γιώργος Γεωργίου</string>
24 + <string name="cos_questionnaire">Ερωτηματολόγιο</string>
23 </resources> 25 </resources>
...\ No newline at end of file ...\ No newline at end of file
......