From 8c4875d258c4dda4aeb58aaf3aeeb88e17bc1d95 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Mon, 23 Apr 2018 14:23:22 +0300
Subject: [PATCH] Adapt wikivoyage welcome screen for landscape

---
 .../fragment_wikivoyage_welcome_dialog.xml    | 10 ++
 .../fragment_wikivoyage_welcome_dialog.xml    | 83 +----------------
 .../res/layout/wikivoyage_welcome_screen.xml  | 91 +++++++++++++++++++
 .../WikivoyageWelcomeDialogFragment.java      |  8 +-
 4 files changed, 109 insertions(+), 83 deletions(-)
 create mode 100644 OsmAnd/res/layout-land/fragment_wikivoyage_welcome_dialog.xml
 create mode 100644 OsmAnd/res/layout/wikivoyage_welcome_screen.xml

diff --git a/OsmAnd/res/layout-land/fragment_wikivoyage_welcome_dialog.xml b/OsmAnd/res/layout-land/fragment_wikivoyage_welcome_dialog.xml
new file mode 100644
index 0000000000..dee268a622
--- /dev/null
+++ b/OsmAnd/res/layout-land/fragment_wikivoyage_welcome_dialog.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/wikivoyage_welcome_bg_color">
+
+	<include layout="@layout/wikivoyage_welcome_screen"/>
+
+</ScrollView>
diff --git a/OsmAnd/res/layout/fragment_wikivoyage_welcome_dialog.xml b/OsmAnd/res/layout/fragment_wikivoyage_welcome_dialog.xml
index 2a9df61fba..e5de9cd2de 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_welcome_dialog.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_welcome_dialog.xml
@@ -1,92 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="?attr/wikivoyage_welcome_bg_color"
 	android:orientation="vertical">
 
