소스 검색

Some UI style changes

seavenois 10 년 전
부모
커밋
a47578a7a1

+ 1 - 1
app/src/main/res/drawable/entry.xml

@@ -2,7 +2,7 @@
     android:shape="rectangle" >
 
     <stroke
-        android:width="2dp"
+        android:width="1dp"
         android:color="@color/entry_border" />
     <solid android:color="@color/entry_background" />
 

+ 3 - 3
app/src/main/res/drawable/section.xml

@@ -1,9 +1,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
-    <stroke
-        android:width="4dp"
-        android:color="@color/section_border" />
+    <!--<stroke-->
+        <!--android:width="2dp"-->
+        <!--android:color="@color/section_border" />-->
     <solid android:color="@color/section_background" />
 
 </shape>

+ 105 - 63
app/src/main/res/layout/fragment_layout_home.xml

@@ -6,35 +6,40 @@
     android:layout_height="wrap_content" >
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:background="@color/background_app">
     
 	    <LinearLayout
-	        android:id="@+id/ll_home_section_location"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="vertical"
+			android:id="@+id/ll_home_section_location"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp"
-			android:visibility="gone">
+			android:visibility="gone"
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_location"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
-                android:id="@+id/ll_home_section_location_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:orientation="vertical"
+				android:id="@+id/ll_home_section_location_content"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
 				android:background="@drawable/entry"
-				android:padding="7dp">
+				android:padding="7dp"
+				android:layout_margin="3dp">
 
 				<TextView
 					android:layout_width="wrap_content"
@@ -78,10 +83,13 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:background="@drawable/section"
-			android:padding="7dp"
 			android:id="@+id/ll_home_section_lablanca"
-			android:layout_margin="7dp"
-			android:visibility="gone">
+			android:visibility="gone"
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
@@ -89,7 +97,8 @@
 				android:textAppearance="?android:attr/textAppearanceLarge"
 				android:text="@string/lablanca_title"
 				android:id="@+id/textView4"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:orientation="horizontal"
@@ -97,7 +106,7 @@
 				android:layout_height="match_parent"
 				android:background="@drawable/entry"
 				android:padding="7dp"
-				android:layout_margin="10dp">
+				android:layout_margin="3dp">
 
 				<ImageView
 					android:layout_width="wrap_content"
@@ -128,9 +137,12 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp"
-			android:visibility="gone">
+			android:visibility="gone"
+			android:layout_marginLeft="0dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
@@ -138,7 +150,8 @@
 				android:text="@string/home_section_gmschedule"
 				android:textAppearance="?android:attr/textAppearanceLarge"
 				android:layout_marginBottom="10dp"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:orientation="vertical"
@@ -147,7 +160,7 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_gmschedule_now_content"
 				android:padding="7dp"
-				android:layout_margin="10dp">
+				android:layout_margin="3dp">
 
 				<TextView
 					android:layout_width="wrap_content"
@@ -174,7 +187,7 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_gmschedule_later_content"
 				android:padding="7dp"
-				android:layout_margin="10dp">
+				android:layout_margin="3dp">
 
 				<TextView
 					android:layout_width="wrap_content"
@@ -202,9 +215,12 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp"
-			android:visibility="gone">
+			android:visibility="gone"
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
@@ -212,7 +228,8 @@
 				android:text="@string/home_section_cityschedule"
 				android:textAppearance="?android:attr/textAppearanceLarge"
 				android:layout_marginBottom="10dp"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:orientation="vertical"
@@ -221,7 +238,7 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_cityschedule_now_content"
 				android:padding="7dp"
-				android:layout_margin="10dp">
+				android:layout_margin="3dp">
 
 				<TextView
                     android:layout_width="wrap_content"
@@ -248,7 +265,7 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_cityschedule_later_content"
 				android:padding="7dp"
-				android:layout_margin="10dp">
+				android:layout_margin="3dp">
 
 				<TextView
 					android:layout_width="wrap_content"
