First steps towards a more friendly UI.

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

@@ -80,7 +80,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 		//boolean requestLocation = false;
 
 		//Show tutorial if its the first time
-		final SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
+		/*final SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 		if (!preferences.getBoolean(GM.PREF_TUTORIAL, false)) {
 			final RelativeLayout llTutorial = (RelativeLayout) getActivity().findViewById(R.id.rl_tutorial);
 			llTutorial.setVisibility(View.VISIBLE);
@@ -100,7 +100,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 					editor.apply();
 				}
 			});
-		}
+		}*/
 
 		//Request location permissions if not set
 		if (ActivityCompat.checkSelfPermission(view.getContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(view.getContext(), android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
@@ -438,8 +438,8 @@ public class HomeLayout extends Fragment implements LocationListener {
 				llSection.setVisibility(View.VISIBLE);
 
 				//Enable menu entries
-				this.getActivity().findViewById(R.id.menu_lablanca_gm_schedule).setVisibility(View.VISIBLE);
-				this.getActivity().findViewById(R.id.menu_lablanca_schedule).setVisibility(View.VISIBLE);
+				//this.getActivity().findViewById(R.id.menu_lablanca_gm_schedule).setVisibility(View.VISIBLE);
+				//this.getActivity().findViewById(R.id.menu_lablanca_schedule).setVisibility(View.VISIBLE);
 
 				//Set text
 				String text = Html.fromHtml(cursor.getString(0)).toString();

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

@@ -87,8 +87,8 @@ class HomeSectionLocation extends AsyncTask<Void, Void, Void> {
 			editor.apply();
 
 			//Show menu entry
-			LinearLayout menuEntry = (LinearLayout) activity.findViewById(R.id.ll_menu_location);
-			menuEntry.setVisibility(View.VISIBLE);
+			//LinearLayout menuEntry = (LinearLayout) activity.findViewById(R.id.rl_menu_location);
+			//menuEntry.setVisibility(View.VISIBLE);
 
 			//Set up home view section
 			LinearLayout section = (LinearLayout) view.findViewById(R.id.ll_home_section_location);

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

@@ -27,6 +27,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -121,8 +122,10 @@ public class MainActivity extends Activity{
 		setSectionTitle(title);
 		
 		//If calling from the menu, close it.
-		if (fromSliderMenu)
-			mLayout.toggleMenu();
+		if (fromSliderMenu){
+			//TODO: Change tabs
+		}
+			//mLayout.toggleMenu();
 	}
 
 	/**
@@ -184,7 +187,7 @@ public class MainActivity extends Activity{
 	    
 	    //Set layout.
 		setContentView(R.layout.activity_main);
-		mLayout = (MainLayout) findViewById(R.id.main_layout);
+		//mLayout = (MainLayout) findViewById(R.id.main_layout);
 
 
 		
@@ -196,20 +199,19 @@ public class MainActivity extends Activity{
 		});
 		
 		//Assign menu items
-		TextView menuItem[] = new TextView[7];
-		menuItem[0] = (TextView) findViewById(R.id.menu_home);
-		menuItem[1] = (TextView) findViewById(R.id.menu_location);
-		menuItem[2] = (TextView) findViewById(R.id.menu_lablanca);
-		menuItem[3] = (TextView) findViewById(R.id.menu_activities);
-		menuItem[4] = (TextView) findViewById(R.id.menu_blog);
-		menuItem[5] = (TextView) findViewById(R.id.menu_gallery);
-		menuItem[6] = (TextView) findViewById(R.id.menu_settings);
-		TextView menuSpacer = (TextView) findViewById(R.id.menu_space);
+		RelativeLayout menuItem[] = new RelativeLayout[6];
+		menuItem[0] = (RelativeLayout) findViewById(R.id.rl_menu_home);
+		menuItem[1] = (RelativeLayout) findViewById(R.id.rl_menu_location);
+		menuItem[2] = (RelativeLayout) findViewById(R.id.rl_menu_lablanca);
+		menuItem[3] = (RelativeLayout) findViewById(R.id.rl_menu_activities);
+		menuItem[4] = (RelativeLayout) findViewById(R.id.rl_menu_blog);
+		menuItem[5] = (RelativeLayout) findViewById(R.id.rl_menu_gallery);
+		//TextView menuSpacer = (TextView) findViewById(R.id.menu_space);
 
 		//Assign buttons for la blanca submenu
 		TextView menuLablancaItem[] = new TextView[2];
-		menuLablancaItem[0] = (TextView) findViewById(R.id.menu_lablanca_schedule);
-		menuLablancaItem[1] = (TextView) findViewById(R.id.menu_lablanca_gm_schedule);
+		//menuLablancaItem[0] = (TextView) findViewById(R.id.menu_lablanca_schedule);
+		//menuLablancaItem[1] = (TextView) findViewById(R.id.menu_lablanca_gm_schedule);
 
 		//Set click listers for menu items
 		menuItem[0].setOnClickListener(new OnClickListener() {
@@ -236,39 +238,28 @@ public class MainActivity extends Activity{
 			@Override
 			public void onClick(View v) { loadSection(GM.SECTION_GALLERY, true); }
 		});
-		menuItem[6].setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) { loadSection(GM.SECTION_SETTINGS, true); }
-		});
 
 
 		SharedPreferences preferences = getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 		if (preferences.getInt(GM.PREF_DB_FESTIVALS, 0) == 1) {
 			//Show the entries
-			for (int i = 0; i < 2; i ++){
-				menuLablancaItem[i].setVisibility(View.VISIBLE);
-			}
+			//for (int i = 0; i < 2; i ++){
+			//	menuLablancaItem[i].setVisibility(View.VISIBLE);
+			//}
 		}
-		menuLablancaItem[0].setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				loadSection(GM.SECTION_LABLANCA_SCHEDULE, true);
-			}
-		});
-
-		menuLablancaItem[1].setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				loadSection(GM.SECTION_LABLANCA_GM_SCHEDULE, true);
-			}
-		});
-
-		menuSpacer.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				mLayout.toggleMenu();
-			}
-		});
+//		menuLablancaItem[0].setOnClickListener(new OnClickListener() {
+//			@Override
+//			public void onClick(View v) {
+//				loadSection(GM.SECTION_LABLANCA_SCHEDULE, true);
+//			}
+//		});
+//
+//		menuLablancaItem[1].setOnClickListener(new OnClickListener() {
+//			@Override
+//			public void onClick(View v) {
+//				loadSection(GM.SECTION_LABLANCA_GM_SCHEDULE, true);
+//			}
+//		});
 
 		//If the user code is not set, generate one
 		if (preferences.getString(GM.USER_CODE, "").length() == 0){

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

@@ -227,6 +227,7 @@ class Sync extends AsyncTask<Void, Void, Void> {
 			fu.Run(GM.SERVER + "/app/sync.php?os=android&code=" + code + "&fg=" + fg + "&v=" + dbVersion + "&lang=" + GM.getLang());
 			//All the info
 			o = fu.getOutput().toString();
+			Log.e("SYNC", o);
 			publishProgress();
 		}
 		catch(Exception ex){

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

@@ -1,392 +1,301 @@
-<FrameLayout
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	tools:ignore="MergeRootFrame">
+	tools:ignore="MergeRootFrame"
+	android:orientation="vertical">
 
-	<com.ivalentin.margolariak.MainLayout
-		android:id="@+id/main_layout"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:fitsSystemWindows="true"
-		android:background="@color/background_menu">
+				<!-- The action bar -->
 
-
-		<!-- Slider menu -->
-
-		<ScrollView
-			android:layout_width="wrap_content"
-			android:layout_height="fill_parent"
-			android:nestedScrollingEnabled="false"
-			tools:ignore="UnusedAttribute"
-			android:id="@+id/sv_menu">
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:background="@drawable/titlebar"
+			android:gravity="center_vertical"
+			android:orientation="horizontal"
+			android:padding="2dp">
+
+			<!-- Button to open slider menu -->
+
+			<ImageButton
+				android:id="@+id/bt_menu"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_weight=".2"
+				android:adjustViewBounds="false"
+				android:background="#00000000"
+				android:contentDescription="@string/app_name"
+				android:maxHeight="20dp"
+				android:maxWidth="20dp"
+				android:scaleType="fitCenter"
+				android:src="@drawable/menu"
+				android:padding="2dp"
+				android:alpha=".5"/>
+
+			<!-- Layout with the app title and current section -->
 
 			<LinearLayout
-				android:layout_width="match_parent"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:divider="@drawable/divider"
-				android:orientation="vertical"
-				android:padding="10dp"
-				android:baselineAligned="false"
-				android:id="@+id/ll_menu">
+				android:layout_gravity="center"
+				android:layout_weight=".8"
+				android:gravity="center"
+				android:orientation="vertical" >
 
-				<TextView
-					android:id="@+id/menu_home"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_home"
-					android:textAppearance="?android:attr/textAppearanceLarge"
-					android:textStyle="bold"
-					android:textColor="@color/menu_entry"
-					android:paddingTop="4dp"
-					android:paddingBottom="4dp"/>
-
-				<LinearLayout
-					android:orientation="vertical"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:id="@+id/ll_menu_location"
-					android:visibility="gone">
-
-					<View
-						android:layout_width="fill_parent"
-						android:layout_height="1dp"
-						android:background="@color/background_separator"/>
-
-					<TextView
-						android:id="@+id/menu_location"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="10dp"
-						android:layout_marginTop="10dp"
-						android:gravity="center_vertical"
-						android:text="@string/menu_location"
-						android:textAppearance="?android:attr/textAppearanceLarge"
-						android:textStyle="bold"
-						android:textColor="@color/menu_entry"
-						android:paddingBottom="4dp"
-						android:paddingTop="4dp"/>
-				</LinearLayout>
-
-				<View
-					android:layout_width="fill_parent"
-					android:layout_height="1dp"
-					android:background="@color/background_separator"/>
+				<!-- App name. Remains unchanged -->
 
 				<TextView
-					android:id="@+id/menu_lablanca"
-					android:layout_width="fill_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_lablanca"
-					android:textAppearance="?android:attr/textAppearanceLarge"
-					android:textStyle="bold"
-					android:textColor="@color/menu_entry"
-					android:paddingTop="4dp"
-					android:paddingBottom="4dp"/>
+					android:gravity="center"
+					android:text="@string/app_name"
+					android:textSize="18sp"
+					android:textStyle="bold" />
+
+				<!-- Section title -->
 
 				<TextView
-					android:id="@+id/menu_lablanca_schedule"
-					android:layout_width="fill_parent"
+					android:id="@+id/activity_main_content_title"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:layout_marginStart="20dp"
-					android:layout_marginLeft="20dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_lablanca_schedule"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:textColor="@color/menu_entry"
-					android:visibility="gone"
-					android:paddingTop="2dp"
-					android:paddingBottom="2dp"/>
+					android:gravity="center"
+					android:text="@string/menu_home"
+					android:textSize="20sp" />
+
+			</LinearLayout>
+
+			<ImageView
+				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:maxHeight="45dp"
+				android:maxWidth="45dp"
+				android:padding="1dp"/>
+
+			<ProgressBar
+				android:id="@+id/pb_sync"
+				android:layout_width="40dp"
+				android:layout_height="40dp"
+				android:layout_weight=".2"
+				android:visibility="gone"
+				android:maxHeight="40dp"
+				android:maxWidth="40dp"/>
+
+		</LinearLayout>
+
+		<!-- The part where the fragments will be loaded -->
+
+	<HorizontalScrollView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/horizontalScrollView">
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="#000000">
+
+			<RelativeLayout
+				android:orientation="vertical"
+				android:layout_width="100dp"
+				android:layout_height="30dp"
+				android:background="#ffffff"
+				android:layout_margin="1dp"
+				android:id="@+id/rl_menu_home">
 
 				<TextView
-					android:id="@+id/menu_lablanca_gm_schedule"
-					android:layout_width="fill_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:layout_marginStart="20dp"
-					android:layout_marginLeft="20dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_lablanca_gm_schedule"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:textColor="@color/menu_entry"
-					android:visibility="gone"
-					android:paddingBottom="2dp"
-					android:paddingTop="2dp"/>
+					android:text="@string/menu_home"
+					android:layout_gravity="top"
+					android:layout_centerHorizontal="true"
+					android:textSize="15sp"/>
 
-				<View
-					android:layout_width="fill_parent"
-					android:layout_height="1dp"
-					android:background="@color/background_separator"/>
+				<ImageView
+					android:layout_width="match_parent"
+					android:layout_height="8dp"
+					android:id="@+id/iv_menu_home"
+					android:background="#0000dd"
+					android:alpha="1"
+					android:layout_gravity="bottom"
+					android:layout_alignParentStart="false"
+					android:layout_alignParentEnd="false"
+					android:layout_alignParentLeft="false"
+					android:layout_alignParentRight="false"
+					android:layout_alignParentBottom="true"/>
+			</RelativeLayout>
+
+			<RelativeLayout
+				android:orientation="vertical"
+				android:layout_width="100dp"
+				android:layout_height="30dp"
+				android:background="#ffffff"
+				android:layout_margin="1dp"
+				android:id="@+id/rl_menu_location">
 
 				<TextView
-					android:id="@+id/menu_activities"
-					android:layout_width="fill_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_activities"
-					android:textAppearance="?android:attr/textAppearanceLarge"
-					android:textStyle="bold"
-					android:textColor="@color/menu_entry"
-					android:paddingTop="4dp"
-					android:paddingBottom="4dp"/>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:text="@string/menu_location"
+					android:layout_gravity="top"
+					android:layout_centerHorizontal="true"
+					android:textSize="15sp"/>
 
-				<View
-					android:layout_width="fill_parent"
-					android:layout_height="1dp"
-					android:background="@color/background_separator"/>
+				<ImageView
+					android:layout_width="match_parent"
+					android:layout_height="2dp"
+					android:id="@+id/iv_menu_location"
+					android:background="#0000dd"
+					android:alpha="1"
+					android:layout_gravity="bottom"
+					android:layout_alignParentStart="false"
+					android:layout_alignParentEnd="false"
+					android:layout_alignParentLeft="false"
+					android:layout_alignParentRight="false"
+					android:layout_alignParentBottom="true"/>
+			</RelativeLayout>
+
+			<RelativeLayout
+				android:orientation="vertical"
+				android:layout_width="100dp"
+				android:layout_height="30dp"
+				android:background="#ffffff"
+				android:layout_margin="1dp"
+				android:id="@+id/rl_menu_lablanca">
 
 				<TextView
-					android:id="@+id/menu_blog"
-					android:layout_width="fill_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_blog"
-					android:textAppearance="?android:attr/textAppearanceLarge"
-					android:textStyle="bold"
-					android:textColor="@color/menu_entry"
-					android:paddingBottom="4dp"
-					android:paddingTop="4dp"/>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:text="@string/menu_lablanca"
+					android:layout_gravity="top"
+					android:layout_centerHorizontal="true"
+					android:textSize="15sp"/>
 
-				<View
-					android:layout_width="fill_parent"
-					android:layout_height="1dp"
-					android:background="@color/background_separator"/>
+				<ImageView
+					android:layout_width="match_parent"
+					android:layout_height="2dp"
+					android:id="@+id/iv_menu_lablanca"
+					android:background="#0000dd"
+					android:alpha="1"
+					android:layout_gravity="bottom"
+					android:layout_alignParentStart="false"
+					android:layout_alignParentEnd="false"
+					android:layout_alignParentLeft="false"
+					android:layout_alignParentRight="false"
+					android:layout_alignParentBottom="true"/>
+			</RelativeLayout>
+
+			<RelativeLayout
+				android:orientation="vertical"
+				android:layout_width="100dp"
+				android:layout_height="30dp"
+				android:background="#ffffff"
+				android:layout_margin="1dp"
+				android:id="@+id/rl_menu_activities">
 
 				<TextView
-					android:id="@+id/menu_gallery"
-					android:layout_width="fill_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_gallery"
-					android:textAppearance="?android:attr/textAppearanceLarge"
-					android:textStyle="bold"
-					android:textColor="@color/menu_entry"
-					android:paddingTop="4dp"
-					android:paddingBottom="4dp"/>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:text="@string/menu_activities"
+					android:layout_gravity="top"
+					android:layout_centerHorizontal="true"
+					android:textSize="15sp"/>
 
-				<View
-					android:layout_width="fill_parent"
-					android:layout_height="1dp"
-					android:background="@color/background_separator"/>
+				<ImageView
+					android:layout_width="match_parent"
+					android:layout_height="2dp"
+					android:id="@+id/iv_menu_activities"
+					android:background="#0000dd"
+					android:alpha="1"
+					android:layout_gravity="bottom"
+					android:layout_alignParentStart="false"
+					android:layout_alignParentEnd="false"
+					android:layout_alignParentLeft="false"
+					android:layout_alignParentRight="false"
+					android:layout_alignParentBottom="true"/>
+			</RelativeLayout>
+
+			<RelativeLayout
+				android:orientation="vertical"
+				android:layout_width="100dp"
+				android:layout_height="30dp"
+				android:background="#ffffff"
+				android:layout_margin="1dp"
+				android:id="@+id/rl_menu_blog">
 
 				<TextView
-					android:id="@+id/menu_settings"
-					android:layout_width="fill_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_marginTop="10dp"
-					android:gravity="center_vertical"
-					android:text="@string/menu_settings"
-					android:textAppearance="?android:attr/textAppearanceLarge"
-					android:textStyle="bold"
-					android:textColor="@color/menu_entry"
-					android:paddingBottom="4dp"
-					android:paddingTop="4dp"/>
-
-				<TextView
-					android:layout_width="fill_parent"
-					android:layout_height="fill_parent"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:id="@+id/menu_space"
-					android:padding="5dp"/>
-
-			</LinearLayout>
-
-		</ScrollView>
-
-		<!-- The visible screen -->
-
-		<LinearLayout
-			xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:background="@color/background_app"
-			android:orientation="vertical"
-			>
+					android:text="@string/menu_blog"
+					android:layout_gravity="top"
+					android:layout_centerHorizontal="true"
+					android:textSize="15sp"/>
 
-			<!-- The action bar -->
+				<ImageView
+					android:layout_width="match_parent"
+					android:layout_height="2dp"
+					android:id="@+id/iv_menu_blog"
+					android:background="#0000dd"
+					android:alpha="1"
+					android:layout_gravity="bottom"
+					android:layout_alignParentStart="false"
+					android:layout_alignParentEnd="false"
+					android:layout_alignParentLeft="false"
+					android:layout_alignParentRight="false"
+					android:layout_alignParentBottom="true"/>
+			</RelativeLayout>
+
+			<RelativeLayout
+				android:orientation="vertical"
+				android:layout_width="100dp"
+				android:layout_height="30dp"
+				android:background="#ffffff"
+				android:layout_margin="1dp"
+				android:id="@+id/rl_menu_gallery">
 
-			<LinearLayout
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:background="@drawable/titlebar"
-				android:gravity="center_vertical"
-				android:orientation="horizontal"
-				android:padding="2dp">
-
-				<!-- Button to open slider menu -->
-
-				<ImageButton
-					android:id="@+id/bt_menu"
-					android:layout_width="40dp"
-					android:layout_height="40dp"
-					android:layout_weight=".2"
-					android:adjustViewBounds="false"
-					android:background="#00000000"
-					android:contentDescription="@string/app_name"
-					android:maxHeight="20dp"
-					android:maxWidth="20dp"
-					android:scaleType="fitCenter"
-					android:src="@drawable/menu"
-					android:padding="2dp"
-					android:alpha=".5"/>
-
-				<!-- Layout with the app title and current section -->
-
-				<LinearLayout
+				<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_gravity="center"
-					android:layout_weight=".8"
-					android:gravity="center"
-					android:orientation="vertical" >
-
-					<!-- App name. Remains unchanged -->
-
-					<TextView
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:text="@string/app_name"
-						android:textSize="18sp"
-						android:textStyle="bold" />
-
-					<!-- Section title -->
-
-					<TextView
-						android:id="@+id/activity_main_content_title"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:text="@string/menu_home"
-						android:textSize="20sp" />
-
-				</LinearLayout>
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					android:text="@string/menu_gallery"
+					android:layout_gravity="top"
+					android:layout_centerHorizontal="true"
+					android:textSize="15sp"/>
 
 				<ImageView
-					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:maxHeight="45dp"
-					android:maxWidth="45dp"
-					android:padding="1dp"/>
-
-				<ProgressBar
-					android:id="@+id/pb_sync"
-					android:layout_width="40dp"
-					android:layout_height="40dp"
-					android:layout_weight=".2"
-					android:visibility="gone"
-					android:maxHeight="40dp"
-					android:maxWidth="40dp"/>
+					android:layout_width="match_parent"
+					android:layout_height="2dp"
+					android:id="@+id/iv_menu_gallery"
+					android:background="#0000dd"
+					android:alpha="1"
+					android:layout_gravity="bottom"
+					android:layout_alignParentStart="false"
+					android:layout_alignParentEnd="false"
+					android:layout_alignParentLeft="false"
+					android:layout_alignParentRight="false"
+					android:layout_alignParentBottom="true"/>
+			</RelativeLayout>
 
-			</LinearLayout>
-
-			<!-- The part where the fragments will be loaded -->
-
-			<FrameLayout
-				android:id="@+id/activity_main_content_fragment"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:layout_marginLeft="9dp"
-				android:layout_marginRight="9dp">
+		</LinearLayout>
+	</HorizontalScrollView>
 
-			</FrameLayout>
+	<FrameLayout
+			android:id="@+id/activity_main_content_fragment"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_marginLeft="9dp"
+			android:layout_marginRight="9dp">
 
-		</LinearLayout>
+		</FrameLayout>
 
-	</com.ivalentin.margolariak.MainLayout>
-
-	<RelativeLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:background="#003377"
-		android:alpha=".85"
-		android:id="@+id/rl_tutorial"
-		android:visibility="gone">
-
-		<ImageView
-			android:layout_width="90dp"
-			android:layout_height="90dp"
-			android:src="@drawable/tutorial_point"
-			tools:ignore="ContentDescription"/>
-
-		<ImageView
-			android:layout_width="110dp"
-			android:layout_height="110dp"
-			android:src="@drawable/tutorial_slide"
-			android:layout_marginTop="110dp"
-			android:layout_marginLeft="-10dp"
-			android:layout_marginStart="-10dp"
-			tools:ignore="ContentDescription"/>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:text="@string/tutorial_menu"
-			android:textColor="#ffffff"
-			android:textStyle="bold"
-			android:layout_marginTop="70dp"
-			android:layout_marginRight="20dp"
-			android:layout_marginEnd="20dp"
-			android:layout_marginLeft="100dp"
-			android:layout_marginStart="100dp"/>
-
-		<ImageView
-			android:layout_width="90dp"
-			android:layout_height="90dp"
-			android:id="@+id/iv_tutorial_content"
-			android:src="@drawable/tutorial_point"
-			android:layout_centerInParent="true"
-			tools:ignore="ContentDescription"/>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:text="@string/tutorial_content"
-			android:textColor="#ffffff"
-			android:textStyle="bold"
-			android:layout_marginLeft="30dp"
-			android:layout_marginRight="30dp"
-			android:layout_below="@+id/iv_tutorial_content"/>
-
-		<Button
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/tutorial_button"
-			android:id="@+id/bt_tutorial"
-			android:layout_gravity="center_horizontal"
-			android:textColor="@color/input_button_color"
-			android:textStyle="bold"
-			android:background="@drawable/button_selector"
-			android:layout_centerHorizontal="true"
-			android:layout_alignParentEnd="false"
-			android:layout_alignParentBottom="true"
-			android:layout_marginBottom="50dp"
-			android:paddingLeft="10dp"
-			android:paddingRight="10dp"/>
-	</RelativeLayout>
-
-</FrameLayout>
+</LinearLayout>