|
@@ -1,149 +1,147 @@ |
1 |
1 |
|
<RelativeLayout |
2 |
|
- |
xmlns:android="http://schemas.android.com/apk/res/android" |
3 |
|
- |
xmlns:tools="http://schemas.android.com/tools" |
4 |
|
- |
android:layout_width="match_parent" |
5 |
|
- |
android:layout_height="match_parent"> |
6 |
|
- |
|
7 |
|
- |
<LinearLayout |
8 |
|
- |
android:orientation="vertical" |
|
2 |
+ |
xmlns:android="http://schemas.android.com/apk/res/android" |
9 |
3 |
|
android:layout_width="match_parent" |
10 |
4 |
|
android:layout_height="match_parent"> |
11 |
5 |
|
|
12 |
|
- |
<ImageView |
|
6 |
+ |
<LinearLayout |
|
7 |
+ |
android:orientation="vertical" |
13 |
8 |
|
android:layout_width="match_parent" |
14 |
|
- |
android:layout_height="@dimen/header_height" |
15 |
|
- |
android:id="@+id/imageView2" |
16 |
|
- |
android:scaleType="fitCenter" |
17 |
|
- |
android:src="@drawable/screen1" |
18 |
|
- |
android:background="#3cdbff" /> |
|
9 |
+ |
android:layout_height="match_parent"> |
|
10 |
+ |
|
|
11 |
+ |
<ImageView |
|
12 |
+ |
android:layout_width="match_parent" |
|
13 |
+ |
android:layout_height="@dimen/header_height" |
|
14 |
+ |
android:id="@+id/imageView2" |
|
15 |
+ |
android:scaleType="fitCenter" |
|
16 |
+ |
android:src="@drawable/screen1" |
|
17 |
+ |
android:background="#3cdbff" /> |
19 |
18 |
|
|
20 |
19 |
|
<ScrollView |
21 |
|
- |
android:layout_width="match_parent" |
22 |
|
- |
android:layout_height="match_parent"> |
23 |
|
- |
<LinearLayout |
24 |
|
- |
android:orientation="vertical" |
25 |
20 |
|
android:layout_width="match_parent" |
26 |
|
- |
android:layout_height="wrap_content" |
27 |
|
- |
android:padding="@dimen/space_16dp" |
28 |
|
- |
android:layout_marginBottom="@dimen/space_16dp" |
29 |
|
- |
android:layout_weight="3"> |
|
21 |
+ |
android:layout_height="match_parent"> |
|
22 |
+ |
<LinearLayout |
|
23 |
+ |
android:orientation="vertical" |
|
24 |
+ |
android:layout_width="match_parent" |
|
25 |
+ |
android:layout_height="wrap_content" |
|
26 |
+ |
android:padding="@dimen/space_16dp" |
|
27 |
+ |
android:layout_marginBottom="@dimen/space_16dp" |
|
28 |
+ |
android:layout_weight="3"> |
30 |
29 |
|
|
31 |
30 |
|
<RelativeLayout |
32 |
|
- |
android:layout_width="match_parent" |
33 |
|
- |
android:layout_height="@dimen/space_48dp"> |
34 |
|
- |
<Button |
35 |
|
- |
android:id="@+id/facebook_login_button" |
36 |
|
- |
android:stateListAnimator="@null" |
37 |
31 |
|
android:layout_width="match_parent" |
38 |
|
- |
android:layout_height="match_parent" /> |
|
32 |
+ |
android:layout_height="@dimen/space_48dp"> |
|
33 |
+ |
<Button |
|
34 |
+ |
android:id="@+id/facebook_login_button" |
|
35 |
+ |
android:stateListAnimator="@null" |
|
36 |
+ |
android:layout_width="match_parent" |
|
37 |
+ |
android:layout_height="match_parent" /> |
39 |
38 |
|
<ImageView |
40 |
|
- |
android:src="@drawable/facebook" |
41 |
|
- |
android:background="@drawable/facebook_bordered_rectangle" |
42 |
|
- |
android:layout_width="match_parent" |
43 |
|
- |
android:layout_height="match_parent" /> |
|
39 |
+ |
android:src="@drawable/facebook" |
|
40 |
+ |
android:background="@drawable/facebook_bordered_rectangle" |
|
41 |
+ |
android:layout_width="match_parent" |
|
42 |
+ |
android:layout_height="match_parent" /> |
44 |
43 |
|
</RelativeLayout> |
45 |
44 |
|
|
46 |
45 |
|
<LinearLayout |
47 |
|
- |
android:id="@+id/or_divider" |
48 |
|
- |
android:layout_width="match_parent" |
49 |
|
- |
android:layout_height="wrap_content" |
50 |
|
- |
android:orientation="horizontal" |
51 |
|
- |
android:layout_marginTop="10dp" |
52 |
|
- |
android:weightSum="4"> |
53 |
|
- |
<View |
54 |
|
- |
android:background="@color/md_grey_500" |
55 |
|
- |
android:layout_gravity="center_vertical" |
|
46 |
+ |
android:id="@+id/or_divider" |
56 |
47 |
|
android:layout_width="match_parent" |
57 |
|
- |
android:layout_height="1dp" |
58 |
|
- |
android:layout_marginRight="5dp" |
59 |
|
- |
android:layout_weight="2"/> |
|
48 |
+ |
android:layout_height="wrap_content" |
|
49 |
+ |
android:orientation="horizontal" |
|
50 |
+ |
android:layout_marginTop="10dp" |
|
51 |
+ |
android:weightSum="4"> |
|
52 |
+ |
<View |
|
53 |
+ |
android:background="@color/md_grey_500" |
|
54 |
+ |
android:layout_gravity="center_vertical" |
|
55 |
+ |
android:layout_width="match_parent" |
|
56 |
+ |
android:layout_height="1dp" |
|
57 |
+ |
android:layout_marginRight="5dp" |
|
58 |
+ |
android:layout_weight="2"/> |
60 |
59 |
|
<TextView |
61 |
|
- |
android:text="@string/login_o_divider" |
62 |
|
- |
android:textColor="@color/md_grey_500" |
63 |
|
- |
android:layout_width="wrap_content" |
64 |
|
- |
android:gravity="center_horizontal" |
65 |
|
- |
android:layout_height="wrap_content"/> |
|
60 |
+ |
android:text="@string/login_o_divider" |
|
61 |
+ |
android:textColor="@color/md_grey_500" |
|
62 |
+ |
android:layout_width="wrap_content" |
|
63 |
+ |
android:gravity="center_horizontal" |
|
64 |
+ |
android:layout_height="wrap_content"/> |
66 |
65 |
|
<View |
67 |
|
- |
android:background="@color/md_grey_500" |
68 |
|
- |
android:layout_gravity="center_vertical" |
69 |
|
- |
android:layout_width="match_parent" |
70 |
|
- |
android:layout_marginLeft="5dp" |
71 |
|
- |
android:layout_height="1dp" |
72 |
|
- |
android:layout_weight="2"/> |
|
66 |
+ |
android:background="@color/md_grey_500" |
|
67 |
+ |
android:layout_gravity="center_vertical" |
|
68 |
+ |
android:layout_width="match_parent" |
|
69 |
+ |
android:layout_marginLeft="5dp" |
|
70 |
+ |
android:layout_height="1dp" |
|
71 |
+ |
android:layout_weight="2"/> |
73 |
72 |
|
</LinearLayout> |
74 |
73 |
|
|
75 |
74 |
|
|
76 |
75 |
|
<android.support.design.widget.TextInputLayout |
77 |
|
- |
android:id="@+id/to_text_input_layout" |
78 |
|
- |
android:layout_width="match_parent" |
79 |
|
- |
android:layout_height="wrap_content"> |
80 |
|
- |
<EditText |
|
76 |
+ |
android:id="@+id/to_text_input_layout" |
81 |
77 |
|
android:layout_width="match_parent" |
82 |
|
- |
android:layout_height="wrap_content" |
83 |
|
- |
android:id="@+id/editText2" |
84 |
|
- |
android:hint="@string/username" |
85 |
|
- |
android:inputType="text" |
86 |
|
- |
android:maxLength="100" /> |
|
78 |
+ |
android:layout_height="wrap_content"> |
|
79 |
+ |
<EditText |
|
80 |
+ |
android:layout_width="match_parent" |
|
81 |
+ |
android:layout_height="wrap_content" |
|
82 |
+ |
android:id="@+id/editText2" |
|
83 |
+ |
android:hint="@string/username" |
|
84 |
+ |
android:inputType="text" |
|
85 |
+ |
android:maxLength="100" /> |
87 |
86 |
|
</android.support.design.widget.TextInputLayout> |
88 |
87 |
|
|
89 |
88 |
|
<android.support.design.widget.TextInputLayout |
90 |
|
- |
android:id="@+id/to_text_input_layout" |
91 |
|
- |
android:layout_width="match_parent" |
92 |
|
- |
android:layout_height="wrap_content"> |
93 |
|
- |
<EditText |
94 |
89 |
|
android:layout_width="match_parent" |
95 |
|
- |
android:layout_height="wrap_content" |
96 |
|
- |
android:id="@+id/editText3" |
97 |
|
- |
android:hint="@string/password" |
98 |
|
- |
android:inputType="textPassword" |
99 |
|
- |
android:maxLength="20" /> |
|
90 |
+ |
android:layout_height="wrap_content"> |
|
91 |
+ |
<EditText |
|
92 |
+ |
android:layout_width="match_parent" |
|
93 |
+ |
android:layout_height="wrap_content" |
|
94 |
+ |
android:id="@+id/editText3" |
|
95 |
+ |
android:hint="@string/password" |
|
96 |
+ |
android:inputType="textPassword" |
|
97 |
+ |
android:maxLength="20" /> |
100 |
98 |
|
</android.support.design.widget.TextInputLayout> |
101 |
99 |
|
|
102 |
100 |
|
|
103 |
101 |
|
|
104 |
102 |
|
<Button |
105 |
|
- |
android:id="@+id/button2" |
106 |
|
- |
android:layout_width="match_parent" |
107 |
|
- |
android:layout_height="wrap_content" |
108 |
|
- |
android:onClick="loginclick" |
109 |
|
- |
android:text="@string/login" |
110 |
|
- |
android:layout_marginTop="@dimen/space_16dp" /> |
|
103 |
+ |
android:id="@+id/button2" |
|
104 |
+ |
android:layout_width="match_parent" |
|
105 |
+ |
android:layout_height="wrap_content" |
|
106 |
+ |
android:onClick="loginclick" |
|
107 |
+ |
android:text="@string/login" |
|
108 |
+ |
android:layout_marginTop="@dimen/space_16dp" /> |
111 |
109 |
|
|
112 |
110 |
|
<LinearLayout |
113 |
|
- |
android:orientation="horizontal" |
114 |
|
- |
android:layout_width="match_parent" |
115 |
|
- |
android:layout_height="wrap_content" |
116 |
|
- |
android:layout_gravity="center_horizontal" |
117 |
|
- |
android:layout_marginLeft="40dp" |
118 |
|
- |
android:layout_marginRight="40dp" |
119 |
|
- |
android:layout_marginTop="10dp"> |
|
111 |
+ |
android:orientation="horizontal" |
|
112 |
+ |
android:layout_width="match_parent" |
|
113 |
+ |
android:layout_height="wrap_content" |
|
114 |
+ |
android:layout_gravity="center_horizontal" |
|
115 |
+ |
android:layout_marginLeft="40dp" |
|
116 |
+ |
android:layout_marginRight="40dp" |
|
117 |
+ |
android:layout_marginTop="10dp"> |
120 |
118 |
|
|
121 |
119 |
|
<Button |
122 |
|
- |
android:id="@+id/button4" |
123 |
|
- |
android:layout_width="wrap_content" |
124 |
|
- |
android:visibility="gone" |
125 |
|
- |
android:layout_height="50dp" /> |
|
120 |
+ |
android:id="@+id/button4" |
|
121 |
+ |
android:layout_width="wrap_content" |
|
122 |
+ |
android:visibility="gone" |
|
123 |
+ |
android:layout_height="50dp" /> |
126 |
124 |
|
|
127 |
125 |
|
|
128 |
126 |
|
</LinearLayout> |
129 |
127 |
|
<Button |
130 |
|
- |
android:id="@+id/button3" |
131 |
|
- |
android:layout_marginTop="@dimen/space_16dp" |
132 |
|
- |
android:layout_width="wrap_content" |
133 |
|
- |
android:layout_height="wrap_content" |
134 |
|
- |
android:onClick="btnregister" |
135 |
|
- |
android:text="@string/btnRegistrazione" |
136 |
|
- |
style="@style/BorderlessButton" |
137 |
|
- |
android:layout_gravity="center_horizontal" /> |
|
128 |
+ |
android:id="@+id/button3" |
|
129 |
+ |
android:layout_marginTop="@dimen/space_16dp" |
|
130 |
+ |
android:layout_width="wrap_content" |
|
131 |
+ |
android:layout_height="wrap_content" |
|
132 |
+ |
android:onClick="btnregister" |
|
133 |
+ |
android:text="@string/btnRegistrazione" |
|
134 |
+ |
style="@style/BorderlessButton" |
|
135 |
+ |
android:layout_gravity="center_horizontal" /> |
138 |
136 |
|
|
139 |
137 |
|
<Button |
140 |
|
- |
android:id="@+id/button6" |
141 |
|
- |
android:layout_width="wrap_content" |
142 |
|
- |
android:layout_gravity="center_horizontal" |
143 |
|
- |
android:layout_height="wrap_content" |
144 |
|
- |
style="@style/BorderlessButton" |
145 |
|
- |
android:text="@string/ignora_btn" |
146 |
|
- |
android:onClick="ignoraclick"/> |
|
138 |
+ |
android:id="@+id/button6" |
|
139 |
+ |
android:layout_width="wrap_content" |
|
140 |
+ |
android:layout_gravity="center_horizontal" |
|
141 |
+ |
android:layout_height="wrap_content" |
|
142 |
+ |
style="@style/BorderlessButton" |
|
143 |
+ |
android:text="@string/ignora_btn" |
|
144 |
+ |
android:onClick="ignoraclick"/> |
147 |
145 |
|
|
148 |
146 |
|
</LinearLayout> |
149 |
147 |
|
|