From fd3e71ce6189fe20ccff5502fe1f079e5d18ec08 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Wed, 4 Jul 2018 19:21:10 +0300
Subject: [PATCH 01/15] improve login dialogs ui

---
 .../res/drawable/bg_pattern_light_xml.xml     |   4 +
 .../res/drawable/no_telegram_btn_bg.xml       |  10 +
 OsmAnd-telegram/res/layout/login_dialog.xml   | 213 ++++++++++++------
 OsmAnd-telegram/res/values/dimens.xml         |   8 +-
 OsmAnd-telegram/res/values/strings.xml        |   4 +
 OsmAnd-telegram/res/values/styles.xml         |   1 +
 .../osmand/telegram/ui/LoginDialogFragment.kt |  49 +++-
 7 files changed, 216 insertions(+), 73 deletions(-)
 create mode 100644 OsmAnd-telegram/res/drawable/bg_pattern_light_xml.xml
 create mode 100644 OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml

diff --git a/OsmAnd-telegram/res/drawable/bg_pattern_light_xml.xml b/OsmAnd-telegram/res/drawable/bg_pattern_light_xml.xml
new file mode 100644
index 0000000000..8779987a4b
--- /dev/null
+++ b/OsmAnd-telegram/res/drawable/bg_pattern_light_xml.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+	android:src="@drawable/bg_pattern_light"
+	android:tileMode="repeat" /> 
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml b/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
new file mode 100644
index 0000000000..43fecebf91
--- /dev/null
+++ b/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="@null" />
+			<stroke android:width="1dp" android:color="#f0f0f0" />
+		</shape>
+	</item>
+</selector>
diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index ddf957149f..21717e9804 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -6,62 +6,81 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<LinearLayout
+	<FrameLayout
 		android:id="@+id/welcome_layout"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:layout_marginLeft="@dimen/dialog_padding_horizontal_edit"
-		android:layout_marginRight="@dimen/dialog_padding_horizontal_edit"
-		android:layout_marginTop="@dimen/dialog_padding_vertical"
+		android:background="@drawable/bg_pattern_light_xml"
 		android:orientation="vertical"
-		android:visibility="visible">
+		android:visibility="visible"
+		tools:visibility="gone">
 
-		<TextView
-			android:id="@+id/welcome_title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/shared_string_welcome"
-			android:textColor="?android:attr/textColorPrimary"
-			android:textSize="@dimen/title_text_size"
-			android:textStyle="bold" />
-
-		<ScrollView
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_marginTop="@dimen/dialog_padding_vertical"
-			android:layout_weight="1"
-			android:fillViewport="true">
-
-			<TextView
-				android:id="@+id/welcome_descr"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/descr_text_size"
-				tools:text="@string/welcome_descr" />
-
-		</ScrollView>
-
-		<Button
-			android:id="@+id/welcome_continue_button"
-			style="@style/DialogActionButtonActive"
+		<ImageView
+			android:id="@+id/welcome_image"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:layout_marginBottom="@dimen/dialog_padding_vertical"
-			android:layout_marginLeft="@dimen/content_padding_standard"
-			android:layout_marginRight="@dimen/content_padding_standard"
-			android:layout_marginTop="@dimen/content_padding_standard"
-			android:text="@string/shared_string_continue" />
+			android:layout_gravity="end"
+			tools:src="@drawable/bg_introduction_image_top" />
 
-	</LinearLayout>
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
+			android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
+			android:layout_marginTop="@dimen/dialog_welcome_title_top_padding" 
+			android:orientation="vertical" 
+			android:visibility="visible">
+
+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/welcome_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/shared_string_welcome"
+				android:layout_marginBottom="@dimen/dialog_welcome_title_bottom_padding"
+				android:textColor="?attr/ctrl_active_color"
+				android:textSize="@dimen/title_welcome_text_size"
+				app:typeface="@string/font_roboto_mono_bold"/>
+
+			<ScrollView
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1"
+				android:fillViewport="true">
+
+				<TextView
+					android:id="@+id/welcome_descr"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:textColor="@color/app_bar_title_light"
+					android:textSize="@dimen/descr_text_size"
+					tools:text="@string/welcome_descr" />
+
+			</ScrollView>
+
+			<Button
+				android:id="@+id/welcome_continue_button"
+				style="@style/DialogActionButtonActive"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_marginBottom="@dimen/dialog_button_bottom_padding"
+				android:layout_marginLeft="@dimen/content_padding_standard"
+				android:layout_marginRight="@dimen/content_padding_standard"
+				android:layout_marginTop="@dimen/content_padding_standard"
+				android:text="@string/shared_string_continue" />
+
+		</LinearLayout>
+
+	</FrameLayout>
 
 	<LinearLayout
 		android:id="@+id/login_layout"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:background="?attr/card_bg_color"
 		android:orientation="vertical"
-		android:visibility="gone">
+		android:visibility="gone"
+		tools:visibility="visible">
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -72,26 +91,26 @@
 
 			<android.support.v7.widget.AppCompatImageView
 				android:id="@+id/back_button"
-				android:layout_width="@dimen/dialog_button_height"
-				android:layout_height="@dimen/dialog_button_height"
-				android:layout_marginEnd="@dimen/content_padding_standard"
-				android:layout_marginLeft="@dimen/content_padding_half"
-				android:layout_marginRight="@dimen/content_padding_standard"
-				android:layout_marginStart="@dimen/content_padding_half"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="@dimen/content_padding_big"
+				android:layout_marginLeft="@dimen/content_padding_standard"
+				android:layout_marginRight="@dimen/content_padding_big"
+				android:layout_marginStart="@dimen/content_padding_standard"
 				android:background="?attr/selectableItemBackgroundBorderless"
 				android:scaleType="centerInside"
 				android:src="@drawable/ic_arrow_back"
 				android:tint="?attr/icon_color" />
 
-			<TextView
+			<net.osmand.telegram.ui.views.TextViewEx
 				android:id="@+id/login_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginEnd="@dimen/content_padding_standard"
 				android:layout_marginRight="@dimen/content_padding_standard"
 				android:textColor="?attr/ctrl_active_color"
-				android:textSize="@dimen/title_text_size"
-				android:textStyle="bold"
+				android:textSize="@dimen/title_login_text_size"
+				app:typeface="@string/font_roboto_mono_bold"
 				tools:text="@string/shared_string_authorization" />
 
 		</LinearLayout>
@@ -101,14 +120,14 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginBottom="@dimen/content_padding_standard"
-			android:layout_marginEnd="@dimen/dialog_padding_horizontal"
+			android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
 			android:layout_marginLeft="@dimen/dialog_padding_horizontal"
-			android:layout_marginRight="@dimen/dialog_padding_horizontal"
+			android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
 			android:layout_marginStart="@dimen/dialog_padding_horizontal"
 			android:layout_marginTop="@dimen/content_padding_standard"
-			android:textColor="?android:attr/textColorSecondary"
+			android:textColor="@color/app_bar_title_light"
 			android:textSize="@dimen/descr_text_size"
-			tools:text="@string/shared_string_authorization_descr" />
+			tools:text="@string/authorization_already_registered_in_telegram" />
 
 		<ScrollView
 			android:layout_width="match_parent"
@@ -119,13 +138,68 @@
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginEnd="@dimen/dialog_padding_horizontal_edit"
-				android:layout_marginLeft="@dimen/dialog_padding_horizontal_edit"
-				android:layout_marginRight="@dimen/dialog_padding_horizontal_edit"
-				android:layout_marginStart="@dimen/dialog_padding_horizontal_edit"
+				android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
+				android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
+				android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
+				android:layout_marginStart="@dimen/dialog_welcome_padding_horizontal"
 				android:layout_marginTop="@dimen/content_padding_standard"
 				android:orientation="vertical">
 
+				<LinearLayout
+					android:id="@+id/no_telegram"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/dialog_padding_vertical"
+					android:background="@drawable/no_telegram_btn_bg"
+					android:gravity="center_vertical"
+					android:visibility="gone"
+					tools:visibility="visible">
+
+					<TextView
+						android:id="@+id/no_telegram_title"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/content_padding_standard"
+						android:layout_marginRight="@dimen/content_padding_standard"
+						android:layout_marginTop="@dimen/content_padding_standard"
+						android:layout_marginBottom="@dimen/content_padding_standard"
+						android:layout_weight="1"
+						android:ellipsize="end"
+						android:gravity="center_vertical"
+						android:maxLines="2"
+						android:text="@string/do_not_have_telegram"
+						android:textColor="?attr/ctrl_active_color"
+						android:textSize="@dimen/descr_text_size"
+						android:textStyle="bold" />
+
+					<ImageView
+						android:id="@+id/no_telegram_button"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginEnd="@dimen/content_padding_standard"
+						android:layout_marginRight="@dimen/content_padding_standard"
+						android:background="?attr/selectableItemBackgroundBorderless"
+						android:scaleType="centerInside"
+						android:src="@drawable/ic_arrow_forward"
+						android:tint="?attr/icon_color"
+						tools:tint="@color/icon_light" />
+
+				</LinearLayout>
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/login_input_type_descr"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/content_padding_standard"
+					android:layout_marginEnd="@dimen/content_padding_standard"
+					android:layout_marginLeft="@dimen/content_padding_standard"
+					android:layout_marginRight="@dimen/content_padding_standard"
+					android:layout_marginStart="@dimen/content_padding_standard"
+					android:text="@string/enter_phone_number"
+					android:textColor="@color/app_bar_title_light"
+					android:textSize="@dimen/title_text_size"
+					android:textStyle="bold" />
+
 				<LinearLayout
 					android:id="@+id/enter_phone_number_layout"
 					android:layout_width="match_parent"
@@ -136,19 +210,28 @@
 					<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						app:hasClearButton="true"
-						app:labelText="@string/phone_number_title">
+						app:hasClearButton="true">
 
 						<studio.carbonylgroup.textfieldboxes.ExtendedEditText
 							android:id="@+id/phone_number_edit_text"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:inputType="phone"
-							android:text="@string/plus"
-							tools:text="+380661234567" />
+							android:hint="@string/phone_number_title"
+							android:inputType="phone"/>
 
 					</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
+					<TextView
+						android:id="@+id/phone_number_format"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/content_padding_standard"
+						android:layout_marginBottom="@dimen/content_padding_standard"
+						android:layout_marginRight="@dimen/content_padding_standard"
+						android:layout_marginTop="@dimen/content_padding_standard"
+						android:textSize="@dimen/descr_text_size"
+						android:text="@string/phone_number_descr" />
+
 				</LinearLayout>
 
 				<LinearLayout
@@ -223,7 +306,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
-			android:layout_marginBottom="@dimen/dialog_padding_vertical"
+			android:layout_marginBottom="@dimen/dialog_button_bottom_padding"
 			android:layout_marginLeft="@dimen/content_padding_standard"
 			android:layout_marginRight="@dimen/content_padding_standard"
 			android:layout_marginTop="@dimen/content_padding_standard"
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index 9f338c38d3..daf2bbb9e1 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -12,11 +12,15 @@
 	<dimen name="action_bar_row_button_height">52dp</dimen>
 
 	<dimen name="dialog_padding_vertical">24dp</dimen>
-	<dimen name="dialog_padding_horizontal">60dp</dimen>
+	<dimen name="dialog_padding_horizontal">64dp</dimen>
 	<dimen name="dialog_padding_horizontal_edit">44dp</dimen>
+	<dimen name="dialog_welcome_padding_horizontal">48dp</dimen>
 
 	<dimen name="dialog_button_height">36dp</dimen>
 	<dimen name="dialog_button_radius">2dp</dimen>
+	<dimen name="dialog_button_bottom_padding">40dp</dimen>
+	<dimen name="dialog_welcome_title_bottom_padding">96dp</dimen>
+	<dimen name="dialog_welcome_title_top_padding">120dp</dimen>
 
 	<dimen name="list_item_height">56dp</dimen>
 	<dimen name="list_item_height_min">48dp</dimen>
@@ -48,6 +52,8 @@
 	<dimen name="dialog_title_text_size">22sp</dimen>
 
 	<dimen name="title_text_size">18sp</dimen>
+	<dimen name="title_login_text_size">20sp</dimen>
+	<dimen name="title_welcome_text_size">32sp</dimen>
 	<dimen name="descr_text_size">16sp</dimen>
 
 	<dimen name="list_item_title_text_size">16sp</dimen>
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index 0ebe842578..0a839fb514 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -1,4 +1,8 @@
 <resources>
