Nextrek

URLs

Explore

Commits

Diff Revisions 546 vs 623 for /Android/SmartCharging/SmartCharging/app/src/main/res/layout/activity_setting_selection.xml

		@@ -1,296 +1,188 @@
1		-	<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2		-	xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
	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"
3	5		android:layout_height="match_parent"
4		-	tools:context="it.fedeloper.smartcharging.Controller.SettingSelectionActivity">
	6	+	android:orientation="vertical">
	7	+
	8	+	<ImageView
	9	+	android:layout_width="match_parent"
	10	+	android:layout_height="250dp"
	11	+	android:id="@+id/imageView5"
	12	+	android:src="@drawable/screen1"
	13	+	android:background="#3cdbff" />
5	14
6	15		<LinearLayout
7	16		android:orientation="vertical"
8	17		android:layout_width="match_parent"
9		-	android:layout_height="match_parent">
	18	+	android:layout_height="match_parent"
	19	+	android:background="@color/background">
10	20
11		-	<ImageView
12		-	android:layout_width="wrap_content"
	21	+	<ScrollView
	22	+	android:layout_width="fill_parent"
13	23		android:layout_height="wrap_content"
14		-	android:id="@+id/imageView5"
15		-	android:scaleType="fitCenter"
16		-	android:layout_centerHorizontal="true"
17		-	android:src="@drawable/screen1"
18		-	android:background="#3cdbff"
19		-	android:layout_weight="0.7" />
20		-
21		-	<LinearLayout
22		-	android:orientation="vertical"
23		-	android:layout_width="match_parent"
24		-	android:layout_height="match_parent"
25		-	android:layout_weight="0.5">
	24	+	android:id="@+id/scrollView3"
	25	+	android:background="#fffefb">
26	26
27		-	<ScrollView
28		-	android:layout_width="fill_parent"
	27	+	<LinearLayout
	28	+	android:orientation="vertical"
	29	+	android:padding="@dimen/space_16dp"
	30	+	android:layout_width="match_parent"
29	31		android:layout_height="wrap_content"
30		-	android:id="@+id/scrollView3"
31		-	android:layout_weight="0.5"
32		-	android:background="#fffefb">
	32	+	android:layout_weight="0.5">
33	33
34	34		<LinearLayout
35	35		android:orientation="vertical"
36	36		android:layout_width="match_parent"
37		-	android:layout_height="match_parent"
38		-	android:layout_alignParentLeft="true"
39		-	android:layout_alignParentStart="true"
40		-	android:layout_alignParentTop="true"
41		-	android:id="@+id/linear2"
42		-	android:layout_weight="0.5">
43		-
44		-	<LinearLayout
45		-	android:orientation="vertical"
	37	+	android:layout_height="wrap_content"
	38	+	android:id="@+id/linearlocal"
	39	+	android:visibility="gone" >
	40	+
	41	+	<!-- NOME LOCALE-->
	42	+	<android.support.design.widget.TextInputLayout
	43	+	android:id="@+id/to_text_input_layout"
46	44		android:layout_width="match_parent"
47		-	android:layout_height="wrap_content"
48		-	android:id="@+id/linearlocal"
49		-	android:visibility="gone"
50		-	android:layout_marginLeft="40dp"
51		-	android:layout_marginRight="40dp" >
52		-
53		-	<LinearLayout
54		-	android:orientation="horizontal"
	45	+	android:layout_height="wrap_content">
	46	+	<EditText
55	47		android:layout_width="match_parent"
56		-	android:layout_height="match_parent"
57		-	android:background="#f0f0f0">
58		-
59		-	<TextView
60		-	android:layout_width="wrap_content"
61		-	android:layout_height="wrap_content"
62		-	android:textAppearance="?android:attr/textAppearanceSmall"
63		-	android:text="@string/nome_locale"
64		-	android:id="@+id/textView23"
65		-	android:layout_alignParentStart="true"
66		-	android:layout_above="@+id/editText8"
67		-	android:layout_alignParentLeft="true"
68		-	android:textColor="#574a67"
69		-	android:layout_marginLeft="20dp"
70		-	android:layout_marginRight="20dp"
71		-	android:layout_gravity="center_vertical"
72		-	android:background="#f0f0f0" />
73		-
74		-	<EditText
75		-	android:layout_width="match_parent"
76		-	android:layout_height="50dp"
77		-	android:id="@+id/editText13"
78		-	android:layout_below="@+id/textView4"
79		-	android:layout_alignParentLeft="true"
80		-	android:layout_alignParentStart="true"
81		-	android:layout_alignParentRight="true"
82		-	android:layout_alignParentEnd="true"
83		-	android:background="#f0f0f0" />
84		-	</LinearLayout>
85		-
86		-	<LinearLayout
87		-	android:orientation="horizontal"
	48	+	android:layout_height="wrap_content"
	49	+	android:hint="@string/nome_locale"
	50	+	android:id="@+id/editText13"
	51	+	android:singleLine="true"
	52	+	android:maxLength="100" />
	53	+	</android.support.design.widget.TextInputLayout>
	54	+
	55	+	<!-- Numero Telefono -->
	56	+	<android.support.design.widget.TextInputLayout
	57	+	android:id="@+id/to_text_input_layout"
	58	+	android:layout_width="match_parent"
	59	+	android:layout_height="wrap_content">
	60	+	<EditText
