Skip to content

Commit

Permalink
Optimize layouts (replace LinearLayouts by RelativeLayouts (opacapp#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphaelm
raphaelm committed Jan 28, 2013
1 parent 4fb79cf commit 81eaff9
Show file tree
Hide file tree
Showing 16 changed files with 263 additions and 255 deletions.
34 changes: 0 additions & 34 deletions res/layout/about_activity.xml
View file

This file was deleted.

32 changes: 26 additions & 6 deletions res/layout/account_activity.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" >

<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<LinearLayout
<RelativeLayout
android:id="@+id/rlAccHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="false"
android:layout_alignParentTop="true"
android:background="@color/account_head_bg"
android:orientation="vertical"
android:padding="8dp" >
Expand All @@ -20,6 +23,8 @@
android:id="@+id/tvAccLabel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/account_head_fg" />
Expand All @@ -28,32 +33,39 @@
android:id="@+id/tvAccCity"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="false"
android:layout_below="@id/tvAccLabel"
android:layout_marginBottom="4dp"
android:textColor="@color/account_head_fg" />

<TextView
android:id="@+id/tvAccUser"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/tvAccCity"
android:layout_marginBottom="4dp"
android:textColor="@color/account_head_fg"
android:textIsSelectable="true" />
</LinearLayout>

</RelativeLayout>

<TextView
android:id="@+id/tvError"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/rlAccHeader"
android:background="@color/error_bg"
android:gravity="center"
android:padding="5dp"
android:textColor="@color/error_fg"
android:textStyle="bold"
android:visibility="gone" />

<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tvError"
android:orientation="vertical"
android:padding="5dp" >

Expand All @@ -75,20 +87,24 @@
android:id="@+id/llLent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tvEntlHeader"
android:orientation="vertical" >

</LinearLayout>

<Button
android:id="@+id/btExtendall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/llLent"
android:text="@string/extendall"
android:visibility="gone" />

<TextView
android:id="@+id/tvResHeader"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/btExtendall"
android:layout_marginBottom="10dp"
android:layout_marginTop="8dp"
android:drawableBottom="@drawable/section_header"
Expand All @@ -103,18 +119,22 @@
android:id="@+id/llReservations"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tvResHeader"
android:orientation="vertical" >

</LinearLayout>

<TextView
android:id="@+id/tvAge"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/llReservations"
android:layout_marginTop="4dp"
android:gravity="center|top"
android:textColor="@color/account_age"
android:textStyle="italic" />
</LinearLayout>
</LinearLayout>

</RelativeLayout>
</RelativeLayout>

</ScrollView>
9 changes: 5 additions & 4 deletions res/layout/account_listitem.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/llItem"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rlItem"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
Expand All @@ -14,7 +14,8 @@

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content"
android:layout_below="@id/tvLabel" >

<TextView
android:id="@+id/tvCity"
Expand All @@ -31,4 +32,4 @@
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>

</LinearLayout>
</RelativeLayout>
7 changes: 4 additions & 3 deletions res/layout/account_listitem_nav.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
android:layout_height="fill_parent" >
</View>

<LinearLayout
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_weight="1"
Expand All @@ -35,8 +35,9 @@
android:id="@+id/tvCity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tvLabel"
android:textColor="@color/nav_fg" />
</LinearLayout>
</RelativeLayout>

<TextView
android:id="@+id/tvNotifications"
Expand Down
20 changes: 7 additions & 13 deletions res/layout/changelog_activity.xml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/svAbout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content"
android:padding="15dip" >

<ScrollView
android:id="@+id/svAbout"
<TextView
android:id="@+id/tvAbout"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content" />

<TextView
android:id="@+id/tvAbout"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</ScrollView>

</LinearLayout>
</ScrollView>
97 changes: 47 additions & 50 deletions res/layout/copy_listitem.xml
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="4dp" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >

<TextView
android:id="@+id/tvLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="" />

<TextView
android:id="@+id/tvZst"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="" />
</LinearLayout>
<View
android:id="@+id/strut"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerHorizontal="true" />

<LinearLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/tvLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >

<TextView
android:id="@+id/tvStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />

<TextView
android:id="@+id/tvVorbestellt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="" />
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@id/strut"
android:ellipsize="end"
android:singleLine="true" />

<TextView
android:id="@+id/tvZst"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/tvLocation"
android:layout_toLeftOf="@id/strut"
android:ellipsize="end"
android:singleLine="true" />

<TextView
android:id="@+id/tvStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/strut" />

<TextView
android:id="@+id/tvRueckgabe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="" />
</LinearLayout>
<TextView
android:id="@+id/tvVorbestellt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tvStatus"
android:layout_toRightOf="@id/strut"
android:ellipsize="end"
android:singleLine="true" />

<TextView
android:id="@+id/tvRueckgabe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tvVorbestellt"
android:layout_toRightOf="@id/strut"
android:ellipsize="end"
android:singleLine="true" />

</LinearLayout>
</RelativeLayout>
10 changes: 5 additions & 5 deletions res/layout/detail_listitem.xml
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="4dp" >
android:padding="4dp"
android:paddingTop="0dp" >

<TextView
android:id="@+id/tvDesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/detail_desc" />

<TextView
android:id="@+id/tvContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:layout_below="@id/tvDesc"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="true" />

</LinearLayout>
</RelativeLayout>
Loading

0 comments on commit 81eaff9

Please sign in to comment.