@@ -276,25 +293,29 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp"
-			android:visibility="gone">
+			android:visibility="gone"
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_around"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_around_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
+				android:layout_margin="3dp"
 				android:orientation="vertical"
 				android:background="@drawable/entry"
-				android:padding="7dp">
+				>
 
 			</LinearLayout>
 
@@ -306,22 +327,26 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp"
-			android:visibility="gone">
+			android:visibility="gone"
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_activities_future"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_activities_future_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
+				android:layout_margin="3dp"
 				android:orientation="vertical">
 
 			</LinearLayout>
@@ -334,22 +359,27 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp">
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_blog"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_blog_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
-				android:orientation="vertical">
+				android:layout_margin="3dp"
+				android:orientation="vertical"
+				>
 
 			</LinearLayout>
 
@@ -361,21 +391,25 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp">
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_gallery"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_gallery_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
+				android:layout_margin="3dp"
 				android:orientation="vertical"
 				android:background="@drawable/entry"
 				android:padding="7dp">
@@ -510,22 +544,26 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp"
-			android:visibility="gone">
+			android:visibility="gone"
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_activities_past"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_activities_past_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
+				android:layout_margin="3dp"
 				android:orientation="vertical">
 
 			</LinearLayout>
@@ -538,21 +576,25 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_margin="7dp"
-			android:padding="7dp">
+			android:layout_marginLeft="0dp"
+			android:layout_marginTop="2dp"
+			android:layout_marginRight="0dp"
+			android:layout_marginBottom="4dp"
+			android:paddingTop="5dp">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_social"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:textStyle="bold"/>
+				android:textStyle="bold"
+				android:textColor="@color/section_title"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_social_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
+				android:layout_margin="3dp"
 				android:orientation="vertical"
 				android:background="@drawable/entry"
 				android:padding="7dp">

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

@@ -12,8 +12,9 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="@drawable/section"
-		android:layout_margin="7dp"
-		android:padding="7dp">
+		android:layout_marginTop="2dp"
+		android:layout_marginBottom="4dp"
+		android:paddingTop="5dp">
 
 		<TextView
 			android:layout_width="wrap_content"
@@ -21,7 +22,9 @@
 			android:textAppearance="@android:style/TextAppearance.Large"
 			android:text="@string/menu_location"
 			android:id="@+id/textView2"
-			android:textStyle="bold"/>
+			android:textStyle="bold"
+			android:layout_marginLeft="10dp"
+			android:textColor="@color/section_title"/>
 
 		<LinearLayout
 			android:orientation="vertical"

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

@@ -8,15 +8,18 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:id="@+id/tv_row_home_blog_title" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:id="@+id/tv_row_home_blog_title"
+        android:textColor="@color/entry_title"
+        android:textStyle="bold"/>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:id="@+id/tv_row_home_blog_date"
-        android:layout_weight=".5" />
+        android:layout_weight=".5"
+        android:textStyle="italic"/>
 
     <TextView
         android:layout_width="wrap_content"

+ 6 - 4
app/src/main/res/values/color.xml

@@ -3,16 +3,18 @@
 
     <!-- Backgrounds for several sections -->
     
-    <color name="background_app">#c6e4f6</color>
+    <color name="background_app">#e4f4fd</color>
     <color name="background_menu">#4c9ed8</color>
     <color name="background_notification">#000000</color>
     <color name="background_separator">#000000</color>
 
 
-    <color name="section_background">#9bc1da</color>
-    <color name="section_border">#9cd3d9</color>
+    <color name="section_background">#d9ecf9</color>
+    <color name="section_border">#badde1</color>
+    <color name="section_title">#07383e</color>
     <color name="entry_background">#ffffff</color>
-    <color name="entry_border">#9cd3d9</color>
+    <color name="entry_border">#d8f3f5</color>
+    <color name="entry_title">#41786e</color>
     
     <!--Color for the menu entries-->
     <color name="menu_entry">#ffffff</color>