+	<string name="authorization_already_registered_in_telegram">You need an already registered account and phone number in Telegram</string>
+	<string name="do_not_have_telegram">I don`t have Telegram account</string>
+	<string name="enter_phone_number">Enter phone number</string>
+	<string name="enter_authentication_code">Enter authentication code</string>
 	<string name="set_visible_time_for_all">Set visible time for all</string>
 	<string name="hours_and_minutes_format">%1$d h %2$d m</string>
 	<string name="minutes_format">%1$d m</string>
diff --git a/OsmAnd-telegram/res/values/styles.xml b/OsmAnd-telegram/res/values/styles.xml
index 1580b0b5f4..a6cd192ff2 100644
--- a/OsmAnd-telegram/res/values/styles.xml
+++ b/OsmAnd-telegram/res/values/styles.xml
@@ -32,6 +32,7 @@
 	<style name="AppTheme.NoActionbar">
 		<item name="windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
+		<item name="android:windowTranslucentStatus">true</item>
 	</style>
 
 	<style name="DialogActionButtonActive">
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 8bc13333b1..9438bf24a8 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -16,6 +16,8 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import net.osmand.PlatformUtil
 import net.osmand.telegram.R
@@ -92,13 +94,14 @@ class LoginDialogFragment : DialogFragment() {
 	private var dismissedManually = false
 
 	enum class LoginDialogType(val viewId: Int, val editorId: Int,
-							   @StringRes val titleId: Int, @StringRes val descriptionId: Int) {
+							   @StringRes val titleId: Int, @StringRes val descriptionId: Int,
+							   @StringRes val inputTypeDescriptionId: Int) {
 		ENTER_PHONE_NUMBER(R.id.enter_phone_number_layout, R.id.phone_number_edit_text,
-				R.string.shared_string_authorization, R.string.shared_string_authorization_descr),
+				R.string.shared_string_authorization, R.string.shared_string_authorization_descr, R.string.enter_phone_number),
 		ENTER_CODE(R.id.enter_code_layout, R.id.code_edit_text,
-				R.string.enter_code, R.string.authentication_code_descr),
+				R.string.enter_code, R.string.authentication_code_descr, R.string.enter_authentication_code),
 		ENTER_PASSWORD(R.id.enter_password_layout, R.id.password_edit_text,
-				R.string.enter_password, R.string.password_descr);
+				R.string.enter_password, R.string.password_descr, R.string.enter_password);
 	}
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -149,6 +152,13 @@ class LoginDialogFragment : DialogFragment() {
 			} else {
 				view?.findViewById<TextView>(R.id.welcome_descr)?.text = Html.fromHtml(getString(R.string.welcome_descr))
 			}
+			val welcomeImage = view?.findViewById<ImageView>(R.id.welcome_image)
+			if (Build.VERSION.SDK_INT >= 18) {
+				welcomeImage?.setImageResource(R.drawable.bg_introduction_image_top)
+			} else {
+				welcomeImage?.visibility = View.GONE
+			}
+
 			val continueButton = view?.findViewById<Button>(R.id.welcome_continue_button)
 			continueButton?.setOnClickListener {
 				showWelcomeDialog = false
@@ -175,8 +185,12 @@ class LoginDialogFragment : DialogFragment() {
 					if (layout != null) {
 						val titleView: TextView? = view.findViewById(R.id.login_title)
 						val descriptionView: TextView? = view.findViewById(R.id.login_description)
+						val inputTypeDescriptionView: TextView? = view.findViewById(R.id.login_input_type_descr)
+						val inputTypeDescription = getText(t.inputTypeDescriptionId).toString() + ":"
+
 						titleView?.text = getText(t.titleId)
 						descriptionView?.text = getText(t.descriptionId)
+						inputTypeDescriptionView?.text = inputTypeDescription
 
 						layout.visibility = View.VISIBLE
 						val editText: ExtendedEditText? = layout.findViewById(t.editorId)
@@ -194,6 +208,21 @@ class LoginDialogFragment : DialogFragment() {
 								focusRequested = true
 							}
 						}
+
+						val noTelegramViewContainer: LinearLayout? = view.findViewById(R.id.no_telegram)
+						if (loginDialogActiveType == LoginDialogType.ENTER_PHONE_NUMBER) {
+							val noTelegramAccountTitleView: TextView? = view.findViewById(R.id.no_telegram_title)
+							val noTelegramAccountButton: ImageView? = view.findViewById(R.id.no_telegram_button)
+							val phoneNumberFormatHintView: TextView? = view.findViewById(R.id.phone_number_format)
+
+							noTelegramAccountTitleView?.text = getText(R.string.do_not_have_telegram)
+							phoneNumberFormatHintView?.text = getText(R.string.phone_number_descr)
+							noTelegramAccountButton?.setImageResource(R.drawable.ic_arrow_forward)
+
+							noTelegramViewContainer?.visibility = View.VISIBLE
+						} else {
+							noTelegramViewContainer?.visibility = View.GONE
+						}
 					}
 				}
 				else -> layout?.visibility = View.GONE
@@ -212,6 +241,7 @@ class LoginDialogFragment : DialogFragment() {
 				continueButton.setOnClickListener(null)
 			} else {
 				continueButton.setOnClickListener {
+					showWelcomeDialog = false
 					for (t in LoginDialogType.values()) {
 						val layout: View? = view.findViewById(t.viewId)
 						val contains = t == loginDialogActiveType
@@ -227,10 +257,15 @@ class LoginDialogFragment : DialogFragment() {
 			}
 		}
 		val cancelButton: AppCompatImageView? = view?.findViewById(R.id.back_button)
-		cancelButton?.visibility = if (loginDialogActiveType == LoginDialogType.ENTER_PHONE_NUMBER) View.INVISIBLE else View.VISIBLE
+		cancelButton?.visibility = if (showWelcomeDialog) View.INVISIBLE else View.VISIBLE
 		cancelButton?.setOnClickListener {
-			showProgress()
-			getMainActivity()?.loginTelegram()
+			if (loginDialogActiveType == LoginDialogType.ENTER_PHONE_NUMBER) {
+				showWelcomeDialog = true
+				buildDialog(view)
+			} else {
+				showProgress()
+				getMainActivity()?.loginTelegram()
+			}
 		}
 	}
 

From 6b660d5c504cc47b723fa71800d1f8836a2455ee Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Thu, 5 Jul 2018 14:17:25 +0300
Subject: [PATCH 02/15] fix welcome dialog scroll and login dialog height

---
 OsmAnd-telegram/res/layout/login_dialog.xml | 105 ++++++++++----------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index 21717e9804..4779e070ed 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -6,78 +6,78 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<FrameLayout
+	<ScrollView
 		android:id="@+id/welcome_layout"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:background="@drawable/bg_pattern_light_xml"
-		android:orientation="vertical"
-		android:visibility="visible"
-		tools:visibility="gone">
+		android:fillViewport="true"
+		android:visibility="visible">
 
-		<ImageView
-			android:id="@+id/welcome_image"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="end"
-			tools:src="@drawable/bg_introduction_image_top" />
-
-		<LinearLayout
+		<FrameLayout
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
-			android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
-			android:layout_marginTop="@dimen/dialog_welcome_title_top_padding" 
-			android:orientation="vertical" 
-			android:visibility="visible">
+			android:layout_height="wrap_content"
+			android:background="@drawable/bg_pattern_light_xml"
+			android:orientation="vertical">
 
-			<net.osmand.telegram.ui.views.TextViewEx
-				android:id="@+id/welcome_title"
-				android:layout_width="match_parent"
+			<ImageView
+				android:id="@+id/welcome_image"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/shared_string_welcome"
-				android:layout_marginBottom="@dimen/dialog_welcome_title_bottom_padding"
-				android:textColor="?attr/ctrl_active_color"
-				android:textSize="@dimen/title_welcome_text_size"
-				app:typeface="@string/font_roboto_mono_bold"/>
+				android:layout_gravity="end"
+				tools:src="@drawable/bg_introduction_image_top" />
 
-			<ScrollView
+			<LinearLayout
 				android:layout_width="match_parent"
-				android:layout_height="0dp"
-				android:layout_weight="1"
-				android:fillViewport="true">
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
+				android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
+				android:layout_marginTop="@dimen/dialog_welcome_title_top_padding"
+				android:orientation="vertical"
+				android:visibility="visible">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/welcome_title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/dialog_welcome_title_bottom_padding"
+					android:text="@string/shared_string_welcome"
+					android:textColor="?attr/ctrl_active_color"
+					android:textSize="@dimen/title_welcome_text_size"
+					app:typeface="@string/font_roboto_mono_bold" />
 
 				<TextView
 					android:id="@+id/welcome_descr"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
+					android:layout_height="0dp"
+					android:layout_weight="1"
 					android:textColor="@color/app_bar_title_light"
 					android:textSize="@dimen/descr_text_size"
 					tools:text="@string/welcome_descr" />
 
-			</ScrollView>
+				<Button
+					android:id="@+id/welcome_continue_button"
+					style="@style/DialogActionButtonActive"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:layout_marginBottom="@dimen/dialog_button_bottom_padding"
+					android:layout_marginLeft="@dimen/content_padding_standard"
+					android:layout_marginRight="@dimen/content_padding_standard"
+					android:layout_marginTop="@dimen/content_padding_standard"
+					android:text="@string/shared_string_continue" />
 
-			<Button
-				android:id="@+id/welcome_continue_button"
-				style="@style/DialogActionButtonActive"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:layout_marginBottom="@dimen/dialog_button_bottom_padding"
-				android:layout_marginLeft="@dimen/content_padding_standard"
-				android:layout_marginRight="@dimen/content_padding_standard"
-				android:layout_marginTop="@dimen/content_padding_standard"
-				android:text="@string/shared_string_continue" />
+			</LinearLayout>
 
-		</LinearLayout>
+		</FrameLayout>
 
-	</FrameLayout>
+	</ScrollView>
 
 	<LinearLayout
 		android:id="@+id/login_layout"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:background="?attr/card_bg_color"
+		android:fitsSystemWindows="true"
 		android:orientation="vertical"
 		android:visibility="gone"
 		tools:visibility="visible">
@@ -159,10 +159,10 @@
 						android:id="@+id/no_telegram_title"
 						android:layout_width="0dp"
 						android:layout_height="wrap_content"
+						android:layout_marginBottom="@dimen/content_padding_standard"
 						android:layout_marginLeft="@dimen/content_padding_standard"
 						android:layout_marginRight="@dimen/content_padding_standard"
 						android:layout_marginTop="@dimen/content_padding_standard"
-						android:layout_marginBottom="@dimen/content_padding_standard"
 						android:layout_weight="1"
 						android:ellipsize="end"
 						android:gravity="center_vertical"
@@ -179,6 +179,7 @@
 						android:layout_marginEnd="@dimen/content_padding_standard"
 						android:layout_marginRight="@dimen/content_padding_standard"
 						android:background="?attr/selectableItemBackgroundBorderless"
+						android:contentDescription="@string/do_not_have_telegram"
 						android:scaleType="centerInside"
 						android:src="@drawable/ic_arrow_forward"
 						android:tint="?attr/icon_color"
@@ -217,7 +218,7 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:hint="@string/phone_number_title"
-							android:inputType="phone"/>
+							android:inputType="phone" />
 
 					</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
@@ -225,12 +226,12 @@
 						android:id="@+id/phone_number_format"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginLeft="@dimen/content_padding_standard"
 						android:layout_marginBottom="@dimen/content_padding_standard"
+						android:layout_marginLeft="@dimen/content_padding_standard"
 						android:layout_marginRight="@dimen/content_padding_standard"
 						android:layout_marginTop="@dimen/content_padding_standard"
-						android:textSize="@dimen/descr_text_size"
-						android:text="@string/phone_number_descr" />
+						android:text="@string/phone_number_descr"
+						android:textSize="@dimen/descr_text_size" />
 
 				</LinearLayout>
 
@@ -239,6 +240,7 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:orientation="vertical"
+					android:paddingBottom="@dimen/content_padding_standard"
 					android:visibility="gone">
 
 					<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
@@ -263,6 +265,7 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:orientation="vertical"
+					android:paddingBottom="@dimen/content_padding_standard"
 					android:visibility="gone">
 
 					<studio.carbonylgroup.textfieldboxes.TextFieldBoxes

From 981143cacdc6408c6bcbb4292f9ebc76cb4bc8d7 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Thu, 5 Jul 2018 19:09:01 +0300
Subject: [PATCH 03/15] add get telegram dialog and improve ui

---
 .../res/drawable/btn_round_blue.xml           |  10 +-
 .../res/drawable/btn_round_purple.xml         |  23 ++
 .../res/drawable/no_telegram_btn_bg.xml       |  18 +-
 OsmAnd-telegram/res/layout/login_dialog.xml   | 322 +++++++++++-------
 OsmAnd-telegram/res/values/colors.xml         |   3 +
 OsmAnd-telegram/res/values/dimens.xml         |   2 +
 OsmAnd-telegram/res/values/strings.xml        |   4 +
 OsmAnd-telegram/res/values/styles.xml         |   9 +
 .../osmand/telegram/ui/LoginDialogFragment.kt | 115 +++++--
 .../net/osmand/telegram/utils/AndroidUtils.kt |  34 ++
 10 files changed, 382 insertions(+), 158 deletions(-)
 create mode 100644 OsmAnd-telegram/res/drawable/btn_round_purple.xml

diff --git a/OsmAnd-telegram/res/drawable/btn_round_blue.xml b/OsmAnd-telegram/res/drawable/btn_round_blue.xml
index 71ed302bdc..c99ccc2c39 100644
--- a/OsmAnd-telegram/res/drawable/btn_round_blue.xml
+++ b/OsmAnd-telegram/res/drawable/btn_round_blue.xml
@@ -3,20 +3,20 @@
 
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_active_light" />
-			<corners android:radius="@dimen/dialog_button_radius" />
+			<solid android:color="@color/dialog_continue_btn_active_bg" />
+			<corners android:radius="@dimen/dialog_continue_button_radius" />
 		</shape>
 	</item>
 	<item android:state_enabled="false">
 		<shape android:shape="rectangle">
 			<solid android:color="@color/ctrl_light" />
-			<corners android:radius="@dimen/dialog_button_radius" />
+			<corners android:radius="@dimen/dialog_continue_button_radius" />
 		</shape>
 	</item>
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_active_light" />
-			<corners android:radius="@dimen/dialog_button_radius" />
+			<solid android:color="@color/dialog_continue_btn_non_active_bg" />
+			<corners android:radius="@dimen/dialog_continue_button_radius" />
 		</shape>
 	</item>
 
diff --git a/OsmAnd-telegram/res/drawable/btn_round_purple.xml b/OsmAnd-telegram/res/drawable/btn_round_purple.xml
new file mode 100644
index 0000000000..ca6b029eef
--- /dev/null
+++ b/OsmAnd-telegram/res/drawable/btn_round_purple.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/dialog_continue_btn_active_bg" />
+			<corners android:radius="@dimen/dialog_continue_button_radius" />
+		</shape>
+	</item>
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/ctrl_light" />
+			<corners android:radius="@dimen/dialog_continue_button_radius" />
+		</shape>
+	</item>
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@color/dialog_continue_btn_active_bg" />
+			<corners android:radius="@dimen/dialog_continue_button_radius" />
+		</shape>
+	</item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml b/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
index 43fecebf91..64af234024 100644
--- a/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
+++ b/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<solid android:color="#f0f0f0" />
+			<corners android:radius="@dimen/dialog_button_radius" />
+		</shape>
+	</item>
+	<item android:state_enabled="false">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/ctrl_light" />
+			<corners android:radius="@dimen/dialog_button_radius" />
+		</shape>
+	</item>
 	<item>
 		<shape android:shape="rectangle">
-			<corners android:radius="2dp" />
 			<solid android:color="@null" />
+			<corners android:radius="@dimen/dialog_button_radius" />
 			<stroke android:width="1dp" android:color="#f0f0f0" />
 		</shape>
 	</item>
-</selector>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index 4779e070ed..199f155b28 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -11,7 +11,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:fillViewport="true"
-		android:visibility="visible">
+		android:visibility="visible"
+		tools:visibility="gone">
 
 		<FrameLayout
 			android:layout_width="match_parent"
@@ -56,7 +57,7 @@
 
 				<Button
 					android:id="@+id/welcome_continue_button"
-					style="@style/DialogActionButtonActive"
+					style="@style/DialogActionButtonActive.Welcome"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center"
@@ -115,19 +116,6 @@
 
 		</LinearLayout>
 
-		<TextView
-			android:id="@+id/login_description"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/content_padding_standard"
-			android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
-			android:layout_marginLeft="@dimen/dialog_padding_horizontal"
-			android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
-			android:layout_marginStart="@dimen/dialog_padding_horizontal"
-			android:layout_marginTop="@dimen/content_padding_standard"
-			android:textColor="@color/app_bar_title_light"
-			android:textSize="@dimen/descr_text_size"
-			tools:text="@string/authorization_already_registered_in_telegram" />
 
 		<ScrollView
 			android:layout_width="match_parent"
@@ -138,164 +126,234 @@
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
-				android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
-				android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
-				android:layout_marginStart="@dimen/dialog_welcome_padding_horizontal"
-				android:layout_marginTop="@dimen/content_padding_standard"
 				android:orientation="vertical">
 
-				<LinearLayout
-					android:id="@+id/no_telegram"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="@dimen/dialog_padding_vertical"
-					android:background="@drawable/no_telegram_btn_bg"
-					android:gravity="center_vertical"
-					android:visibility="gone"
-					tools:visibility="visible">
-
-					<TextView
-						android:id="@+id/no_telegram_title"
-						android:layout_width="0dp"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/content_padding_standard"
-						android:layout_marginLeft="@dimen/content_padding_standard"
-						android:layout_marginRight="@dimen/content_padding_standard"
-						android:layout_marginTop="@dimen/content_padding_standard"
-						android:layout_weight="1"
-						android:ellipsize="end"
-						android:gravity="center_vertical"
-						android:maxLines="2"
-						android:text="@string/do_not_have_telegram"
-						android:textColor="?attr/ctrl_active_color"
-						android:textSize="@dimen/descr_text_size"
-						android:textStyle="bold" />
-
-					<ImageView
-						android:id="@+id/no_telegram_button"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginEnd="@dimen/content_padding_standard"
-						android:layout_marginRight="@dimen/content_padding_standard"
-						android:background="?attr/selectableItemBackgroundBorderless"
-						android:contentDescription="@string/do_not_have_telegram"
-						android:scaleType="centerInside"
-						android:src="@drawable/ic_arrow_forward"
-						android:tint="?attr/icon_color"
-						tools:tint="@color/icon_light" />
-
-				</LinearLayout>
-
-				<net.osmand.telegram.ui.views.TextViewEx
-					android:id="@+id/login_input_type_descr"
+				<TextView
+					android:id="@+id/login_description"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="@dimen/content_padding_standard"
-					android:layout_marginEnd="@dimen/content_padding_standard"
-					android:layout_marginLeft="@dimen/content_padding_standard"
-					android:layout_marginRight="@dimen/content_padding_standard"
-					android:layout_marginStart="@dimen/content_padding_standard"
-					android:text="@string/enter_phone_number"
+					android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
+					android:layout_marginLeft="@dimen/dialog_padding_horizontal"
+					android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
+					android:layout_marginStart="@dimen/dialog_padding_horizontal"
+					android:layout_marginTop="@dimen/content_padding_standard"
 					android:textColor="@color/app_bar_title_light"
-					android:textSize="@dimen/title_text_size"
-					android:textStyle="bold" />
+					android:textSize="@dimen/descr_text_size"
+					tools:text="@string/authorization_already_registered_in_telegram" />
 
 				<LinearLayout
-					android:id="@+id/enter_phone_number_layout"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:orientation="vertical"
-					android:visibility="visible">
+					android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
+					android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
+					android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
+					android:layout_marginStart="@dimen/dialog_welcome_padding_horizontal"
+					android:layout_marginTop="@dimen/content_padding_standard"
+					android:orientation="vertical">
 
-					<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+					<LinearLayout
+						android:id="@+id/no_telegram"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						app:hasClearButton="true">
+						android:layout_marginBottom="@dimen/dialog_padding_vertical"
+						android:background="@drawable/no_telegram_btn_bg"
+						android:gravity="center_vertical"
+						android:visibility="gone"
+						tools:visibility="gone">
 
-						<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-							android:id="@+id/phone_number_edit_text"
-							android:layout_width="match_parent"
+						<TextView
+							android:id="@+id/no_telegram_title"
+							android:layout_width="0dp"
 							android:layout_height="wrap_content"
-							android:hint="@string/phone_number_title"
-							android:inputType="phone" />
+							android:layout_marginBottom="@dimen/content_padding_standard"
+							android:layout_marginLeft="@dimen/content_padding_standard"
+							android:layout_marginRight="@dimen/content_padding_standard"
+							android:layout_marginTop="@dimen/content_padding_standard"
+							android:layout_weight="1"
+							android:ellipsize="end"
+							android:gravity="center_vertical"
+							android:maxLines="2"
+							android:text="@string/do_not_have_telegram"
+							android:textColor="?attr/ctrl_active_color"
+							android:textSize="@dimen/descr_text_size"
+							android:textStyle="bold" />
 
-					</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+						<ImageView
+							android:id="@+id/no_telegram_button"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginEnd="@dimen/content_padding_standard"
+							android:layout_marginRight="@dimen/content_padding_standard"
+							android:contentDescription="@string/do_not_have_telegram"
+							android:scaleType="centerInside"
+							android:src="@drawable/ic_arrow_forward"
+							android:tint="?attr/icon_color"
+							tools:tint="@color/icon_light" />
 
-					<TextView
-						android:id="@+id/phone_number_format"
+					</LinearLayout>
+
+					<net.osmand.telegram.ui.views.TextViewEx
+						android:id="@+id/login_input_type_descr"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_marginBottom="@dimen/content_padding_standard"
+						android:layout_marginEnd="@dimen/content_padding_standard"
 						android:layout_marginLeft="@dimen/content_padding_standard"
 						android:layout_marginRight="@dimen/content_padding_standard"
-						android:layout_marginTop="@dimen/content_padding_standard"
-						android:text="@string/phone_number_descr"
-						android:textSize="@dimen/descr_text_size" />
+						android:layout_marginStart="@dimen/content_padding_standard"
+						android:text="@string/enter_phone_number"
+						android:textColor="@color/app_bar_title_light"
+						android:textSize="@dimen/title_text_size"
+						android:textStyle="bold"
+						tools:visibility="visible" />
 
-				</LinearLayout>
-
-				<LinearLayout
-					android:id="@+id/enter_code_layout"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical"
-					android:paddingBottom="@dimen/content_padding_standard"
-					android:visibility="gone">
-
-					<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+					<LinearLayout
+						android:id="@+id/enter_phone_number_layout"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						app:hasClearButton="true"
-						app:labelText="@string/authentication_code">
+						android:orientation="vertical"
+						android:visibility="visible"
+						tools:visibility="visible">
 
-						<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-							android:id="@+id/code_edit_text"
+						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:inputType="number"
-							tools:text="123456" />
+							app:hasClearButton="true">
 
-					</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+								android:id="@+id/phone_number_edit_text"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:hint="@string/phone_number_title"
+								android:inputType="phone" />
 
-				</LinearLayout>
+						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
-				<LinearLayout
-					android:id="@+id/enter_password_layout"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical"
-					android:paddingBottom="@dimen/content_padding_standard"
-					android:visibility="gone">
+						<TextView
+							android:id="@+id/phone_number_format"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="@dimen/content_padding_standard"
+							android:layout_marginLeft="@dimen/content_padding_standard"
+							android:layout_marginRight="@dimen/content_padding_standard"
+							android:layout_marginTop="@dimen/content_padding_standard"
+							android:text="@string/phone_number_descr"
+							android:textSize="@dimen/descr_text_size" />
 
-					<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/enter_code_layout"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						app:hasClearButton="true"
-						app:labelText="@string/shared_string_password">
+						android:orientation="vertical"
+						android:paddingBottom="@dimen/content_padding_standard"
+						android:visibility="gone">
 
-						<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-							android:id="@+id/password_edit_text"
+						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:inputType="textPassword"
-							tools:text="12345678" />
+							app:hasClearButton="true"
+							app:labelText="@string/authentication_code">
 
-					</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+								android:id="@+id/code_edit_text"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:inputType="number"
+								tools:text="123456" />
 
-				</LinearLayout>
+						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
-				<LinearLayout
-					android:id="@+id/progress_layout"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="center"
-					android:orientation="vertical"
-					android:visibility="gone">
+					</LinearLayout>
 
-					<ProgressBar
-						android:layout_width="@dimen/progress_bar_size_small"
-						android:layout_height="@dimen/progress_bar_size_small" />
+					<LinearLayout
+						android:id="@+id/enter_password_layout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="vertical"
+						android:paddingBottom="@dimen/content_padding_standard"
+						android:visibility="gone">
+
+						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							app:hasClearButton="true"
+							app:labelText="@string/shared_string_password">
+
+							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+								android:id="@+id/password_edit_text"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:inputType="textPassword"
+								tools:text="12345678" />
+
+						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/get_telegram_layout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="vertical"
+						android:paddingBottom="@dimen/content_padding_standard"
+						android:visibility="gone"
+						tools:visibility="gone">
+
+						<TextView
+							android:id="@+id/get_telegram_description_first"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="@dimen/content_padding_standard"
+							android:layout_marginEnd="@dimen/content_padding_standard"
+							android:layout_marginLeft="@dimen/content_padding_standard"
+							android:layout_marginRight="@dimen/content_padding_standard"
+							android:layout_marginStart="@dimen/content_padding_standard"
+							android:textColor="@color/app_bar_title_light"
+							android:textSize="@dimen/descr_text_size"
+							tools:text="@string/get_telegram_description_second" />
+
+						<ImageView
+							android:id="@+id/google_play_button"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="@dimen/content_padding_standard"
+							android:layout_marginEnd="@dimen/content_padding_standard"
+							android:layout_marginLeft="@dimen/content_padding_standard"
+							android:layout_marginRight="@dimen/content_padding_standard"
+							android:layout_marginStart="@dimen/content_padding_standard"
+							android:src="@drawable/google_play_badge" />
+
+						<TextView
+							android:id="@+id/get_telegram_description_second"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginBottom="@dimen/content_padding_standard"
+							android:layout_marginEnd="@dimen/content_padding_standard"
+							android:layout_marginLeft="@dimen/content_padding_standard"
+							android:layout_marginRight="@dimen/content_padding_standard"
+							android:layout_marginStart="@dimen/content_padding_standard"
+							android:textColor="@color/app_bar_title_light"
+							android:textSize="@dimen/descr_text_size"
+							tools:text="@string/get_telegram_description_third" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/progress_layout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:gravity="center"
+						android:orientation="vertical"
+						android:visibility="gone">
+
+						<ProgressBar
+							android:layout_width="@dimen/progress_bar_size_small"
+							android:layout_height="@dimen/progress_bar_size_small" />
+
+					</LinearLayout>
 
 				</LinearLayout>
 
diff --git a/OsmAnd-telegram/res/values/colors.xml b/OsmAnd-telegram/res/values/colors.xml
index 31d0772846..6a956e9d58 100644
--- a/OsmAnd-telegram/res/values/colors.xml
+++ b/OsmAnd-telegram/res/values/colors.xml
@@ -35,5 +35,8 @@
 	<color name="primary_btn_text_dark">#cccccc</color>
 
 	<color name="app_bar_title_light">#333333</color>
+	
+	<color name="dialog_continue_btn_active_bg">#5959ff</color>
+	<color name="dialog_continue_btn_non_active_bg">#f0f0f0</color>
 
 </resources>
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index daf2bbb9e1..022fd3bd39 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -18,6 +18,7 @@
 
 	<dimen name="dialog_button_height">36dp</dimen>
 	<dimen name="dialog_button_radius">2dp</dimen>
+	<dimen name="dialog_continue_button_radius">4dp</dimen>
 	<dimen name="dialog_button_bottom_padding">40dp</dimen>
 	<dimen name="dialog_welcome_title_bottom_padding">96dp</dimen>
 	<dimen name="dialog_welcome_title_top_padding">120dp</dimen>
@@ -55,6 +56,7 @@
 	<dimen name="title_login_text_size">20sp</dimen>
 	<dimen name="title_welcome_text_size">32sp</dimen>
 	<dimen name="descr_text_size">16sp</dimen>
+	<dimen name="continue_btn_text_size">14sp</dimen>
 
 	<dimen name="list_item_title_text_size">16sp</dimen>
 	<dimen name="list_item_description_text_size">12sp</dimen>
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index f7fc26e29d..c177c3e142 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -1,4 +1,8 @@
 <resources>
+	<string name="get_telegram_title">Registration in Telegram</string>
+	<string name="get_telegram_description_first">You need an account in Telegram to use the capabilities of OsmAnd Location Sharing.</string>
+	<string name="get_telegram_description_second">If you want to continue, please install the Telegram from Google Play and register your account.</string>
+	<string name="get_telegram_description_third">After creating an account, you can use this application.</string>
 	<string name="shared_string_all">All</string>
 	<string name="shared_string_off">Off</string>
 	<string name="authorization_already_registered_in_telegram">You need an already registered account and phone number in Telegram</string>
diff --git a/OsmAnd-telegram/res/values/styles.xml b/OsmAnd-telegram/res/values/styles.xml
index a6cd192ff2..91308dd087 100644
--- a/OsmAnd-telegram/res/values/styles.xml
+++ b/OsmAnd-telegram/res/values/styles.xml
@@ -32,6 +32,9 @@
 	<style name="AppTheme.NoActionbar">
 		<item name="windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
+	</style>
+
+	<style name="AppTheme.NoActionbar.Translucent">
 		<item name="android:windowTranslucentStatus">true</item>
 	</style>
 
@@ -45,7 +48,13 @@
 		<item name="android:paddingBottom">8dp</item>
 		<item name="android:textColor">@color/white</item>
 		<item name="android:textAllCaps">false</item>
+		<item name="android:textSize">@dimen/continue_btn_text_size</item>
 		<item name="android:background">@drawable/btn_round_blue</item>
+		<item name="android:letterSpacing">0.07</item>
+	</style>
+
+	<style name="DialogActionButtonActive.Welcome">
+		<item name="android:background">@drawable/btn_round_purple</item>
 	</style>
 
 	<style name="DialogActionButton">
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 9438bf24a8..7a50934a57 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -10,19 +10,19 @@ import android.support.v4.app.FragmentManager
 import android.support.v7.widget.AppCompatImageView
 import android.text.Html
 import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import net.osmand.PlatformUtil
 import net.osmand.telegram.R
 import net.osmand.telegram.utils.AndroidUtils
 import studio.carbonylgroup.textfieldboxes.ExtendedEditText
+import android.content.Intent
+import android.graphics.Rect
+import android.net.Uri
+import android.view.*
+import android.view.ViewGroup
+import android.text.Editable
+import android.text.TextWatcher
 
 
 class LoginDialogFragment : DialogFragment() {
@@ -35,10 +35,15 @@ class LoginDialogFragment : DialogFragment() {
 		private const val LOGIN_DIALOG_TYPE_PARAM_KEY = "login_dialog_type_param"
 		private const val SHOW_PROGRESS_PARAM_KEY = "show_progress_param"
 		private const val SHOW_WELCOME_DIALOG_PARAM_KEY = "show_welcome_dialog_param"
+		private const val TELEGRAM_PLAY_MARKET_LINK = "market://details?id=org.telegram.messenger"
+		private const val TELEGRAM_NO_PLAY_MARKET_LINK = "https://play.google.com/store/apps/details?id=org.telegram.messenger"
+		private const val SOFT_KEYBOARD_MIN_DETECTION_SIZE = 0.15
 
 		var welcomeDialogShown = false
 			private set
 
+		private var softKeyboardShown: Boolean = false
+
 		fun showWelcomeDialog(fragmentManager: FragmentManager) {
 			welcomeDialogShown = true
 			showDialog(fragmentManager, welcomeDialog = true)
@@ -101,12 +106,14 @@ class LoginDialogFragment : DialogFragment() {
 		ENTER_CODE(R.id.enter_code_layout, R.id.code_edit_text,
 				R.string.enter_code, R.string.authentication_code_descr, R.string.enter_authentication_code),
 		ENTER_PASSWORD(R.id.enter_password_layout, R.id.password_edit_text,
-				R.string.enter_password, R.string.password_descr, R.string.enter_password);
+				R.string.enter_password, R.string.password_descr, R.string.enter_password),
+		GET_TELEGRAM(R.id.get_telegram_layout, 0,
+				R.string.get_telegram_title, R.string.get_telegram_description_first, 0);
 	}
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar)
+		setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Translucent)
 		val activity = requireActivity()
 		val window = activity.window
 		window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
@@ -124,6 +131,31 @@ class LoginDialogFragment : DialogFragment() {
 		}
 		val view = inflater.inflate(R.layout.login_dialog, container)
 		buildDialog(view)
+		view.viewTreeObserver.addOnGlobalLayoutListener {
+			val r = Rect()
+			view.getWindowVisibleDisplayFrame(r)
+			val screenHeight = view.rootView.height
+			val keypadHeight = screenHeight - r.bottom
+			val softKeyboardVisible = keypadHeight > screenHeight * SOFT_KEYBOARD_MIN_DETECTION_SIZE
+			if (!softKeyboardShown && softKeyboardVisible) {
+				softKeyboardShown = softKeyboardVisible
+				val continueButton = view?.findViewById<Button>(R.id.continue_button)
+				if (continueButton?.layoutParams is ViewGroup.MarginLayoutParams) {
+					val p = continueButton.layoutParams as ViewGroup.MarginLayoutParams
+					p.setMargins(p.leftMargin, p.topMargin, p.rightMargin, AndroidUtils.dpToPx(context!!, 16F))
+					continueButton.requestLayout()
+				}
+			} else if (softKeyboardShown && !softKeyboardVisible) {
+				softKeyboardShown = softKeyboardVisible
+				val continueButton = view?.findViewById<Button>(R.id.continue_button)
+				if (continueButton?.layoutParams is ViewGroup.MarginLayoutParams) {
+					val p = continueButton.layoutParams as ViewGroup.MarginLayoutParams
+					p.setMargins(p.leftMargin, p.topMargin, p.rightMargin, AndroidUtils.dpToPx(context!!, 40F))
+					continueButton.requestLayout()
+				}
+			}
+			softKeyboardShown = softKeyboardVisible
+		}
 		return view
 	}
 
@@ -186,11 +218,15 @@ class LoginDialogFragment : DialogFragment() {
 						val titleView: TextView? = view.findViewById(R.id.login_title)
 						val descriptionView: TextView? = view.findViewById(R.id.login_description)
 						val inputTypeDescriptionView: TextView? = view.findViewById(R.id.login_input_type_descr)
-						val inputTypeDescription = getText(t.inputTypeDescriptionId).toString() + ":"
+						if (t.inputTypeDescriptionId != 0) {
+							val inputTypeDescription = getText(t.inputTypeDescriptionId).toString() + ":"
+							inputTypeDescriptionView?.text = inputTypeDescription
+						} else {
+							inputTypeDescriptionView?.visibility = View.GONE
+						}
 
 						titleView?.text = getText(t.titleId)
 						descriptionView?.text = getText(t.descriptionId)
-						inputTypeDescriptionView?.text = inputTypeDescription
 
 						layout.visibility = View.VISIBLE
 						val editText: ExtendedEditText? = layout.findViewById(t.editorId)
@@ -207,22 +243,59 @@ class LoginDialogFragment : DialogFragment() {
 								AndroidUtils.softKeyboardDelayed(editText)
 								focusRequested = true
 							}
+							editText.addTextChangedListener(object : TextWatcher {
+								override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+								override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+								override fun afterTextChanged(s: Editable) {
+									val continueButton: Button? = view.findViewById(R.id.continue_button)
+									if (s.isEmpty()) {
+										continueButton?.setBackgroundResource(R.drawable.btn_round_blue)
+//                                        continueButton?.set()
+									} else {
+										continueButton?.setBackgroundResource(R.drawable.btn_round_purple)
+//                                        continueButton?.setTextColor(R.color.secondary_text_light)
+									}
+								}
+							})
 						}
 
 						val noTelegramViewContainer: LinearLayout? = view.findViewById(R.id.no_telegram)
 						if (loginDialogActiveType == LoginDialogType.ENTER_PHONE_NUMBER) {
-							val noTelegramAccountTitleView: TextView? = view.findViewById(R.id.no_telegram_title)
-							val noTelegramAccountButton: ImageView? = view.findViewById(R.id.no_telegram_button)
-							val phoneNumberFormatHintView: TextView? = view.findViewById(R.id.phone_number_format)
-
-							noTelegramAccountTitleView?.text = getText(R.string.do_not_have_telegram)
-							phoneNumberFormatHintView?.text = getText(R.string.phone_number_descr)
-							noTelegramAccountButton?.setImageResource(R.drawable.ic_arrow_forward)
+							view.findViewById<TextView>(R.id.no_telegram_title)?.text = getText(R.string.do_not_have_telegram)
+							view.findViewById<TextView>(R.id.phone_number_format)?.text = getText(R.string.phone_number_descr)
+							view.findViewById<ImageView>(R.id.no_telegram_button)?.setImageResource(R.drawable.ic_arrow_forward)
 
+							noTelegramViewContainer?.setOnClickListener {
+								val focusedView = dialog.currentFocus
+								if (focusedView != null && softKeyboardShown) {
+									AndroidUtils.hideSoftKeyboard(activity!!, focusedView)
+								}
+								updateDialog(LoginDialogType.GET_TELEGRAM, false)
+							}
 							noTelegramViewContainer?.visibility = View.VISIBLE
 						} else {
 							noTelegramViewContainer?.visibility = View.GONE
 						}
+
+						val getTelegramViewContainer: LinearLayout? = view.findViewById(R.id.get_telegram_layout)
+						if (loginDialogActiveType == LoginDialogType.GET_TELEGRAM) {
+							view.findViewById<TextView>(R.id.get_telegram_description_first)?.text = getText(R.string.get_telegram_description_second)
+							view.findViewById<TextView>(R.id.get_telegram_description_second)?.text = getText(R.string.get_telegram_description_third)
+							val getTelegramButton: ImageView? = view.findViewById(R.id.google_play_button)
+							getTelegramButton?.setImageResource(R.drawable.google_play_badge)
+							getTelegramButton?.setOnClickListener {
+								try {
+									startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(TELEGRAM_PLAY_MARKET_LINK)))
+								} catch (anfe: android.content.ActivityNotFoundException) {
+									startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(TELEGRAM_NO_PLAY_MARKET_LINK)))
+								}
+							}
+							view.findViewById<Button>(R.id.continue_button).visibility = View.GONE
+							getTelegramViewContainer?.visibility = View.VISIBLE
+						} else {
+							getTelegramViewContainer?.visibility = View.GONE
+							view.findViewById<Button>(R.id.continue_button).visibility = View.VISIBLE
+						}
 					}
 				}
 				else -> layout?.visibility = View.GONE
@@ -261,6 +334,10 @@ class LoginDialogFragment : DialogFragment() {
 		cancelButton?.setOnClickListener {
 			if (loginDialogActiveType == LoginDialogType.ENTER_PHONE_NUMBER) {
 				showWelcomeDialog = true
+				val focusedView = dialog.currentFocus
+				if (focusedView != null && softKeyboardShown) {
+					AndroidUtils.hideSoftKeyboard(activity!!, focusedView)
+				}
 				buildDialog(view)
 			} else {
 				showProgress()
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
index 2e257b3a05..949ab3ca61 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
@@ -4,12 +4,15 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.support.annotation.AttrRes
 import android.support.annotation.ColorInt
+import android.support.annotation.ColorRes
 import android.support.v4.app.ActivityCompat
+import android.support.v4.content.ContextCompat
 import android.support.v4.content.FileProvider
 import android.util.TypedValue
 import android.util.TypedValue.COMPLEX_UNIT_DIP
@@ -45,6 +48,37 @@ object AndroidUtils {
 		}
 	}
 
+    fun createCheckedColorStateList(ctx: Context, @ColorRes normal: Int, @ColorRes checked: Int): ColorStateList {
+        return createCheckedColorStateList(ctx, false, normal, checked, 0, 0)
+    }
+
+    fun createCheckedColorStateList(ctx: Context, night: Boolean,
+                                    @ColorRes lightNormal: Int, @ColorRes lightChecked: Int,
+                                    @ColorRes darkNormal: Int, @ColorRes darkChecked: Int): ColorStateList {
+        return createColorStateList(ctx, night, android.R.attr.state_checked,
+                lightNormal, lightChecked, darkNormal, darkChecked)
+    }
+    
+    fun createPressedColorStateList(ctx: Context, @ColorRes normal: Int, @ColorRes pressed: Int): ColorStateList {
+        return createPressedColorStateList(ctx, false, normal, pressed, 0, 0)
+    }
+
+    fun createPressedColorStateList(ctx: Context, night: Boolean,
+                                    @ColorRes lightNormal: Int, @ColorRes lightPressed: Int,
+                                    @ColorRes darkNormal: Int, @ColorRes darkPressed: Int): ColorStateList {
+        return createColorStateList(ctx, night, android.R.attr.state_pressed,
+                lightNormal, lightPressed, darkNormal, darkPressed)
+    }
+
+    private fun createColorStateList(ctx: Context, night: Boolean, state: Int,
+                                     @ColorRes lightNormal: Int, @ColorRes lightState: Int,
+                                     @ColorRes darkNormal: Int, @ColorRes darkState: Int): ColorStateList {
+        return ColorStateList(
+                arrayOf(intArrayOf(state), intArrayOf()),
+                intArrayOf(ContextCompat.getColor(ctx, if (night) darkState else lightState), ContextCompat.getColor(ctx, if (night) darkNormal else lightNormal))
+        )
+    }
+    
 	fun isLocationPermissionAvailable(context: Context): Boolean {
 		return ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
 	}

From eb41225fbf8295170a4b6c133599bdec791eea20 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 11:09:43 +0300
Subject: [PATCH 04/15] fix continueButton active and not active version

---
 .../osmand/telegram/ui/LoginDialogFragment.kt | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 7a50934a57..f1680948f0 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -19,6 +19,7 @@ import studio.carbonylgroup.textfieldboxes.ExtendedEditText
 import android.content.Intent
 import android.graphics.Rect
 import android.net.Uri
+import android.support.v4.content.ContextCompat
 import android.view.*
 import android.view.ViewGroup
 import android.text.Editable
@@ -96,6 +97,7 @@ class LoginDialogFragment : DialogFragment() {
 
 	private var showWelcomeDialog = false
 	private var showProgress = false
+	private var continueButtonEnabled = false
 	private var dismissedManually = false
 
 	enum class LoginDialogType(val viewId: Int, val editorId: Int,
@@ -229,7 +231,8 @@ class LoginDialogFragment : DialogFragment() {
 						descriptionView?.text = getText(t.descriptionId)
 
 						layout.visibility = View.VISIBLE
-						val editText: ExtendedEditText? = layout.findViewById(t.editorId)
+						val editText: ExtendedEditText? = layout.findViewById<ExtendedEditText>(t.editorId)
+						val continueButton: Button? = view.findViewById(R.id.continue_button)
 						if (editText != null && !showWelcomeDialog) {
 							editText.setOnEditorActionListener { _, actionId, _ ->
 								if (actionId == EditorInfo.IME_ACTION_DONE) {
@@ -247,16 +250,22 @@ class LoginDialogFragment : DialogFragment() {
 								override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 								override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
 								override fun afterTextChanged(s: Editable) {
-									val continueButton: Button? = view.findViewById(R.id.continue_button)
-									if (s.isEmpty()) {
-										continueButton?.setBackgroundResource(R.drawable.btn_round_blue)
-//                                        continueButton?.set()
-									} else {
-										continueButton?.setBackgroundResource(R.drawable.btn_round_purple)
-//                                        continueButton?.setTextColor(R.color.secondary_text_light)
+									if (continueButton != null) {
+										if (s.isEmpty()) {
+											changeContinueButton(continueButton, false)
+										} else {
+											changeContinueButton(continueButton, true)
+										}
 									}
 								}
 							})
+							if (continueButton != null) {
+								if (editText.text.isEmpty()) {
+									changeContinueButton(continueButton, false)
+								} else {
+									changeContinueButton(continueButton, true)
+								}
+							}
 						}
 
 						val noTelegramViewContainer: LinearLayout? = view.findViewById(R.id.no_telegram)
@@ -309,7 +318,7 @@ class LoginDialogFragment : DialogFragment() {
 		}
 		val continueButton: Button? = view?.findViewById(R.id.continue_button)
 		if (continueButton != null) {
-			continueButton.isEnabled = !showProgress
+			continueButton.isEnabled = !showProgress && continueButtonEnabled
 			if (showProgress) {
 				continueButton.setOnClickListener(null)
 			} else {
@@ -322,6 +331,7 @@ class LoginDialogFragment : DialogFragment() {
 							val editText: ExtendedEditText? = layout.findViewById(t.editorId)
 							val text = editText?.text.toString()
 							if (!TextUtils.isEmpty(text) && text.length > 1) {
+								continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.secondary_text_light))
 								applyAuthParam(t, text)
 							}
 						}
@@ -380,4 +390,18 @@ class LoginDialogFragment : DialogFragment() {
 		showProgress = true
 		buildDialog(view)
 	}
+
+	private fun changeContinueButton(continueButton: Button, isActive: Boolean = false) {
+		if (isActive) {
+			continueButton.setBackgroundResource(R.drawable.btn_round_purple)
+			continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.white))
+			continueButtonEnabled = isActive
+			continueButton.isEnabled = continueButtonEnabled
+		} else {
+			continueButton.setBackgroundResource(R.drawable.btn_round_blue)
+			continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.secondary_text_light))
+			continueButtonEnabled = isActive
+			continueButton.isEnabled = continueButtonEnabled
+		}
+	}
 }

From 1490dbd67f8a9c06849ce2e2718ad5ea2fab5140 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 11:26:34 +0300
Subject: [PATCH 05/15] remove unnecessary changes

---
 .../{btn_round_blue.xml => btn_round_4dp.xml} |   0
 .../res/drawable/google_play_badge.png        | Bin 0 -> 13957 bytes
 OsmAnd-telegram/res/layout/login_dialog.xml   |  26 ++++++---------
 OsmAnd-telegram/res/values/strings.xml        |   6 ++--
 OsmAnd-telegram/res/values/styles.xml         |   2 +-
 .../osmand/telegram/ui/LoginDialogFragment.kt |   8 ++---
 .../net/osmand/telegram/utils/AndroidUtils.kt |  31 ------------------
 7 files changed, 18 insertions(+), 55 deletions(-)
 rename OsmAnd-telegram/res/drawable/{btn_round_blue.xml => btn_round_4dp.xml} (100%)
 create mode 100644 OsmAnd-telegram/res/drawable/google_play_badge.png

diff --git a/OsmAnd-telegram/res/drawable/btn_round_blue.xml b/OsmAnd-telegram/res/drawable/btn_round_4dp.xml
similarity index 100%
rename from OsmAnd-telegram/res/drawable/btn_round_blue.xml
rename to OsmAnd-telegram/res/drawable/btn_round_4dp.xml
diff --git a/OsmAnd-telegram/res/drawable/google_play_badge.png b/OsmAnd-telegram/res/drawable/google_play_badge.png
new file mode 100644
index 0000000000000000000000000000000000000000..c77b7464b049c7d6666155c61df5f486f241f760
GIT binary patch
literal 13957
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
X%LPP+756@c3`<o}Q=v-kpWy!m7bkT<

