Merge branch 'newui' into SettingsActivity

app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/Theme.AppBaseTheme"
         android:supportsRtl="true"
         android:isGame="false"
         android:fullBackupContent="@xml/backup"
@@ -43,7 +43,6 @@
         
         <activity
             android:name="com.ivalentin.margolariak.MainActivity"
-            android:theme="@style/Theme.NoTitle"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="orientation"
             android:screenOrientation="portrait"
@@ -57,7 +56,6 @@
 
         <activity
             android:name=".SettingsActivity"
-            android:theme="@style/Theme.NoTitle"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="orientation"
             android:screenOrientation="portrait"

app/src/main/java/com/ivalentin/margolariak/GM.java

@@ -460,6 +460,11 @@ final class GM {
 	static final int IMG_THUMB = 180;
 	static final int IMG_VIEW = 800;
 
+	/**
+	 *Programaticall loaded rows needs their margin to also be set programatically
+	 */
+	static final int ENTRY_MARGIN = 8;
+
 	/**
 	 * Gets the language code for sql queries.
 	 * Only three values can be returned: es, eu, en.

app/src/main/java/com/ivalentin/margolariak/HomeLayout.java

@@ -651,7 +651,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 			//Set margins
 			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-			layoutParams.setMargins(10, 10, 10, 25);
+			layoutParams.setMargins(GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN);
 			entry.setLayoutParams(layoutParams);
 
 			//Set title
@@ -674,9 +674,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 			} else {
 				text = Html.fromHtml(cursor.getString(6)).toString();
 			}
-			if (text.length() > 100) {
-				text = text.substring(0, 100) + "...";
-			}
+
 			TextView tvText = (TextView) entry.findViewById(R.id.tv_row_home_activity_text);
 			tvText.setText(text);
 
@@ -791,7 +789,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 				//Set margins
 				LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-				layoutParams.setMargins(10, 10, 10, 25);
+				layoutParams.setMargins(GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN);
 				entry.setLayoutParams(layoutParams);
 
 				//Set title
@@ -808,9 +806,6 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 				//Set text
 				String text = Html.fromHtml(cursor.getString(4)).toString();
-				if (text.length() > 100) {
-					text = text.substring(0, 100) + "...";
-				}
 				TextView tvText = (TextView) entry.findViewById(R.id.tv_row_home_activity_text);
 				tvText.setText(text);
 
@@ -921,7 +916,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 			//Set margins
 			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-			layoutParams.setMargins(10, 10, 10, 25);
+			layoutParams.setMargins(GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN);
 			entry.setLayoutParams(layoutParams);
 
 			//Set title
@@ -930,9 +925,6 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 			//Set text
 			String text = Html.fromHtml(cursor.getString(2)).toString();
-			if (text.length() > 100) {
-				text = text.substring(0, 100) + "...";
-			}
 			TextView tvText = (TextView) entry.findViewById(R.id.tv_row_home_blog_text);
 			tvText.setText(text);
 

app/src/main/res/drawable/entry.xml

@@ -4,6 +4,14 @@
     <stroke
         android:width="1dp"
         android:color="@color/entry_border" />
-    <solid android:color="@color/entry_background" />
+
+    <solid
+        android:color="@color/entry_background" />
+
+    <corners
+        android:bottomRightRadius="4dp"
+        android:bottomLeftRadius="4dp"
+        android:topLeftRadius="4dp"
+        android:topRightRadius="4dp"/>
 
 </shape>

app/src/main/res/drawable/gradient_v_white.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+
+    <gradient
+        android:angle="90"
+        android:endColor="#00ffffff"
+        android:startColor="#ffffffff"
+        android:type="linear" />
+
+    <corners
+        android:radius="0dp"/>
+
+</shape>

app/src/main/res/drawable/row_home_image.xml

@@ -0,0 +1,15 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/image_border" />
+
+    <corners
+        android:bottomRightRadius="2dp"
+        android:bottomLeftRadius="2dp"
+        android:topLeftRadius="2dp"
+        android:topRightRadius="2dp"/>
+
+</shape>

app/src/main/res/drawable/section.xml

@@ -1,9 +1,18 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
-    <!--<stroke-->
-        <!--android:width="2dp"-->
-        <!--android:color="@color/section_border" />-->
-    <solid android:color="@color/section_background" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/section_border" />
+
+    <solid
+        android:color="@color/section_background" />
+
+    <corners
+        android:bottomRightRadius="5dp"
+        android:bottomLeftRadius="5dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"/>
 
 </shape>

app/src/main/res/drawable/section_title.xml

@@ -0,0 +1,16 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/section_border" />
+
+    <solid
+        android:color="@color/section_title_background" />
+
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"/>
+
+</shape>

app/src/main/res/layout/activity_main.xml

@@ -9,7 +9,7 @@
 	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:background="@drawable/titlebar"
+		android:background="@color/background_menu"
 		android:gravity="center_vertical"
 		android:orientation="horizontal"
 		android:padding="2dp">
@@ -46,7 +46,8 @@
 				android:gravity="center"
 				android:text="@string/app_name"
 				android:textSize="18sp"
-				android:textStyle="bold" />
+				android:textStyle="bold"
+				android:textColor="@color/menu_entry"/>
 
 			<!-- Section title -->
 
@@ -56,7 +57,8 @@
 				android:layout_height="wrap_content"
 				android:gravity="center"
 				android:text="@string/menu_home"
-				android:textSize="20sp" />
+				android:textSize="20sp"
+				android:textColor="@color/menu_entry"/>
 
 		</LinearLayout>
 
@@ -91,7 +93,7 @@
 		android:scrollIndicators="none"
 		android:requiresFadingEdge="horizontal"
 		android:fadingEdgeLength="125dp"
-		android:background="@color/background_bar_gradient"
+		android:background="@color/background_menu"
 		tools:ignore="UnusedAttribute">
 
 		<LinearLayout
@@ -117,7 +119,8 @@
 					android:textSize="15sp"
 					android:layout_centerInParent="true"
 					android:textStyle="bold"
-					android:id="@+id/tv_menu_home"/>
+					android:id="@+id/tv_menu_home"
+					android:textColor="@color/menu_entry"/>
 
 				<ImageView
 					android:layout_width="match_parent"
@@ -150,7 +153,8 @@
 					android:layout_gravity="top"
 					android:textSize="15sp"
 					android:layout_centerInParent="true"
-					android:id="@+id/tv_menu_location"/>
+					android:id="@+id/tv_menu_location"
+					android:textColor="@color/menu_entry"/>
 
 				<ImageView
 					android:layout_width="match_parent"
@@ -183,7 +187,8 @@
 					android:layout_gravity="top"
 					android:textSize="15sp"
 					android:layout_centerInParent="true"
-					android:id="@+id/tv_menu_lablanca"/>
+					android:id="@+id/tv_menu_lablanca"
+					android:textColor="@color/menu_entry"/>
 
 				<ImageView
 					android:layout_width="match_parent"
@@ -216,7 +221,8 @@
 					android:layout_gravity="top"
 					android:textSize="15sp"
 					android:layout_centerInParent="true"
-					android:id="@+id/tv_menu_activities"/>
+					android:id="@+id/tv_menu_activities"
+					android:textColor="@color/menu_entry"/>
 
 				<ImageView
 					android:layout_width="match_parent"
@@ -249,7 +255,8 @@
 					android:layout_gravity="top"
 					android:textSize="15sp"
 					android:layout_centerInParent="true"
-					android:id="@+id/tv_menu_blog"/>
+					android:id="@+id/tv_menu_blog"
+					android:textColor="@color/menu_entry"/>
 
 				<ImageView
 					android:layout_width="match_parent"
@@ -282,7 +289,8 @@
 					android:layout_gravity="top"
 					android:textSize="15sp"
 					android:layout_centerInParent="true"
-					android:id="@+id/tv_menu_gallery"/>
+					android:id="@+id/tv_menu_gallery"
+					android:textColor="@color/menu_entry"/>
 
 				<ImageView
 					android:layout_width="match_parent"
@@ -305,13 +313,15 @@
 	<ScrollView
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/sv_main_content">
+		android:id="@+id/sv_main_content"
+		android:background="@color/background_app">
 
 		<FrameLayout
 			android:id="@+id/activity_main_content_fragment"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			tools:ignore="ScrollViewSize">
+			tools:ignore="ScrollViewSize"
+			android:background="@color/background_app">
 
 		</FrameLayout>
 	</ScrollView>

app/src/main/res/layout/fragment_layout_home.xml

@@ -1,5 +1,6 @@
 <com.ivalentin.margolariak.CustomScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/sh_home_layout"
     android:layout_width="fill_parent"
@@ -13,23 +14,27 @@
     
 	    <LinearLayout
 			android:id="@+id/ll_home_section_location"
-			android:layout_width="fill_parent"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:visibility="gone"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp"
+			android:visibility="gone">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_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"
+				android:paddingLeft="20dp"
+				android:paddingRight="10dp"
+				android:paddingStart="20dp"
+				android:paddingTop="4dp"
 				android:textColor="@color/section_title"/>
 
 			<LinearLayout
@@ -39,14 +44,15 @@
 				android:orientation="vertical"
 				android:background="@drawable/entry"
 				android:padding="7dp"
-				android:layout_margin="3dp">
+				android:layout_margin="8dp">
 
 				<TextView
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:textAppearance="@android:style/TextAppearance.Medium"
-					android:text="@string/home_section_location_text_0"
-					android:id="@+id/textView9"/>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:textColor="@color/entry_title"
+					android:textStyle="bold"
+					android:text="@string/home_section_location_text_0"/>
 
 				<LinearLayout
 					android:orientation="horizontal"
@@ -81,24 +87,26 @@
 		<LinearLayout
 			android:orientation="vertical"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:background="@drawable/section"
 			android:id="@+id/ll_home_section_lablanca"
-			android:visibility="gone"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp"
+			android:visibility="gone">
 
 			<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/textView4"
 				android:textStyle="bold"
-				android:textColor="@color/section_title"/>
+				android:textColor="@color/section_title"
+				android:paddingBottom="4dp"
+				android:paddingEnd="10dp"
+				android:paddingLeft="20dp"
+				android:paddingRight="10dp"
+				android:paddingStart="20dp"
+				android:paddingTop="4dp"
+				android:background="@drawable/section_title"/>
 
 			<LinearLayout
 				android:orientation="horizontal"
@@ -106,7 +114,7 @@
 				android:layout_height="match_parent"
 				android:background="@drawable/entry"
 				android:padding="7dp"
-				android:layout_margin="3dp">
+				android:layout_margin="8dp">
 
 				<ImageView
 					android:layout_width="wrap_content"
@@ -125,8 +133,14 @@
 					android:id="@+id/tv_home_section_lablanca_text"
 					android:layout_weight=".6"
 					android:padding="7dp"
-					android:maxLines="4"
-					android:ellipsize="end"/>
+					android:maxLines="4"/>
+
+				<ImageView
+					android:layout_width="match_parent"
+					android:layout_weight="1"
+					android:layout_height="40dp"
+					android:layout_marginTop="-40dp"
+					android:background="@drawable/gradient_v_white"/>
 
 			</LinearLayout>
 		</LinearLayout>
@@ -137,20 +151,23 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:visibility="gone"
-			android:layout_marginLeft="0dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp"
+			android:visibility="gone">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_gmschedule"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginBottom="10dp"
 				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
@@ -160,14 +177,15 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_gmschedule_now_content"
 				android:padding="7dp"
-				android:layout_margin="3dp">
+				android:layout_margin="8dp">
 
 				<TextView
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:textAppearance="@android:style/TextAppearance.Medium"
-					android:text="@string/schedule_now"
-					android:textStyle="bold"/>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:textColor="@color/entry_title"
+					android:textStyle="bold"
+					android:text="@string/schedule_now"/>
 
 				<LinearLayout
 					android:id="@+id/ll_home_section_gmschedule_now_list"
@@ -187,14 +205,15 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_gmschedule_later_content"
 				android:padding="7dp"
-				android:layout_margin="3dp">
+				android:layout_margin="8dp">
 
 				<TextView
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:textAppearance="@android:style/TextAppearance.Medium"
-					android:text="@string/schedule_later"
-					android:textStyle="bold"/>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:textColor="@color/entry_title"
+					android:textStyle="bold"
+					android:text="@string/schedule_later"/>
 
 				<LinearLayout
 					android:id="@+id/ll_home_section_gmschedule_later_list"
@@ -215,20 +234,23 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:visibility="gone"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp"
+			android:visibility="gone">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_cityschedule"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginBottom="10dp"
 				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
@@ -238,14 +260,15 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_cityschedule_now_content"
 				android:padding="7dp"
-				android:layout_margin="3dp">
+				android:layout_margin="8dp">
 
 				<TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@android:style/TextAppearance.Medium"
-                    android:text="@string/schedule_now"
-					android:textStyle="bold"/>
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:textColor="@color/entry_title"
+					android:textStyle="bold"
+                    android:text="@string/schedule_now"/>
 
 				<LinearLayout
                     android:id="@+id/ll_home_section_cityschedule_now_list"
@@ -265,14 +288,15 @@
 				android:background="@drawable/entry"
 				android:id="@+id/ll_home_section_cityschedule_later_content"
 				android:padding="7dp"
-				android:layout_margin="3dp">
+				android:layout_margin="8dp">
 
 				<TextView
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:textAppearance="@android:style/TextAppearance.Medium"
-					android:text="@string/schedule_later"
-					android:textStyle="bold"/>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:textColor="@color/entry_title"
+					android:textStyle="bold"
+					android:text="@string/schedule_later"/>
 
 				<LinearLayout
 					android:id="@+id/ll_home_section_cityschedule_later_list"
@@ -293,26 +317,30 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:visibility="gone"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp"
+			android:visibility="gone">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_around"
 				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"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_around_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="3dp"
+				android:layout_margin="8dp"
 				android:orientation="vertical"
 				android:background="@drawable/entry"
 				>
@@ -327,26 +355,30 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:visibility="gone"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp"
+			android:visibility="gone">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_activities_future"
 				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"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_activities_future_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="3dp"
+				android:layout_margin="8dp"
 				android:orientation="vertical">
 
 			</LinearLayout>
@@ -359,27 +391,30 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_blog"
 				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"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_blog_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="3dp"
 				android:orientation="vertical"
-				>
+				android:layout_margin="8dp">
 
 			</LinearLayout>
 
@@ -391,25 +426,29 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_gallery"
 				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"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_gallery_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="3dp"
+				android:layout_margin="8dp"
 				android:orientation="vertical"
 				android:background="@drawable/entry"
 				android:padding="7dp">
@@ -432,9 +471,9 @@
 							android:layout_height="wrap_content"
 							android:id="@+id/iv_home_section_gallery_0"
 							android:contentDescription="@string/app_cdesc"
-							android:layout_margin="7dp"
-							android:padding="1dp"
-							android:background="@color/album_border"
+							android:layout_margin="3dp"
+							android:padding="0.5dp"
+							android:background="@color/image_border"
 							android:adjustViewBounds="true"
 							/>
 					</LinearLayout>
@@ -451,9 +490,9 @@
 							android:layout_height="wrap_content"
 							android:id="@+id/iv_home_section_gallery_1"
 							android:contentDescription="@string/app_cdesc"
-							android:layout_margin="7dp"
-							android:background="@color/album_border"
-							android:padding="1dp"
+							android:layout_margin="3dp"
+							android:background="@color/image_border"
+							android:padding="0.5dp"
 							android:adjustViewBounds="true"
 							/>
 					</LinearLayout>
@@ -478,9 +517,9 @@
 							android:layout_height="wrap_content"
 							android:id="@+id/iv_home_section_gallery_2"
 							android:contentDescription="@string/app_cdesc"
-							android:layout_margin="7dp"
-							android:padding="1dp"
-							android:background="@color/album_border"
+							android:layout_margin="3dp"
+							android:padding="0.5dp"
+							android:background="@color/image_border"
 							android:adjustViewBounds="true"
 							/>
 					</LinearLayout>
@@ -497,9 +536,9 @@
 							android:layout_height="wrap_content"
 							android:id="@+id/iv_home_section_gallery_3"
 							android:contentDescription="@string/app_cdesc"
-							android:layout_margin="7dp"
-							android:background="@color/album_border"
-							android:padding="1dp"
+							android:layout_margin="3dp"
+							android:background="@color/image_border"
+							android:padding="0.5dp"
 							android:adjustViewBounds="true"
 							/>
 					</LinearLayout>
@@ -544,26 +583,29 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:visibility="gone"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp"
+			android:visibility="gone">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_activities_past"
 				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"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_activities_past_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="3dp"
 				android:orientation="vertical">
 
 			</LinearLayout>
@@ -576,25 +618,29 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:background="@drawable/section"
-			android:layout_marginLeft="0dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginRight="0dp"
-			android:layout_marginBottom="4dp"
-			android:paddingTop="5dp">
+			android:layout_margin="10dp">
 
 			<TextView
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_social"
 				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"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_social_content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_margin="3dp"
+				android:layout_margin="8dp"
 				android:orientation="vertical"
 				android:background="@drawable/entry"
 				android:padding="7dp">
@@ -608,40 +654,40 @@
 						android:id="@+id/iv_home_section_social_phone"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_phone"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_phone"/>
 
 					<ImageView
 						android:id="@+id/iv_home_section_social_mail"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_mail"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_mail" />
 
 					<ImageView
 						android:id="@+id/iv_home_section_social_whatsapp"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_whatsapp"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_whatsapp" />
 
 					<ImageView
 						android:id="@+id/iv_home_section_social_facebook"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_facebook"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_facebook" />
 				</LinearLayout>
 
@@ -654,42 +700,44 @@
 						android:id="@+id/iv_home_section_social_twitter"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_twitter"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_twitter" />
 
 					<ImageView
 						android:id="@+id/iv_home_section_social_googleplus"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_googleplus"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_googleplus" />
 
 					<ImageView
 						android:id="@+id/iv_home_section_social_youtube"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_youtube"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_youtube" />
 
 					<ImageView
 						android:id="@+id/iv_home_section_social_instagram"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_margin="10dp"
+						android:layout_margin="5dp"
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_instagram"
-						android:maxWidth="50dp"
+						android:maxWidth="60dp"
 						android:src="@drawable/social_instagram" />
+
 				</LinearLayout>
+
 			</LinearLayout>
 
 		</LinearLayout>

app/src/main/res/layout/row_home_activities.xml

@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/entry"
-    android:padding="4dp">
+              android:orientation="vertical" android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@drawable/entry"
+              android:padding="7dp"
+              android:layout_margin="8dp">
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/entry_title"
+        android:textStyle="bold"
         android:id="@+id/tv_row_home_activity_title" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:id="@+id/tv_row_home_activity_date"
-        android:gravity="end"
-        android:textStyle="italic" />
-
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -39,35 +34,65 @@
             android:maxWidth="130dp"
             android:layout_weight=".8"
             android:layout_margin="3dp"
-            android:layout_gravity="center_vertical"
-            android:adjustViewBounds="true"/>
+            android:layout_gravity="top"
+            android:adjustViewBounds="true"
+            android:background="@color/image_border"
+            android:padding="0.5dp"/>
 
-        <TextView
-            android:layout_width="fill_parent"
+        <LinearLayout
+            android:orientation="vertical"
             android:layout_height="wrap_content"
-            android:id="@+id/tv_row_home_activity_text"
             android:layout_weight=".2"
-            android:textAppearance="@android:style/TextAppearance.Medium"
-            android:layout_margin="5dp" />
-    </LinearLayout>
+            android:layout_width="match_parent"
+            android:layout_gravity="top">
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:id="@+id/tv_row_home_activity_date"
+                android:gravity="end"
+                android:textStyle="italic"
+                android:layout_weight="1"
+                android:layout_marginTop="4dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:id="@+id/tv_row_home_activity_city" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:id="@+id/tv_row_home_activity_city"
+                android:layout_weight="1"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"/>
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/tv_row_home_activity_text"
+                android:layout_weight="1"
+                android:textAppearance="@android:style/TextAppearance.Medium"
+                android:layout_margin="5dp"
+                android:maxLines="4"/>
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_weight="1"
+                android:layout_height="40dp"
+                android:layout_marginTop="-40dp"
+                android:background="@drawable/gradient_v_white"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:id="@+id/tv_row_home_activity_price"
+                android:layout_weight="1"
+                android:layout_marginLeft="35dp"
+                android:layout_marginStart="35dp"/>
+        </LinearLayout>
 
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:id="@+id/tv_row_home_activity_price"
-            android:gravity="end" />
     </LinearLayout>
 
 </LinearLayout>

app/src/main/res/layout/row_home_blog.xml

@@ -1,30 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/entry"
-    android:padding="4dp">
+              android:orientation="vertical" android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@drawable/entry"
+              android:padding="7dp"
+              android:layout_margin="8dp">
 
     <TextView
+        android:id="@+id/tv_row_home_blog_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         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:textStyle="italic"/>
-
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="New Text"
         android:id="@+id/tv_row_home_blog_hidden"
         android:visibility="gone" />
 
@@ -41,16 +33,47 @@
             android:maxWidth="130dp"
             android:layout_weight=".7"
             android:layout_margin="3dp"
-            android:layout_gravity="center_vertical"
-            android:adjustViewBounds="true"/>
+            android:adjustViewBounds="true"
+            android:padding="0.5dp"
+            android:background="@color/image_border"
+            android:layout_gravity="top"/>
 
-        <TextView
-            android:layout_width="fill_parent"
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/tv_row_home_blog_text"
             android:layout_weight=".3"
-            android:textAppearance="@android:style/TextAppearance.Medium"
-            android:layout_margin="5dp" />
+            android:layout_gravity="top">
+
+            <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=".3"
+                android:textStyle="italic"
+                android:layout_marginTop="4dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/tv_row_home_blog_text"
+                android:layout_weight=".3"
+                android:textAppearance="@android:style/TextAppearance.Medium"
+                android:layout_margin="5dp"
+                android:maxLines="4"/>
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_weight="1"
+                android:layout_height="40dp"
+                android:layout_marginTop="-40dp"
+                android:background="@drawable/gradient_v_white"/>
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </LinearLayout>

app/src/main/res/layout/row_home_schedule.xml

@@ -4,9 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="15dp"
-    android:paddingEnd="15dp"
-    android:paddingTop="5dp">
+    android:layout_margin="8dp"
+    android:padding="7dp">
 
     <TextView
         android:id="@+id/tv_row_home_schedule_id"

app/src/main/res/values-v21/styles.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.AppBaseTheme" parent="android:Theme.Material.Light">
+        <item name="android:colorPrimary">@color/background_menu</item>
+        <item name="android:colorPrimaryDark">@color/background_menu</item>
+        <item name="android:colorAccent">@color/background_menu</item>
+        <item name="android:colorBackground">@color/background_app</item>
+    </style>
+</resources>

app/src/main/res/values/color.xml

@@ -3,18 +3,22 @@
 
     <!-- Backgrounds for several sections -->
     
-    <color name="background_app">#e4f4fd</color>
-    <color name="background_menu">#4c9ed8</color>
+    <color name="background_app">#b5d3e5</color>
+    <color name="background_menu">#0078ff</color>
     <color name="background_notification">#000000</color>
     <color name="background_separator">#000000</color>
 
 
-    <color name="section_background">#d9ecf9</color>
-    <color name="section_border">#badde1</color>
-    <color name="section_title">#07383e</color>
+    <color name="section_background">#98c8ff</color>
+    <color name="section_border">#000011</color>
+    <color name="section_title">#ffffff</color>
+    <color name="section_title_background">#0078ff</color>
     <color name="entry_background">#ffffff</color>
-    <color name="entry_border">#d8f3f5</color>
-    <color name="entry_title">#41786e</color>
+    <color name="entry_border">#6D6990</color>
+    <color name="entry_title">#275573</color>
+
+    <!--Color for the border of the image-->
+    <color name="image_border">#292690</color>
     
     <!--Color for the menu entries-->
     <color name="menu_entry">#ffffff</color>
@@ -23,7 +27,7 @@
 
     <color name="background_bar">#9bc1da</color>
     <color name="background_bar_gradient">#bdf8fd</color>
-    <color name="menu_selected">#456075</color>
+    <color name="menu_selected">#ccccff</color>
 
     <!--Color for input fields-->
     <color name="input_background">#223344</color>

app/src/main/res/values/styles.xml

@@ -16,6 +16,13 @@
     <style name="AppTheme" parent="AppBaseTheme">
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
         <item name="android:textColorPrimary">#333333</item>
+        <item name="android:windowBackground">@color/background_menu</item>
+        <item name="android:colorBackground">@color/background_app</item>
+
+        <item name="colorPrimary">@color/background_menu</item>
+        <item name="colorPrimaryDark">@color/background_menu</item>
+        <item name="colorAccent">@color/background_menu</item>
+
     </style>
     
     <style name="Theme.Default" parent="Theme.AppCompat.Light"></style>