Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:joey-mbk/MobileCityGuide

  • Loading branch information...
commit 6d5432b735636d9095ee3c82616267efcbc0b1aa 2 parents deba1c0 + b9545f2
@francgrim francgrim authored
Showing with 55 additions and 52 deletions.
  1. +55 −52 res/layout/itineraries_list.xml
View
107 res/layout/itineraries_list.xml
@@ -4,71 +4,74 @@
android:orientation="vertical"
android:padding="20dip" >
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <LinearLayout
- android:layout_width="199dp"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
+ <TextView
+ android:id="@+id/city_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:text="@string/city"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="#ffffff" />
- <TextView
- android:id="@+id/city_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:text="@string/city"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="#ffffff" />
+ <TextView
+ android:id="@+id/itinerary_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:text="@string/itinerary"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="#ffffff" />
- <TextView
- android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginLeft="10dp"
- android:layout_weight="0.52"
- android:text="@string/itinerary_prompt"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#ffffff" />
- </LinearLayout>
+ <LinearLayout
+ android:id="@+id/contentLayoutBottom"
+ style="@style/LinearLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:gravity="center"
+ android:orientation="horizontal" >
<Button
- android:id="@+id/filtersbutton"
- android:layout_width="match_parent"
- android:layout_height="30dp"
- android:layout_gravity="center_vertical"
+ android:id="@+id/add_poi"
+ android:layout_width="132dp"
+ android:layout_height="35dp"
android:background="@drawable/buttonroundedcorners2"
- android:text="@string/filters"
+ android:text="@string/add_poi_label"
+ android:textColor="#ffffff" />
+
+ <Button
+ android:id="@+id/delete_poiButton"
+ android:layout_width="132dp"
+ android:layout_height="35dp"
+ android:layout_marginLeft="5dp"
+ android:background="@drawable/buttonroundedcorners3"
+ android:text="@string/delete_poi_label"
android:textColor="#ffffff" />
</LinearLayout>
<ListView
android:id="@+id/list"
- android:layout_width="fill_parent"
- android:layout_height="177dp"
- android:layout_marginTop="10dp"
- android:layout_weight="0.11"
+ android:layout_width="wrap_content"
+ android:layout_height="200dp"
+ android:layout_marginTop="6dp"
+ android:layout_weight="0.47"
android:background="@drawable/listroundedcorners"
- android:cacheColorHint="#00000000" >
+ android:cacheColorHint="#00ffffff" >
</ListView>
- <Button
- android:id="@+id/create_itinerary"
- android:layout_width="fill_parent"
- android:layout_height="35dp"
- android:layout_marginTop="10dp"
- android:background="@drawable/buttonroundedcorners"
- android:text="@string/create_itinerary_label"
- android:textColor="#ffffff" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
- <Button
- android:id="@+id/delete_itinerary"
- android:layout_width="fill_parent"
- android:layout_height="35dp"
- android:layout_marginTop="10dp"
- android:background="@drawable/buttonroundedcorners3"
- android:text="@string/itinerary_deleteButton"
- android:textColor="#ffffff" />
+ <Button
+ android:id="@+id/start"
+ android:layout_width="fill_parent"
+ android:layout_height="35dp"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/buttonroundedcorners"
+ android:text="@string/start_label"
+ android:textColor="#ffffff" />
+ </LinearLayout>
</LinearLayout>
Please sign in to comment.
Something went wrong with that request. Please try again.