literal 0
HcmV?d00001

diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index 199f155b28..9331508046 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -11,8 +11,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:fillViewport="true"
-		android:visibility="visible"
-		tools:visibility="gone">
+		android:visibility="visible">
 
 		<FrameLayout
 			android:layout_width="match_parent"
@@ -80,8 +79,7 @@
 		android:background="?attr/card_bg_color"
 		android:fitsSystemWindows="true"
 		android:orientation="vertical"
-		android:visibility="gone"
-		tools:visibility="visible">
+		android:visibility="gone">
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -159,10 +157,9 @@
 						android:layout_marginBottom="@dimen/dialog_padding_vertical"
 						android:background="@drawable/no_telegram_btn_bg"
 						android:gravity="center_vertical"
-						android:visibility="gone"
-						tools:visibility="gone">
+						android:visibility="gone">
 
-						<TextView
+						<net.osmand.telegram.ui.views.TextViewEx
 							android:id="@+id/no_telegram_title"
 							android:layout_width="0dp"
 							android:layout_height="wrap_content"
@@ -177,7 +174,7 @@
 							android:text="@string/do_not_have_telegram"
 							android:textColor="?attr/ctrl_active_color"
 							android:textSize="@dimen/descr_text_size"
-							android:textStyle="bold" />
+							app:typeface="@string/font_roboto_mono_bold" />
 
 						<ImageView
 							android:id="@+id/no_telegram_button"