88	61		android:layout_width="match_parent"
89		-	android:layout_height="match_parent"
90		-	android:layout_gravity="center_vertical"
91		-	android:background="#f0f0f0"
92		-	android:layout_marginTop="10dp" >
93		-
94		-	<TextView
95		-	android:layout_width="wrap_content"
96		-	android:layout_height="wrap_content"
97		-	android:textAppearance="?android:attr/textAppearanceSmall"
98		-	android:text="@string/num_telefono"
99		-	android:layout_below="@+id/editText2"
100		-	android:layout_alignParentLeft="true"
101		-	android:layout_alignParentStart="true"
102		-	android:layout_gravity="center_vertical"
103		-	android:background="#f0f0f0"
104		-	android:textColor="#574a67"
105		-	android:layout_marginLeft="20dp"
106		-	android:layout_marginRight="20dp" />
107		-
108		-	<EditText
109		-	android:layout_width="match_parent"
110		-	android:layout_height="50dp"
111		-	android:inputType="number"
112		-	android:ems="10"
113		-	android:id="@+id/editText178"
114		-	android:layout_alignParentLeft="true"
115		-	android:layout_alignParentStart="true"
116		-	android:layout_alignRight="@+id/editText"
117		-	android:layout_alignEnd="@+id/editText"
118		-	android:background="#f0f0f0" />
119		-	</LinearLayout>
120		-
121		-	<LinearLayout
122		-	android:orientation="horizontal"
	62	+	android:layout_height="wrap_content"
	63	+	android:inputType="number"
	64	+	android:hint="@string/num_telefono"
	65	+	android:ems="10"
	66	+	android:id="@+id/editText178"
	67	+	android:singleLine="true"
	68	+	android:maxLength="10" />
	69	+	</android.support.design.widget.TextInputLayout>
	70	+
	71	+	<!--Email-->
	72	+	<android.support.design.widget.TextInputLayout
	73	+	android:id="@+id/to_text_input_layout"
	74	+	android:layout_width="match_parent"
	75	+	android:layout_height="wrap_content">
	76	+	<EditText
123	77		android:layout_width="match_parent"
124		-	android:layout_height="match_parent"
125		-	android:background="#f0f0f0"
126		-	android:layout_marginTop="10dp"
127		-	android:layout_marginBottom="10dp">
128		-
129		-	<TextView
130		-	android:layout_width="wrap_content"
131		-	android:layout_height="wrap_content"
132		-	android:textAppearance="?android:attr/textAppearanceSmall"
133		-	android:text="@string/email"
134		-	android:layout_centerVertical="true"
135		-	android:layout_alignParentLeft="true"
136		-	android:layout_alignParentStart="true"
137		-	android:background="#f0f0f0"
138		-	android:layout_gravity="center_vertical"
139		-	android:textColor="#574a67"
140		-	android:layout_marginLeft="20dp"
141		-	android:layout_marginRight="20dp" />
142		-
143		-	<EditText
144		-	android:layout_width="match_parent"
145		-	android:layout_height="50dp"
146		-	android:id="@+id/editText17"
147		-	android:layout_below="@+id/textView5"
148		-	android:layout_alignParentLeft="true"
149		-	android:layout_alignParentStart="true"
150		-	android:layout_alignRight="@+id/editText"
151		-	android:layout_alignEnd="@+id/editText"
152		-	android:background="#f0f0f0" />
153		-	</LinearLayout>
154		-
155		-	<LinearLayout
156		-	android:orientation="horizontal"
	78	+	android:layout_height="wrap_content"
	79	+	android:hint="@string/email"
	80	+	android:id="@+id/editText17"
	81	+	android:singleLine="true"
	82	+	android:maxLength="100" />
	83	+	</android.support.design.widget.TextInputLayout>
	84	+
	85	+	<!-- SITO WBE-->
	86	+	<android.support.design.widget.TextInputLayout
	87	+	android:id="@+id/to_text_input_layout"
	88	+	android:layout_width="match_parent"
	89	+	android:layout_height="wrap_content">
	90	+	<EditText
