浏览代码

Fixed some festivals and activities-related layouts and dialogs.

Iñigo Valentin 9 年之前
父节点
当前提交
b053855c46

+ 50 - 43
app/src/main/res/layout/dialog_schedule.xml

@@ -3,22 +3,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:layout_marginBottom="0dp"
+    android:layout_marginEnd="0dp"
+    android:layout_marginLeft="0dp"
+    android:layout_marginRight="0dp"
+    android:layout_marginStart="0dp"
+    android:layout_marginTop="0dp"
     android:background="@drawable/section"
     android:orientation="vertical"
-    android:layout_marginBottom="30dp"
-    android:layout_marginEnd="18dp"
-    android:layout_marginLeft="18dp"
-    android:layout_marginRight="18dp"
-    android:layout_marginStart="18dp"
-    android:layout_marginTop="35dp"
-    android:paddingBottom="15dp">
+    >
 
     <LinearLayout
         android:id="@+id/ll_dialog_schedule_buttons"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/bt_schedule_close"
@@ -45,15 +45,12 @@
         android:layout_above="@id/ll_dialog_schedule_buttons"
         android:layout_alignParentTop="true"
         android:orientation="vertical"
-        android:background="@drawable/section"
         android:paddingBottom="15dp">
 
         <TextView
             android:id="@+id/tv_dialog_schedule_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
             android:background="@drawable/section_title"
             android:paddingBottom="4dp"
             android:paddingEnd="10dp"
@@ -61,44 +58,31 @@
             android:paddingRight="10dp"
             android:paddingStart="20dp"
             android:paddingTop="4dp"
-            android:textColor="@color/section_title"/>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="@color/section_title"
+            android:textStyle="bold"/>
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_margin="8dp"
             android:background="@drawable/entry"
-            android:padding="7dp"
-            android:layout_margin="8dp">
-
-            <TextView
-                android:id="@+id/tv_dialog_schedule_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:textAppearance="@android:style/TextAppearance.Medium"/>
-
-            <TextView
-                android:id="@+id/tv_dialog_schedule_host"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginStart="5dp"
-                android:textStyle="italic"
-                android:visibility="gone"
-                android:textAppearance="@android:style/TextAppearance.Small"/>
+            android:orientation="vertical"
+            android:padding="7dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp" >
+                android:layout_margin="10dp">
 
                 <TextView
                     android:id="@+id/tv_dialog_schedule_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@android:style/TextAppearance.Medium"
                     android:capitalize="sentences"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold"
                     tools:ignore="Deprecated,TextViewEdits"/>
 
                 <TextView
@@ -107,15 +91,34 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:layout_marginStart="10dp"
-                    android:textAppearance="@android:style/TextAppearance.Medium"/>
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold"/>
 
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/tv_dialog_schedule_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:textAppearance="@android:style/TextAppearance.Medium"/>
+
+            <TextView
+                android:id="@+id/tv_dialog_schedule_host"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginStart="15dp"
+                android:textAppearance="@android:style/TextAppearance.Small"
+                android:textStyle="italic"
+                android:visibility="gone"/>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:orientation="horizontal" >
+                android:layout_margin="15dp"
+                android:orientation="horizontal">
 
                 <ImageView
                     android:id="@+id/imageView1"
@@ -126,12 +129,14 @@
                     android:maxHeight="50dp"
                     android:maxWidth="50dp"
                     android:scaleType="centerInside"
-                    android:src="@drawable/pinpoint" />
+                    android:src="@drawable/pinpoint"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical" >
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
+                    android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/tv_dialog_schedule_place"
@@ -143,8 +148,8 @@
                         android:id="@+id/tv_dialog_schedule_address"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textStyle="italic"
-                        android:textAppearance="@android:style/TextAppearance.Small"/>
+                        android:textAppearance="@android:style/TextAppearance.Small"
+                        android:textStyle="italic"/>
 
                 </LinearLayout>
             </LinearLayout>
@@ -153,12 +158,14 @@
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_margin="20dp"
-                android:padding="3dp" >
+                android:padding="3dp">
 
                 <com.google.android.gms.maps.MapView
                     android:id="@+id/mv_dialog_schedule_map"
                     android:layout_width="fill_parent"
-                    android:layout_height="fill_parent" >
+                    android:layout_height="fill_parent"
+                    android:background="@android:color/black"
+                    android:padding="1dp">
                 </com.google.android.gms.maps.MapView>
             </LinearLayout>
         </LinearLayout>

+ 42 - 18
app/src/main/res/layout/fragment_layout_lablanca.xml