@@ -205,16 +202,14 @@
 						android:text="@string/enter_phone_number"
 						android:textColor="@color/app_bar_title_light"
 						android:textSize="@dimen/title_text_size"
-						android:textStyle="bold"
-						tools:visibility="visible" />
+						app:typeface="@string/font_roboto_mono_bold" />
 
 					<LinearLayout
 						android:id="@+id/enter_phone_number_layout"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:orientation="vertical"
-						android:visibility="visible"
-						tools:visibility="visible">
+						android:visibility="visible">
 
 						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
 							android:layout_width="match_parent"
@@ -299,8 +294,7 @@
 						android:layout_height="wrap_content"
 						android:orientation="vertical"
 						android:paddingBottom="@dimen/content_padding_standard"
-						android:visibility="gone"
-						tools:visibility="gone">
+						android:visibility="gone">
 
 						<TextView
 							android:id="@+id/get_telegram_description_first"
@@ -313,7 +307,7 @@
 							android:layout_marginStart="@dimen/content_padding_standard"
 							android:textColor="@color/app_bar_title_light"
 							android:textSize="@dimen/descr_text_size"
-							tools:text="@string/get_telegram_description_second" />
+							tools:text="@string/get_telegram_description_continue" />
 
 						<ImageView
 							android:id="@+id/google_play_button"
@@ -337,7 +331,7 @@
 							android:layout_marginStart="@dimen/content_padding_standard"
 							android:textColor="@color/app_bar_title_light"
 							android:textSize="@dimen/descr_text_size"
-							tools:text="@string/get_telegram_description_third" />
+							tools:text="@string/get_telegram_after_creating_account" />
 
 					</LinearLayout>
 
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index c177c3e142..828e390640 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="get_telegram_title">Registration in Telegram</string>
-	<string name="get_telegram_description_first">You need an account in Telegram to use the capabilities of OsmAnd Location Sharing.</string>
-	<string name="get_telegram_description_second">If you want to continue, please install the Telegram from Google Play and register your account.</string>
-	<string name="get_telegram_description_third">After creating an account, you can use this application.</string>
+	<string name="get_telegram_account_first">You need an account in Telegram to use the capabilities of OsmAnd Location Sharing.</string>
+	<string name="get_telegram_description_continue">If you want to continue, please install the Telegram from Google Play and register your account.</string>
+	<string name="get_telegram_after_creating_account">After creating an account, you can use this application.</string>
 	<string name="shared_string_all">All</string>
 	<string name="shared_string_off">Off</string>
 	<string name="authorization_already_registered_in_telegram">You need an already registered account and phone number in Telegram</string>
diff --git a/OsmAnd-telegram/res/values/styles.xml b/OsmAnd-telegram/res/values/styles.xml
index 91308dd087..0285b13b6c 100644
--- a/OsmAnd-telegram/res/values/styles.xml
+++ b/OsmAnd-telegram/res/values/styles.xml
@@ -49,7 +49,7 @@
 		<item name="android:textColor">@color/white</item>
 		<item name="android:textAllCaps">false</item>
 		<item name="android:textSize">@dimen/continue_btn_text_size</item>
-		<item name="android:background">@drawable/btn_round_blue</item>
+		<item name="android:background">@drawable/btn_round_4dp</item>
 		<item name="android:letterSpacing">0.07</item>
 	</style>
 
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index f1680948f0..734b6f223f 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -110,7 +110,7 @@ class LoginDialogFragment : DialogFragment() {
 		ENTER_PASSWORD(R.id.enter_password_layout, R.id.password_edit_text,
 				R.string.enter_password, R.string.password_descr, R.string.enter_password),
 		GET_TELEGRAM(R.id.get_telegram_layout, 0,
-				R.string.get_telegram_title, R.string.get_telegram_description_first, 0);
+				R.string.get_telegram_title, R.string.get_telegram_account_first, 0);
 	}
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -288,8 +288,8 @@ class LoginDialogFragment : DialogFragment() {
 
 						val getTelegramViewContainer: LinearLayout? = view.findViewById(R.id.get_telegram_layout)
 						if (loginDialogActiveType == LoginDialogType.GET_TELEGRAM) {
-							view.findViewById<TextView>(R.id.get_telegram_description_first)?.text = getText(R.string.get_telegram_description_second)
-							view.findViewById<TextView>(R.id.get_telegram_description_second)?.text = getText(R.string.get_telegram_description_third)
+							view.findViewById<TextView>(R.id.get_telegram_description_first)?.text = getText(R.string.get_telegram_description_continue)
+							view.findViewById<TextView>(R.id.get_telegram_description_second)?.text = getText(R.string.get_telegram_after_creating_account)
 							val getTelegramButton: ImageView? = view.findViewById(R.id.google_play_button)
 							getTelegramButton?.setImageResource(R.drawable.google_play_badge)
 							getTelegramButton?.setOnClickListener {
@@ -398,7 +398,7 @@ class LoginDialogFragment : DialogFragment() {
 			continueButtonEnabled = isActive
 			continueButton.isEnabled = continueButtonEnabled
 		} else {
-			continueButton.setBackgroundResource(R.drawable.btn_round_blue)
+			continueButton.setBackgroundResource(R.drawable.btn_round_4dp)
 			continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.secondary_text_light))
 			continueButtonEnabled = isActive
 			continueButton.isEnabled = continueButtonEnabled
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
index 949ab3ca61..43a540807d 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
@@ -47,37 +47,6 @@ object AndroidUtils {
 			}
 		}
 	}