157	91		android:layout_width="match_parent"
158		-	android:layout_height="match_parent"
159		-	android:background="#f0f0f0"
160		-	android:layout_marginBottom="10dp" >
161		-
162		-	<TextView
163		-	android:layout_width="wrap_content"
164		-	android:layout_height="wrap_content"
165		-	android:textAppearance="?android:attr/textAppearanceSmall"
166		-	android:text="@string/sito_web"
167		-	android:id="@+id/textView25"
168		-	android:layout_alignParentStart="true"
169		-	android:layout_above="@+id/editText8"
170		-	android:layout_alignParentLeft="true"
171		-	android:textColor="#574a67"
172		-	android:background="#f0f0f0"
173		-	android:layout_marginLeft="20dp"
174		-	android:layout_marginRight="20dp"
175		-	android:layout_gravity="center_vertical" />
176		-
177		-	<EditText
178		-	android:layout_width="match_parent"
179		-	android:layout_height="50dp"
180		-	android:id="@+id/editText14"
181		-	android:layout_below="@+id/textView4"
182		-	android:layout_alignParentLeft="true"
183		-	android:layout_alignParentStart="true"
184		-	android:layout_alignParentRight="true"
185		-	android:layout_alignParentEnd="true"
186		-	android:background="#f0f0f0" />
187		-	</LinearLayout>
188		-
189		-	<LinearLayout
190		-	android:orientation="vertical"
	92	+	android:layout_height="wrap_content"
	93	+	android:id="@+id/editText14"
	94	+	android:hint="@string/sito_web"
	95	+	android:singleLine="true"
	96	+	android:maxLength="100" />
	97	+	</android.support.design.widget.TextInputLayout>
	98	+
	99	+	<!-- DESCRIZIONE -->
	100	+	<android.support.design.widget.TextInputLayout
	101	+	android:id="@+id/to_text_input_layout"
	102	+	android:layout_width="match_parent"
	103	+	android:layout_height="wrap_content">
	104	+	<EditText
191	105		android:layout_width="match_parent"
192		-	android:layout_height="match_parent"
193		-	android:background="#f0f0f0" >
	106	+	android:layout_height="wrap_content"
	107	+	android:id="@+id/editText16"
	108	+	android:hint="@string/descrizione_locale"
	109	+	android:inputType="textMultiLine"
	110	+	android:maxLength="4000" />
	111	+	</android.support.design.widget.TextInputLayout>
	112	+
	113	+	<!-- PUNTI RICARICA -->
	114	+	<android.support.design.widget.TextInputLayout
	115	+	android:id="@+id/to_text_input_layout"
	116	+	android:layout_width="match_parent"
	117	+	android:layout_height="wrap_content">
	118	+	<EditText
	119	+	android:layout_width="match_parent"
	120	+	android:layout_height="wrap_content"
	121	+	android:id="@+id/punti_ricarica"
	122	+	android:hint="@string/punti_ricarica"
	123	+	android:inputType="number"
	124	+	android:maxLength="4" />
	125	+	</android.support.design.widget.TextInputLayout>
194	126
195		-	<TextView
196		-	android:layout_width="wrap_content"
197		-	android:layout_height="wrap_content"
198		-	android:textAppearance="?android:attr/textAppearanceSmall"
199		-	android:text="@string/descrizione_locale"
200		-	android:id="@+id/textView26"
201		-	android:layout_centerVertical="true"
202		-	android:layout_alignParentLeft="true"
203		-	android:layout_alignParentStart="true"
204		-	android:textColor="#574a67"
205		-	android:background="#f0f0f0"
206		-	android:layout_marginTop="10dp"
207		-	android:layout_marginLeft="20dp" />
208		-
209		-	<EditText
210		-	android:layout_width="match_parent"
211		-	android:layout_height="87dp"
212		-	android:id="@+id/editText16"
213		-	android:layout_below="@+id/textView5"
214		-	android:layout_alignParentLeft="true"
215		-	android:layout_alignParentStart="true"
216		-	android:layout_alignRight="@+id/editText"
217		-	android:layout_alignEnd="@+id/editText"
218		-	android:background="#f0f0f0" />
219		-	</LinearLayout>
	127	+	<fr.ganfra.materialspinner.MaterialSpinner
	128	+	android:layout_marginTop="10dp"
	129	+	android:layout_width="match_parent"
	130	+	app:ms_hint="@string/type_spinner_prompt"
	131	+	app:ms_multiline="false"
	132	+	android:layout_height="wrap_content"
	133	+	android:id="@+id/spinner3"/>
	134	+
	135	+	<TextView
	136	+	android:text="@string/add_image_label"
	137	+	android:layout_width="wrap_content"
	138	+	android:layout_marginLeft="@dimen/space_8dp"
	139	+	android:layout_height="wrap_content"
	140	+	android:layout_marginTop="10dp"/>
	141	+	<HorizontalScrollView
	142	+	android:layout_width="wrap_content"
	143	+	android:layout_height="wrap_content"
	144	+	android:id="@+id/horizontalScrollView4"
	145	+	android:layout_marginLeft="@dimen/space_8dp"
	146	+	android:layout_marginTop="10dp" >
