Merge branch 'newui'

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

@@ -19,6 +19,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -147,11 +148,16 @@ public class MainActivity extends Activity {
 		String title = "";
 		Bundle bundle = new Bundle();
 
+		//Get measures in dp
+		DisplayMetrics metrics = getResources().getDisplayMetrics();
+		int dp7 = (int) (8 * ((float)metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT));
+		int dp3 = (int) (4 * ((float)metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT));
+
 		//Reset all tabs to it's original state
 		for (int i = 0; i < 6; i++) {
 			menuText[i].setTypeface(null, Typeface.NORMAL);
 			menuImage[i].requestLayout();
-			menuImage[i].getLayoutParams().height = 2;
+			menuImage[i].getLayoutParams().height = dp3;
 		}
 
 		switch (section) {
@@ -159,14 +165,14 @@ public class MainActivity extends Activity {
 				fragment = new HomeLayout();
 				title = getString(R.string.menu_home);
 				menuText[0].setTypeface(null, Typeface.BOLD);
-				menuImage[0].getLayoutParams().height = 8;
+				menuImage[0].getLayoutParams().height = dp7;
 				break;
 
 			case GM.SECTION.LOCATION:
 				fragment = new LocationLayout();
 				title = getString(R.string.menu_location);
 				menuText[1].setTypeface(null, Typeface.BOLD);
-				menuImage[1].getLayoutParams().height = 8;
+				menuImage[1].getLayoutParams().height = dp7;
 				break;
 
 			case GM.SECTION.LABLANCA:
@@ -179,7 +185,7 @@ public class MainActivity extends Activity {
 				}
 				title = getString(R.string.menu_lablanca);
 				menuText[2].setTypeface(null, Typeface.BOLD);
-				menuImage[2].getLayoutParams().height = 8;
+				menuImage[2].getLayoutParams().height = dp7;
 				break;
 
 			case GM.SECTION.SCHEDULE:
@@ -188,7 +194,7 @@ public class MainActivity extends Activity {
 				fragment.setArguments(bundle);
 				title = getString(R.string.menu_lablanca_schedule);
 				menuText[2].setTypeface(null, Typeface.BOLD);
-				menuImage[2].getLayoutParams().height = 8;
+				menuImage[2].getLayoutParams().height = dp7;
 				break;
 
 			case GM.SECTION.GM_SCHEDULE:
@@ -197,28 +203,28 @@ public class MainActivity extends Activity {
 				fragment.setArguments(bundle);
 				title = getString(R.string.menu_lablanca_gm_schedule);
 				menuText[2].setTypeface(null, Typeface.BOLD);
-				menuImage[2].getLayoutParams().height = 8;
+				menuImage[2].getLayoutParams().height = dp7;
 				break;
 
 			case GM.SECTION.ACTIVITIES:
 				fragment = new ActivityLayout();
 				title = getString(R.string.menu_activities);
 				menuText[3].setTypeface(null, Typeface.BOLD);
-				menuImage[3].getLayoutParams().height = 8;
+				menuImage[3].getLayoutParams().height = dp7;
 				break;
 
 			case GM.SECTION.BLOG:
 				fragment = new BlogLayout();
 				title = getString(R.string.menu_blog);
 				menuText[4].setTypeface(null, Typeface.BOLD);
-				menuImage[4].getLayoutParams().height = 8;
+				menuImage[4].getLayoutParams().height = dp7;
 				break;
 
 			case GM.SECTION.GALLERY:
 				fragment = new GalleryLayout();
 				title = getString(R.string.menu_blog);
 				menuText[5].setTypeface(null, Typeface.BOLD);
-				menuImage[5].getLayoutParams().height = 8;
+				menuImage[5].getLayoutParams().height = dp7;
 				break;
 		}
 

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

@@ -204,7 +204,7 @@ public class PhotoLayout extends Fragment {
 		}
 		else {
 			//If not,  set placeholder image, create directories and download asynchronously
-			imageView.setImageResource(getResources().getIdentifier("com.ivalentin.margolariak:drawable/pinpoint_gm", null, null));
+			imageView.setImageResource(getResources().getIdentifier("com.ivalentin.margolariak:drawable/photo_placeholder", null, null));
 			File fpath;
 			fpath = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/view/");
 			fpath.mkdirs();

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

@@ -18,22 +18,23 @@
 
 		<ImageView
 			android:contentDescription="@string/app_name"
-			android:layout_width="40dp"
-			android:layout_height="40dp"
 			android:id="@+id/iv_logo"
 			android:src="@drawable/ic_launcher"
 			android:adjustViewBounds="true"
 			android:layout_weight=".2"
+			android:padding="1dp"
+			android:layout_height="wrap_content"
+			android:layout_width="wrap_content"
 			android:maxHeight="45dp"
 			android:maxWidth="45dp"
-			android:padding="1dp"/>
+			android:layout_gravity="center_vertical"/>
 
 		<!-- Layout with the app title and current section -->
 
 		<LinearLayout
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center"
+			android:layout_gravity="center_vertical|center"
 			android:layout_weight=".8"
 			android:gravity="center"
 			android:orientation="vertical" >
@@ -63,7 +64,7 @@
 		</LinearLayout>
 
 		<ImageButton
-			android:layout_width="40dp"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:src="@drawable/ic_expand"
 			android:contentDescription="@string/tutorial_menu"
@@ -71,7 +72,9 @@
 			android:layout_weight=".2"
 			android:id="@+id/bt_menu"
 			app:srcCompat="@drawable/ic_expand"
-			android:background="#00000000"/>
+			android:background="#00000000"
+			android:adjustViewBounds="false"
+			android:cropToPadding="false"/>
 
 		<ProgressBar
 			android:id="@+id/pb_sync"
@@ -88,11 +91,11 @@
 
 	<HorizontalScrollView
 		android:layout_width="wrap_content"
-		android:layout_height="50dp"
+		android:layout_height="55dp"
 		android:id="@+id/sv_menu"
 		android:scrollIndicators="none"
 		android:requiresFadingEdge="horizontal"
-		android:fadingEdgeLength="125dp"
+		android:fadingEdgeLength="80dp"
 		android:background="@color/background_menu"
 		tools:ignore="UnusedAttribute">
 
@@ -100,7 +103,7 @@
 			android:orientation="horizontal"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			>
+			android:layout_marginBottom="1dp">
 
 			<RelativeLayout
 				android:orientation="vertical"
@@ -124,7 +127,6 @@
 
 				<ImageView
 					android:layout_width="match_parent"
-					android:layout_height="8dp"
 					android:id="@+id/iv_menu_home"
 					android:background="@color/menu_selected"
 					android:alpha="1"
@@ -134,7 +136,8 @@
 					android:layout_alignParentLeft="false"
 					android:layout_alignParentRight="false"
 					android:layout_alignParentBottom="true"
-					tools:ignore="ContentDescription"/>
+					tools:ignore="ContentDescription"
+					android:layout_height="7dp"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -158,7 +161,6 @@
 
 				<ImageView
 					android:layout_width="match_parent"
-					android:layout_height="2dp"
 					android:id="@+id/iv_menu_location"
 					android:background="@color/menu_selected"
 					android:alpha="1"
@@ -168,7 +170,8 @@
 					android:layout_alignParentLeft="false"
 					android:layout_alignParentRight="false"
 					android:layout_alignParentBottom="true"
-					tools:ignore="ContentDescription"/>
+					tools:ignore="ContentDescription"
+					android:layout_height="3dp"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -192,7 +195,6 @@
 
 				<ImageView
 					android:layout_width="match_parent"
-					android:layout_height="2dp"
 					android:id="@+id/iv_menu_lablanca"
 					android:background="@color/menu_selected"
 					android:alpha="1"
@@ -202,7 +204,8 @@
 					android:layout_alignParentLeft="false"
 					android:layout_alignParentRight="false"
 					android:layout_alignParentBottom="true"
-					tools:ignore="ContentDescription"/>
+					tools:ignore="ContentDescription"
+					android:layout_height="3dp"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -226,7 +229,6 @@
 
 				<ImageView
 					android:layout_width="match_parent"
-					android:layout_height="2dp"
 					android:id="@+id/iv_menu_activities"
 					android:background="@color/menu_selected"
 					android:alpha="1"
@@ -236,7 +238,8 @@
 					android:layout_alignParentLeft="false"
 					android:layout_alignParentRight="false"
 					android:layout_alignParentBottom="true"
-					tools:ignore="ContentDescription"/>
+					tools:ignore="ContentDescription"
+					android:layout_height="3dp"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -260,7 +263,6 @@
 
 				<ImageView
 					android:layout_width="match_parent"
-					android:layout_height="2dp"
 					android:id="@+id/iv_menu_blog"
 					android:background="@color/menu_selected"
 					android:alpha="1"
@@ -270,7 +272,8 @@
 					android:layout_alignParentLeft="false"
 					android:layout_alignParentRight="false"
 					android:layout_alignParentBottom="true"
-					tools:ignore="ContentDescription"/>
+					tools:ignore="ContentDescription"
+					android:layout_height="3dp"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -294,7 +297,6 @@
 
 				<ImageView
 					android:layout_width="match_parent"
-					android:layout_height="2dp"
 					android:id="@+id/iv_menu_gallery"
 					android:background="@color/menu_selected"
 					android:alpha="1"
@@ -304,7 +306,8 @@
 					android:layout_alignParentLeft="false"
 					android:layout_alignParentRight="false"
 					android:layout_alignParentBottom="true"
-					tools:ignore="ContentDescription"/>
+					tools:ignore="ContentDescription"
+					android:layout_height="3dp"/>
 			</RelativeLayout>
 
 		</LinearLayout>

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

@@ -16,20 +16,21 @@
 
         <ImageView
             android:contentDescription="@string/app_name"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/iv_logo"
             android:src="@drawable/ic_launcher"
             android:adjustViewBounds="true"
             android:layout_weight=".2"
             android:maxHeight="45dp"
             android:maxWidth="45dp"
-            android:padding="1dp"/>
+            android:padding="1dp"
+            android:layout_gravity="center_vertical"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_gravity="center_vertical|center"
             android:layout_weight=".8"
             android:gravity="center"
             android:orientation="vertical" >

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

@@ -4,180 +4,170 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/scrollView3"
-    android:background="@color/background_app"
-    android:padding="7dp"
-    tools:ignore="Overdraw">
+    android:background="@color/background_app">
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/section"
-        android:layout_margin="7dp"
-        android:padding="7dp" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Large Text"
-            android:id="@+id/tv_activity_future_title"
-            android:textStyle="bold"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp">
 
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/entry"
-            android:padding="7dp" >
+            android:layout_height="wrap_content"
+            android:background="@drawable/section"
+            android:layout_margin="10dp"
+            tools:ignore="UselessParent">
 
             <TextView
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:id="@+id/tv_activity_future_title"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Large Text"
-                android:id="@+id/tv_activity_future_date"
-                android:layout_gravity="end"
-                android:gravity="center_horizontal" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/iv_activity_future_0"
-                android:layout_gravity="center_horizontal"
-                android:contentDescription="@string/app_cdesc"
-                android:visibility="gone"
-                android:maxHeight="70dp"
-                />
-
-            <WebView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/wv_activity_future_text" />
+                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="horizontal"
+                android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="center_horizontal"
-                android:layout_gravity="center_horizontal" >
+                android:background="@drawable/entry"
+                android:padding="7dp"
+                android:layout_margin="8dp">
 
-                <ImageView
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_future_1"
-                    android:contentDescription="@string/app_cdesc"
-                    android:layout_gravity="center_horizontal"
-                    android:maxHeight="50dp"
-                    android:visibility="gone"/>
+                    android:id="@+id/tv_activity_future_date"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold" />
 
-                <ImageView
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_future_2"
-                    android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
-                    android:maxHeight="50dp" />
+                    android:id="@+id/tv_activity_future_city"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold"/>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_future_3"
-                    android:contentDescription="@string/app_cdesc"
+                    android:id="@+id/iv_activity_future_0"
+                    android:layout_gravity="center_horizontal"
+                    android:contentDescription="@string/empty"
                     android:visibility="gone"
-                    android:maxHeight="50dp" />
+                    android:maxHeight="90dp"/>
 
-                <ImageView
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:gravity="center_horizontal"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_future_4"
-                    android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
-                    android:maxHeight="50dp" />
-            </LinearLayout>
-
-            <TableLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_margin="15dp"
-                android:layout_gravity="center_horizontal"
-                android:background="@color/album_border"
-                >
-
-                <TableRow
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_marginBottom="10dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@android:style/TextAppearance.Medium"
-                        android:text="@string/activity_city"
-                        android:gravity="end"
-                        android:background="#ffffff"
+                        android:textAppearance="@android:style/TextAppearance.Small"
+                        android:text="@string/activity_price"
                         android:layout_margin="1dp"
-                        android:padding="4dp"/>
+                        android:padding="4dp"
+                        android:visibility="gone"/>
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@android:style/TextAppearance.Medium"
-                        android:id="@+id/tv_activity_future_city"
-                        android:layout_margin="1dp"
-                        android:background="#ffffff"
+                        android:textAppearance="@android:style/TextAppearance.Small"
+                        android:id="@+id/tv_activity_future_price"
                         android:padding="4dp"/>
-                </TableRow>
+                </LinearLayout>
+
+                <WebView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/wv_activity_future_text" />
 
-                <TableRow
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:gravity="center_horizontal"
+                    android:layout_gravity="center_horizontal" >
 
-                    <TextView
+                    <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@android:style/TextAppearance.Medium"
-                        android:text="@string/activity_price"
-                        android:layout_margin="1dp"
-                        android:gravity="end"
-                        android:background="#ffffff"
-                        android:padding="4dp"/>
+                        android:id="@+id/iv_activity_future_1"
+                        android:contentDescription="@string/app_cdesc"
+                        android:layout_gravity="center_horizontal"
+                        android:maxHeight="50dp"
+                        android:visibility="gone"/>
 
-                    <TextView
+                    <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@android:style/TextAppearance.Medium"
-                        android:id="@+id/tv_activity_future_price"
-                        android:layout_margin="1dp"
-                        android:background="#ffffff"
-                        android:padding="4dp"/>
-                </TableRow>
-            </TableLayout>
+                        android:id="@+id/iv_activity_future_2"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
 
-        </LinearLayout>
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_activity_future_3"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
 
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="15dp"
-            android:id="@+id/ll_activity_future_schedule">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_activity_future_4"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
+                </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/activity_schedule"
-                android:textStyle="bold"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:id="@+id/ll_activity_future_schedule_list"
                 android:background="@drawable/entry"
-                android:padding="7dp"/>
+                android:padding="7dp"
+                android:layout_margin="8dp"
+                android:id="@+id/ll_activity_future_schedule">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/activity_schedule"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold"/>
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:id="@+id/ll_activity_future_schedule_list"
+                    android:padding="7dp"/>
+            </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>
+
 </com.ivalentin.margolariak.CustomScrollView>

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

@@ -4,117 +4,124 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="match_parent"
-    android:id="@+id/scrollView3"
-    android:background="@color/background_app"
-    android:padding="7dp"
-    tools:ignore="Overdraw">
+    android:background="@color/background_app">
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/section"
-        android:layout_margin="7dp"
-        android:padding="7dp" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Large Text"
-            android:id="@+id/tv_activity_past_title"
-            android:textStyle="bold"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp">
 
         <LinearLayout
             android:orientation="vertical"
-            android:transitionGroup="true"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/entry"
-            android:padding="7dp">
+            android:layout_height="wrap_content"
+            android:background="@drawable/section"
+            android:layout_margin="10dp"
+            tools:ignore="UselessParent">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/tv_activity_past_title"
+                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:orientation="horizontal"
+                android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="7dp">
+                android:background="@drawable/entry"
+                android:padding="7dp"
+                android:layout_margin="8dp">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:id="@+id/tv_activity_past_date"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/tv_activity_past_city"
-                    android:layout_margin="5dp" />
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold"/>
 
                 <TextView
-                    android:layout_width="fill_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:id="@+id/tv_activity_past_city"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/tv_activity_past_date"
-                    android:layout_margin="5dp"
-                    android:gravity="end" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/iv_activity_past_0"
-                android:contentDescription="@string/app_cdesc"
-                android:layout_gravity="center_horizontal"
-                android:visibility="gone"
-                android:maxHeight="70dp" />
-
-            <WebView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/wv_activity_past_text"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp" />
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_horizontal"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="15dp">
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold"/>
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_past_1"
-                    android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
+                    android:id="@+id/iv_activity_past_0"
                     android:layout_gravity="center_horizontal"
-                    android:maxHeight="50dp" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_past_2"
-                    android:contentDescription="@string/app_cdesc"
+                    android:contentDescription="@string/empty"
                     android:visibility="gone"
-                    android:maxHeight="50dp" />
+                    android:maxHeight="90dp"/>
 
-                <ImageView
-                    android:layout_width="wrap_content"
+                <WebView
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_past_3"
-                    android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
-                    android:maxHeight="50dp" />
+                    android:id="@+id/wv_activity_past_text"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_horizontal"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="15dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_activity_past_1"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:layout_gravity="center_horizontal"
+                        android:maxHeight="50dp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_activity_past_2"
+                        android:contentDescription="@string/empty"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_activity_past_3"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_activity_past_4"
+                        android:contentDescription="@string/empty"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
+                </LinearLayout>
 
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/iv_activity_past_4"
-                    android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
-                    android:maxHeight="50dp" />
             </LinearLayout>
 
         </LinearLayout>
 
     </LinearLayout>
+
 </com.ivalentin.margolariak.CustomScrollView>

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

@@ -5,47 +5,73 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/scrollView3"
-    android:background="@color/background_app"
-    android:padding="7dp"
-    tools:ignore="Overdraw">
+    >
 
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/section"
-        android:paddingBottom="15dp"
-        android:paddingLeft="7dp"
-        android:paddingTop="7dp"
-        android:paddingRight="7dp">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
             android:id="@+id/tv_album_title"
-            android:textStyle="bold"/>
-
-        <WebView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="Medium Text"
-            android:id="@+id/wv_album_description"
-            android:layout_margin="7dp"
-            android:background="@drawable/entry"
-            android:padding="7dp" />
+            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"
+            android:layout_marginBottom="-1.3dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"/>
 
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="7dp"
-            android:layout_marginTop="15dp"
-            android:layout_marginRight="7dp"
-            android:layout_marginBottom="7dp"
-            android:id="@+id/ll_album_list">
+            android:background="@drawable/section_large"
+            android:layout_marginBottom="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="0dp">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/entry"
+                android:padding="7dp"
+                android:layout_margin="8dp">
+
+                <WebView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:id="@+id/wv_album_description"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="7dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="7dp"
+                android:layout_marginBottom="7dp"
+                android:id="@+id/ll_album_list">
+            </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>

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

@@ -3,71 +3,80 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/scrollView3"
-    tools:ignore="Overdraw">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:background="@drawable/section"
-        android:layout_margin="10dp">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/section_title_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"/>
+        android:layout_marginBottom="10dp"
+        tools:ignore="UselessParent">
 
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/ll_blog_list"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal">
+            android:layout_height="fill_parent"
+            android:background="@drawable/section"
+            android:layout_margin="10dp">
 
-            <Button
-                android:layout_width="wrap_content"
+            <TextView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/blog_pager_previous"
-                android:id="@+id/bt_blog_previous"
-                android:background="@drawable/button_selector"
+                android:text="@string/section_title_blog"
+                android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textStyle="bold"
-                android:textColor="@color/input_button_color"
-                android:layout_gravity="center_horizontal"
-                android:visibility="gone"
-                android:layout_margin="5dp"
-                tools:ignore="ButtonStyle"/>
+                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:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/blog_pager_next"
-                android:id="@+id/bt_blog_next"
-                android:background="@drawable/button_selector"
-                android:textStyle="bold"
-                android:textColor="@color/input_button_color"
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/ll_blog_list"/>
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_gravity="center_horizontal"
-                android:layout_margin="5dp"
-                tools:ignore="ButtonStyle"/>
+                android:gravity="center_horizontal">
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/blog_pager_previous"
+                    android:id="@+id/bt_blog_previous"
+                    android:background="@drawable/button_selector"
+                    android:textStyle="bold"
+                    android:textColor="@color/input_button_color"
+                    android:layout_gravity="center_horizontal"
+                    android:visibility="gone"
+                    android:layout_margin="5dp"
+                    tools:ignore="ButtonStyle"/>
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/blog_pager_next"
+                    android:id="@+id/bt_blog_next"
+                    android:background="@drawable/button_selector"
+                    android:textStyle="bold"
+                    android:textColor="@color/input_button_color"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_margin="5dp"
+                    tools:ignore="ButtonStyle"/>
+
+            </LinearLayout>
+
         </LinearLayout>
+
     </LinearLayout>
+
 </com.ivalentin.margolariak.CustomScrollView>

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

@@ -2,198 +2,221 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/background_app"
-    android:padding="7dp"
-    tools:ignore="Overdraw">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/section"
-        android:paddingBottom="15dp"
-        android:paddingLeft="7dp"
-        android:paddingTop="7dp"
-        android:paddingRight="7dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:id="@+id/tv_photo_title"
-            android:textStyle="bold"/>
+        android:layout_height="fill_parent"
+        android:layout_marginBottom="10dp">
 
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/entry"
-            android:padding="7dp">
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/iv_photo"
-                android:contentDescription="@string/app_cdesc"
-                android:padding="2dp"
-                android:background="@color/album_border"
-                android:adjustViewBounds="true"
-                android:src="@drawable/photo_placeholder_preview"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Medium Text"
-                android:id="@+id/tv_photo_description"/>
+            android:layout_height="wrap_content"
+            android:background="@drawable/section"
+            android:layout_margin="10dp"
+            tools:ignore="UselessParent">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:text="Small Text"
-                android:id="@+id/tv_photo_date"
-                android:layout_marginStart="15dp"
-                android:layout_marginBottom="15dp"
-                android:textStyle="italic"/>
+                android:id="@+id/tv_photo_title"
+                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:orientation="horizontal"
+                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal"
-                android:padding="7dp">
+                android:layout_height="wrap_content"
+                android:background="@drawable/entry"
+                android:padding="7dp"
+                android:layout_margin="8dp">
 
-                <Button
-                    android:layout_width="wrap_content"
+                <ImageView
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/blog_pager_previous"
-                    android:id="@+id/bt_photo_previous"
-                    android:background="@drawable/button_selector"
-                    android:textStyle="bold"
-                    android:textColor="@color/input_button_color"
-                    android:layout_gravity="center_horizontal"
-                    android:visibility="visible"
-                    android:layout_margin="5dp"
-                    tools:ignore="ButtonStyle"/>
+                    android:id="@+id/iv_photo"
+                    android:contentDescription="@string/app_cdesc"
+                    android:padding="2dp"
+                    android:background="@color/album_border"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/photo_placeholder_preview"/>
 
-                <Button
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/blog_pager_next"
-                    android:id="@+id/bt_photo_next"
-                    android:background="@drawable/button_selector"
-                    android:textStyle="bold"
-                    android:textColor="@color/input_button_color"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_margin="5dp"
-                    tools:ignore="ButtonStyle"/>
-            </LinearLayout>
-        </LinearLayout>
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:text="Medium Text"
+                    android:id="@+id/tv_photo_description"/>
 
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/entry"
-            android:layout_marginTop="15dp"
-            android:padding="7dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:text="Small Text"
+                    android:id="@+id/tv_photo_date"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginBottom="15dp"
+                    android:textStyle="italic"/>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="New Text"
-                android:id="@+id/tv_comments"
-                android:textAppearance="@android:style/TextAppearance.Medium" />
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center_horizontal"
+                    android:padding="7dp">
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/ll_comment_list">
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/blog_pager_previous"
+                        android:id="@+id/bt_photo_previous"
+                        android:background="@drawable/button_selector"
+                        android:textStyle="bold"
+                        android:textColor="@color/input_button_color"
+                        android:layout_gravity="center_horizontal"
+                        android:visibility="visible"
+                        android:layout_margin="5dp"
+                        tools:ignore="ButtonStyle"/>
 
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/blog_pager_next"
+                        android:id="@+id/bt_photo_next"
+                        android:background="@drawable/button_selector"
+                        android:textStyle="bold"
+                        android:textColor="@color/input_button_color"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_margin="5dp"
+                        tools:ignore="ButtonStyle"/>
+                </LinearLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="2dp"
-                android:background="@color/background_separator"
-                android:layout_margin="6dp" />
-
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:id="@+id/ll_new_comment"
-                android:layout_marginTop="15dp"
-                android:layout_marginLeft="7dp"
-                android:layout_marginRight="7dp"
-                android:layout_marginBottom="7dp">
+                android:background="@drawable/entry"
+                android:padding="7dp"
+                android:layout_margin="8dp">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/comment_your_comment"
-                    android:textAppearance="@android:style/TextAppearance.Medium" />
+                    android:id="@+id/tv_comments"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold" />
 
-                <EditText
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/et_comment_text"
-                    android:minLines="2"
-                    android:hint="@string/comment_text"
-                    android:background="@drawable/input"
-                    android:textColor="@color/input_text_color"
-                    android:textColorHint="@color/input_hint_color"
-                    android:gravity="top"
-                    android:layout_margin="4dp"
-                    android:inputType="textCapSentences|textMultiLine"/>
-
-                <EditText
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/et_comment_name"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:hint="@string/comment_name"
-                    android:background="@drawable/input"
-                    android:textColor="@color/input_text_color"
-                    android:textColorHint="@color/input_hint_color"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:inputType="textCapWords"/>
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:id="@+id/ll_comment_list">
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="@color/image_border"
+                    android:layout_margin="10dp"
+                    android:layout_marginBottom="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="3dp"
+                    android:alpha="0.5"
+                    android:adjustViewBounds="false"
+                    android:contentDescription="@string/empty"/>
 
                 <LinearLayout
-                    android:orientation="horizontal"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center_horizontal"
-                    android:layout_marginBottom="10dp">
+                    android:id="@+id/ll_new_comment"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginLeft="7dp"
+                    android:layout_marginRight="7dp"
+                    android:layout_marginBottom="7dp">
 
-                    <Button
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/comment_send"
-                        android:id="@+id/bt_comment_send"
-                        android:layout_gravity="center_horizontal"
-                        android:background="@drawable/button_selector"
-                        android:textColor="@color/input_button_color"
-                        android:textStyle="bold"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp" />
+                        android:text="@string/comment_your_comment"
+                        android:textAppearance="@android:style/TextAppearance.Medium" />
 
-                    <ProgressBar
-                        android:layout_width="wrap_content"
+                    <EditText
+                        android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:id="@+id/pb_comment"
-                        android:layout_gravity="center_horizontal"
-                        android:visibility="gone" />
+                        android:id="@+id/et_comment_text"
+                        android:minLines="2"
+                        android:hint="@string/comment_text"
+                        android:background="@drawable/input"
+                        android:textColor="@color/input_text_color"
+                        android:textColorHint="@color/input_hint_color"
+                        android:gravity="top"
+                        android:layout_margin="4dp"
+                        android:inputType="textCapSentences|textMultiLine"/>
+
+                    <EditText
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/et_comment_name"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="20dp"
+                        android:hint="@string/comment_name"
+                        android:background="@drawable/input"
+                        android:textColor="@color/input_text_color"
+                        android:textColorHint="@color/input_hint_color"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp"
+                        android:inputType="textCapWords"/>
+
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center_horizontal"
+                        android:layout_marginBottom="10dp">
+
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/comment_send"
+                            android:id="@+id/bt_comment_send"
+                            android:layout_gravity="center_horizontal"
+                            android:background="@drawable/button_selector"
+                            android:textColor="@color/input_button_color"
+                            android:textStyle="bold"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginBottom="5dp" />
+
+                        <ProgressBar
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/pb_comment"
+                            android:layout_gravity="center_horizontal"
+                            android:visibility="gone" />
+                    </LinearLayout>
+
                 </LinearLayout>
 
             </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>

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

@@ -2,207 +2,243 @@
 <com.ivalentin.margolariak.CustomScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/background_app"
-    android:padding="7dp"
-    tools:ignore="Overdraw">
+    android:background="@color/background_app">
+
+
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/section"
-        android:layout_margin="7dp"
-        android:padding="7dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Large Text"
-            android:id="@+id/tv_post_title"
-            android:textStyle="bold"/>
+        android:layout_width="match_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginBottom="10dp">
 
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/entry"
-            android:padding="7dp">
+            android:layout_height="wrap_content"
+            android:background="@drawable/section"
+            android:layout_margin="10dp"
+            tools:ignore="UselessParent">
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/iv_post_0"
-                android:contentDescription="@string/app_cdesc"
-                android:layout_gravity="center_horizontal"
-                android:visibility="gone"
-                android:maxHeight="70dp" />
-
-            <WebView
-                android:layout_width="wrap_content"
+            <TextView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/wv_post_text" />
+                android:id="@+id/tv_post_title"
+                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:orientation="horizontal"
+                android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="center_horizontal"
-                android:layout_gravity="center_horizontal">
+                android:background="@drawable/entry"
+                android:padding="7dp"
+                android:layout_margin="8dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_post_1"
+                    android:id="@+id/iv_post_0"
                     android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
                     android:layout_gravity="center_horizontal"
-                    android:maxHeight="50dp" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/iv_post_2"
-                    android:contentDescription="@string/app_cdesc"
                     android:visibility="gone"
-                    android:maxHeight="50dp" />
+                    android:maxHeight="90dp" />
 
-                <ImageView
+                <WebView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/iv_post_3"
-                    android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
-                    android:maxHeight="50dp" />
+                    android:id="@+id/wv_post_text" />
 
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/iv_post_4"
-                    android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
-                    android:maxHeight="50dp" />
-            </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_horizontal"
+                    android:layout_gravity="center_horizontal">
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/background_separator"
-                android:layout_margin="6dp"/>
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_post_1"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:layout_gravity="center_horizontal"
+                        android:maxHeight="50dp" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="New Text"
-                android:id="@+id/tv_post_date"
-                android:layout_gravity="end" />
-        </LinearLayout>
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_post_2"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
 
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/entry"
-            android:layout_marginTop="15dp"
-            android:padding="7dp">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_post_3"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="New Text"
-                android:id="@+id/tv_comments"
-                android:textAppearance="@android:style/TextAppearance.Medium" />
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/iv_post_4"
+                        android:contentDescription="@string/app_cdesc"
+                        android:visibility="gone"
+                        android:maxHeight="50dp" />
+                </LinearLayout>
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/ll_comment_list">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="@color/image_border"
+                    android:layout_margin="10dp"
+                    android:layout_marginBottom="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="3dp"
+                    android:alpha="0.5"
+                    android:adjustViewBounds="false"
+                    android:contentDescription="@string/empty"/>
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tv_post_date"
+                    android:layout_gravity="end" />
             </LinearLayout>
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="2dp"
-                android:background="@color/background_separator"
-                android:layout_margin="6dp" />
-
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:id="@+id/ll_new_comment"
-                android:layout_marginTop="15dp"
-                android:layout_marginLeft="7dp"
-                android:layout_marginRight="7dp"
-                android:layout_marginBottom="7dp">
+                android:background="@drawable/entry"
+                android:padding="7dp"
+                android:layout_margin="8dp">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/comment_your_comment"
-                    android:id="@+id/textView"
-                    android:textAppearance="@android:style/TextAppearance.Medium" />
+                    android:id="@+id/tv_comments"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/entry_title"
+                    android:textStyle="bold" />
 
-                <EditText
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/et_comment_text"
-                    android:minLines="2"
-                    android:hint="@string/comment_text"
-                    android:background="@drawable/input"
-                    android:textColor="@color/input_text_color"
-                    android:textColorHint="@color/input_hint_color"
-                    android:gravity="top"
-                    android:layout_margin="4dp"
-                    android:inputType="textCapSentences|textMultiLine"/>
-
-                <EditText
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/et_comment_name"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:hint="@string/comment_name"
-                    android:background="@drawable/input"
-                    android:textColor="@color/input_text_color"
-                    android:textColorHint="@color/input_hint_color"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:inputType="textCapSentences"/>
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:id="@+id/ll_comment_list">
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="@color/image_border"
+                    android:layout_margin="10dp"
+                    android:layout_marginBottom="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="3dp"
+                    android:alpha="0.5"
+                    android:adjustViewBounds="false"
+                    android:contentDescription="@string/empty"/>
 
                 <LinearLayout
-                    android:orientation="horizontal"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center_horizontal"
-                    android:layout_marginBottom="10dp">
+                    android:id="@+id/ll_new_comment"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginLeft="7dp"
+                    android:layout_marginRight="7dp"
+                    android:layout_marginBottom="7dp">
 
-                    <Button
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/comment_send"
-                        android:id="@+id/bt_comment_send"
-                        android:layout_gravity="center_horizontal"
-                        android:background="@drawable/button_selector"
-                        android:textColor="@color/input_button_color"
-                        android:textStyle="bold"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp" />
+                        android:text="@string/comment_your_comment"
+                        android:id="@+id/textView"
+                        android:textAppearance="@android:style/TextAppearance.Medium" />
 
-                    <ProgressBar
-                        android:layout_width="wrap_content"
+                    <EditText
+                        android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:id="@+id/pb_comment"
-                        android:layout_gravity="center_horizontal"
-                        android:visibility="gone" />
+                        android:id="@+id/et_comment_text"
+                        android:minLines="2"
+                        android:hint="@string/comment_text"
+                        android:background="@drawable/input"
+                        android:textColor="@color/input_text_color"
+                        android:textColorHint="@color/input_hint_color"
+                        android:gravity="top"
+                        android:layout_margin="4dp"
+                        android:inputType="textCapSentences|textMultiLine"/>
+
+                    <EditText
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/et_comment_name"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="20dp"
+                        android:hint="@string/comment_name"
+                        android:background="@drawable/input"
+                        android:textColor="@color/input_text_color"
+                        android:textColorHint="@color/input_hint_color"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp"
+                        android:inputType="textCapSentences"/>
+
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center_horizontal"
+                        android:layout_marginBottom="10dp">
+
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/comment_send"
+                            android:id="@+id/bt_comment_send"
+                            android:layout_gravity="center_horizontal"
+                            android:background="@drawable/button_selector"
+                            android:textColor="@color/input_button_color"
+                            android:textStyle="bold"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginBottom="5dp" />
+
+                        <ProgressBar
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/pb_comment"
+                            android:layout_gravity="center_horizontal"
+                            android:visibility="gone" />
+                    </LinearLayout>
+
                 </LinearLayout>
 
             </LinearLayout>
+
         </LinearLayout>
+
     </LinearLayout>
+
 </com.ivalentin.margolariak.CustomScrollView>

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

@@ -13,15 +13,19 @@
         android:layout_height="wrap_content"
         android:layout_weight=".5"
         android:background="@drawable/entry"
-        android:layout_margin="5dp"
-        android:padding="5dp"
-        android:id="@+id/ll_row_album_left">
+        android:padding="7dp"
+        android:id="@+id/ll_row_album_left"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="8dp">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="Medium Text"
             android:id="@+id/tv_row_album_hidden_left"
             android:visibility="gone" />
 
@@ -40,6 +44,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/entry_title"
+            android:textStyle="bold"
             android:id="@+id/tv_row_album_title_left"
             android:gravity="center_horizontal" />
 
@@ -59,10 +65,10 @@
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:layout_width="15dp"
-                android:layout_height="15dp"
+                android:layout_width="11dp"
+                android:layout_height="11dp"
                 android:src="@drawable/comment"
-                android:contentDescription="@string/app_cdesc"
+                android:contentDescription="@string/empty"
                 android:layout_marginStart="5dp"
                 android:layout_gravity="center_vertical" />
         </LinearLayout>
@@ -75,16 +81,20 @@
         android:layout_height="wrap_content"
         android:layout_weight=".5"
         android:background="@drawable/entry"
-        android:layout_margin="5dp"
-        android:padding="5dp"
+        android:padding="7dp"
         android:id="@+id/ll_row_album_right"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="8dp"
         android:visibility="invisible">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="Medium Text"
             android:id="@+id/tv_row_album_hidden_right"
             android:visibility="gone" />
 
@@ -103,7 +113,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="Medium Text"
+            android:textColor="@color/entry_title"
+            android:textStyle="bold"
             android:id="@+id/tv_row_album_title_right"
             android:gravity="center_horizontal" />
 
@@ -124,10 +135,10 @@
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:layout_width="15dp"
-                android:layout_height="15dp"
+                android:layout_width="11dp"
+                android:layout_height="11dp"
                 android:src="@drawable/comment"
-                android:contentDescription="@string/app_cdesc"
+                android:contentDescription="@string/empty"
                 android:layout_marginStart="5dp"
                 android:layout_gravity="center_vertical" />
         </LinearLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -19,7 +20,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="New Text"
         android:id="@+id/tv_row_blog_hidden"
         android:visibility="gone" />
 
@@ -64,7 +64,9 @@
                 android:layout_height="40dp"
                 android:layout_marginTop="-40dp"
                 android:background="@drawable/gradient_v_white"
-                android:adjustViewBounds="true"/>
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/empty"
+                tools:ignore="InefficientWeight"/>
 
         </LinearLayout>
 
@@ -82,7 +84,8 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="3dp"
         android:alpha="0.5"
-        android:adjustViewBounds="false"/>
+        android:adjustViewBounds="false"
+        android:contentDescription="@string/empty"/>
 
     <LinearLayout
         android:orientation="horizontal"

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

@@ -207,5 +207,6 @@
 	<string name="pop_menu_about">Sobre nosotros</string>
 	<string name="preferences_info_source">Código fuente</string>
 	<string name="changelog">Changelog</string>
+	<string name="empty" translatable="false"></string>
 
 </resources>