-
-    fun createCheckedColorStateList(ctx: Context, @ColorRes normal: Int, @ColorRes checked: Int): ColorStateList {
-        return createCheckedColorStateList(ctx, false, normal, checked, 0, 0)
-    }
-
-    fun createCheckedColorStateList(ctx: Context, night: Boolean,
-                                    @ColorRes lightNormal: Int, @ColorRes lightChecked: Int,
-                                    @ColorRes darkNormal: Int, @ColorRes darkChecked: Int): ColorStateList {
-        return createColorStateList(ctx, night, android.R.attr.state_checked,
-                lightNormal, lightChecked, darkNormal, darkChecked)
-    }
-    
-    fun createPressedColorStateList(ctx: Context, @ColorRes normal: Int, @ColorRes pressed: Int): ColorStateList {
-        return createPressedColorStateList(ctx, false, normal, pressed, 0, 0)
-    }
-
-    fun createPressedColorStateList(ctx: Context, night: Boolean,
-                                    @ColorRes lightNormal: Int, @ColorRes lightPressed: Int,
-                                    @ColorRes darkNormal: Int, @ColorRes darkPressed: Int): ColorStateList {
-        return createColorStateList(ctx, night, android.R.attr.state_pressed,
-                lightNormal, lightPressed, darkNormal, darkPressed)
-    }
-
-    private fun createColorStateList(ctx: Context, night: Boolean, state: Int,
-                                     @ColorRes lightNormal: Int, @ColorRes lightState: Int,
-                                     @ColorRes darkNormal: Int, @ColorRes darkState: Int): ColorStateList {
-        return ColorStateList(
-                arrayOf(intArrayOf(state), intArrayOf()),
-                intArrayOf(ContextCompat.getColor(ctx, if (night) darkState else lightState), ContextCompat.getColor(ctx, if (night) darkNormal else lightNormal))
-        )
-    }
     
 	fun isLocationPermissionAvailable(context: Context): Boolean {
 		return ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED

From 2851d8d520e742c8407bbaff600e2e44909466f8 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 11:28:26 +0300
Subject: [PATCH 06/15] clean imports

---
 .../src/net/osmand/telegram/utils/AndroidUtils.kt            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
index 43a540807d..2e257b3a05 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
@@ -4,15 +4,12 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
-import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.support.annotation.AttrRes
 import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
 import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
 import android.support.v4.content.FileProvider
 import android.util.TypedValue
 import android.util.TypedValue.COMPLEX_UNIT_DIP
@@ -47,7 +44,7 @@ object AndroidUtils {
 			}
 		}
 	}
-    
+
 	fun isLocationPermissionAvailable(context: Context): Boolean {
 		return ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
 	}

From 1375427c64f4094b04f230e6db7f559113e573b3 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 11:32:12 +0300
Subject: [PATCH 07/15] add color for getTelegram button

---
 OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml | 2 +-
 OsmAnd-telegram/res/values/colors.xml               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml b/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
index 64af234024..3f3386ea77 100644
--- a/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
+++ b/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
@@ -3,7 +3,7 @@
 
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<solid android:color="#f0f0f0" />
+			<solid android:color="@color/dialog_no_telegram_bg" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
diff --git a/OsmAnd-telegram/res/values/colors.xml b/OsmAnd-telegram/res/values/colors.xml
index 6a956e9d58..eb17b5ffec 100644
--- a/OsmAnd-telegram/res/values/colors.xml
+++ b/OsmAnd-telegram/res/values/colors.xml
@@ -38,5 +38,6 @@
 	
 	<color name="dialog_continue_btn_active_bg">#5959ff</color>
 	<color name="dialog_continue_btn_non_active_bg">#f0f0f0</color>
+	<color name="dialog_no_telegram_bg">#f0f0f0</color>
 
 </resources>

From 4f4e6c7ab5d75ed957cd6370a0bad5b24ad358c1 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 15:31:59 +0300
Subject: [PATCH 08/15] remove keyboard listener and rename resources

---
 ..._telegram_btn_bg.xml => btn_border_bg.xml} |   2 +-
 .../res/drawable/btn_round_4dp.xml            |  23 -
 ..._round_purple.xml => btn_round_active.xml} |  10 +-
 OsmAnd-telegram/res/layout/login_dialog.xml   | 429 +++++++++---------
 OsmAnd-telegram/res/values/colors.xml         |   4 -
 OsmAnd-telegram/res/values/dimens.xml         |   6 +-
 OsmAnd-telegram/res/values/strings.xml        |   2 +-
 OsmAnd-telegram/res/values/styles.xml         |   8 +-
 .../osmand/telegram/ui/LoginDialogFragment.kt |  80 +---
 .../net/osmand/telegram/utils/AndroidUtils.kt |  17 +
 10 files changed, 264 insertions(+), 317 deletions(-)
 rename OsmAnd-telegram/res/drawable/{no_telegram_btn_bg.xml => btn_border_bg.xml} (92%)
 delete mode 100644 OsmAnd-telegram/res/drawable/btn_round_4dp.xml
 rename OsmAnd-telegram/res/drawable/{btn_round_purple.xml => btn_round_active.xml} (55%)

diff --git a/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml b/OsmAnd-telegram/res/drawable/btn_border_bg.xml
similarity index 92%
rename from OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
rename to OsmAnd-telegram/res/drawable/btn_border_bg.xml
index 3f3386ea77..ed2c7083c6 100644
--- a/OsmAnd-telegram/res/drawable/no_telegram_btn_bg.xml
+++ b/OsmAnd-telegram/res/drawable/btn_border_bg.xml
@@ -3,7 +3,7 @@
 
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<solid android:color="@color/dialog_no_telegram_bg" />
+			<solid android:color="@color/ctrl_light" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
diff --git a/OsmAnd-telegram/res/drawable/btn_round_4dp.xml b/OsmAnd-telegram/res/drawable/btn_round_4dp.xml
deleted file mode 100644
index c99ccc2c39..0000000000
--- a/OsmAnd-telegram/res/drawable/btn_round_4dp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<item android:state_pressed="true">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/dialog_continue_btn_active_bg" />
-			<corners android:radius="@dimen/dialog_continue_button_radius" />
-		</shape>
-	</item>
-	<item android:state_enabled="false">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_light" />
-			<corners android:radius="@dimen/dialog_continue_button_radius" />
-		</shape>
-	</item>
-	<item>
-		<shape android:shape="rectangle">
-			<solid android:color="@color/dialog_continue_btn_non_active_bg" />
-			<corners android:radius="@dimen/dialog_continue_button_radius" />
-		</shape>
-	</item>
-
-</selector>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/drawable/btn_round_purple.xml b/OsmAnd-telegram/res/drawable/btn_round_active.xml
similarity index 55%
rename from OsmAnd-telegram/res/drawable/btn_round_purple.xml
rename to OsmAnd-telegram/res/drawable/btn_round_active.xml
index ca6b029eef..71ed302bdc 100644
--- a/OsmAnd-telegram/res/drawable/btn_round_purple.xml
+++ b/OsmAnd-telegram/res/drawable/btn_round_active.xml
@@ -3,20 +3,20 @@
 
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<solid android:color="@color/dialog_continue_btn_active_bg" />
-			<corners android:radius="@dimen/dialog_continue_button_radius" />
+			<solid android:color="@color/ctrl_active_light" />
+			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
 	<item android:state_enabled="false">
 		<shape android:shape="rectangle">
 			<solid android:color="@color/ctrl_light" />
-			<corners android:radius="@dimen/dialog_continue_button_radius" />
+			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="@color/dialog_continue_btn_active_bg" />
-			<corners android:radius="@dimen/dialog_continue_button_radius" />
+			<solid android:color="@color/ctrl_active_light" />
+			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
 
diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index 9331508046..f547cb9490 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -11,7 +11,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:fillViewport="true"
-		android:visibility="visible">
+		android:visibility="visible"
+		tools:visibility="gone">
 
 		<FrameLayout
 			android:layout_width="match_parent"
@@ -31,25 +32,28 @@
 				android:layout_height="match_parent"
 				android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
 				android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
-				android:layout_marginTop="@dimen/dialog_welcome_title_top_padding"
+				android:layout_marginTop="85dp"
 				android:orientation="vertical"
 				android:visibility="visible">
 
 				<net.osmand.telegram.ui.views.TextViewEx
 					android:id="@+id/welcome_title"
-					android:layout_width="match_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="@dimen/dialog_welcome_title_bottom_padding"
-					android:text="@string/shared_string_welcome"
+					android:layout_marginBottom="70dp"
+					android:letterSpacing="-0.03"
+					android:text="Hello!"
 					android:textColor="?attr/ctrl_active_color"
 					android:textSize="@dimen/title_welcome_text_size"
 					app:typeface="@string/font_roboto_mono_bold" />
 
 				<TextView
 					android:id="@+id/welcome_descr"
-					android:layout_width="match_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="0dp"
 					android:layout_weight="1"
+					android:letterSpacing="0.0156"
+					android:lineSpacingMultiplier="1.25"
 					android:textColor="@color/app_bar_title_light"
 					android:textSize="@dimen/descr_text_size"
 					tools:text="@string/welcome_descr" />
@@ -79,11 +83,12 @@
 		android:background="?attr/card_bg_color"
 		android:fitsSystemWindows="true"
 		android:orientation="vertical"
-		android:visibility="gone">
+		android:visibility="gone"
+		tools:visibility="visible">
 
 		<LinearLayout
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
+			android:layout_height="@dimen/action_bar_height"
 			android:gravity="center_vertical"
 			android:minHeight="@dimen/action_bar_height"
 			android:orientation="horizontal">
@@ -114,258 +119,252 @@
 
 		</LinearLayout>
 
-
-		<ScrollView
+		<FrameLayout
 			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1"
-			android:fillViewport="true">
+			android:layout_height="match_parent"
+			android:background="@android:color/transparent">
 
-			<LinearLayout
+			<ScrollView
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical">
-
-				<TextView
-					android:id="@+id/login_description"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="@dimen/content_padding_standard"
-					android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
-					android:layout_marginLeft="@dimen/dialog_padding_horizontal"
-					android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
-					android:layout_marginStart="@dimen/dialog_padding_horizontal"
-					android:layout_marginTop="@dimen/content_padding_standard"
-					android:textColor="@color/app_bar_title_light"
-					android:textSize="@dimen/descr_text_size"
-					tools:text="@string/authorization_already_registered_in_telegram" />
+				android:layout_height="match_parent"
+				android:fillViewport="true">
 
 				<LinearLayout
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
-					android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
-					android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
-					android:layout_marginStart="@dimen/dialog_welcome_padding_horizontal"
-					android:layout_marginTop="@dimen/content_padding_standard"
 					android:orientation="vertical">
 
-					<LinearLayout
-						android:id="@+id/no_telegram"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/dialog_padding_vertical"
-						android:background="@drawable/no_telegram_btn_bg"
-						android:gravity="center_vertical"
-						android:visibility="gone">
-
-						<net.osmand.telegram.ui.views.TextViewEx
-							android:id="@+id/no_telegram_title"
-							android:layout_width="0dp"
-							android:layout_height="wrap_content"
-							android:layout_marginBottom="@dimen/content_padding_standard"
-							android:layout_marginLeft="@dimen/content_padding_standard"
-							android:layout_marginRight="@dimen/content_padding_standard"
-							android:layout_marginTop="@dimen/content_padding_standard"
-							android:layout_weight="1"
-							android:ellipsize="end"
-							android:gravity="center_vertical"
-							android:maxLines="2"
-							android:text="@string/do_not_have_telegram"
-							android:textColor="?attr/ctrl_active_color"
-							android:textSize="@dimen/descr_text_size"
-							app:typeface="@string/font_roboto_mono_bold" />
-
-						<ImageView
-							android:id="@+id/no_telegram_button"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginEnd="@dimen/content_padding_standard"
-							android:layout_marginRight="@dimen/content_padding_standard"
-							android:contentDescription="@string/do_not_have_telegram"
-							android:scaleType="centerInside"
-							android:src="@drawable/ic_arrow_forward"
-							android:tint="?attr/icon_color"
-							tools:tint="@color/icon_light" />
-
-					</LinearLayout>
-
-					<net.osmand.telegram.ui.views.TextViewEx
-						android:id="@+id/login_input_type_descr"
+					<TextView
+						android:id="@+id/login_description"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_marginBottom="@dimen/content_padding_standard"
-						android:layout_marginEnd="@dimen/content_padding_standard"
-						android:layout_marginLeft="@dimen/content_padding_standard"
-						android:layout_marginRight="@dimen/content_padding_standard"
-						android:layout_marginStart="@dimen/content_padding_standard"
-						android:text="@string/enter_phone_number"
+						android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
+						android:layout_marginLeft="@dimen/dialog_padding_horizontal"
+						android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
+						android:layout_marginStart="@dimen/dialog_padding_horizontal"
+						android:layout_marginTop="@dimen/content_padding_standard"
+						android:letterSpacing="0.0156"
+						android:lineSpacingMultiplier="1.25"
 						android:textColor="@color/app_bar_title_light"
-						android:textSize="@dimen/title_text_size"
-						app:typeface="@string/font_roboto_mono_bold" />
+						android:textSize="@dimen/descr_text_size"
+						tools:text="@string/already_registered_in_telegram" />
 
 					<LinearLayout
-						android:id="@+id/enter_phone_number_layout"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
+						android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
+						android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
 						android:orientation="vertical"
-						android:visibility="visible">
+						android:paddingBottom="@dimen/dialog_padding_horizontal">
 
-						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+						<LinearLayout
+							android:id="@+id/no_telegram"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							app:hasClearButton="true">
+							android:background="@drawable/btn_border_bg"
+							android:gravity="center_vertical"
+							android:visibility="gone"
+							tools:visibility="visible">
 
-							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-								android:id="@+id/phone_number_edit_text"
-								android:layout_width="match_parent"
+							<net.osmand.telegram.ui.views.TextViewEx
+								android:id="@+id/no_telegram_title"
+								android:layout_width="0dp"
 								android:layout_height="wrap_content"
-								android:hint="@string/phone_number_title"
-								android:inputType="phone" />
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:layout_marginLeft="@dimen/content_padding_standard"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:layout_marginTop="@dimen/content_padding_standard"
+								android:layout_weight="1"
+								android:ellipsize="end"
+								android:gravity="center_vertical"
+								android:maxLines="2"
+								android:text="@string/do_not_have_telegram"
+								android:textColor="?attr/ctrl_active_color"
+								android:textSize="@dimen/text_button_text_size"
+								app:typeface="@string/font_roboto_mono_bold" />
 
-						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+							<ImageView
+								android:id="@+id/no_telegram_button"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginEnd="@dimen/content_padding_standard"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:contentDescription="@string/do_not_have_telegram"
+								android:scaleType="centerInside"
+								android:src="@drawable/ic_arrow_forward"
+								android:tint="?attr/icon_color"
+								tools:tint="@color/icon_light" />
 
-						<TextView
-							android:id="@+id/phone_number_format"
+						</LinearLayout>
+
+						<net.osmand.telegram.ui.views.TextViewEx
+							android:id="@+id/login_input_type_descr"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:layout_marginBottom="@dimen/content_padding_standard"
 							android:layout_marginLeft="@dimen/content_padding_standard"
 							android:layout_marginRight="@dimen/content_padding_standard"
-							android:layout_marginTop="@dimen/content_padding_standard"
-							android:text="@string/phone_number_descr"
-							android:textSize="@dimen/descr_text_size" />
-
-					</LinearLayout>
-
-					<LinearLayout
-						android:id="@+id/enter_code_layout"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:orientation="vertical"
-						android:paddingBottom="@dimen/content_padding_standard"
-						android:visibility="gone">
-
-						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							app:hasClearButton="true"
-							app:labelText="@string/authentication_code">
-
-							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-								android:id="@+id/code_edit_text"
-								android:layout_width="match_parent"
-								android:layout_height="wrap_content"
-								android:inputType="number"
-								tools:text="123456" />
-
-						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
-
-					</LinearLayout>
-
-					<LinearLayout
-						android:id="@+id/enter_password_layout"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:orientation="vertical"
-						android:paddingBottom="@dimen/content_padding_standard"
-						android:visibility="gone">
-
-						<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							app:hasClearButton="true"
-							app:labelText="@string/shared_string_password">
-
-							<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-								android:id="@+id/password_edit_text"
-								android:layout_width="match_parent"
-								android:layout_height="wrap_content"
-								android:inputType="textPassword"
-								tools:text="12345678" />
-
-						</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
-
-					</LinearLayout>
-
-					<LinearLayout
-						android:id="@+id/get_telegram_layout"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:orientation="vertical"
-						android:paddingBottom="@dimen/content_padding_standard"
-						android:visibility="gone">
-
-						<TextView
-							android:id="@+id/get_telegram_description_first"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:layout_marginBottom="@dimen/content_padding_standard"
-							android:layout_marginEnd="@dimen/content_padding_standard"
-							android:layout_marginLeft="@dimen/content_padding_standard"
-							android:layout_marginRight="@dimen/content_padding_standard"
-							android:layout_marginStart="@dimen/content_padding_standard"
+							android:text="@string/enter_phone_number"
 							android:textColor="@color/app_bar_title_light"
 							android:textSize="@dimen/descr_text_size"
-							tools:text="@string/get_telegram_description_continue" />
+							app:typeface="@string/font_roboto_mono_bold" />
 