220	147
221	148		<LinearLayout
222	149		android:orientation="horizontal"
223	150		android:layout_width="match_parent"
224	151		android:layout_height="match_parent"
225		-	android:background="#f0f0f0"
226		-	android:layout_marginTop="10dp" >
227		-
228		-	<TextView
229		-	android:layout_width="wrap_content"
230		-	android:layout_height="wrap_content"
231		-	android:textAppearance="?android:attr/textAppearanceSmall"
232		-	android:text="@string/tipologia"
233		-	android:id="@+id/textView27"
234		-	android:layout_centerVertical="true"
235		-	android:layout_alignParentLeft="true"
236		-	android:layout_alignParentStart="true"
237		-	android:textColor="#574a67"
238		-	android:layout_gravity="center_vertical"
239		-	android:background="#f0f0f0"
240		-	android:layout_marginLeft="20dp"
241		-	android:layout_marginRight="20dp" />
242		-
243		-	<Spinner
244		-	android:layout_width="match_parent"
245		-	android:layout_height="50dp"
246		-	android:id="@+id/spinner3"
247		-	android:spinnerMode="dialog"
248		-	android:background="#f0f0f0" />
249		-	</LinearLayout>
	152	+	android:id="@+id/linearLayout122" >
250	153
251		-	<HorizontalScrollView
252		-	android:layout_width="wrap_content"
253		-	android:layout_height="wrap_content"
254		-	android:id="@+id/horizontalScrollView4"
255		-	android:layout_marginTop="10dp" >
	154	+	<ImageView
	155	+	android:layout_width="52dp"
	156	+	android:layout_height="52dp"
	157	+	android:background="@color/app_accent"
	158	+	android:padding="@dimen/space_8dp"
	159	+	android:id="@+id/button20"
	160	+	android:onClick="addimage"
	161	+	android:src="@drawable/ic_collections_white_48dp" />
256	162
257		-	<LinearLayout
258		-	android:orientation="horizontal"
259		-	android:layout_width="match_parent"
260		-	android:layout_height="match_parent"
261		-	android:weightSum="1"
262		-	android:id="@+id/linearLayout122" >
263		-
264		-	<Button
265		-	android:layout_width="80dp"
266		-	android:layout_height="80dp"
267		-	android:text="+"
268		-	android:id="@+id/button10"
269		-	android:layout_weight="0.26"
270		-	android:onClick="addimage"
271		-	android:textColor="#574a67"
272		-	android:background="@drawable/back" />
273		-	</LinearLayout>
274		-	</HorizontalScrollView>
275		-	</LinearLayout>
	163	+	</LinearLayout>
	164	+	</HorizontalScrollView>
	165	+	</LinearLayout>
276	166
277		-	<Button
278		-	android:layout_width="match_parent"
279		-	android:layout_height="50dp"
280		-	android:text="@string/aggiungilocale_btn"
281		-	android:id="@+id/button9"
282		-	android:layout_marginLeft="40dp"
283		-	android:layout_marginRight="40dp"
284		-	android:layout_gravity="center_horizontal"
285		-	android:background="@drawable/back"
286		-	android:textColor="#6c6179"
287		-	android:layout_marginTop="10dp"
288		-	android:onClick="addclick" />
	167	+	<Button
	168	+	android:layout_width="match_parent"
	169	+	android:layout_height="wrap_content"
	170	+	android:text="@string/aggiungilocale_btn"
	171	+	android:id="@+id/button9"
	172	+	android:layout_gravity="center_horizontal"
	173	+	android:layout_marginTop="10dp"
	174	+	android:onClick="addclick" />
289	175
	176	+	<LinearLayout
	177	+	android:orientation="vertical"
	178	+	android:layout_width="match_parent"
	179	+	android:layout_height="wrap_content"
	180	+	android:id="@+id/linear2"
	181	+	android:layout_weight="0.5">
290	182		</LinearLayout>
291		-	</ScrollView>
292		-	</LinearLayout>
293	183
	184	+	</LinearLayout>
	185	+	</ScrollView>
294	186		</LinearLayout>
295	187
296		-	</RelativeLayout>
	188	+	</LinearLayout>

View View this file contents

History View the full history

Feeds

Commits for /Android/SmartCharging/SmartCharging/app/src/main/res/layout/activity_setting_selection.xml