@@ -18,16 +18,23 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/section"
-            android:padding="7dp">
+            android:background="@drawable/section">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/lablanca_title"
-                android:id="@+id/textView10"
-                android:textStyle="bold"/>
+                android:textStyle="bold"
+                tools:layout_width="match_parent"
+                android:background="@drawable/section_title"
+                android:paddingBottom="4dp"
+                android:paddingEnd="10dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="10dp"
+                android:paddingStart="20dp"
+                android:paddingTop="4dp"
+                android:textColor="@color/section_title"
+                android:text="@string/lablanca_title"/>
 
             <LinearLayout
                 android:orientation="vertical"
@@ -63,15 +70,23 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/section"
-            android:padding="7dp"
             android:layout_marginTop="15dp">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/lablanca_schedule"
-                android:textStyle="bold"/>
+                android:textStyle="bold"
+                tools:layout_width="match_parent"
+                android:background="@drawable/section_title"
+                android:paddingBottom="4dp"
+                android:paddingEnd="10dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="10dp"
+                android:paddingStart="20dp"
+                android:paddingTop="4dp"
+                android:textColor="@color/section_title"
+                android:text="@string/lablanca_schedule"/>
 
             <LinearLayout
                 android:orientation="horizontal"
@@ -113,15 +128,23 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/section"
-            android:layout_marginTop="12dp"
-            android:padding="7dp">
+            android:layout_marginTop="12dp">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:text="@string/lablanca_prices"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/lablanca_prices"
-                android:textStyle="bold"/>
+                android:textStyle="bold"
+                tools:layout_width="match_parent"
+                android:background="@drawable/section_title"
+                android:paddingBottom="4dp"
+                android:paddingEnd="10dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="10dp"
+                android:paddingStart="20dp"
+                android:paddingTop="4dp"
+                android:textColor="@color/section_title"/>
 
             <LinearLayout
                 android:orientation="vertical"
@@ -157,9 +180,10 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:text="@string/lablanca_prices_pack"
-                    android:layout_marginBottom="15dp"/>
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold"
+                    android:text="@string/lablanca_prices_pack"/>
 
                 <LinearLayout
                     android:orientation="vertical"

+ 17 - 17
app/src/main/res/layout/fragment_layout_location.xml

@@ -2,25 +2,21 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  xmlns:tools="http://schemas.android.com/tools"
 			  android:layout_width="fill_parent"
-			  android:orientation="vertical"
 			  android:layout_height="fill_parent"
 			  android:background="@color/background_app"
+			  android:orientation="vertical"
 			  tools:ignore="Overdraw">
 
 	<LinearLayout
-		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:layout_margin="10dp"
 		android:background="@drawable/section"
-		android:layout_margin="10dp">
+		android:orientation="vertical">
 
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/menu_location"
-			android:textAppearance="?android:attr/textAppearanceLarge"
-			android:textStyle="bold"
-			tools:layout_width="match_parent"
 			android:background="@drawable/section_title"
 			android:paddingBottom="4dp"
 			android:paddingEnd="10dp"
@@ -28,38 +24,42 @@
 			android:paddingRight="10dp"
 			android:paddingStart="20dp"
 			android:paddingTop="4dp"
-			android:textColor="@color/section_title"/>
+			android:text="@string/menu_location"
+			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:textColor="@color/section_title"
+			android:textStyle="bold"
+			tools:layout_width="match_parent"/>
 
 		<LinearLayout
-			android:orientation="vertical"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
+			android:layout_margin="8dp"
 			android:background="@drawable/entry"
-			android:padding="7dp"
-			android:layout_margin="8dp">
+			android:orientation="vertical"
+			android:padding="7dp">
 
 			<TextView
-                android:text="@string/home_section_location_text_0"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:text="@string/home_section_location_text_0"
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				android:textColor="@color/entry_title"
 				android:textStyle="bold"/>
 
 			<TextView
+				android:id="@+id/tv_location_distance"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:id="@+id/tv_location_distance"
+				android:layout_margin="10dp"
 				android:text="@string/home_section_location_text_calculating"
-				android:layout_margin="10dp"/>
+				android:textAppearance="?android:attr/textAppearanceSmall"/>
 
 			<com.google.android.gms.maps.MapView
 				android:id="@+id/mapview"
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent"
-				android:minHeight="150dp"
-				android:layout_margin="7dp"/>
+				android:layout_margin="7dp"
+				android:minHeight="150dp"/>
 		</LinearLayout>
 
 	</LinearLayout>

+ 90 - 59
app/src/main/res/layout/fragment_layout_schedule.xml

@@ -16,84 +16,115 @@
         android:background="@drawable/section"
         android:layout_margin="7dp">
 