-						<ImageView
-							android:id="@+id/google_play_button"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginBottom="@dimen/content_padding_standard"
-							android:layout_marginEnd="@dimen/content_padding_standard"
-							android:layout_marginLeft="@dimen/content_padding_standard"
-							android:layout_marginRight="@dimen/content_padding_standard"
-							android:layout_marginStart="@dimen/content_padding_standard"
-							android:src="@drawable/google_play_badge" />
-
-						<TextView
-							android:id="@+id/get_telegram_description_second"
+						<LinearLayout
+							android:id="@+id/enter_phone_number_layout"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:layout_marginBottom="@dimen/content_padding_standard"
-							android:layout_marginEnd="@dimen/content_padding_standard"
-							android:layout_marginLeft="@dimen/content_padding_standard"
-							android:layout_marginRight="@dimen/content_padding_standard"
-							android:layout_marginStart="@dimen/content_padding_standard"
-							android:textColor="@color/app_bar_title_light"
-							android:textSize="@dimen/descr_text_size"
-							tools:text="@string/get_telegram_after_creating_account" />
+							android:orientation="vertical"
+							android:visibility="visible">
 
-					</LinearLayout>
+							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								app:hasClearButton="true">
 
-					<LinearLayout
-						android:id="@+id/progress_layout"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:orientation="vertical"
-						android:visibility="gone">
+								<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+									android:id="@+id/phone_number_edit_text"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:hint="@string/phone_number_title"
+									android:inputType="phone" />
 
-						<ProgressBar
-							android:layout_width="@dimen/progress_bar_size_small"
-							android:layout_height="@dimen/progress_bar_size_small" />
+							</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+							<TextView
+								android:id="@+id/phone_number_format"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:layout_marginLeft="@dimen/content_padding_standard"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:layout_marginTop="@dimen/content_padding_standard"
+								android:text="@string/phone_number_descr"
+								android:textSize="@dimen/descr_text_size" />
+
+						</LinearLayout>
+
+						<LinearLayout
+							android:id="@+id/enter_code_layout"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingBottom="@dimen/content_padding_standard"
+							android:visibility="gone">
+
+							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								app:hasClearButton="true"
+								app:labelText="@string/authentication_code">
+
+								<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+									android:id="@+id/code_edit_text"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:inputType="number"
+									tools:text="123456" />
+
+							</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+						</LinearLayout>
+
+						<LinearLayout
+							android:id="@+id/enter_password_layout"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingBottom="@dimen/content_padding_standard"
+							android:visibility="gone">
+
+							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								app:hasClearButton="true"
+								app:labelText="@string/shared_string_password">
+
+								<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+									android:id="@+id/password_edit_text"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:inputType="textPassword"
+									tools:text="12345678" />
+
+							</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+
+						</LinearLayout>
+
+						<LinearLayout
+							android:id="@+id/get_telegram_layout"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingBottom="@dimen/content_padding_standard"
+							android:visibility="gone">
+
+							<TextView
+								android:id="@+id/get_telegram_description_first"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:layout_marginLeft="@dimen/content_padding_standard"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:textColor="@color/app_bar_title_light"
+								android:textSize="@dimen/descr_text_size"
+								tools:text="@string/get_telegram_description_continue" />
+
+							<ImageView
+								android:id="@+id/google_play_button"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:layout_marginLeft="@dimen/content_padding_standard"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:src="@drawable/google_play_badge" />
+
+							<TextView
+								android:id="@+id/get_telegram_description_second"
+								android:layout_width="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:layout_marginLeft="@dimen/content_padding_standard"
+								android:layout_marginRight="@dimen/content_padding_standard"
+								android:textColor="@color/app_bar_title_light"
+								android:textSize="@dimen/descr_text_size"
+								tools:text="@string/get_telegram_after_creating_account" />
+
+						</LinearLayout>
+
+						<LinearLayout
+							android:id="@+id/progress_layout"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:gravity="center"
+							android:orientation="vertical"
+							android:visibility="gone">
+
+							<ProgressBar
+								android:layout_width="@dimen/progress_bar_size_small"
+								android:layout_height="@dimen/progress_bar_size_small" />
+
+						</LinearLayout>
 
 					</LinearLayout>
 
 				</LinearLayout>
 
-			</LinearLayout>
+			</ScrollView>
 
-		</ScrollView>
+			<Button
+				android:id="@+id/continue_button"
+				style="@style/DialogActionButtonActive"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom|center_horizontal"
+				android:layout_marginBottom="@dimen/dialog_button_bottom_padding"
+				android:text="@string/shared_string_continue" />
 
-		<Button
-			android:id="@+id/continue_button"
-			style="@style/DialogActionButtonActive"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:layout_marginBottom="@dimen/dialog_button_bottom_padding"
-			android:layout_marginLeft="@dimen/content_padding_standard"
-			android:layout_marginRight="@dimen/content_padding_standard"
-			android:layout_marginTop="@dimen/content_padding_standard"
-			android:text="@string/shared_string_continue" />
+		</FrameLayout>
 
 	</LinearLayout>
 
diff --git a/OsmAnd-telegram/res/values/colors.xml b/OsmAnd-telegram/res/values/colors.xml
index eb17b5ffec..2e23d359e2 100644
--- a/OsmAnd-telegram/res/values/colors.xml
+++ b/OsmAnd-telegram/res/values/colors.xml
@@ -36,8 +36,4 @@
 
 	<color name="app_bar_title_light">#333333</color>
 	
-	<color name="dialog_continue_btn_active_bg">#5959ff</color>
-	<color name="dialog_continue_btn_non_active_bg">#f0f0f0</color>
-	<color name="dialog_no_telegram_bg">#f0f0f0</color>
-
 </resources>
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index 022fd3bd39..aed1826347 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -17,8 +17,7 @@
 	<dimen name="dialog_welcome_padding_horizontal">48dp</dimen>
 
 	<dimen name="dialog_button_height">36dp</dimen>
-	<dimen name="dialog_button_radius">2dp</dimen>
-	<dimen name="dialog_continue_button_radius">4dp</dimen>
+	<dimen name="dialog_button_radius">4dp</dimen>
 	<dimen name="dialog_button_bottom_padding">40dp</dimen>
 	<dimen name="dialog_welcome_title_bottom_padding">96dp</dimen>
 	<dimen name="dialog_welcome_title_top_padding">120dp</dimen>
@@ -46,7 +45,7 @@
 
 	<dimen name="buttons_bottom_bar_height">56dp</dimen>
 
-	<dimen name="text_button_letter_spacing" format="float">0.01</dimen>
+	<dimen name="text_button_letter_spacing" format="float">0.07</dimen>
 
 	<!-- Text sizes -->
 
@@ -56,7 +55,6 @@
 	<dimen name="title_login_text_size">20sp</dimen>
 	<dimen name="title_welcome_text_size">32sp</dimen>
 	<dimen name="descr_text_size">16sp</dimen>
-	<dimen name="continue_btn_text_size">14sp</dimen>
 
 	<dimen name="list_item_title_text_size">16sp</dimen>
 	<dimen name="list_item_description_text_size">12sp</dimen>
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index 828e390640..ffd7852488 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -5,7 +5,7 @@
 	<string name="get_telegram_after_creating_account">After creating an account, you can use this application.</string>
 	<string name="shared_string_all">All</string>
 	<string name="shared_string_off">Off</string>
-	<string name="authorization_already_registered_in_telegram">You need an already registered account and phone number in Telegram</string>
+	<string name="already_registered_in_telegram">You need an already registered account and phone number in Telegram</string>
 	<string name="do_not_have_telegram">I don`t have Telegram account</string>
 	<string name="enter_phone_number">Enter phone number</string>
 	<string name="enter_authentication_code">Enter authentication code</string>
diff --git a/OsmAnd-telegram/res/values/styles.xml b/OsmAnd-telegram/res/values/styles.xml
index 0285b13b6c..3b5918d5cc 100644
--- a/OsmAnd-telegram/res/values/styles.xml
+++ b/OsmAnd-telegram/res/values/styles.xml
@@ -48,13 +48,13 @@
 		<item name="android:paddingBottom">8dp</item>
 		<item name="android:textColor">@color/white</item>
 		<item name="android:textAllCaps">false</item>
-		<item name="android:textSize">@dimen/continue_btn_text_size</item>
-		<item name="android:background">@drawable/btn_round_4dp</item>
-		<item name="android:letterSpacing">0.07</item>
+		<item name="android:textSize">@dimen/text_button_text_size</item>
+		<item name="android:background">@drawable/btn_round_active</item>
+		<item name="android:letterSpacing">@dimen/text_button_letter_spacing</item>
 	</style>
 
 	<style name="DialogActionButtonActive.Welcome">
-		<item name="android:background">@drawable/btn_round_purple</item>
+		<item name="android:background">@drawable/btn_round_active</item>
 	</style>
 
 	<style name="DialogActionButton">
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 734b6f223f..91216fe14b 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -8,7 +8,6 @@ import android.support.annotation.StringRes
 import android.support.v4.app.DialogFragment
 import android.support.v4.app.FragmentManager
 import android.support.v7.widget.AppCompatImageView
-import android.text.Html
 import android.text.TextUtils
 import android.view.inputmethod.EditorInfo
 import android.widget.*
@@ -17,12 +16,12 @@ import net.osmand.telegram.R
 import net.osmand.telegram.utils.AndroidUtils
 import studio.carbonylgroup.textfieldboxes.ExtendedEditText
 import android.content.Intent
-import android.graphics.Rect
 import android.net.Uri
 import android.support.v4.content.ContextCompat
 import android.view.*
 import android.view.ViewGroup
 import android.text.Editable
+import android.text.Html
 import android.text.TextWatcher
 
 
@@ -36,15 +35,11 @@ class LoginDialogFragment : DialogFragment() {
 		private const val LOGIN_DIALOG_TYPE_PARAM_KEY = "login_dialog_type_param"
 		private const val SHOW_PROGRESS_PARAM_KEY = "show_progress_param"
 		private const val SHOW_WELCOME_DIALOG_PARAM_KEY = "show_welcome_dialog_param"
-		private const val TELEGRAM_PLAY_MARKET_LINK = "market://details?id=org.telegram.messenger"
-		private const val TELEGRAM_NO_PLAY_MARKET_LINK = "https://play.google.com/store/apps/details?id=org.telegram.messenger"
-		private const val SOFT_KEYBOARD_MIN_DETECTION_SIZE = 0.15
+		private const val TELEGRAM_PACKAGE = "org.telegram.messenger"
 
 		var welcomeDialogShown = false
 			private set
 
-		private var softKeyboardShown: Boolean = false
-
 		fun showWelcomeDialog(fragmentManager: FragmentManager) {
 			welcomeDialogShown = true
 			showDialog(fragmentManager, welcomeDialog = true)
@@ -97,8 +92,8 @@ class LoginDialogFragment : DialogFragment() {
 
 	private var showWelcomeDialog = false
 	private var showProgress = false
-	private var continueButtonEnabled = false
 	private var dismissedManually = false
+	private lateinit var continueButton: Button
 
 	enum class LoginDialogType(val viewId: Int, val editorId: Int,
 							   @StringRes val titleId: Int, @StringRes val descriptionId: Int,
@@ -132,32 +127,12 @@ class LoginDialogFragment : DialogFragment() {
 			showWelcomeDialog = args.getBoolean(SHOW_WELCOME_DIALOG_PARAM_KEY, false)
 		}
 		val view = inflater.inflate(R.layout.login_dialog, container)
-		buildDialog(view)
-		view.viewTreeObserver.addOnGlobalLayoutListener {
-			val r = Rect()
-			view.getWindowVisibleDisplayFrame(r)
-			val screenHeight = view.rootView.height
-			val keypadHeight = screenHeight - r.bottom
-			val softKeyboardVisible = keypadHeight > screenHeight * SOFT_KEYBOARD_MIN_DETECTION_SIZE
-			if (!softKeyboardShown && softKeyboardVisible) {
-				softKeyboardShown = softKeyboardVisible
-				val continueButton = view?.findViewById<Button>(R.id.continue_button)
-				if (continueButton?.layoutParams is ViewGroup.MarginLayoutParams) {
-					val p = continueButton.layoutParams as ViewGroup.MarginLayoutParams
-					p.setMargins(p.leftMargin, p.topMargin, p.rightMargin, AndroidUtils.dpToPx(context!!, 16F))
-					continueButton.requestLayout()
-				}
-			} else if (softKeyboardShown && !softKeyboardVisible) {
-				softKeyboardShown = softKeyboardVisible
-				val continueButton = view?.findViewById<Button>(R.id.continue_button)
-				if (continueButton?.layoutParams is ViewGroup.MarginLayoutParams) {
-					val p = continueButton.layoutParams as ViewGroup.MarginLayoutParams
-					p.setMargins(p.leftMargin, p.topMargin, p.rightMargin, AndroidUtils.dpToPx(context!!, 40F))
-					continueButton.requestLayout()
-				}
-			}
-			softKeyboardShown = softKeyboardVisible
+		val button = view?.findViewById<Button>(R.id.continue_button)
+		if (button != null) {
+			continueButton = button
 		}
+
+		buildDialog(view)
 		return view
 	}
 
@@ -251,20 +226,12 @@ class LoginDialogFragment : DialogFragment() {
 								override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
 								override fun afterTextChanged(s: Editable) {
 									if (continueButton != null) {
-										if (s.isEmpty()) {
-											changeContinueButton(continueButton, false)
-										} else {
-											changeContinueButton(continueButton, true)
-										}
+										changeContinueButtonEnabled(!s.isEmpty())
 									}
 								}
 							})
 							if (continueButton != null) {
-								if (editText.text.isEmpty()) {
-									changeContinueButton(continueButton, false)
-								} else {
-									changeContinueButton(continueButton, true)
-								}
+								changeContinueButtonEnabled(!editText.text.isEmpty())
 							}
 						}
 
@@ -276,7 +243,7 @@ class LoginDialogFragment : DialogFragment() {
 
 							noTelegramViewContainer?.setOnClickListener {
 								val focusedView = dialog.currentFocus
-								if (focusedView != null && softKeyboardShown) {
+								if (focusedView != null) {
 									AndroidUtils.hideSoftKeyboard(activity!!, focusedView)
 								}
 								updateDialog(LoginDialogType.GET_TELEGRAM, false)
@@ -293,10 +260,9 @@ class LoginDialogFragment : DialogFragment() {
 							val getTelegramButton: ImageView? = view.findViewById(R.id.google_play_button)
 							getTelegramButton?.setImageResource(R.drawable.google_play_badge)
 							getTelegramButton?.setOnClickListener {
-								try {
-									startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(TELEGRAM_PLAY_MARKET_LINK)))
-								} catch (anfe: android.content.ActivityNotFoundException) {
-									startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(TELEGRAM_NO_PLAY_MARKET_LINK)))
+								val app = getMainActivity()?.application
+								if (app != null) {
+									startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(AndroidUtils.getPlayMarketLink(app, TELEGRAM_PACKAGE))))
 								}
 							}
 							view.findViewById<Button>(R.id.continue_button).visibility = View.GONE
@@ -316,16 +282,15 @@ class LoginDialogFragment : DialogFragment() {
 				progressView?.visibility = View.GONE
 			}
 		}
-		val continueButton: Button? = view?.findViewById(R.id.continue_button)
 		if (continueButton != null) {
-			continueButton.isEnabled = !showProgress && continueButtonEnabled
+			continueButton.isEnabled = !showProgress && continueButton.isEnabled
 			if (showProgress) {
 				continueButton.setOnClickListener(null)
 			} else {
 				continueButton.setOnClickListener {
 					showWelcomeDialog = false
 					for (t in LoginDialogType.values()) {
-						val layout: View? = view.findViewById(t.viewId)
+						val layout: View? = view?.findViewById(t.viewId)
 						val contains = t == loginDialogActiveType
 						if (contains && layout != null) {
 							val editText: ExtendedEditText? = layout.findViewById(t.editorId)
@@ -345,7 +310,7 @@ class LoginDialogFragment : DialogFragment() {
 			if (loginDialogActiveType == LoginDialogType.ENTER_PHONE_NUMBER) {
 				showWelcomeDialog = true
 				val focusedView = dialog.currentFocus
-				if (focusedView != null && softKeyboardShown) {
+				if (focusedView != null) {
 					AndroidUtils.hideSoftKeyboard(activity!!, focusedView)
 				}
 				buildDialog(view)
@@ -391,17 +356,12 @@ class LoginDialogFragment : DialogFragment() {
 		buildDialog(view)
 	}
 
-	private fun changeContinueButton(continueButton: Button, isActive: Boolean = false) {
-		if (isActive) {
-			continueButton.setBackgroundResource(R.drawable.btn_round_purple)
+	private fun changeContinueButtonEnabled(enabled: Boolean) {
+		if (enabled) {
 			continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.white))
-			continueButtonEnabled = isActive
-			continueButton.isEnabled = continueButtonEnabled
 		} else {
-			continueButton.setBackgroundResource(R.drawable.btn_round_4dp)
 			continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.secondary_text_light))
-			continueButtonEnabled = isActive
-			continueButton.isEnabled = continueButtonEnabled
 		}
+		continueButton.isEnabled = enabled
 	}
 }
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
index 2e257b3a05..bb448abfe1 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
@@ -73,4 +73,21 @@ object AndroidUtils {
 			FileProvider.getUriForFile(context,  "net.osmand.telegram.fileprovider", file)
 		}
 	}
+
+	fun isGooglePlayInstalled(ctx: Context): Boolean {
+		try {
+			ctx.packageManager.getPackageInfo("com.android.vending", 0)
+		} catch (e: PackageManager.NameNotFoundException) {
+			return false
+		}
+
+		return true
+	}
+
+	fun getPlayMarketLink(ctx: Context, packageName: String): String {
+		if (isGooglePlayInstalled(ctx)) {
+			return "market://details?id=$packageName"
+		}
+		return "https://play.google.com/store/apps/details?id=$packageName"
+	}
 }

From 69c668274c4a6808a702631a24fb0492d695a355 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 18:47:47 +0300
Subject: [PATCH 09/15] polish ui and refactor continueButton

---
 .../res/drawable/google_play_badge.png        | Bin 13957 -> 0 bytes
 OsmAnd-telegram/res/layout/login_dialog.xml   |  64 +++++++++++-------
 OsmAnd-telegram/res/values/colors.xml         |   2 +-
 OsmAnd-telegram/res/values/dimens.xml         |   8 ++-
 .../osmand/telegram/ui/LoginDialogFragment.kt |  50 +++++++-------
 5 files changed, 69 insertions(+), 55 deletions(-)
 delete mode 100644 OsmAnd-telegram/res/drawable/google_play_badge.png

diff --git a/OsmAnd-telegram/res/drawable/google_play_badge.png b/OsmAnd-telegram/res/drawable/google_play_badge.png
deleted file mode 100644
index c77b7464b049c7d6666155c61df5f486f241f760..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13957
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
X%LPP+756@c3`<o}Q=v-kpWy!m7bkT<

diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index f547cb9490..45b8cf7bfe 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -32,7 +32,6 @@
 				android:layout_height="match_parent"
 				android:layout_marginLeft="@dimen/dialog_welcome_padding_horizontal"
 				android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
-				android:layout_marginTop="85dp"
 				android:orientation="vertical"
 				android:visibility="visible">
 
@@ -40,7 +39,8 @@
 					android:id="@+id/welcome_title"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="70dp"
+					android:layout_marginBottom="@dimen/dialog_welcome_title_bottom_padding"
+					android:layout_marginTop="@dimen/dialog_welcome_title_top_margin"
 					android:letterSpacing="-0.03"
 					android:text="Hello!"
 					android:textColor="?attr/ctrl_active_color"
@@ -52,8 +52,8 @@
 					android:layout_width="wrap_content"
 					android:layout_height="0dp"
 					android:layout_weight="1"
-					android:letterSpacing="0.0156"
-					android:lineSpacingMultiplier="1.25"
+					android:letterSpacing="@dimen/text_description_letter_spacing"
+					android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
 					android:textColor="@color/app_bar_title_light"
 					android:textSize="@dimen/descr_text_size"
 					tools:text="@string/welcome_descr" />
@@ -83,7 +83,7 @@
 		android:background="?attr/card_bg_color"
 		android:fitsSystemWindows="true"
 		android:orientation="vertical"
-		android:visibility="gone"
+		android:visibility="visible"
 		tools:visibility="visible">
 
 		<LinearLayout
@@ -138,14 +138,14 @@
 						android:id="@+id/login_description"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_marginBottom="@dimen/content_padding_standard"
+						android:layout_marginBottom="@dimen/dialog_description_margin"
 						android:layout_marginEnd="@dimen/dialog_welcome_padding_horizontal"
 						android:layout_marginLeft="@dimen/dialog_padding_horizontal"
 						android:layout_marginRight="@dimen/dialog_welcome_padding_horizontal"
 						android:layout_marginStart="@dimen/dialog_padding_horizontal"
-						android:layout_marginTop="@dimen/content_padding_standard"
-						android:letterSpacing="0.0156"
-						android:lineSpacingMultiplier="1.25"
+						android:layout_marginTop="@dimen/dialog_description_margin"
+						android:letterSpacing="@dimen/text_description_letter_spacing"
+						android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
 						android:textColor="@color/app_bar_title_light"
 						android:textSize="@dimen/descr_text_size"
 						tools:text="@string/already_registered_in_telegram" />
@@ -162,6 +162,7 @@
 							android:id="@+id/no_telegram"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
+							android:layout_marginBottom="@dimen/content_padding_half"
 							android:background="@drawable/btn_border_bg"
 							android:gravity="center_vertical"
 							android:visibility="gone"
@@ -171,18 +172,24 @@
 								android:id="@+id/no_telegram_title"
 								android:layout_width="0dp"
 								android:layout_height="wrap_content"
-								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:layout_marginBottom="10dp"
 								android:layout_marginLeft="@dimen/content_padding_standard"
 								android:layout_marginRight="@dimen/content_padding_standard"
-								android:layout_marginTop="@dimen/content_padding_standard"
+								android:layout_marginTop="10dp"
 								android:layout_weight="1"
 								android:ellipsize="end"
 								android:gravity="center_vertical"
-								android:maxLines="2"
+								android:letterSpacing="@dimen/text_description_letter_spacing"
 								android:text="@string/do_not_have_telegram"
 								android:textColor="?attr/ctrl_active_color"
-								android:textSize="@dimen/text_button_text_size"
-								app:typeface="@string/font_roboto_mono_bold" />
+								android:textSize="@dimen/hint_text_size"
+								android:textStyle="bold" />
+
+							<View
+								android:layout_width="0dp"
+								android:layout_height="0dp"
+								android:layout_weight="0.3"
+								android:background="@color/white" />
 
 							<ImageView
 								android:id="@+id/no_telegram_button"
@@ -193,29 +200,31 @@
 								android:contentDescription="@string/do_not_have_telegram"
 								android:scaleType="centerInside"
 								android:src="@drawable/ic_arrow_forward"
-								android:tint="?attr/icon_color"
-								tools:tint="@color/icon_light" />
+								android:tint="?attr/ctrl_active_color"
+								tools:tint="@color/ctrl_active_light" />
 
 						</LinearLayout>
 
 						<net.osmand.telegram.ui.views.TextViewEx
-							android:id="@+id/login_input_type_descr"
+							android:id="@+id/edittext_descr"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:layout_marginBottom="@dimen/content_padding_standard"
+							android:layout_marginBottom="@dimen/dialog_description_margin"
 							android:layout_marginLeft="@dimen/content_padding_standard"
 							android:layout_marginRight="@dimen/content_padding_standard"
+							android:layout_marginTop="@dimen/content_padding_big"
+							android:letterSpacing="@dimen/text_description_letter_spacing"
 							android:text="@string/enter_phone_number"
 							android:textColor="@color/app_bar_title_light"
-							android:textSize="@dimen/descr_text_size"
-							app:typeface="@string/font_roboto_mono_bold" />
+							android:textSize="@dimen/descr_text_size" />
 
 						<LinearLayout
 							android:id="@+id/enter_phone_number_layout"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:orientation="vertical"
-							android:visibility="visible">
+							android:visibility="visible"
+							tools:visibility="visible">
 
 							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
 								android:layout_width="match_parent"
@@ -238,9 +247,11 @@
 								android:layout_marginBottom="@dimen/content_padding_standard"
 								android:layout_marginLeft="@dimen/content_padding_standard"
 								android:layout_marginRight="@dimen/content_padding_standard"
-								android:layout_marginTop="@dimen/content_padding_standard"
+								android:layout_marginTop="10dp"
+								android:letterSpacing="@dimen/text_description_letter_spacing"
+								android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
 								android:text="@string/phone_number_descr"
-								android:textSize="@dimen/descr_text_size" />
+								android:textSize="@dimen/hint_text_size" />
 
 						</LinearLayout>
 
@@ -250,7 +261,8 @@
 							android:layout_height="wrap_content"
 							android:orientation="vertical"
 							android:paddingBottom="@dimen/content_padding_standard"
-							android:visibility="gone">
+							android:visibility="gone"
+							tools:visibility="gone">
 
 							<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
 								android:layout_width="match_parent"
@@ -309,6 +321,8 @@
 								android:layout_marginBottom="@dimen/content_padding_standard"
 								android:layout_marginLeft="@dimen/content_padding_standard"
 								android:layout_marginRight="@dimen/content_padding_standard"
+								android:letterSpacing="@dimen/text_description_letter_spacing"
+								android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
 								android:textColor="@color/app_bar_title_light"
 								android:textSize="@dimen/descr_text_size"
 								tools:text="@string/get_telegram_description_continue" />
@@ -320,7 +334,7 @@
 								android:layout_marginBottom="@dimen/content_padding_standard"
 								android:layout_marginLeft="@dimen/content_padding_standard"
 								android:layout_marginRight="@dimen/content_padding_standard"
-								android:src="@drawable/google_play_badge" />
+								android:src="@drawable/img_google_play_badge" />
 
 							<TextView
 								android:id="@+id/get_telegram_description_second"
diff --git a/OsmAnd-telegram/res/values/colors.xml b/OsmAnd-telegram/res/values/colors.xml
index 2e23d359e2..31d0772846 100644
--- a/OsmAnd-telegram/res/values/colors.xml
+++ b/OsmAnd-telegram/res/values/colors.xml
@@ -35,5 +35,5 @@
 	<color name="primary_btn_text_dark">#cccccc</color>
 
 	<color name="app_bar_title_light">#333333</color>
-	
+
 </resources>
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index aed1826347..01a8538862 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -15,12 +15,13 @@
 	<dimen name="dialog_padding_horizontal">64dp</dimen>
 	<dimen name="dialog_padding_horizontal_edit">44dp</dimen>
 	<dimen name="dialog_welcome_padding_horizontal">48dp</dimen>
+	<dimen name="dialog_description_margin">12dp</dimen>
 
 	<dimen name="dialog_button_height">36dp</dimen>
 	<dimen name="dialog_button_radius">4dp</dimen>
 	<dimen name="dialog_button_bottom_padding">40dp</dimen>
-	<dimen name="dialog_welcome_title_bottom_padding">96dp</dimen>
-	<dimen name="dialog_welcome_title_top_padding">120dp</dimen>
+	<dimen name="dialog_welcome_title_bottom_padding">70dp</dimen>
+	<dimen name="dialog_welcome_title_top_margin">85dp</dimen>
 
 	<dimen name="list_item_height">56dp</dimen>
 	<dimen name="list_item_height_min">48dp</dimen>
@@ -46,6 +47,8 @@
 	<dimen name="buttons_bottom_bar_height">56dp</dimen>
 
 	<dimen name="text_button_letter_spacing" format="float">0.07</dimen>
+	<dimen name="text_description_letter_spacing" format="float">0.0156</dimen>
+	<dimen name="text_description_line_spacing_multiplier" format="float">1.25</dimen>
 
 	<!-- Text sizes -->
 
@@ -55,6 +58,7 @@
 	<dimen name="title_login_text_size">20sp</dimen>
 	<dimen name="title_welcome_text_size">32sp</dimen>
 	<dimen name="descr_text_size">16sp</dimen>
+	<dimen name="hint_text_size">14sp</dimen>
 
 	<dimen name="list_item_title_text_size">16sp</dimen>
 	<dimen name="list_item_description_text_size">12sp</dimen>
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 91216fe14b..42402e0e30 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import android.text.Editable
 import android.text.Html
 import android.text.TextWatcher
