Showing
4 changed files
with
60 additions
and
22 deletions
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
... | @@ -10,26 +10,38 @@ | ... | @@ -10,26 +10,38 @@ |
10 | <RelativeLayout | 10 | <RelativeLayout |
11 | android:id="@+id/rl_map_pin" | 11 | android:id="@+id/rl_map_pin" |
12 | android:layout_width="match_parent" | 12 | android:layout_width="match_parent" |
13 | - android:layout_height="wrap_content" | 13 | + android:layout_height="48dp" |
14 | - android:layout_marginBottom="24dp" | 14 | + android:layout_marginTop="8dp" |
15 | - android:paddingHorizontal="24dp" | 15 | + android:layout_marginBottom="24dp"> |
16 | - android:paddingTop="16dp"> | ||
17 | 16 | ||
18 | <TextView | 17 | <TextView |
19 | android:id="@+id/tv_pin_title" | 18 | android:id="@+id/tv_pin_title" |
20 | android:layout_width="wrap_content" | 19 | android:layout_width="wrap_content" |
21 | - android:layout_height="wrap_content" | 20 | + android:layout_height="match_parent" |
22 | android:layout_alignParentStart="true" | 21 | android:layout_alignParentStart="true" |
22 | + android:layout_marginStart="24dp" | ||
23 | + android:gravity="center_vertical" | ||
23 | android:textColor="@color/cos_grey9" | 24 | android:textColor="@color/cos_grey9" |
24 | android:textSize="16sp" | 25 | android:textSize="16sp" |
25 | tools:text="ΓΕΡΜΑΝΟΣ" /> | 26 | tools:text="ΓΕΡΜΑΝΟΣ" /> |
26 | 27 | ||
27 | - <ImageView | 28 | + <RelativeLayout |
28 | - android:id="@+id/iv_map_pin_close" | 29 | + android:id="@+id/rl_map_pin_close" |
29 | - android:layout_width="16dp" | 30 | + android:layout_width="32dp" |
30 | - android:layout_height="16dp" | 31 | + android:layout_height="32dp" |
31 | android:layout_alignParentEnd="true" | 32 | android:layout_alignParentEnd="true" |
32 | - android:src="@drawable/ic_close" /> | 33 | + android:layout_centerVertical="true" |
34 | + android:layout_gravity="center" | ||
35 | + android:layout_marginEnd="12dp" | ||
36 | + android:gravity="center"> | ||
37 | + | ||
38 | + <ImageView | ||
39 | + android:id="@+id/iv_map_pin_close" | ||
40 | + android:layout_width="16dp" | ||
41 | + android:layout_height="16dp" | ||
42 | + android:contentDescription="@string/accessibility_close" | ||
43 | + android:src="@drawable/ic_close" /> | ||
44 | + </RelativeLayout> | ||
33 | </RelativeLayout> | 45 | </RelativeLayout> |
34 | 46 | ||
35 | <LinearLayout | 47 | <LinearLayout |
... | @@ -82,18 +94,28 @@ | ... | @@ -82,18 +94,28 @@ |
82 | android:layout_height="36dp" | 94 | android:layout_height="36dp" |
83 | android:gravity="center_vertical" | 95 | android:gravity="center_vertical" |
84 | android:orientation="horizontal" | 96 | android:orientation="horizontal" |
85 | - android:paddingHorizontal="24dp"> | 97 | + android:paddingStart="24dp" |
98 | + android:paddingEnd="24dp"> | ||
86 | 99 | ||
87 | - <ImageView | 100 | + <RelativeLayout |
88 | - android:layout_width="14dp" | 101 | + android:id="@+id/rl_phone" |
89 | - android:layout_height="14dp" | 102 | + android:layout_width="28dp" |
90 | - android:src="@drawable/ic_pin_tel" /> | 103 | + android:layout_height="28dp" |
104 | + android:gravity="center"> | ||
105 | + | ||
106 | + <ImageView | ||
107 | + android:id="@+id/iv_phone" | ||
108 | + android:layout_width="14dp" | ||
109 | + android:layout_height="14dp" | ||
110 | + android:src="@drawable/ic_pin_tel" /> | ||
111 | + </RelativeLayout> | ||
91 | 112 | ||
92 | <TextView | 113 | <TextView |
93 | android:id="@+id/tv_pin_tel" | 114 | android:id="@+id/tv_pin_tel" |
94 | android:layout_width="wrap_content" | 115 | android:layout_width="wrap_content" |
95 | - android:layout_height="wrap_content" | 116 | + android:layout_height="match_parent" |
96 | android:layout_marginStart="12dp" | 117 | android:layout_marginStart="12dp" |
118 | + android:gravity="center_vertical" | ||
97 | android:textColor="@color/grey" | 119 | android:textColor="@color/grey" |
98 | android:textSize="14sp" | 120 | android:textSize="14sp" |
99 | tools:text="210-6230543" /> | 121 | tools:text="210-6230543" /> |
... | @@ -110,7 +132,8 @@ | ... | @@ -110,7 +132,8 @@ |
110 | android:layout_width="match_parent" | 132 | android:layout_width="match_parent" |
111 | android:layout_height="wrap_content" | 133 | android:layout_height="wrap_content" |
112 | android:layout_marginBottom="16dp" | 134 | android:layout_marginBottom="16dp" |
113 | - android:paddingHorizontal="24dp"> | 135 | + android:paddingStart="24dp" |
136 | + android:paddingEnd="24dp"> | ||
114 | 137 | ||
115 | <LinearLayout | 138 | <LinearLayout |
116 | android:id="@+id/ll_pin_address" | 139 | android:id="@+id/ll_pin_address" |
... | @@ -119,16 +142,25 @@ | ... | @@ -119,16 +142,25 @@ |
119 | android:gravity="center_vertical" | 142 | android:gravity="center_vertical" |
120 | android:orientation="horizontal"> | 143 | android:orientation="horizontal"> |
121 | 144 | ||
122 | - <ImageView | 145 | + <RelativeLayout |
123 | - android:layout_width="14dp" | 146 | + android:id="@+id/rl_location" |
124 | - android:layout_height="14dp" | 147 | + android:layout_width="28dp" |
125 | - android:src="@drawable/ic_pin_location" /> | 148 | + android:layout_height="28dp" |
149 | + android:gravity="center"> | ||
150 | + | ||
151 | + <ImageView | ||
152 | + android:id="@+id/iv_location" | ||
153 | + android:layout_width="14dp" | ||
154 | + android:layout_height="14dp" | ||
155 | + android:src="@drawable/ic_pin_location" /> | ||
156 | + </RelativeLayout> | ||
126 | 157 | ||
127 | <TextView | 158 | <TextView |
128 | android:id="@+id/tv_pin_address" | 159 | android:id="@+id/tv_pin_address" |
129 | android:layout_width="184dp" | 160 | android:layout_width="184dp" |
130 | - android:layout_height="wrap_content" | 161 | + android:layout_height="match_parent" |
131 | android:layout_marginStart="12dp" | 162 | android:layout_marginStart="12dp" |
163 | + android:gravity="center_vertical" | ||
132 | android:maxLines="2" | 164 | android:maxLines="2" |
133 | android:textColor="@color/grey" | 165 | android:textColor="@color/grey" |
134 | android:textSize="14sp" | 166 | android:textSize="14sp" | ... | ... |
... | @@ -268,6 +268,12 @@ | ... | @@ -268,6 +268,12 @@ |
268 | <string name="accessibility_expand">Ανεπτυγμένο</string> | 268 | <string name="accessibility_expand">Ανεπτυγμένο</string> |
269 | <string name="accessibility_collapse">Συμπτυγμένο</string> | 269 | <string name="accessibility_collapse">Συμπτυγμένο</string> |
270 | <string name="accessibility_activate">Διπλό πάτημα για επιλογή</string> | 270 | <string name="accessibility_activate">Διπλό πάτημα για επιλογή</string> |
271 | + <string name="accessibility_open">Διπλό πάτημα για άνοιγμα</string> | ||
272 | + <string name="accessibility_pin">Πινέζα</string> | ||
273 | + <string name="accessibility_shop">κατάστημα</string> | ||
274 | + <string name="accessibility_phone">Τηλέφωνο</string> | ||
275 | + <string name="accessibility_address">Διεύθυνση</string> | ||
276 | + <string name="accessibility_shop_logo">Λογότυπο καταστήματος</string> | ||
271 | 277 | ||
272 | <string-array name="coupons_array"> | 278 | <string-array name="coupons_array"> |
273 | <item>Κουπόνια</item> | 279 | <item>Κουπόνια</item> | ... | ... |
-
Please register or login to post a comment