-        <LinearLayout
-            android:id="@+id/ll_schedule_date"
-            android:layout_width="fill_parent"
+        <TextView
+            android:text="@string/lablanca_schedule_gm"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="8dp" >
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textStyle="bold"
+            tools:layout_width="match_parent"
+            android:background="@drawable/section_title"
+            android:paddingBottom="4dp"
+            android:paddingEnd="10dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="10dp"
+            android:paddingStart="20dp"
+            android:paddingTop="4dp"
+            android:textColor="@color/section_title"/>
 
-            <Button
-                android:id="@+id/bt_schedule_l"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_weight=".8"
-                android:background="@drawable/button_selector"
-                android:text="@string/arrow_left"
-                android:textColor="@color/input_button_color"
-                android:textStyle="bold"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="7dp"
+            android:background="@drawable/entry"
+            android:orientation="vertical"
+            android:padding="7dp">
 
             <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight=".3"
-                android:gravity="center"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/tv_schedule_day_number"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textSize="40sp" />
+                android:id="@+id/ll_schedule_date"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <Button
+                    android:id="@+id/bt_schedule_l"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:layout_weight=".8"
+                    android:background="@drawable/button_selector"
+                    android:text="@string/arrow_left"
+                    android:textColor="@color/input_button_color"
+                    android:textStyle="bold"/>
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical" >
+                    android:layout_weight=".3"
+                    android:gravity="center"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/tv_schedule_day_title"
+                        android:id="@+id/tv_schedule_day_number"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingEnd="0dp"
-                        android:paddingLeft="13dp"
-                        android:paddingRight="0dp"
-                        android:paddingStart="13dp"
-                        android:textSize="20sp"
-                        android:textStyle="italic" />
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:textSize="40sp"/>
 
-                    <TextView
-                        android:id="@+id/tv_schedule_day_month"
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/tv_schedule_day_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingEnd="0dp"
+                            android:paddingLeft="13dp"
+                            android:paddingRight="0dp"
+                            android:paddingStart="13dp"
+                            android:textSize="20sp"
+                            android:textStyle="italic"/>
+
+                        <TextView
+                            android:id="@+id/tv_schedule_day_month"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+                    </LinearLayout>
                 </LinearLayout>
+
+                <Button
+                    android:id="@+id/bt_schedule_r"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="end"
+                    android:layout_weight=".8"
+                    android:background="@drawable/button_selector"
+                    android:text="@string/arrow_right"
+                    android:textColor="@color/input_button_color"
+                    android:textStyle="bold"/>
             </LinearLayout>
 
-            <Button
-                android:id="@+id/bt_schedule_r"
+            <EditText
+                android:id="@+id/et_schedule_filter"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_gravity="end"
-                android:layout_weight=".8"
-                android:background="@drawable/button_selector"
-                android:text="@string/arrow_right"
-                android:textStyle="bold"
-                android:textColor="@color/input_button_color"/>
-        </LinearLayout>
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/input"
+                android:ems="10"
+                android:hint="@string/schedule_filter"
+                android:textColor="@color/input_text_color"
+                android:textColorHint="@color/input_hint_color">
+
+                <requestFocus/>
+            </EditText>
 
-        <EditText
-            android:id="@+id/et_schedule_filter"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:hint="@string/schedule_filter"
-            android:background="@drawable/input"
-            android:textColor="@color/input_text_color"
-            android:textColorHint="@color/input_hint_color">
-
-            <requestFocus />
-        </EditText>
+        </LinearLayout>
 
         <com.ivalentin.margolariak.CustomScrollView
             android:id="@+id/sv_schedule"

+ 6 - 3
app/src/main/res/layout/row_activity_schedule.xml

@@ -9,10 +9,11 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="@android:style/TextAppearance.Medium"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/entry_title"
+        android:textStyle="bold"
         android:id="@+id/tv_row_activity_itinerary_time"
         android:layout_weight=".8"
-        android:textStyle="bold"
         android:gravity="end" />
 
     <TextView
@@ -56,7 +57,9 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Large"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/entry_title"
+            android:textStyle="bold"
             android:id="@+id/tv_row_activity_itinerary_title" />
 
         <TextView

+ 6 - 2
app/src/main/res/layout/row_schedule.xml

@@ -49,7 +49,9 @@
             android:layout_alignParentTop="true"
             android:layout_toLeftOf="@id/schedule_timeline"
             android:layout_toStartOf="@id/schedule_timeline"
-            android:textAppearance="@android:style/TextAppearance.Medium"/>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/entry_title"
+            android:textStyle="bold"/>
 
     </RelativeLayout>
 
@@ -65,7 +67,9 @@
             android:id="@+id/tv_row_schedule_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Large" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/entry_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/tv_row_schedule_description"