| |
@@ -12,16 +12,15 @@ |
| 12 |
12 |
|
android:layout_height="match_parent"> |
| 13 |
13 |
|
|
| 14 |
14 |
|
<ImageView |
| 15 |
|
- |
android:layout_width="wrap_content" |
| |
15 |
+ |
android:layout_width="match_parent" |
| 16 |
16 |
|
android:layout_height="wrap_content" |
| 17 |
17 |
|
android:id="@+id/imageView3" |
| 18 |
18 |
|
android:scaleType="fitCenter" |
| 19 |
|
- |
android:layout_centerHorizontal="true" |
| 20 |
19 |
|
android:src="@drawable/screen1" |
| 21 |
20 |
|
android:background="#3cdbff" |
| 22 |
|
- |
android:layout_weight="0.7" /> |
| |
21 |
+ |
android:layout_weight="0.7"/> |
| 23 |
22 |
|
|
| 24 |
|
- |
<LinearLayout |
| |
23 |
+ |
<ScrollView |
| 25 |
24 |
|
android:orientation="vertical" |
| 26 |
25 |
|
android:layout_width="match_parent" |
| 27 |
26 |
|
android:layout_height="match_parent" |
| |
@@ -30,7 +29,7 @@ |
| 30 |
29 |
|
<LinearLayout |
| 31 |
30 |
|
android:orientation="vertical" |
| 32 |
31 |
|
android:layout_width="match_parent" |
| 33 |
|
- |
android:layout_height="match_parent" |
| |
32 |
+ |
android:layout_height="wrap_content" |
| 34 |
33 |
|
android:layout_gravity="center_vertical" |
| 35 |
34 |
|
android:gravity="center_vertical"> |
| 36 |
35 |
|
|
| |
@@ -42,25 +41,53 @@ |
| 42 |
41 |
|
android:onClick="managerclick" |
| 43 |
42 |
|
android:background="#f0f0f0" |
| 44 |
43 |
|
android:textColor="#574a67" |
| 45 |
|
- |
android:layout_alignTop="@+id/linearLayout" |
| 46 |
|
- |
android:layout_centerHorizontal="true" |
| 47 |
44 |
|
android:layout_marginLeft="20dp" |
| 48 |
45 |
|
android:layout_marginRight="20dp" |
| 49 |
46 |
|
android:layout_gravity="center_horizontal" /> |
| 50 |
47 |
|
|
| 51 |
48 |
|
<Button |
| 52 |
|
- |
android:layout_width="fill_parent" |
| |
49 |
+ |
android:layout_width="match_parent" |
| 53 |
50 |
|
android:layout_height="50dp" |
| 54 |
51 |
|
android:text="@string/ricarica_al_piu_prest" |
| 55 |
52 |
|
android:id="@+id/button7" |
| 56 |
53 |
|
android:onClick="fastclick" |
| 57 |
54 |
|
android:background="#574a67" |
| 58 |
|
- |
android:layout_below="@+id/button22" |
| 59 |
|
- |
android:layout_centerHorizontal="true" |
| 60 |
55 |
|
android:layout_gravity="center_horizontal" |
| 61 |
56 |
|
android:layout_marginLeft="20dp" |
| 62 |
57 |
|
android:layout_marginRight="20dp" |
| 63 |
|
- |
android:layout_marginTop="10dp" /> |
| |
58 |
+ |
android:layout_marginTop="24dp" /> |
| |
59 |
+ |
|
| |
60 |
+ |
<LinearLayout |
| |
61 |
+ |
android:id="@+id/or_divider" |
| |
62 |
+ |
android:layout_width="match_parent" |
| |
63 |
+ |
android:layout_height="wrap_content" |
| |
64 |
+ |
android:orientation="horizontal" |
| |
65 |
+ |
android:layout_marginTop="10dp" |
| |
66 |
+ |
android:layout_marginBottom="10dp" |
| |
67 |
+ |
android:layout_marginLeft="16dp" |
| |
68 |
+ |
android:layout_marginRight="16dp" |
| |
69 |
+ |
android:weightSum="4"> |
| |
70 |
+ |
<View |
| |
71 |
+ |
android:background="#574a67" |
| |
72 |
+ |
android:layout_gravity="center_vertical" |
| |
73 |
+ |
android:layout_width="match_parent" |
| |
74 |
+ |
android:layout_height="1dp" |
| |
75 |
+ |
android:layout_marginRight="5dp" |
| |
76 |
+ |
android:layout_weight="2"/> |
| |
77 |
+ |
<TextView |
| |
78 |
+ |
android:text="@string/login_o_divider" |
| |
79 |
+ |
android:textColor="#574a67" |
| |
80 |
+ |
android:layout_width="20dp" |
| |
81 |
+ |
android:gravity="center_horizontal" |
| |
82 |
+ |
android:layout_height="wrap_content"/> |
| |
83 |
+ |
<View |
| |
84 |
+ |
android:background="#574a67" |
| |
85 |
+ |
android:layout_gravity="center_vertical" |
| |
86 |
+ |
android:layout_width="match_parent" |
| |
87 |
+ |
android:layout_marginLeft="5dp" |
| |
88 |
+ |
android:layout_height="1dp" |
| |
89 |
+ |
android:layout_weight="2"/> |
| |
90 |
+ |
</LinearLayout> |
| 64 |
91 |
|
|
| 65 |
92 |
|
<LinearLayout |
| 66 |
93 |
|
android:orientation="horizontal" |
| |
@@ -68,22 +95,21 @@ |
| 68 |
95 |
|
android:layout_height="wrap_content" |
| 69 |
96 |
|
android:layout_marginRight="20dp" |
| 70 |
97 |
|
android:layout_marginLeft="20dp" |
| 71 |
|
- |
android:layout_marginTop="10dp" |
| 72 |
|
- |
android:background="#f0f0f0"> |
| |
98 |
+ |
android:background="@drawable/grey_bordered_rectangle"> |
| 73 |
99 |
|
|
| 74 |
100 |
|
<TextView |
| 75 |
101 |
|
android:layout_width="wrap_content" |
| 76 |
102 |
|
android:layout_height="50dp" |
| 77 |
103 |
|
android:textAppearance="?android:attr/textAppearanceSmall" |
| 78 |
|
- |
android:text="@string/tipologia" |
| |
104 |
+ |
android:text="@string/tipologia_spinner" |
| |
105 |
+ |
android:textSize="15sp" |
| 79 |
106 |
|
android:id="@+id/textView17" |
| |
107 |
+ |
android:background="#f0f0f0" |
| 80 |
108 |
|
android:gravity="center_vertical" |
| 81 |
|
- |
android:background="@drawable/grey_bordered_rectangle" |
| 82 |
109 |
|
android:layout_gravity="center_vertical" |
| 83 |
110 |
|
android:textColor="#574a67" |
| 84 |
111 |
|
android:paddingLeft="20dp" |
| 85 |
112 |
|
android:paddingRight="20dp" /> |
| 86 |
|
- |
|
| 87 |
113 |
|
<Spinner |
| 88 |
114 |
|
android:layout_width="fill_parent" |
| 89 |
115 |
|
android:layout_height="50dp" |
| |
@@ -92,13 +118,9 @@ |
| 92 |
118 |
|
android:popupBackground="#f0f0f0" |
| 93 |
119 |
|
android:layout_marginLeft="16dp" |
| 94 |
120 |
|
android:textColor="#574a67" |
| 95 |
|
- |
android:layout_below="@+id/button7" |
| 96 |
|
- |
android:layout_alignParentLeft="true" |
| 97 |
|
- |
android:layout_alignParentStart="true" |
| 98 |
121 |
|
android:layout_gravity="center_horizontal" |
| 99 |
122 |
|
android:dropDownSelector="@drawable/spinner_back" |
| 100 |
|
- |
android:popupElevation="5dp" |
| 101 |
|
- |
android:textAlignment="center" /> |
| |
123 |
+ |
android:popupElevation="5dp" /> |
| 102 |
124 |
|
|
| 103 |
125 |
|
</LinearLayout> |
| 104 |
126 |
|
|
| |
@@ -108,11 +130,6 @@ |
| 108 |
130 |
|
android:text="@string/ricarica_con_pref" |
| 109 |
131 |
|
android:id="@+id/button8" |
| 110 |
132 |
|
android:onClick="prefclick" |
| 111 |
|
- |
android:layout_below="@+id/spinner2" |
| 112 |
|
- |
android:layout_alignParentLeft="true" |
| 113 |
|
- |
android:layout_alignParentStart="true" |
| 114 |
|
- |
android:layout_alignRight="@+id/button7" |
| 115 |
|
- |
android:layout_alignEnd="@+id/button7" |
| 116 |
133 |
|
android:background="@drawable/back" |
| 117 |
134 |
|
android:textColor="#574a67" |
| 118 |
135 |
|
android:layout_gravity="center_horizontal" |
| |
@@ -122,7 +139,7 @@ |
| 122 |
139 |
|
|
| 123 |
140 |
|
</LinearLayout> |
| 124 |
141 |
|
|
| 125 |
|
- |
</LinearLayout> |
| |
142 |
+ |
</ScrollView> |
| 126 |
143 |
|
</LinearLayout> |
| 127 |
144 |
|
|
| 128 |
145 |
|
</RelativeLayout> |
View this file contents
View the full history
Commits for