-	<FrameLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<ImageView
-			android:id="@+id/main_image"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/wikivoyage_welcome_image_top_margin"
-			android:scaleType="centerCrop"
-			tools:ignore="ContentDescription"
-			tools:src="@drawable/img_start_screen_travel_night"/>
-
-		<ImageView
-			android:id="@+id/back_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/content_padding"
-			android:background="?attr/selectableItemBackgroundBorderless"
-			android:contentDescription="@string/access_shared_string_navigate_up"
-			tools:src="@drawable/ic_arrow_back"/>
-
-	</FrameLayout>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_marginLeft="@dimen/wikivoyage_welcome_content_margin"
-		android:layout_marginRight="@dimen/wikivoyage_welcome_content_margin"
-		android:orientation="vertical">
-
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/wikivoyage_welcome_title_bottom_margin"
-			android:layout_marginTop="@dimen/wikivoyage_welcome_title_top_margin"
-			android:ellipsize="end"
-			android:gravity="center_vertical"
-			android:maxLines="1"
-			android:text="@string/travel_guide"
-			android:textColor="?attr/wikivoyage_primary_text_color"
-			android:textSize="@dimen/title_text_size"/>
-
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1"
-			android:ellipsize="end"
-			android:lineSpacingMultiplier="1.2"
-			android:text="@string/travel_guide_description"
-			android:textColor="@color/wikivoyage_secondary_text"
-			android:textSize="@dimen/default_list_text_size"/>
-
-		<FrameLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginBottom="@dimen/wikivoyage_welcome_content_margin"
-			android:layout_marginTop="@dimen/content_padding"
-			android:background="@drawable/wikivoyage_welcome_btn_bg">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/continue_button"
-				android:layout_width="wrap_content"
-				android:layout_height="@dimen/wikivoyage_card_button_height"
-				android:background="?attr/selectableItemBackgroundBorderless"
-				android:ellipsize="end"
-				android:gravity="center"
-				android:maxLines="1"
-				android:paddingLeft="@dimen/content_padding"
-				android:paddingRight="@dimen/content_padding"
-				android:text="@string/shared_string_continue"
-				android:textColor="@color/color_white"
-				android:textSize="@dimen/text_button_text_size"
-				osmand:typeface="@string/font_roboto_medium"/>
-
-		</FrameLayout>
-
-	</LinearLayout>
+	<include layout="@layout/wikivoyage_welcome_screen"/>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/wikivoyage_welcome_screen.xml b/OsmAnd/res/layout/wikivoyage_welcome_screen.xml
new file mode 100644
index 0000000000..80f0951586
--- /dev/null
+++ b/OsmAnd/res/layout/wikivoyage_welcome_screen.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<ImageView
+			android:id="@+id/main_image"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginTop="@dimen/wikivoyage_welcome_image_top_margin"
+			tools:ignore="ContentDescription"
+			tools:scaleType="centerCrop"
+			tools:src="@drawable/img_start_screen_travel_night"/>
+
+		<ImageView
+			android:id="@+id/back_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/content_padding"
+			android:background="?attr/selectableItemBackgroundBorderless"
+			android:contentDescription="@string/access_shared_string_navigate_up"
+			tools:src="@drawable/ic_arrow_back"/>
+
+	</FrameLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_marginLeft="@dimen/wikivoyage_welcome_content_margin"
+		android:layout_marginRight="@dimen/wikivoyage_welcome_content_margin"
+		android:orientation="vertical">
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/wikivoyage_welcome_title_bottom_margin"
+			android:layout_marginTop="@dimen/wikivoyage_welcome_title_top_margin"
+			android:ellipsize="end"
+			android:gravity="center_vertical"
+			android:maxLines="1"
+			android:text="@string/travel_guide"
+			android:textColor="?attr/wikivoyage_primary_text_color"
+			android:textSize="@dimen/title_text_size"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1"
+			android:ellipsize="end"
+			android:lineSpacingMultiplier="1.2"
+			android:text="@string/travel_guide_description"
+			android:textColor="@color/wikivoyage_secondary_text"
+			android:textSize="@dimen/default_list_text_size"/>
+
+		<FrameLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginBottom="@dimen/wikivoyage_welcome_content_margin"
+			android:layout_marginTop="@dimen/content_padding"
+			android:background="@drawable/wikivoyage_welcome_btn_bg">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/continue_button"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/wikivoyage_card_button_height"
+				android:background="?attr/selectableItemBackgroundBorderless"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:maxLines="1"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding"
+				android:text="@string/shared_string_continue"
+				android:textColor="@color/color_white"
+				android:textSize="@dimen/text_button_text_size"
+				osmand:typeface="@string/font_roboto_medium"/>
+
+		</FrameLayout>
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWelcomeDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWelcomeDialogFragment.java
index d72e085dbf..6b859889c0 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWelcomeDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWelcomeDialogFragment.java
@@ -9,8 +9,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
 
 import net.osmand.plus.R;
+import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.wikivoyage.explore.WikivoyageExploreDialogFragment;
 
 public class WikivoyageWelcomeDialogFragment extends WikivoyageBaseDialogFragment {
@@ -20,6 +22,8 @@ public class WikivoyageWelcomeDialogFragment extends WikivoyageBaseDialogFragmen
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		final boolean portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
+
 		View mainView = inflate(R.layout.fragment_wikivoyage_welcome_dialog, container);
 
 		ImageView backBtn = (ImageView) mainView.findViewById(R.id.back_button);
@@ -32,7 +36,9 @@ public class WikivoyageWelcomeDialogFragment extends WikivoyageBaseDialogFragmen
 		});
 
 		int imgId = nightMode ? R.drawable.img_start_screen_travel_night : R.drawable.img_start_screen_travel_day;
-		((ImageView) mainView.findViewById(R.id.main_image)).setImageResource(imgId);
+		ImageView mainImage = (ImageView) mainView.findViewById(R.id.main_image);
+		mainImage.setScaleType(portrait ? ScaleType.CENTER_CROP : ScaleType.CENTER_INSIDE);
+		mainImage.setImageResource(imgId);
 
 		mainView.findViewById(R.id.continue_button).setOnClickListener(new View.OnClickListener() {
 			@Override