| |
@@ -47,6 +47,8 @@ |
| 47 |
47 |
|
android:id="@+id/editText6" |
| 48 |
48 |
|
android:singleLine="true" |
| 49 |
49 |
|
android:background="@drawable/google_now_edittext" /> |
| |
50 |
+ |
|
| |
51 |
+ |
|
| 50 |
52 |
|
</RelativeLayout> |
| 51 |
53 |
|
|
| 52 |
54 |
|
<LinearLayout |
| |
@@ -70,15 +72,32 @@ |
| 70 |
72 |
|
android:paddingRight="@dimen/space_8dp" |
| 71 |
73 |
|
android:layout_weight="1"> |
| 72 |
74 |
|
|
| 73 |
|
- |
<com.makeramen.roundedimageview.RoundedImageView |
| 74 |
|
- |
xmlns:app="http://schemas.android.com/apk/res-auto" |
| |
75 |
+ |
<RelativeLayout |
| 75 |
76 |
|
android:layout_width="60dp" |
| 76 |
77 |
|
android:layout_height="60dp" |
| 77 |
|
- |
android:layout_marginRight="@dimen/space_8dp" |
| 78 |
|
- |
android:id="@+id/profile_image" |
| 79 |
|
- |
app:riv_corner_radius="30dip" |
| 80 |
|
- |
app:riv_oval="true" |
| 81 |
|
- |
android:scaleType="centerCrop"/> |
| |
78 |
+ |
android:id="@+id/rel_img" |
| |
79 |
+ |
android:layout_marginRight="@dimen/space_8dp"> |
| |
80 |
+ |
<com.rey.material.widget.ProgressView |
| |
81 |
+ |
xmlns:app="http://schemas.android.com/apk/res-auto" |
| |
82 |
+ |
android:layout_centerHorizontal="true" |
| |
83 |
+ |
android:layout_centerVertical="true" |
| |
84 |
+ |
android:layout_width="48dp" |
| |
85 |
+ |
android:layout_height="48dp" |
| |
86 |
+ |
app:pv_autostart="true" |
| |
87 |
+ |
app:pv_circular="true" |
| |
88 |
+ |
app:pv_progressStyle="@style/Material.Drawable.CircularProgress" |
| |
89 |
+ |
app:pv_progressMode="indeterminate" |
| |
90 |
+ |
android:id="@+id/loadingImage" /> |
| |
91 |
+ |
<com.makeramen.roundedimageview.RoundedImageView |
| |
92 |
+ |
xmlns:app="http://schemas.android.com/apk/res-auto" |
| |
93 |
+ |
android:layout_width="60dp" |
| |
94 |
+ |
android:layout_height="60dp" |
| |
95 |
+ |
android:id="@+id/profile_image" |
| |
96 |
+ |
app:riv_corner_radius="30dip" |
| |
97 |
+ |
app:riv_oval="true" |
| |
98 |
+ |
android:scaleType="centerCrop"/> |
| |
99 |
+ |
</RelativeLayout> |
| |
100 |
+ |
|
| 82 |
101 |
|
<!--<it.fedeloper.smartcharging.View.RoundedImageView--> |
| 83 |
102 |
|
<!--android:layout_width="60dp"--> |
| 84 |
103 |
|
<!--android:layout_height="60dp"--> |
| |
@@ -94,7 +113,7 @@ |
| 94 |
113 |
|
android:ellipsize="end" |
| 95 |
114 |
|
android:textAppearance="?android:attr/textAppearanceMedium" |
| 96 |
115 |
|
android:id="@+id/nome_locale" |
| 97 |
|
- |
android:layout_toRightOf="@id/profile_image" |
| |
116 |
+ |
android:layout_toRightOf="@id/rel_img" |
| 98 |
117 |
|
android:textColor="#676767" |
| 99 |
118 |
|
android:layout_marginTop="5dp" /> |
| 100 |
119 |
|
|
| |
@@ -106,7 +125,7 @@ |
| 106 |
125 |
|
android:singleLine="true" |
| 107 |
126 |
|
android:id="@+id/tipologia" |
| 108 |
127 |
|
android:textColor="#a4a4a4" |
| 109 |
|
- |
android:layout_toRightOf="@id/profile_image" |
| |
128 |
+ |
android:layout_toRightOf="@id/rel_img" |
| 110 |
129 |
|
android:layout_below="@+id/nome_locale" |
| 111 |
130 |
|
android:layout_marginTop="3dp" /> |
| 112 |
131 |
|
</RelativeLayout> |
| |
@@ -217,12 +236,27 @@ |
| 217 |
236 |
|
</LinearLayout> |
| 218 |
237 |
|
|
| 219 |
238 |
|
<!-- TODO --> |
| |
239 |
+ |
<com.rey.material.widget.ProgressView |
| |
240 |
+ |
xmlns:app="http://schemas.android.com/apk/res-auto" |
| |
241 |
+ |
android:layout_width="48dp" |
| |
242 |
+ |
android:layout_height="48dp" |
| |
243 |
+ |
app:pv_autostart="true" |
| |
244 |
+ |
app:pv_circular="true" |
| |
245 |
+ |
app:pv_progressStyle="@style/Material.Drawable.CircularProgress" |
| |
246 |
+ |
app:pv_progressMode="indeterminate" |
| |
247 |
+ |
android:id="@+id/loadingAll" |
| |
248 |
+ |
android:layout_below="@+id/editText6" |
| |
249 |
+ |
android:layout_centerHorizontal="true" |
| |
250 |
+ |
android:visibility="visible" |
| |
251 |
+ |
android:layout_gravity="center_horizontal" |
| |
252 |
+ |
android:layout_marginTop="@dimen/space_32dp" |
| |
253 |
+ |
android:layout_marginBottom="20dp" /> |
| |
254 |
+ |
|
| 220 |
255 |
|
<TextView |
| 221 |
256 |
|
android:layout_width="wrap_content" |
| 222 |
257 |
|
android:layout_height="wrap_content" |
| 223 |
258 |
|
android:textAppearance="?android:attr/textAppearanceMedium" |
| 224 |
259 |
|
android:text="@string/seleziona_locale" |
| 225 |
|
- |
android:layout_marginTop="@dimen/space_32dp" |
| 226 |
260 |
|
android:id="@+id/no_locali_message" |
| 227 |
261 |
|
android:layout_gravity="center_horizontal" /> |
| 228 |
262 |
|
|
View this file contents
View the full history
Commits for