Subversion Repository Public Repository

Nextrek

Diff Revisions 777 vs 778 for /Android/SmartCharging/SmartCharging/app/src/main/res/layout/activity_selection.xml

Diff revisions: vs.
  @@ -8,23 +8,21 @@
8 8 <LinearLayout
9 9 android:orientation="vertical"
10 10 android:layout_width="match_parent"
11 - android:layout_height="match_parent"
12 - android:weightSum="5">
11 + android:layout_height="match_parent">
13 12
14 13 <ImageView
15 14 android:layout_width="match_parent"
16 - android:layout_height="wrap_content"
15 + android:layout_height="@dimen/header_height"
17 16 android:id="@+id/imageView3"
18 17 android:scaleType="fitCenter"
19 18 android:src="@drawable/screen1"
20 - android:background="#3cdbff"
21 - android:layout_weight="3"/>
19 + android:background="#3cdbff"/>
22 20
23 21 <ScrollView
24 22 android:orientation="vertical"
25 23 android:layout_width="match_parent"
26 24 android:layout_height="match_parent"
27 - android:layout_weight="2">
25 + android:paddingBottom="@dimen/logo_regione_height">
28 26
29 27 <LinearLayout
30 28 android:orientation="vertical"
  @@ -88,17 +86,20 @@
88 86 android:layout_marginLeft="@dimen/space_16dp"
89 87 android:layout_marginBottom="@dimen/space_16dp"/>
90 88
91 - <ImageView
92 - android:src="@drawable/logoregione"
93 - android:layout_marginLeft="@dimen/space_16dp"
94 - android:layout_marginRight="@dimen/space_16dp"
95 - android:layout_width="match_parent"
96 - android:layout_height="45dp" />
89 +
97 90
98 91 </LinearLayout>
99 92 </ScrollView>
100 93 </LinearLayout>
101 94
95 + <ImageView
96 + android:src="@drawable/logoregione"
97 + android:layout_alignParentBottom="true"
98 + android:layout_marginLeft="@dimen/space_16dp"
99 + android:layout_marginRight="@dimen/space_16dp"
100 + android:layout_width="match_parent"
101 + android:layout_height="@dimen/logo_regione_height" />
102 +
102 103 <View
103 104 android:layout_alignParentRight="true"
104 105 android:elevation="2dp"