| |
@@ -1,180 +1,179 @@ |
| 1 |
1 |
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 2 |
|
- |
xmlns:tools="http://schemas.android.com/tools" |
| 3 |
|
- |
android:layout_width="match_parent" |
| 4 |
|
- |
android:layout_height="match_parent" |
| |
2 |
+ |
xmlns:tools="http://schemas.android.com/tools" |
| |
3 |
+ |
android:layout_width="match_parent" |
| |
4 |
+ |
android:layout_height="match_parent" |
| 5 |
5 |
|
|
| 6 |
|
- |
tools:context="it.fedeloper.smartcharging.Controller.LoginActivity"> |
| |
6 |
+ |
tools:context="it.fedeloper.smartcharging.Controller.LoginActivity"> |
| 7 |
7 |
|
|
| 8 |
8 |
|
|
| 9 |
9 |
|
<LinearLayout |
| 10 |
|
- |
android:orientation="vertical" |
| 11 |
|
- |
android:layout_width="match_parent" |
| 12 |
|
- |
android:layout_height="match_parent"> |
| |
10 |
+ |
android:orientation="vertical" |
| |
11 |
+ |
android:layout_width="match_parent" |
| |
12 |
+ |
android:layout_height="match_parent"> |
| 13 |
13 |
|
|
| 14 |
14 |
|
<ImageView |
| 15 |
|
- |
android:layout_width="wrap_content" |
| 16 |
|
- |
android:layout_height="wrap_content" |
| 17 |
|
- |
android:id="@+id/imageView2" |
| 18 |
|
- |
android:scaleType="fitCenter" |
| 19 |
|
- |
android:layout_centerHorizontal="true" |
| 20 |
|
- |
android:src="@drawable/screen1" |
| 21 |
|
- |
android:background="#3cdbff" |
| 22 |
|
- |
android:layout_weight="0.7" /> |
| |
15 |
+ |
android:layout_width="wrap_content" |
| |
16 |
+ |
android:layout_height="wrap_content" |
| |
17 |
+ |
android:id="@+id/imageView2" |
| |
18 |
+ |
android:scaleType="fitCenter" |
| |
19 |
+ |
android:layout_centerHorizontal="true" |
| |
20 |
+ |
android:src="@drawable/screen1" |
| |
21 |
+ |
android:background="#3cdbff" |
| |
22 |
+ |
android:layout_weight="0.7" /> |
| 23 |
23 |
|
|
| 24 |
24 |
|
<LinearLayout |
| 25 |
|
- |
android:orientation="vertical" |
| 26 |
|
- |
android:layout_width="match_parent" |
| 27 |
|
- |
android:layout_height="match_parent" |
| 28 |
|
- |
android:layout_weight="0.5"> |
| 29 |
|
- |
|
| 30 |
|
- |
<LinearLayout |
| 31 |
25 |
|
android:orientation="vertical" |
| 32 |
26 |
|
android:layout_width="match_parent" |
| 33 |
27 |
|
android:layout_height="match_parent" |
| 34 |
|
- |
android:layout_gravity="center_vertical" |
| 35 |
|
- |
android:gravity="center_vertical"> |
| |
28 |
+ |
android:layout_weight="0.5"> |
| 36 |
29 |
|
|
| 37 |
|
- |
<LinearLayout |
| 38 |
|
- |
android:orientation="horizontal" |
| |
30 |
+ |
<LinearLayout |
| |
31 |
+ |
android:orientation="vertical" |
| 39 |
32 |
|
android:layout_width="match_parent" |
| 40 |
|
- |
android:layout_height="wrap_content" |
| 41 |
|
- |
android:layout_marginLeft="40dp" |
| 42 |
|
- |
android:layout_marginRight="40dp" |
| 43 |
|
- |
android:background="#f0f0f0" |
| 44 |
|
- |
android:layout_marginBottom="10dp"> |
| |
33 |
+ |
android:layout_height="match_parent" |
| |
34 |
+ |
android:layout_gravity="center_vertical" |
| |
35 |
+ |
android:gravity="center_vertical"> |
| 45 |
36 |
|
|
| 46 |
|
- |
<TextView |
| 47 |
|
- |
android:id="@+id/textView" |
| 48 |
|
- |
android:layout_width="wrap_content" |
| |
37 |
+ |
<LinearLayout |
| |
38 |
+ |
android:orientation="horizontal" |
| |
39 |
+ |
android:layout_width="match_parent" |
| 49 |
40 |
|
android:layout_height="wrap_content" |
| 50 |
|
- |
android:layout_alignParentLeft="true" |
| 51 |
|
- |
android:layout_alignParentStart="true" |
| 52 |
|
- |
android:layout_below="@+id/imageView2" |
| 53 |
|
- |
android:text="@string/username" |
| 54 |
|
- |
android:textAppearance="?android:attr/textAppearanceSmall" |
| 55 |
|
- |
android:layout_marginLeft="20dp" |
| 56 |
|
- |
android:layout_marginRight="20dp" |
| 57 |
|
- |
android:background="#f0f0f0" /> |
| |
41 |
+ |
android:layout_marginLeft="40dp" |
| |
42 |
+ |
android:layout_marginRight="40dp" |
| |
43 |
+ |
android:background="#f0f0f0" |
| |
44 |
+ |
android:layout_marginBottom="10dp"> |
| |
45 |
+ |
|
| |
46 |
+ |
<TextView |
| |
47 |
+ |
android:id="@+id/textView" |
| |
48 |
+ |
android:layout_width="wrap_content" |
| |
49 |
+ |
android:layout_height="wrap_content" |
| |
50 |
+ |
android:layout_alignParentLeft="true" |
| |
51 |
+ |
android:layout_alignParentStart="true" |
| |
52 |
+ |
android:layout_below="@+id/imageView2" |
| |
53 |
+ |
android:text="@string/username" |
| |
54 |
+ |
android:textAppearance="?android:attr/textAppearanceSmall" |
| |
55 |
+ |
android:layout_marginLeft="20dp" |
| |
56 |
+ |
android:layout_marginRight="20dp" |
| |
57 |
+ |
android:background="#f0f0f0" /> |
| 58 |
58 |
|
|
| 59 |
59 |
|
<EditText |
| 60 |
|
- |
android:id="@+id/editText2" |
| 61 |
|
- |
android:layout_width="match_parent" |
| 62 |
|
- |
android:layout_height="50dp" |
| 63 |
|
- |
android:layout_alignParentEnd="true" |
| 64 |
|
- |
android:layout_alignParentLeft="true" |
| 65 |
|
- |
android:layout_alignParentRight="true" |
| 66 |
|
- |
android:layout_alignParentStart="true" |
| 67 |
|
- |
android:layout_below="@+id/textView" |
| 68 |
|
- |
android:background="#f0f0f0" /> |
| |
60 |
+ |
android:id="@+id/editText2" |
| |
61 |
+ |
android:layout_width="match_parent" |
| |
62 |
+ |
android:layout_height="50dp" |
| |
63 |
+ |
android:layout_alignParentEnd="true" |
| |
64 |
+ |
android:layout_alignParentLeft="true" |
| |
65 |
+ |
android:layout_alignParentRight="true" |
| |
66 |
+ |
android:layout_alignParentStart="true" |
| |
67 |
+ |
android:layout_below="@+id/textView" |
| |
68 |
+ |
android:background="#f0f0f0" /> |
| 69 |
69 |
|
</LinearLayout> |
| 70 |
70 |
|
|
| 71 |
71 |
|
<LinearLayout |
| 72 |
|
- |
android:orientation="horizontal" |
| 73 |
|
- |
android:layout_width="match_parent" |
| 74 |
|
- |
android:layout_height="wrap_content" |
| 75 |
|
- |
android:layout_marginLeft="40dp" |
| 76 |
|
- |
android:layout_marginRight="40dp" |
| 77 |
|
- |
android:background="#f0f0f0"> |
| |
72 |
+ |
android:orientation="horizontal" |
| |
73 |
+ |
android:layout_width="match_parent" |
| |
74 |
+ |
android:layout_height="wrap_content" |
| |
75 |
+ |
android:layout_marginLeft="40dp" |
| |
76 |
+ |
android:layout_marginRight="40dp" |
| |
77 |
+ |
android:background="#f0f0f0"> |
| 78 |
78 |
|
|
| 79 |
79 |
|
<TextView |
| 80 |
|
- |
android:id="@+id/textView2" |
| 81 |
|
- |
android:layout_width="wrap_content" |
| 82 |
|
- |
android:layout_height="wrap_content" |
| 83 |
|
- |
android:layout_alignParentLeft="true" |
| 84 |
|
- |
android:layout_alignParentStart="true" |
| 85 |
|
- |
android:layout_below="@+id/editText2" |
| 86 |
|
- |
android:text="@string/password" |
| 87 |
|
- |
android:textAppearance="?android:attr/textAppearanceSmall" |
| 88 |
|
- |
android:layout_marginRight="20dp" |
| 89 |
|
- |
android:layout_marginLeft="20dp" |
| 90 |
|
- |
android:background="#f0f0f0" /> |
| |
80 |
+ |
android:id="@+id/textView2" |
| |
81 |
+ |
android:layout_width="wrap_content" |
| |
82 |
+ |
android:layout_height="wrap_content" |
| |
83 |
+ |
android:layout_alignParentLeft="true" |
| |
84 |
+ |
android:layout_alignParentStart="true" |
| |
85 |
+ |
android:layout_below="@+id/editText2" |
| |
86 |
+ |
android:text="@string/password" |
| |
87 |
+ |
android:textAppearance="?android:attr/textAppearanceSmall" |
| |
88 |
+ |
android:layout_marginRight="20dp" |
| |
89 |
+ |
android:layout_marginLeft="20dp" |
| |
90 |
+ |
android:background="#f0f0f0" /> |
| 91 |
91 |
|
|
| 92 |
92 |
|
<EditText |
| 93 |
|
- |
android:id="@+id/editText3" |
| 94 |
|
- |
android:layout_width="match_parent" |
| 95 |
|
- |
android:layout_height="50dp" |
| 96 |
|
- |
android:layout_alignParentEnd="true" |
| 97 |
|
- |
android:layout_alignParentLeft="true" |
| 98 |
|
- |
android:layout_alignParentRight="true" |
| 99 |
|
- |
android:layout_alignParentStart="true" |
| 100 |
|
- |
android:layout_below="@+id/textView2" |
| 101 |
|
- |
android:ems="10" |
| 102 |
|
- |
android:inputType="textPassword" |
| 103 |
|
- |
android:background="#f0f0f0" /> |
| |
93 |
+ |
android:id="@+id/editText3" |
| |
94 |
+ |
android:layout_width="match_parent" |
| |
95 |
+ |
android:layout_height="50dp" |
| |
96 |
+ |
android:layout_alignParentEnd="true" |
| |
97 |
+ |
android:layout_alignParentLeft="true" |
| |
98 |
+ |
android:layout_alignParentRight="true" |
| |
99 |
+ |
android:layout_alignParentStart="true" |
| |
100 |
+ |
android:layout_below="@+id/textView2" |
| |
101 |
+ |
android:ems="10" |
| |
102 |
+ |
android:inputType="textPassword" |
| |
103 |
+ |
android:background="#f0f0f0" /> |
| 104 |
104 |
|
</LinearLayout> |
| 105 |
105 |
|
|
| 106 |
106 |
|
<Button |
| 107 |
|
- |
android:id="@+id/button2" |
| 108 |
|
- |
android:layout_width="fill_parent" |
| 109 |
|
- |
android:layout_height="50dp" |
| 110 |
|
- |
android:layout_alignParentLeft="true" |
| 111 |
|
- |
android:layout_alignParentStart="true" |
| 112 |
|
- |
android:layout_below="@+id/editText3" |
| 113 |
|
- |
android:onClick="loginclick" |
| 114 |
|
- |
android:text="@string/login" |
| 115 |
|
- |
android:layout_marginLeft="40dp" |
| 116 |
|
- |
android:layout_marginRight="40dp" |
| 117 |
|
- |
android:background="@drawable/back" |
| 118 |
|
- |
android:textColor="#574a67" |
| 119 |
|
- |
android:layout_marginTop="10dp" /> |
| |
107 |
+ |
android:id="@+id/button2" |
| |
108 |
+ |
android:layout_width="fill_parent" |
| |
109 |
+ |
android:layout_height="50dp" |
| |
110 |
+ |
android:layout_alignParentLeft="true" |
| |
111 |
+ |
android:layout_alignParentStart="true" |
| |
112 |
+ |
android:layout_below="@+id/editText3" |
| |
113 |
+ |
android:onClick="loginclick" |
| |
114 |
+ |
android:text="@string/login" |
| |
115 |
+ |
android:layout_marginLeft="40dp" |
| |
116 |
+ |
android:layout_marginRight="40dp" |
| |
117 |
+ |
android:background="@drawable/back" |
| |
118 |
+ |
android:textColor="#574a67" |
| |
119 |
+ |
android:layout_marginTop="10dp" /> |
| 120 |
120 |
|
|
| 121 |
121 |
|
<LinearLayout |
| 122 |
|
- |
android:orientation="horizontal" |
| 123 |
|
- |
android:layout_width="match_parent" |
| 124 |
|
- |
android:layout_height="wrap_content" |
| 125 |
|
- |
android:layout_gravity="center_horizontal" |
| 126 |
|
- |
android:layout_marginLeft="40dp" |
| 127 |
|
- |
android:layout_marginRight="40dp" |
| 128 |
|
- |
android:layout_marginTop="10dp"> |
| |
122 |
+ |
android:orientation="horizontal" |
| |
123 |
+ |
android:layout_width="match_parent" |
| |
124 |
+ |
android:layout_height="wrap_content" |
| |
125 |
+ |
android:layout_gravity="center_horizontal" |
| |
126 |
+ |
android:layout_marginLeft="40dp" |
| |
127 |
+ |
android:layout_marginRight="40dp" |
| |
128 |
+ |
android:layout_marginTop="10dp"> |
| 129 |
129 |
|
|
| 130 |
130 |
|
<Button |
| 131 |
|
- |
android:id="@+id/button4" |
| 132 |
|
- |
android:layout_width="wrap_content" |
| 133 |
|
- |
android:visibility="gone" |
| 134 |
|
- |
android:layout_height="50dp" |
| 135 |
|
- |
android:background="@drawable/google" /> |
| |
131 |
+ |
android:id="@+id/button4" |
| |
132 |
+ |
android:layout_width="wrap_content" |
| |
133 |
+ |
android:visibility="gone" |
| |
134 |
+ |
android:layout_height="50dp" |
| |
135 |
+ |
android:background="@drawable/google" /> |
| 136 |
136 |
|
|
| 137 |
137 |
|
<RelativeLayout |
| 138 |
138 |
|
android:layout_width="match_parent" |
| 139 |
|
- |
android:layout_height="58dp"> |
| |
139 |
+ |
android:layout_height="50dp" |
| |
140 |
+ |
> |
| 140 |
141 |
|
<Button |
| 141 |
142 |
|
android:id="@+id/facebook_login_button" |
| 142 |
143 |
|
android:layout_width="match_parent" |
| 143 |
144 |
|
android:layout_height="match_parent" /> |
| 144 |
145 |
|
<ImageView |
| 145 |
|
- |
android:background="@drawable/facebook" |
| |
146 |
+ |
android:src="@drawable/facebook" |
| |
147 |
+ |
android:background="@drawable/facebook_bordered_rectangle" |
| 146 |
148 |
|
android:layout_width="wrap_content" |
| 147 |
|
- |
android:layout_height="match_parent"/> |
| |
149 |
+ |
android:layout_height="wrap_content" /> |
| 148 |
150 |
|
</RelativeLayout> |
| 149 |
|
- |
|
| 150 |
151 |
|
</LinearLayout> |
| 151 |
|
- |
|
| 152 |
152 |
|
<Button |
| 153 |
|
- |
android:id="@+id/button3" |
| 154 |
|
- |
android:layout_width="wrap_content" |
| 155 |
|
- |
android:layout_height="wrap_content" |
| 156 |
|
- |
android:layout_alignParentEnd="true" |
| 157 |
|
- |
android:layout_alignParentRight="true" |
| 158 |
|
- |
android:layout_below="@+id/editText3" |
| 159 |
|
- |
android:layout_toEndOf="@+id/imageView2" |
| 160 |
|
- |
android:onClick="btnregister" |
| 161 |
|
- |
android:text="@string/btnRegistrazione" |
| 162 |
|
- |
android:background="#00fffcac" |
| 163 |
|
- |
android:textColor="#676767" |
| 164 |
|
- |
android:layout_gravity="bottom|center_horizontal" /> |
| |
153 |
+ |
android:id="@+id/button3" |
| |
154 |
+ |
android:layout_width="wrap_content" |
| |
155 |
+ |
android:layout_height="wrap_content" |
| |
156 |
+ |
android:layout_alignParentEnd="true" |
| |
157 |
+ |
android:layout_alignParentRight="true" |
| |
158 |
+ |
android:layout_below="@+id/editText3" |
| |
159 |
+ |
android:layout_toEndOf="@+id/imageView2" |
| |
160 |
+ |
android:onClick="btnregister" |
| |
161 |
+ |
android:text="@string/btnRegistrazione" |
| |
162 |
+ |
android:background="#00fffcac" |
| |
163 |
+ |
android:textColor="#676767" |
| |
164 |
+ |
android:layout_gravity="bottom|center_horizontal" /> |
| 165 |
165 |
|
|
| 166 |
166 |
|
<Button |
| 167 |
|
- |
android:id="@+id/button6" |
| 168 |
|
- |
android:layout_width="wrap_content" |
| 169 |
|
- |
android:layout_height="wrap_content" |
| 170 |
|
- |
|
| 171 |
|
- |
android:text="@string/ignora_btn" |
| 172 |
|
- |
android:layout_alignParentBottom="true" |
| 173 |
|
- |
android:layout_alignParentEnd="true" |
| 174 |
|
- |
android:onClick="ignoraclick" |
| 175 |
|
- |
android:textColor="#676767" |
| 176 |
|
- |
android:background="#0045d6ff" |
| 177 |
|
- |
android:layout_gravity="right" /> |
| |
167 |
+ |
android:id="@+id/button6" |
| |
168 |
+ |
android:layout_width="wrap_content" |
| |
169 |
+ |
android:layout_height="wrap_content" |
| |
170 |
+ |
|
| |
171 |
+ |
android:text="@string/ignora_btn" |
| |
172 |
+ |
android:layout_marginRight="10dp" |
| |
173 |
+ |
android:onClick="ignoraclick" |
| |
174 |
+ |
android:textColor="#676767" |
| |
175 |
+ |
android:background="#0045d6ff" |
| |
176 |
+ |
android:layout_gravity="right" /> |
| 178 |
177 |
|
</LinearLayout> |
| 179 |
178 |
|
|
| 180 |
179 |
|
</LinearLayout> |
View this file contents
View the full history
Commits for