Subversion Repository Public Repository

Nextrek

Diff Revisions 599 vs 611 for /Android/SmartCharging/SmartCharging/app/src/main/res/layout/activity_register_locale.xml

Diff revisions: vs.
  @@ -1,262 +1,286 @@
1 1 <LinearLayout
2 - xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"
4 - android:layout_width="match_parent"
5 - android:layout_height="match_parent"
6 - android:orientation="vertical">
2 + xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 + android:layout_width="match_parent"
5 + android:layout_height="match_parent"
6 + android:orientation="vertical">
7 7
8 8 <include
9 - android:id="@+id/toolbar"
10 - android:layout_height="wrap_content"
11 - android:layout_width="match_parent"
12 - layout="@layout/toolbar_color" />
9 + android:id="@+id/toolbar"
10 + android:layout_height="wrap_content"
11 + android:layout_width="match_parent"
12 + layout="@layout/toolbar_color" />
13 13
14 14 <ScrollView
15 - android:id="@+id/ScrollView01"
16 - android:layout_width="match_parent"
17 - android:layout_height="match_parent"
18 - android:paddingBottom="@dimen/space_16dp">
15 + android:id="@+id/ScrollView01"
16 + android:layout_width="match_parent"
17 + android:layout_height="match_parent"
18 + android:paddingBottom="@dimen/space_16dp">
19 19
20 20 <LinearLayout
21 - android:orientation="vertical"
22 - android:layout_width="match_parent"
23 - android:layout_height="wrap_content"
24 - android:layout_margin="@dimen/space_16dp">
21 + android:orientation="vertical"
22 + android:layout_width="match_parent"
23 + android:layout_height="wrap_content"
24 + android:padding="@dimen/space_16dp">
25 25
26 26 <RadioGroup
27 - android:layout_width="match_parent"
28 - android:layout_height="wrap_content"
29 - android:layout_gravity="center_horizontal"
30 - android:layout_marginBottom="@dimen/space_16dp">
27 + android:layout_width="match_parent"
28 + android:layout_height="wrap_content"
29 + android:layout_gravity="center_horizontal"
30 + android:layout_marginBottom="@dimen/space_16dp">
31 31 <RadioButton
32 - android:layout_width="wrap_content"
33 - android:layout_height="wrap_content"
34 - android:text="@string/utente"
35 - android:id="@+id/user_type_radio"
36 - android:checked="true"
37 - android:onClick="radioutente"
38 - android:textColor="#574a67" />
32 + android:layout_width="wrap_content"
33 + android:layout_height="wrap_content"
34 + android:text="@string/utente"
35 + android:id="@+id/user_type_radio"
36 + android:checked="true"
37 + android:onClick="radioutente"
38 + android:textColor="#574a67" />
39 39 <RadioButton
40 - android:layout_width="wrap_content"
41 - android:layout_height="wrap_content"
42 - android:text="@string/gestore_locale"
43 - android:id="@+id/local_type_radio"
44 - android:checked="false"
45 - android:onClick="radiolocale"
46 - android:textColor="#574a67" />
40 + android:layout_width="wrap_content"
41 + android:layout_height="wrap_content"
42 + android:text="@string/gestore_locale"
43 + android:id="@+id/local_type_radio"
44 + android:checked="false"
45 + android:onClick="radiolocale"
46 + android:textColor="#574a67" />
47 47 </RadioGroup>
48 48
49 49 <!-- Nome -->
50 50 <android.support.design.widget.TextInputLayout
51 - android:id="@+id/to_text_input_layout"
52 - android:layout_width="match_parent"
53 - android:layout_height="wrap_content">
51 + android:id="@+id/to_text_input_layout"
52 + android:layout_width="match_parent"
53 + android:layout_height="wrap_content">
54 54 <EditText
55 - android:layout_width="match_parent"
56 - android:layout_height="wrap_content"
57 - android:id="@+id/editText2"
58 - android:hint="@string/nome"
59 - android:singleLine="true" />
55 + android:layout_width="match_parent"
56 + android:layout_height="wrap_content"
57 + android:id="@+id/editText2"
58 + android:hint="@string/nome"
59 + android:singleLine="true"
60 + android:maxLength="35" />
60 61 </android.support.design.widget.TextInputLayout>
61 62
62 63 <!-- Cognome -->
63 64 <android.support.design.widget.TextInputLayout
64 - android:id="@+id/to_text_input_layout"
65 - android:layout_width="match_parent"
66 - android:layout_height="wrap_content">
65 + android:id="@+id/to_text_input_layout"
66 + android:layout_width="match_parent"
67 + android:layout_height="wrap_content">
67 68 <EditText
68 - android:layout_width="match_parent"
69 - android:layout_height="wrap_content"
70 - android:hint="@string/cognome"
71 - android:id="@+id/editText18"
72 - android:singleLine="true" />
69 + android:layout_width="match_parent"
70 + android:layout_height="wrap_content"
71 + android:hint="@string/cognome"
72 + android:id="@+id/editText18"
73 + android:singleLine="true"
74 + android:maxLength="35" />
73 75 </android.support.design.widget.TextInputLayout>
74 76
75 77
76 78 <!-- Numero Telefono -->
77 79 <android.support.design.widget.TextInputLayout
78 - android:id="@+id/to_text_input_layout"
79 - android:layout_width="match_parent"
80 - android:layout_height="wrap_content">
80 + android:id="@+id/to_text_input_layout"
81 + android:layout_width="match_parent"
82 + android:layout_height="wrap_content">
81 83 <EditText
82 - android:layout_width="match_parent"
83 - android:layout_height="wrap_content"
84 - android:inputType="number"
85 - android:hint="@string/num_telefono"
86 - android:ems="10"
87 - android:id="@+id/editText4"
88 - android:singleLine="true" />
84 + android:layout_width="match_parent"
85 + android:layout_height="wrap_content"
86 + android:inputType="number"
87 + android:hint="@string/num_telefono"
88 + android:ems="10"
89 + android:id="@+id/editText4"
90 + android:singleLine="true"
91 + android:maxLength="10" />
89 92 </android.support.design.widget.TextInputLayout>
90 93
91 94 <!--Email-->
92 95 <android.support.design.widget.TextInputLayout
93 - android:id="@+id/to_text_input_layout"
94 - android:layout_width="match_parent"
95 - android:layout_height="wrap_content">
96 + android:id="@+id/to_text_input_layout"
97 + android:layout_width="match_parent"
98 + android:layout_height="wrap_content">
96 99 <EditText
97 - android:layout_width="match_parent"
98 - android:layout_height="wrap_content"
99 - android:hint="@string/email"
100 - android:id="@+id/editText5"
101 - android:singleLine="true" />
100 + android:layout_width="match_parent"
101 + android:layout_height="wrap_content"
102 + android:hint="@string/email"
103 + android:id="@+id/editText5"
104 + android:singleLine="true"
105 + android:maxLength="100" />
102 106 </android.support.design.widget.TextInputLayout>
103 107
104 108 <!--Username-->
105 109 <android.support.design.widget.TextInputLayout
106 - android:id="@+id/to_text_input_layout"
107 - android:layout_width="match_parent"
108 - android:layout_height="wrap_content">
110 + android:id="@+id/to_text_input_layout"
111 + android:layout_width="match_parent"
112 + android:layout_height="wrap_content">
109 113 <EditText
110 - android:layout_width="match_parent"
111 - android:layout_height="wrap_content"
112 - android:hint="@string/username"
113 - android:id="@+id/editText8"
114 - android:singleLine="true" />
114 + android:layout_width="match_parent"
115 + android:layout_height="wrap_content"
116 + android:hint="@string/username"
117 + android:id="@+id/editText8"
118 + android:singleLine="true"
119 + android:maxLength="20" />
115 120 </android.support.design.widget.TextInputLayout>
116 121
117 122 <!-- Password -->
118 123 <android.support.design.widget.TextInputLayout
119 - android:id="@+id/to_text_input_layout"
120 - android:layout_width="match_parent"
121 - android:layout_height="wrap_content">
124 + android:id="@+id/to_text_input_layout"
125 + android:layout_width="match_parent"
126 + android:layout_height="wrap_content">
122 127 <EditText
123 - android:layout_width="match_parent"
124 - android:layout_height="wrap_content"
125 - android:inputType="textPassword"
126 - android:hint="@string/password"
127 - android:ems="10"
128 - android:id="@+id/editText7"
129 - android:singleLine="true" />
128 + android:layout_width="match_parent"
129 + android:layout_height="wrap_content"
130 + android:inputType="textPassword"
131 + android:hint="@string/password"
132 + android:ems="10"
133 + android:id="@+id/editText7"
134 + android:singleLine="true"
135 + android:maxLength="20" />
130 136 </android.support.design.widget.TextInputLayout>
131 137
132 138 <RelativeLayout
133 - android:layout_marginTop="@dimen/space_16dp"
134 - android:layout_width="match_parent"
135 - android:layout_height="wrap_content">
139 + android:layout_marginTop="@dimen/space_16dp"
140 + android:layout_width="match_parent"
141 + android:layout_height="wrap_content">
136 142
137 143
138 144
139 145 <it.fedeloper.smartcharging.View.RoundedImageView
140 - android:layout_width="70dp"
141 - android:layout_height="70dp"
142 - android:src="@drawable/avatar_placeholder"
143 - android:layout_marginRight="@dimen/space_16dp"
144 - android:id="@+id/avatarImage"
145 - android:scaleType="fitCenter" />
146 + android:layout_width="70dp"
147 + android:layout_height="70dp"
148 + android:src="@drawable/avatar_placeholder"
149 + android:layout_marginRight="@dimen/space_16dp"
150 + android:id="@+id/avatarImage"
151 + android:scaleType="fitCenter" />
146 152
147 153 <Button
148 - android:text="@string/seleziona_avatar"
149 - android:layout_toRightOf="@id/avatarImage"
150 - style="@style/DefaultButtonRed"
151 - android:onClick="avatarclick"
152 - android:layout_width="wrap_content"
153 - android:layout_height="wrap_content"/>
154 + android:text="@string/seleziona_avatar"
155 + android:layout_toRightOf="@id/avatarImage"
156 + android:onClick="avatarclick"
157 + android:layout_width="wrap_content"
158 + android:layout_height="wrap_content"/>
154 159 </RelativeLayout>
155 160
156 161
157 162
158 163
159 164 <LinearLayout
160 - android:orientation="vertical"
161 - android:layout_width="match_parent"
162 - android:layout_height="wrap_content"
163 - android:layout_marginTop="@dimen/space_16dp"
164 - android:id="@+id/locale">
165 + android:orientation="vertical"
166 + android:layout_width="match_parent"
167 + android:layout_height="wrap_content"
168 + android:layout_marginTop="@dimen/space_16dp"
169 + android:id="@+id/locale">
165 170
166 171 <!-- NOME LOCALE-->
167 172 <android.support.design.widget.TextInputLayout
168 - android:id="@+id/to_text_input_layout"
169 - android:layout_width="match_parent"
170 - android:layout_height="wrap_content">
173 + android:id="@+id/to_text_input_layout"
174 + android:layout_width="match_parent"
175 + android:layout_height="wrap_content">
171 176 <EditText
172 - android:layout_width="match_parent"
173 - android:layout_height="wrap_content"
174 - android:hint="@string/nome_locale"
175 - android:id="@+id/editText11"
176 - android:singleLine="true" />
177 + android:layout_width="match_parent"
178 + android:layout_height="wrap_content"
179 + android:hint="@string/nome_locale"
180 + android:id="@+id/editText11"
181 + android:singleLine="true"
182 + android:maxLength="100" />
177 183 </android.support.design.widget.TextInputLayout>
178 184
179 185
180 186
181 187 <!-- SITO WBE-->
182 188 <android.support.design.widget.TextInputLayout
183 - android:id="@+id/to_text_input_layout"
184 - android:layout_width="match_parent"
185 - android:layout_height="wrap_content">
189 + android:id="@+id/to_text_input_layout"
190 + android:layout_width="match_parent"
191 + android:layout_height="wrap_content">
186 192 <EditText
187 - android:layout_width="match_parent"
188 - android:layout_height="wrap_content"
189 - android:id="@+id/editText12"
190 - android:hint="@string/sito_web"
191 - android:singleLine="true" />
193 + android:layout_width="match_parent"
194 + android:layout_height="wrap_content"
195 + android:id="@+id/editText12"
196 + android:hint="@string/sito_web"
197 + android:singleLine="true"
198 + android:maxLength="100" />
192 199 </android.support.design.widget.TextInputLayout>
193 200
194 201 <!-- DESCRIZIONE -->
195 202 <android.support.design.widget.TextInputLayout
196 - android:id="@+id/to_text_input_layout"
197 - android:layout_width="match_parent"
198 - android:layout_height="wrap_content">
203 + android:id="@+id/to_text_input_layout"
204 + android:layout_width="match_parent"
205 + android:layout_height="wrap_content">
199 206 <EditText
200 - android:layout_width="match_parent"
201 - android:layout_height="wrap_content"
202 - android:id="@+id/editText15"
203 - android:hint="@string/descrizione_locale"
204 - android:inputType="textMultiLine"/>
207 + android:layout_width="match_parent"
208 + android:layout_height="wrap_content"
209 + android:id="@+id/editText15"
210 + android:hint="@string/descrizione_locale"
211 + android:inputType="textMultiLine"
212 + android:maxLength="4000" />
205 213 </android.support.design.widget.TextInputLayout>
206 214
207 215
208 - <fr.ganfra.materialspinner.MaterialSpinner
209 - android:layout_marginTop="10dp"
216 + <!-- PUNTI RICARICA -->
217 + <android.support.design.widget.TextInputLayout
218 + android:id="@+id/to_text_input_layout"
219 + android:layout_width="match_parent"
220 + android:layout_height="wrap_content">
221 + <EditText
210 222 android:layout_width="match_parent"
211 - app:ms_hint="@string/type_spinner_prompt"
212 - app:ms_multiline="false"
213 223 android:layout_height="wrap_content"
214 - android:id="@+id/spinner"/>
224 + android:id="@+id/punti_ricarica"
225 + android:hint="@string/punti_ricarica"
226 + android:inputType="number"
227 + android:maxLength="4" />
228 + </android.support.design.widget.TextInputLayout>
215 229
230 + <fr.ganfra.materialspinner.MaterialSpinner
231 + android:layout_marginTop="10dp"
232 + android:layout_width="match_parent"
233 + app:ms_hint="@string/type_spinner_prompt"
234 + app:ms_multiline="false"
235 + android:layout_height="wrap_content"
236 + android:id="@+id/spinner"/>
237 +
238 + <TextView
239 + android:text="@string/add_image_label"
240 + android:layout_width="wrap_content"
241 + android:layout_marginLeft="@dimen/space_8dp"
242 + android:layout_height="wrap_content"
243 + android:layout_marginTop="10dp"/>
216 244 <HorizontalScrollView
217 - android:layout_width="wrap_content"
218 - android:layout_height="wrap_content"
219 - android:id="@+id/horizontalScrollView"
220 - android:layout_marginTop="10dp">
245 + android:layout_width="wrap_content"
246 + android:layout_height="wrap_content"
247 + android:id="@+id/horizontalScrollView">
221 248
222 249 <LinearLayout
223 - android:orientation="horizontal"
224 - android:layout_width="match_parent"
225 - android:layout_height="match_parent"
226 - android:weightSum="1"
227 - android:id="@+id/imgs">
228 -
229 - <Button
230 - android:layout_width="80dp"
231 - android:layout_height="80dp"
232 - android:text="+"
233 - android:id="@+id/button20"
234 - android:layout_weight="0.26"
235 - android:onClick="addimage"
236 - android:textColor="#574a67"
237 - android:background="@drawable/back" />
250 + android:orientation="horizontal"
251 + android:layout_width="match_parent"
252 + android:layout_height="match_parent"
253 + android:weightSum="1"
254 + android:id="@+id/imgs">
255 + <ImageView
256 + android:layout_width="52dp"
257 + android:layout_height="52dp"
258 + android:padding="@dimen/space_8dp"
259 + android:layout_gravity="center_vertical"
260 + android:id="@+id/button20"
261 + android:layout_weight="0.26"
262 + android:alpha="0.6"
263 + android:onClick="addimage"
264 + android:src="@drawable/ic_add_to_photos_black_48dp" />
238 265 </LinearLayout>
239 266 </HorizontalScrollView>
240 267
241 268 </LinearLayout>
242 269
243 270 <Button
244 - android:layout_width="match_parent"
245 - android:layout_height="48dp"
246 - android:text="@string/sendregistration_btn"
247 - android:id="@+id/button3"
248 - android:onClick="nextclick"
249 - style="@style/DefaultButtonRed"
250 - android:layout_marginTop="@dimen/space_16dp"
251 - android:layout_marginBottom="@dimen/space_16dp"/>
271 + android:layout_width="match_parent"
272 + android:layout_height="wrap_content"
273 + android:text="@string/sendregistration_btn"
274 + android:id="@+id/button3"
275 + android:onClick="nextclick"
276 + android:layout_marginTop="@dimen/space_16dp"/>
252 277
253 278 <LinearLayout
254 - android:orientation="vertical"
255 - android:layout_width="match_parent"
256 - android:layout_height="match_parent"
257 - android:layout_marginRight="40dp"
258 - android:layout_marginLeft="40dp">
259 -
279 + android:orientation="vertical"
280 + android:layout_width="match_parent"
281 + android:layout_height="match_parent"
282 + android:layout_marginRight="40dp"
283 + android:layout_marginLeft="40dp">
260 284 </LinearLayout>
261 285
262 286 </LinearLayout>