From 17727397a87d07388cbd5fa41df9999514fd6a2c Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Tue, 8 May 2018 11:59:10 +0300
Subject: [PATCH] added WikipediaArticleWikiLinkFragment and custom xml for it

---
 .../bottom_sheet_item_title_with_descr.xml    | 53 +++++++++++++++++++
 .../layout/bottom_sheet_item_with_descr.xml   | 47 ++++++++++++++++
 OsmAnd/res/values-large/sizes.xml             |  2 +
 OsmAnd/res/values/sizes.xml                   |  2 +
 OsmAnd/res/values/strings.xml                 |  5 ++
 5 files changed, 109 insertions(+)
 create mode 100644 OsmAnd/res/layout/bottom_sheet_item_title_with_descr.xml
 create mode 100644 OsmAnd/res/layout/bottom_sheet_item_with_descr.xml

diff --git a/OsmAnd/res/layout/bottom_sheet_item_title_with_descr.xml b/OsmAnd/res/layout/bottom_sheet_item_title_with_descr.xml
new file mode 100644
index 0000000000..422bda20fa
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_title_with_descr.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:paddingEnd="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
+		android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingTop="@dimen/content_padding_small"
+		tools:src="@drawable/list_destination" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:orientation="vertical"
+		android:paddingBottom="@dimen/wikilink_bottom_sheet_padding"
+		android:paddingLeft="@dimen/bottom_sheet_divider_margin_start"
+		android:paddingStart="@dimen/bottom_sheet_divider_margin_start"
+		android:paddingTop="@dimen/content_padding_small">
+
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:paddingBottom="@dimen/bottom_sheet_content_padding_small"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			tools:text="Some title" />
+
+		<TextView
+			android:id="@+id/description"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="2"
+			android:textSize="@dimen/default_sub_text_size"
+			tools:text="Some description" />
+
+	</LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr.xml
new file mode 100644
index 0000000000..ce67db4d8d
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr.xml
@@ -0,0 +1,47 @@
+<?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="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:paddingBottom="@dimen/content_padding"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding"
+	android:paddingTop="@dimen/wikilink_bottom_sheet_padding">
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:gravity="center_vertical"
+			android:maxLines="1"
+			android:paddingBottom="@dimen/bottom_sheet_content_padding_small"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Some title" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/description"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="2"
+			android:textColor="?attr/color_dialog_buttons"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Some description" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 5492af1bed..fa0a2417eb 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -212,4 +212,6 @@
 	<dimen name="wikivoyage_start_editing_card_text_image_padding">60dp</dimen>
 	<dimen name="wikivoyage_show_images_dialog_buttons_height">66dp</dimen>
 
+	<dimen name="wikilink_bottom_sheet_padding">21dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index bcdb406302..f27d83c02e 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -299,6 +299,8 @@
 
 	<dimen name="wikivoyage_explore_card_image_height">144dp</dimen>
 
+	<dimen name="wikilink_bottom_sheet_padding">14dp</dimen>
+
 	<dimen name="text_button_letter_spacing" format="float">0.01</dimen>
 	<dimen name="text_button_line_spacing_multiplier" format="float">1.2</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index e88a6eb24d..0670c56cf6 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,11 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="open_wikipedia_link_online">Open wikipedia link online</string>
+    <string name="open_wikipedia_link_online_description">OsmAnd will redirect you to the browser and open the link online.</string>
+    <string name="read_wikipedia_offline_description">Get OsmAnd Live subscription to read Wikipedia and Wikivoyage articles offline.</string>
+    <string name="how_to_open_link">How to open link?</string>
+    <string name="read_wikipedia_offline">Read Wikipedia offline</string>
     <string name="download_all">Download all</string>
     <string name="shared_string_restart">Restart</string>
     <string name="show_images">Show images</string>