+import android.util.TypedValue
 
 
 class LoginDialogFragment : DialogFragment() {
@@ -194,10 +195,11 @@ class LoginDialogFragment : DialogFragment() {
 					if (layout != null) {
 						val titleView: TextView? = view.findViewById(R.id.login_title)
 						val descriptionView: TextView? = view.findViewById(R.id.login_description)
-						val inputTypeDescriptionView: TextView? = view.findViewById(R.id.login_input_type_descr)
+						val inputTypeDescriptionView: TextView? = view.findViewById(R.id.edittext_descr)
 						if (t.inputTypeDescriptionId != 0) {
 							val inputTypeDescription = getText(t.inputTypeDescriptionId).toString() + ":"
 							inputTypeDescriptionView?.text = inputTypeDescription
+							inputTypeDescriptionView?.visibility = View.VISIBLE
 						} else {
 							inputTypeDescriptionView?.visibility = View.GONE
 						}
@@ -206,8 +208,7 @@ class LoginDialogFragment : DialogFragment() {
 						descriptionView?.text = getText(t.descriptionId)
 
 						layout.visibility = View.VISIBLE
-						val editText: ExtendedEditText? = layout.findViewById<ExtendedEditText>(t.editorId)
-						val continueButton: Button? = view.findViewById(R.id.continue_button)
+						val editText: ExtendedEditText? = layout.findViewById(t.editorId)
 						if (editText != null && !showWelcomeDialog) {
 							editText.setOnEditorActionListener { _, actionId, _ ->
 								if (actionId == EditorInfo.IME_ACTION_DONE) {
@@ -225,14 +226,11 @@ class LoginDialogFragment : DialogFragment() {
 								override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 								override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
 								override fun afterTextChanged(s: Editable) {
-									if (continueButton != null) {
-										changeContinueButtonEnabled(!s.isEmpty())
-									}
+									changeContinueButtonEnabled(!s.isEmpty())
 								}
 							})
-							if (continueButton != null) {
-								changeContinueButtonEnabled(!editText.text.isEmpty())
-							}
+							changeContinueButtonEnabled(!editText.text.isEmpty())
+							editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16F)
 						}
 
 						val noTelegramViewContainer: LinearLayout? = view.findViewById(R.id.no_telegram)
@@ -258,7 +256,7 @@ class LoginDialogFragment : DialogFragment() {
 							view.findViewById<TextView>(R.id.get_telegram_description_first)?.text = getText(R.string.get_telegram_description_continue)
 							view.findViewById<TextView>(R.id.get_telegram_description_second)?.text = getText(R.string.get_telegram_after_creating_account)
 							val getTelegramButton: ImageView? = view.findViewById(R.id.google_play_button)
-							getTelegramButton?.setImageResource(R.drawable.google_play_badge)
+							getTelegramButton?.setImageResource(R.drawable.img_google_play_badge)
 							getTelegramButton?.setOnClickListener {
 								val app = getMainActivity()?.application
 								if (app != null) {
@@ -282,23 +280,21 @@ class LoginDialogFragment : DialogFragment() {
 				progressView?.visibility = View.GONE
 			}
 		}
-		if (continueButton != null) {
-			continueButton.isEnabled = !showProgress && continueButton.isEnabled
-			if (showProgress) {
-				continueButton.setOnClickListener(null)
-			} else {
-				continueButton.setOnClickListener {
-					showWelcomeDialog = false
-					for (t in LoginDialogType.values()) {
-						val layout: View? = view?.findViewById(t.viewId)
-						val contains = t == loginDialogActiveType
-						if (contains && layout != null) {
-							val editText: ExtendedEditText? = layout.findViewById(t.editorId)
-							val text = editText?.text.toString()
-							if (!TextUtils.isEmpty(text) && text.length > 1) {
-								continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.secondary_text_light))
-								applyAuthParam(t, text)
-							}
+		continueButton.isEnabled = !showProgress && continueButton.isEnabled
+		if (showProgress) {
+			continueButton.setOnClickListener(null)
+		} else {
+			continueButton.setOnClickListener {
+				showWelcomeDialog = false
+				for (t in LoginDialogType.values()) {
+					val layout: View? = view?.findViewById(t.viewId)
+					val contains = t == loginDialogActiveType
+					if (contains && layout != null) {
+						val editText: ExtendedEditText? = layout.findViewById(t.editorId)
+						val text = editText?.text.toString()
+						if (!TextUtils.isEmpty(text) && text.length > 1) {
+							continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.secondary_text_light))
+							applyAuthParam(t, text)
 						}
 					}
 				}

From ccdec89cdb53f15b4d3f0b5dac776cbddb651ad7 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 18:56:27 +0300
Subject: [PATCH 10/15] add letter_spacing for welcome title

---
 OsmAnd-telegram/res/layout/login_dialog.xml |  4 ++--
 OsmAnd-telegram/res/values/dimens.xml       |  1 +
 OsmAnd-telegram/res/values/strings.xml      | 17 +++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index 45b8cf7bfe..f931571b73 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -41,8 +41,8 @@
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="@dimen/dialog_welcome_title_bottom_padding"
 					android:layout_marginTop="@dimen/dialog_welcome_title_top_margin"
-					android:letterSpacing="-0.03"
-					android:text="Hello!"
+					android:letterSpacing="@dimen/title_letter_spacing"
+					android:text="@string/shared_string_welcome"
 					android:textColor="?attr/ctrl_active_color"
 					android:textSize="@dimen/title_welcome_text_size"
 					app:typeface="@string/font_roboto_mono_bold" />
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index 01a8538862..1efb279022 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -49,6 +49,7 @@
 	<dimen name="text_button_letter_spacing" format="float">0.07</dimen>
 	<dimen name="text_description_letter_spacing" format="float">0.0156</dimen>
 	<dimen name="text_description_line_spacing_multiplier" format="float">1.25</dimen>
+	<dimen name="title_letter_spacing" format="float">-0.03</dimen>
 
 	<!-- Text sizes -->
 
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index ffd7852488..ee2514c4a0 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
+	<string name="versionFeatures">+play_market -amazon -blackberry</string>
 	<string name="get_telegram_title">Registration in Telegram</string>
 	<string name="get_telegram_account_first">You need an account in Telegram to use the capabilities of OsmAnd Location Sharing.</string>
 	<string name="get_telegram_description_continue">If you want to continue, please install the Telegram from Google Play and register your account.</string>
@@ -7,8 +8,8 @@
 	<string name="shared_string_off">Off</string>
 	<string name="already_registered_in_telegram">You need an already registered account and phone number in Telegram</string>
 	<string name="do_not_have_telegram">I don`t have Telegram account</string>
-	<string name="enter_phone_number">Enter phone number</string>
-	<string name="enter_authentication_code">Enter authentication code</string>
+	<string name="enter_phone_number">Введите номер телефона</string>
+	<string name="enter_authentication_code">Введите код авторизации</string>
 	<string name="set_visible_time_for_all">Set visible time for all</string>
 	<string name="hours_and_minutes_format">%1$d h %2$d m</string>
 	<string name="minutes_format">%1$d m</string>
@@ -25,11 +26,11 @@
 	<string name="show_on_map">Show on map</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Phone number</string>
-	<string name="phone_number_descr">Phone number in the international format</string>
+	<string name="phone_number_descr">Номер должен быть в международном формате: +380 99 888 77 66</string>
 	<string name="shared_string_password">Password</string>
-	<string name="enter_code">Enter code</string>
+	<string name="enter_code">Введите код</string>
 	<string name="authentication_code">Authentication code</string>
-	<string name="authentication_code_descr">You have been sent a code by Telegram. It will be used by OsmAnd to login into your account.</string>
+	<string name="authentication_code_descr">Telegram отправил вам код авторизации, который разрешить OsmAnd подключиться к вашей учетной записи.</string>
 	<string name="enter_password">Enter password</string>
 	<string name="password_descr">Please enter your Telegram account\'s password to finish authorization</string>
 	<string name="shared_string_login">Login</string>
@@ -61,8 +62,8 @@
 	<string name="install_osmand">Install OsmAnd</string>
 	<string name="show_users_on_map">Show users on map</string>
 	<string name="active_chats">Active chats</string>
-	<string name="shared_string_authorization">Authorization</string>
-	<string name="shared_string_authorization_descr">Please enter the phone number of your Telegram account in the international format</string>
+	<string name="shared_string_authorization">Авторизация</string>
+	<string name="shared_string_authorization_descr">Вам необходим уже зарегестрированный аккаунт и номер телефона в Telegram.</string>
 	<string name="shared_string_welcome">Welcome</string>
 
 	<string name="yard">yd</string>
@@ -91,7 +92,7 @@
 	<string name="shared_string_hour_short">h</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="plus">+</string>
-	<string name="welcome_descr"><![CDATA[<b>OsmAnd Location Sharing</b> allows you to share your location and see locations of other people in the OsmAnd.<br/><br/>The application works on base of Telegram API. To use this app you must have a Telegram account.]]></string>
+	<string name="welcome_descr">Делитесь вашим ........... местоположение, и просматривайте местоположение ваших контактов на карте в OsmAnd.</string>
 	<string name="my_location">My location</string>
 	<string name="live_now">Live now</string>
 

From afdb83f84844094b86ad60e1bee18996d26cd5d9 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 19:15:53 +0300
Subject: [PATCH 11/15] add match parent continue button if keyboard visible

---
 OsmAnd-telegram/res/layout/login_dialog.xml   |  2 ++
 .../osmand/telegram/ui/LoginDialogFragment.kt | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index f931571b73..9ecec70ff7 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -376,6 +376,8 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="bottom|center_horizontal"
 				android:layout_marginBottom="@dimen/dialog_button_bottom_padding"
+				android:layout_marginLeft="@dimen/content_padding_half"
+				android:layout_marginRight="@dimen/content_padding_half"
 				android:text="@string/shared_string_continue" />
 
 		</FrameLayout>
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 42402e0e30..dd13f1dedf 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -16,6 +16,7 @@ import net.osmand.telegram.R
 import net.osmand.telegram.utils.AndroidUtils
 import studio.carbonylgroup.textfieldboxes.ExtendedEditText
 import android.content.Intent
+import android.graphics.Rect
 import android.net.Uri
 import android.support.v4.content.ContextCompat
 import android.view.*
@@ -37,10 +38,13 @@ class LoginDialogFragment : DialogFragment() {
 		private const val SHOW_PROGRESS_PARAM_KEY = "show_progress_param"
 		private const val SHOW_WELCOME_DIALOG_PARAM_KEY = "show_welcome_dialog_param"
 		private const val TELEGRAM_PACKAGE = "org.telegram.messenger"
+		private const val SOFT_KEYBOARD_MIN_DETECTION_SIZE = 0.15
 
 		var welcomeDialogShown = false
 			private set
 
+		private var softKeyboardShown: Boolean = false
+
 		fun showWelcomeDialog(fragmentManager: FragmentManager) {
 			welcomeDialogShown = true
 			showDialog(fragmentManager, welcomeDialog = true)
@@ -134,9 +138,37 @@ class LoginDialogFragment : DialogFragment() {
 		}
 
 		buildDialog(view)
+		view.viewTreeObserver.addOnGlobalLayoutListener {
+			val r = Rect()
+			view.getWindowVisibleDisplayFrame(r)
+			val screenHeight = view.rootView.height
+			val keypadHeight = screenHeight - r.bottom
+			val softKeyboardVisible = keypadHeight > screenHeight * SOFT_KEYBOARD_MIN_DETECTION_SIZE
+			if (!softKeyboardShown && softKeyboardVisible) {
+				softKeyboardShown = softKeyboardVisible
+				setContinueButtonSize(true)
+			} else if (softKeyboardShown && !softKeyboardVisible) {
+				setContinueButtonSize(false)
+			}
+			softKeyboardShown = softKeyboardVisible
+		}
 		return view
 	}
 
+	private fun setContinueButtonSize(isWide: Boolean) {
+		val params = continueButton.layoutParams
+		if (params is ViewGroup.MarginLayoutParams) {
+			if (isWide) {
+				params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, AndroidUtils.dpToPx(context!!, 16F))
+				params.width = ViewGroup.LayoutParams.MATCH_PARENT
+			} else {
+				params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, AndroidUtils.dpToPx(context!!, 40F))
+				params.width = ViewGroup.LayoutParams.WRAP_CONTENT
+			}
+			continueButton.requestLayout()
+		}
+	}
+
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 		return object : Dialog(requireActivity(), theme) {
 			override fun onBackPressed() {

From 20a59b607e4941c8cc89a8564b7ddf507e0aad12 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 19:19:12 +0300
Subject: [PATCH 12/15] remove unnecessary string changes

---
 OsmAnd-telegram/res/values/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index ee2514c4a0..f7aecc81cd 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -26,11 +26,11 @@
 	<string name="show_on_map">Show on map</string>
 	<string name="app_name">OsmAnd Telegram</string>
 	<string name="phone_number_title">Phone number</string>
-	<string name="phone_number_descr">Номер должен быть в международном формате: +380 99 888 77 66</string>
+	<string name="phone_number_descr">Phone number in the international format</string>
 	<string name="shared_string_password">Password</string>
-	<string name="enter_code">Введите код</string>
+	<string name="enter_code">Enter code</string>
 	<string name="authentication_code">Authentication code</string>
-	<string name="authentication_code_descr">Telegram отправил вам код авторизации, который разрешить OsmAnd подключиться к вашей учетной записи.</string>
+	<string name="authentication_code_descr">You have been sent a code by Telegram. It will be used by OsmAnd to login into your account.</string>
 	<string name="enter_password">Enter password</string>
 	<string name="password_descr">Please enter your Telegram account\'s password to finish authorization</string>
 	<string name="shared_string_login">Login</string>
@@ -62,8 +62,8 @@
 	<string name="install_osmand">Install OsmAnd</string>
 	<string name="show_users_on_map">Show users on map</string>
 	<string name="active_chats">Active chats</string>
-	<string name="shared_string_authorization">Авторизация</string>
-	<string name="shared_string_authorization_descr">Вам необходим уже зарегестрированный аккаунт и номер телефона в Telegram.</string>
+	<string name="shared_string_authorization">Authorization</string>
+	<string name="shared_string_authorization_descr">Please enter the phone number of your Telegram account in the international format</string>
 	<string name="shared_string_welcome">Welcome</string>
 
 	<string name="yard">yd</string>
@@ -92,9 +92,9 @@
 	<string name="shared_string_hour_short">h</string>
 	<string name="shared_string_minute_short">min</string>
 	<string name="plus">+</string>
-	<string name="welcome_descr">Делитесь вашим ........... местоположение, и просматривайте местоположение ваших контактов на карте в OsmAnd.</string>
+	<string name="welcome_descr"><![CDATA[<b>OsmAnd Location Sharing</b> allows you to share your location and see locations of other people in the OsmAnd.<br/><br/>The application works on base of Telegram API. To use this app you must have a Telegram account.]]></string>
 	<string name="my_location">My location</string>
 	<string name="live_now">Live now</string>
 
 
-</resources>
+</resources>
\ No newline at end of file

From 1bb2a3786bcde5d1aa51ecb2d5a7c66c06ef916e Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 6 Jul 2018 19:38:28 +0300
Subject: [PATCH 13/15] fix description padding and line spacing in get
 telegram dialog

---
 OsmAnd-telegram/res/layout/login_dialog.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index 9ecec70ff7..c1d34e8b57 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -321,6 +321,7 @@
 								android:layout_marginBottom="@dimen/content_padding_standard"
 								android:layout_marginLeft="@dimen/content_padding_standard"
 								android:layout_marginRight="@dimen/content_padding_standard"
+								android:layout_marginTop="@dimen/dialog_description_margin"
 								android:letterSpacing="@dimen/text_description_letter_spacing"
 								android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
 								android:textColor="@color/app_bar_title_light"
@@ -331,7 +332,7 @@
 								android:id="@+id/google_play_button"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
-								android:layout_marginBottom="@dimen/content_padding_standard"
+								android:layout_marginBottom="@dimen/content_padding_half"
 								android:layout_marginLeft="@dimen/content_padding_standard"
 								android:layout_marginRight="@dimen/content_padding_standard"
 								android:src="@drawable/img_google_play_badge" />
@@ -343,6 +344,8 @@
 								android:layout_marginBottom="@dimen/content_padding_standard"
 								android:layout_marginLeft="@dimen/content_padding_standard"
 								android:layout_marginRight="@dimen/content_padding_standard"
+								android:letterSpacing="@dimen/text_description_letter_spacing"
+								android:lineSpacingMultiplier="@dimen/text_description_line_spacing_multiplier"
 								android:textColor="@color/app_bar_title_light"
 								android:textSize="@dimen/descr_text_size"
 								tools:text="@string/get_telegram_after_creating_account" />

From cab3ef3f72ef3c9e6797c425a207b3cd043d98b4 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Mon, 9 Jul 2018 16:17:39 +0300
Subject: [PATCH 14/15] rename changeContinueButtonEnabled and clear resources

---
 .../res/drawable/btn_border_bg.xml            |  2 +-
 OsmAnd-telegram/res/values/strings.xml        |  1 -
 .../osmand/telegram/ui/LoginDialogFragment.kt | 37 ++++++++-----------
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/OsmAnd-telegram/res/drawable/btn_border_bg.xml b/OsmAnd-telegram/res/drawable/btn_border_bg.xml
index ed2c7083c6..e322bda1b2 100644
--- a/OsmAnd-telegram/res/drawable/btn_border_bg.xml
+++ b/OsmAnd-telegram/res/drawable/btn_border_bg.xml
@@ -17,7 +17,7 @@
 		<shape android:shape="rectangle">
 			<solid android:color="@null" />
 			<corners android:radius="@dimen/dialog_button_radius" />
-			<stroke android:width="1dp" android:color="#f0f0f0" />
+			<stroke android:width="1dp" android:color="@color/ctrl_light" />
 		</shape>
 	</item>
 
diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index f7aecc81cd..7705646677 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -1,5 +1,4 @@
 <resources>
-	<string name="versionFeatures">+play_market -amazon -blackberry</string>
 	<string name="get_telegram_title">Registration in Telegram</string>
 	<string name="get_telegram_account_first">You need an account in Telegram to use the capabilities of OsmAnd Location Sharing.</string>
 	<string name="get_telegram_description_continue">If you want to continue, please install the Telegram from Google Play and register your account.</string>
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index dd13f1dedf..8b51c12d29 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -132,10 +132,7 @@ class LoginDialogFragment : DialogFragment() {
 			showWelcomeDialog = args.getBoolean(SHOW_WELCOME_DIALOG_PARAM_KEY, false)
 		}
 		val view = inflater.inflate(R.layout.login_dialog, container)
-		val button = view?.findViewById<Button>(R.id.continue_button)
-		if (button != null) {
-			continueButton = button
-		}
+		continueButton = view.findViewById(R.id.continue_button)
 
 		buildDialog(view)
 		view.viewTreeObserver.addOnGlobalLayoutListener {
@@ -146,27 +143,24 @@ class LoginDialogFragment : DialogFragment() {
 			val softKeyboardVisible = keypadHeight > screenHeight * SOFT_KEYBOARD_MIN_DETECTION_SIZE
 			if (!softKeyboardShown && softKeyboardVisible) {
 				softKeyboardShown = softKeyboardVisible
-				setContinueButtonSize(true)
+				transformContinueButton(true)
 			} else if (softKeyboardShown && !softKeyboardVisible) {
-				setContinueButtonSize(false)
+				transformContinueButton(false)
 			}
 			softKeyboardShown = softKeyboardVisible
 		}
 		return view
 	}
 
-	private fun setContinueButtonSize(isWide: Boolean) {
-		val params = continueButton.layoutParams
-		if (params is ViewGroup.MarginLayoutParams) {
-			if (isWide) {
-				params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, AndroidUtils.dpToPx(context!!, 16F))
-				params.width = ViewGroup.LayoutParams.MATCH_PARENT
-			} else {
-				params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, AndroidUtils.dpToPx(context!!, 40F))
-				params.width = ViewGroup.LayoutParams.WRAP_CONTENT
-			}
-			continueButton.requestLayout()
+	private fun transformContinueButton(expanded: Boolean) {
+		val params = continueButton.layoutParams as ViewGroup.MarginLayoutParams
+		val margin = if (expanded) 16f else 40f
+		val width = if (expanded) ViewGroup.LayoutParams.MATCH_PARENT else ViewGroup.LayoutParams.WRAP_CONTENT
+		params.apply {
+			setMargins(leftMargin, topMargin, rightMargin, AndroidUtils.dpToPx(context!!, margin))
+			this.width = width
 		}
+		continueButton.requestLayout()
 	}
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -385,11 +379,10 @@ class LoginDialogFragment : DialogFragment() {
 	}
 
 	private fun changeContinueButtonEnabled(enabled: Boolean) {
-		if (enabled) {
-			continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.white))
-		} else {
-			continueButton.setTextColor(ContextCompat.getColor(context!!, R.color.secondary_text_light))
+		if (enabled != continueButton.isEnabled) {
+			val color = if (enabled) R.color.white else R.color.secondary_text_light
+			continueButton.setTextColor(ContextCompat.getColor(context!!, color))
+			continueButton.isEnabled = enabled
 		}
-		continueButton.isEnabled = enabled
 	}
 }

From 46c9ea1c6f8d1daaca78fce9cab605abce3685b3 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Mon, 9 Jul 2018 16:21:28 +0300
Subject: [PATCH 15/15] fix string resources

---
 OsmAnd-telegram/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml
index 7705646677..75f99207a9 100644
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@@ -7,8 +7,8 @@
 	<string name="shared_string_off">Off</string>
 	<string name="already_registered_in_telegram">You need an already registered account and phone number in Telegram</string>
 	<string name="do_not_have_telegram">I don`t have Telegram account</string>
-	<string name="enter_phone_number">Введите номер телефона</string>
-	<string name="enter_authentication_code">Введите код авторизации</string>
+	<string name="enter_phone_number">Enter phone number</string>
+	<string name="enter_authentication_code">Enter authentication code</string>
 	<string name="set_visible_time_for_all">Set visible time for all</string>
 	<string name="hours_and_minutes_format">%1$d h %2$d m</string>
 	<string name="minutes_format">%1$d m</string>