|
@@ -20,151 +20,136 @@ |
20 |
20 |
|
android:background="#3cdbff" |
21 |
21 |
|
android:layout_weight="7" /> |
22 |
22 |
|
|
23 |
|
- |
<LinearLayout |
24 |
|
- |
android:orientation="vertical" |
|
23 |
+ |
<ScrollView |
25 |
24 |
|
android:layout_width="match_parent" |
26 |
|
- |
android:layout_height="match_parent" |
27 |
|
- |
android:layout_margin="@dimen/space_16dp" |
28 |
|
- |
android:layout_weight="3"> |
29 |
|
- |
|
30 |
|
- |
<RelativeLayout |
31 |
|
- |
android:layout_width="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" /> |
38 |
|
- |
<ImageView |
39 |
|
- |
android:src="@drawable/facebook" |
40 |
|
- |
android:background="@drawable/facebook_bordered_rectangle" |
41 |
|
- |
android:layout_width="match_parent" |
42 |
|
- |
android:layout_height="match_parent" /> |
43 |
|
- |
</RelativeLayout> |
44 |
|
- |
|
|
25 |
+ |
android:layout_height="match_parent"> |
45 |
26 |
|
<LinearLayout |
46 |
|
- |
android:id="@+id/or_divider" |
|
27 |
+ |
android:orientation="vertical" |
47 |
28 |
|
android:layout_width="match_parent" |
48 |
29 |
|
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"/> |
59 |
|
- |
<TextView |
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"/> |
65 |
|
- |
<View |
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"/> |
72 |
|
- |
</LinearLayout> |
|
30 |
+ |
android:padding="@dimen/space_16dp" |
|
31 |
+ |
android:layout_weight="3"> |
73 |
32 |
|
|
74 |
|
- |
<LinearLayout |
75 |
|
- |
android:orientation="horizontal" |
76 |
|
- |
android:layout_width="match_parent" |
77 |
|
- |
android:layout_height="wrap_content" |
78 |
|
- |
android:background="#f0f0f0" |
79 |
|
- |
android:layout_marginTop="10dp"> |
80 |
|
- |
<TextView |
81 |
|
- |
android:id="@+id/textView" |
82 |
|
- |
android:layout_width="wrap_content" |
83 |
|
- |
android:layout_height="wrap_content" |
84 |
|
- |
android:text="@string/username" |
85 |
|
- |
android:textAppearance="?android:attr/textAppearanceSmall" |
86 |
|
- |
android:layout_marginLeft="@dimen/space_16dp" |
87 |
|
- |
android:layout_marginRight="@dimen/space_16dp" |
88 |
|
- |
android:background="#f0f0f0" /> |
|
33 |
+ |
<RelativeLayout |
|
34 |
+ |
android:layout_width="match_parent" |
|
35 |
+ |
android:layout_height="@dimen/space_48dp"> |
|
36 |
+ |
<Button |
|
37 |
+ |
android:id="@+id/facebook_login_button" |
|
38 |
+ |
android:stateListAnimator="@null" |
|
39 |
+ |
android:layout_width="match_parent" |
|
40 |
+ |
android:layout_height="match_parent" /> |
|
41 |
+ |
<ImageView |
|
42 |
+ |
android:src="@drawable/facebook" |
|
43 |
+ |
android:background="@drawable/facebook_bordered_rectangle" |
|
44 |
+ |
android:layout_width="match_parent" |
|
45 |
+ |
android:layout_height="match_parent" /> |
|
46 |
+ |
</RelativeLayout> |
89 |
47 |
|
|
90 |
|
- |
<EditText |
91 |
|
- |
android:id="@+id/editText2" |
|
48 |
+ |
<LinearLayout |
|
49 |
+ |
android:id="@+id/or_divider" |
92 |
50 |
|
android:layout_width="match_parent" |
93 |
|
- |
android:layout_height="50dp" |
94 |
|
- |
android:background="#f0f0f0" /> |
95 |
|
- |
</LinearLayout> |
|
51 |
+ |
android:layout_height="wrap_content" |
|
52 |
+ |
android:orientation="horizontal" |
|
53 |
+ |
android:layout_marginTop="10dp" |
|
54 |
+ |
android:weightSum="4"> |
|
55 |
+ |
<View |
|
56 |
+ |
android:background="@color/md_grey_500" |
|
57 |
+ |
android:layout_gravity="center_vertical" |
|
58 |
+ |
android:layout_width="match_parent" |
|
59 |
+ |
android:layout_height="1dp" |
|
60 |
+ |
android:layout_marginRight="5dp" |
|
61 |
+ |
android:layout_weight="2"/> |
|
62 |
+ |
<TextView |
|
63 |
+ |
android:text="@string/login_o_divider" |
|
64 |
+ |
android:textColor="@color/md_grey_500" |
|
65 |
+ |
android:layout_width="wrap_content" |
|
66 |
+ |
android:gravity="center_horizontal" |
|
67 |
+ |
android:layout_height="wrap_content"/> |
|
68 |
+ |
<View |
|
69 |
+ |
android:background="@color/md_grey_500" |
|
70 |
+ |
android:layout_gravity="center_vertical" |
|
71 |
+ |
android:layout_width="match_parent" |
|
72 |
+ |
android:layout_marginLeft="5dp" |
|
73 |
+ |
android:layout_height="1dp" |
|
74 |
+ |
android:layout_weight="2"/> |
|
75 |
+ |
</LinearLayout> |
|
76 |
+ |
|
|
77 |
+ |
|
|
78 |
+ |
<android.support.design.widget.TextInputLayout |
|
79 |
+ |
android:id="@+id/to_text_input_layout" |
|
80 |
+ |
android:layout_width="match_parent" |
|
81 |
+ |
android:layout_height="wrap_content"> |
|
82 |
+ |
<EditText |
|
83 |
+ |
android:layout_width="match_parent" |
|
84 |
+ |
android:layout_height="wrap_content" |
|
85 |
+ |
android:id="@+id/editText2" |
|
86 |
+ |
android:hint="@string/username" |
|
87 |
+ |
android:inputType="text" |
|
88 |
+ |
android:maxLength="4" /> |
|
89 |
+ |
</android.support.design.widget.TextInputLayout> |
|
90 |
+ |
|
|
91 |
+ |
<android.support.design.widget.TextInputLayout |
|
92 |
+ |
android:id="@+id/to_text_input_layout" |
|
93 |
+ |
android:layout_width="match_parent" |
|
94 |
+ |
android:layout_height="wrap_content"> |
|
95 |
+ |
<EditText |
|
96 |
+ |
android:layout_width="match_parent" |
|
97 |
+ |
android:layout_height="wrap_content" |
|
98 |
+ |
android:id="@+id/editText3" |
|
99 |
+ |
android:hint="@string/password" |
|
100 |
+ |
android:inputType="textPassword" |
|
101 |
+ |
android:maxLength="4" /> |
|
102 |
+ |
</android.support.design.widget.TextInputLayout> |
96 |
103 |
|
|
97 |
|
- |
<LinearLayout |
98 |
|
- |
android:orientation="horizontal" |
99 |
|
- |
android:layout_width="match_parent" |
100 |
|
- |
android:layout_height="wrap_content" |
101 |
|
- |
android:layout_marginTop="10dp" |
102 |
|
- |
android:background="#f0f0f0"> |
103 |
104 |
|
|
104 |
|
- |
<TextView |
105 |
|
- |
android:id="@+id/textView2" |
106 |
|
- |
android:layout_width="wrap_content" |
|
105 |
+ |
|
|
106 |
+ |
<Button |
|
107 |
+ |
android:id="@+id/button2" |
|
108 |
+ |
android:layout_width="match_parent" |
107 |
109 |
|
android:layout_height="wrap_content" |
108 |
|
- |
android:text="@string/password" |
109 |
|
- |
android:textAppearance="?android:attr/textAppearanceSmall" |
110 |
|
- |
android:layout_marginLeft="@dimen/space_16dp" |
111 |
|
- |
android:layout_marginRight="@dimen/space_16dp" |
112 |
|
- |
android:background="#f0f0f0" /> |
113 |
|
- |
|
114 |
|
- |
<EditText |
115 |
|
- |
android:id="@+id/editText3" |
116 |
|
- |
android:layout_width="match_parent" |
117 |
|
- |
android:layout_height="50dp" |
118 |
|
- |
android:ems="10" |
119 |
|
- |
android:inputType="textPassword" |
120 |
|
- |
android:background="#f0f0f0" /> |
121 |
|
- |
</LinearLayout> |
|
110 |
+ |
android:onClick="loginclick" |
|
111 |
+ |
android:text="@string/login" |
|
112 |
+ |
android:layout_marginTop="@dimen/space_16dp" /> |
122 |
113 |
|
|
123 |
|
- |
<Button |
124 |
|
- |
android:id="@+id/button2" |
125 |
|
- |
android:layout_width="match_parent" |
126 |
|
- |
android:layout_height="wrap_content" |
127 |
|
- |
android:onClick="loginclick" |
128 |
|
- |
android:text="@string/login" |
129 |
|
- |
android:layout_marginTop="@dimen/space_16dp" /> |
|
114 |
+ |
<LinearLayout |
|
115 |
+ |
android:orientation="horizontal" |
|
116 |
+ |
android:layout_width="match_parent" |
|
117 |
+ |
android:layout_height="wrap_content" |
|
118 |
+ |
android:layout_gravity="center_horizontal" |
|
119 |
+ |
android:layout_marginLeft="40dp" |
|
120 |
+ |
android:layout_marginRight="40dp" |
|
121 |
+ |
android:layout_marginTop="10dp"> |
|
122 |
+ |
|
|
123 |
+ |
<Button |
|
124 |
+ |
android:id="@+id/button4" |
|
125 |
+ |
android:layout_width="wrap_content" |
|
126 |
+ |
android:visibility="gone" |
|
127 |
+ |
android:layout_height="50dp" /> |
130 |
128 |
|
|
131 |
|
- |
<LinearLayout |
132 |
|
- |
android:orientation="horizontal" |
133 |
|
- |
android:layout_width="match_parent" |
134 |
|
- |
android:layout_height="wrap_content" |
135 |
|
- |
android:layout_gravity="center_horizontal" |
136 |
|
- |
android:layout_marginLeft="40dp" |
137 |
|
- |
android:layout_marginRight="40dp" |
138 |
|
- |
android:layout_marginTop="10dp"> |
139 |
129 |
|
|
|
130 |
+ |
</LinearLayout> |
140 |
131 |
|
<Button |
141 |
|
- |
android:id="@+id/button4" |
|
132 |
+ |
android:id="@+id/button3" |
|
133 |
+ |
android:layout_marginTop="@dimen/space_16dp" |
142 |
134 |
|
android:layout_width="wrap_content" |
143 |
|
- |
android:visibility="gone" |
144 |
|
- |
android:layout_height="50dp" /> |
|
135 |
+ |
android:layout_height="wrap_content" |
|
136 |
+ |
android:onClick="btnregister" |
|
137 |
+ |
android:text="@string/btnRegistrazione" |
|
138 |
+ |
style="@style/BorderlessButton" |
|
139 |
+ |
android:layout_gravity="center_horizontal" /> |
145 |
140 |
|
|
|
141 |
+ |
<Button |
|
142 |
+ |
android:id="@+id/button6" |
|
143 |
+ |
android:layout_width="wrap_content" |
|
144 |
+ |
android:layout_gravity="center_horizontal" |
|
145 |
+ |
android:layout_height="wrap_content" |
|
146 |
+ |
style="@style/BorderlessButton" |
|
147 |
+ |
android:text="@string/ignora_btn" |
|
148 |
+ |
android:onClick="ignoraclick"/> |
146 |
149 |
|
|
147 |
150 |
|
</LinearLayout> |
148 |
|
- |
<Button |
149 |
|
- |
android:id="@+id/button3" |
150 |
|
- |
android:layout_marginTop="@dimen/space_16dp" |
151 |
|
- |
android:layout_width="wrap_content" |
152 |
|
- |
android:layout_height="wrap_content" |
153 |
|
- |
android:onClick="btnregister" |
154 |
|
- |
android:text="@string/btnRegistrazione" |
155 |
|
- |
style="@style/BorderlessButton" |
156 |
|
- |
android:layout_gravity="center_horizontal" /> |
157 |
|
- |
|
158 |
|
- |
<Button |
159 |
|
- |
android:id="@+id/button6" |
160 |
|
- |
android:layout_width="wrap_content" |
161 |
|
- |
android:layout_gravity="center_horizontal" |
162 |
|
- |
android:layout_height="wrap_content" |
163 |
|
- |
style="@style/BorderlessButton" |
164 |
|
- |
android:text="@string/ignora_btn" |
165 |
|
- |
android:onClick="ignoraclick"/> |
166 |
151 |
|
|
167 |
|
- |
</LinearLayout> |
|
152 |
+ |
</ScrollView> |
168 |
153 |
|
</LinearLayout> |
169 |
154 |
|
|
170 |
155 |
|
</RelativeLayout> |