Merge branches 'import_export_fixes' and 'master' of https://github.com/osmandapp/Osmand into import_export_fixes

 Conflicts:

	OsmAnd/res/values/strings.xml

	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java

	OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java

	OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java

OsmAnd-api/build.gradle

@@ -5,8 +5,8 @@ group = 'com.github.osmandapp.osmand'
 version = '2.0.0'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
-    buildToolsVersion "27.0.3"
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 14
@@ -28,7 +28,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
 }
 
 task sourcesJar(type: Jar) {

OsmAnd-api/src/net/osmand/aidlapi/copyfile/CopyFileParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidlapi.copyfile;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/customization/OsmandSettingsInfoParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidlapi.customization;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/customization/OsmandSettingsParams.java

@@ -2,8 +2,9 @@ package net.osmand.aidlapi.customization;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/customization/SetWidgetsParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidlapi.customization;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/gpx/AGpxBitmap.java

@@ -3,7 +3,8 @@ package net.osmand.aidlapi.gpx;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/gpx/AGpxFile.java

@@ -2,8 +2,9 @@ package net.osmand.aidlapi.gpx;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/gpx/ASelectedGpxFile.java

@@ -2,8 +2,9 @@ package net.osmand.aidlapi.gpx;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/navdrawer/NavDrawerFooterParams.java

@@ -2,8 +2,9 @@ package net.osmand.aidlapi.navdrawer;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/navdrawer/NavDrawerHeaderParams.java

@@ -2,8 +2,9 @@ package net.osmand.aidlapi.navdrawer;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/navdrawer/NavDrawerItem.java

@@ -2,8 +2,9 @@ package net.osmand.aidlapi.navdrawer;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/navdrawer/SetNavDrawerItemsParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidlapi.navdrawer;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-api/src/net/osmand/aidlapi/tiles/ASqliteDbFile.java

@@ -2,7 +2,8 @@ package net.osmand.aidlapi.tiles;
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import net.osmand.aidlapi.AidlParams;
 

OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapDataObject.java

@@ -109,7 +109,7 @@ public class BinaryMapDataObject {
 	}
 	
 	public boolean containsAdditionalType(int cachedType) {
-		if (cachedType != -1) {
+		if (cachedType != -1 && additionalTypes != null) {
 			for (int i = 0; i < additionalTypes.length; i++) {
 				if (additionalTypes[i] == cachedType) {
 					return true;

OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java

@@ -39,7 +39,7 @@ public class OsmMapUtils {
 			return getWeightCenterForWay(((Way) e));
 		} else if (e instanceof Relation) {
 			List<LatLon> list = new ArrayList<LatLon>();
-			if (e.getTag("type").equals("multipolygon")) {
+			if (e.getTag("type") != null && e.getTag("type").equals("multipolygon")) {
 				MultipolygonBuilder original = new MultipolygonBuilder();
 				original.setId(e.getId());
 

OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java

@@ -26,7 +26,8 @@ import org.apache.commons.logging.Log;
 public class RoutePlannerFrontEnd {
 
 	protected static final Log log = PlatformUtil.getLog(RoutePlannerFrontEnd.class);
-	protected static final double GPS_POSSIBLE_ERROR = 10;
+	// Check issue #8649
+	protected static final double GPS_POSSIBLE_ERROR = 7;
 	public boolean useSmartRouteRecalculation = true;
 
 	

OsmAnd-telegram/AndroidManifest.xml

@@ -66,7 +66,7 @@
         </receiver>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="net.osmand.telegram.fileprovider"
             android:grantUriPermissions="true"
             android:exported="false">

OsmAnd-telegram/build.gradle

@@ -142,14 +142,14 @@ dependencies {
 	implementation( "org.jetbrains.kotlin:kotlin-stdlib:1.2.71") {
 		exclude group: 'org.jetbrains', module: 'annotations'
 	}
-	implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
+	implementation 'androidx.appcompat:appcompat:1.0.0'
-	implementation 'com.android.support:design:28.0.0-rc01'
+	implementation 'com.google.android.material:material:1.0.0'
-	implementation 'com.android.support:customtabs:28.0.0-rc01'
+	implementation 'androidx.browser:browser:1.0.0'
-	implementation 'com.android.support:support-annotations:28.0.0-rc01'
+	implementation 'androidx.annotation:annotation:1.1.0'
 	implementation 'commons-logging:commons-logging-api:1.1'
-	implementation 'com.android.support:recyclerview-v7:28.0.0-rc01'
+	implementation 'androidx.recyclerview:recyclerview:1.1.0'
 	implementation 'com.vividsolutions:jts-core:1.14.0'
-	implementation("com.github.HITGIF:TextFieldBoxes:1.4.4") {
+	implementation("com.github.HITGIF:TextFieldBoxes:1.4.5") {
 		exclude group: 'com.android.support'
 	}
 	implementation 'org.jetbrains:annotations-java5:15.0'

OsmAnd-telegram/res/layout/activity_main.xml

@@ -8,7 +8,7 @@
 	android:orientation="vertical"
 	tools:context=".ui.MainActivity">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:layout_width="match_parent"
 		android:id="@+id/coordinator"
 		android:layout_height="0dp"
@@ -19,21 +19,21 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"/>
 
-		<android.support.v7.widget.AppCompatImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="bottom"
 			android:scaleType="fitXY"
 			android:src="?attr/bottom_nav_shadow"/>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<include
 		layout="@layout/bottom_buttons_bar"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/buttons_bottom_bar_height" />
 
-	<android.support.design.widget.BottomNavigationView
+	<com.google.android.material.bottomnavigation.BottomNavigationView
 		android:id="@+id/bottom_navigation"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

OsmAnd-telegram/res/layout/bottom_sheet_add_new_device.xml

@@ -7,12 +7,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -81,9 +81,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_battery_optimization.xml

@@ -7,12 +7,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -52,9 +52,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_choose_osmand.xml

@@ -8,12 +8,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -58,9 +58,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_dialog.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -16,4 +16,4 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_horizontal|bottom"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

OsmAnd-telegram/res/layout/bottom_sheet_disable_sharing.xml

@@ -8,12 +8,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -73,9 +73,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_disconnect_telegram.xml

@@ -8,12 +8,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -52,9 +52,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_logout.xml

@@ -8,12 +8,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -53,9 +53,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_set_time.xml

@@ -7,12 +7,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -180,9 +180,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_sharing_status.xml

@@ -7,13 +7,13 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginBottom="@dimen/list_view_bottom_padding">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -46,9 +46,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/bottom_sheet_sort_by.xml

@@ -7,12 +7,12 @@
 	android:orientation="vertical"
 	tools:layout_gravity="bottom">
 
-	<android.support.design.widget.CoordinatorLayout
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		android:id="@+id/scroll_view_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<android.support.v4.widget.NestedScrollView
+		<androidx.core.widget.NestedScrollView
 			android:id="@+id/scroll_view"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -45,9 +45,9 @@
 
 			</LinearLayout>
 
-		</android.support.v4.widget.NestedScrollView>
+		</androidx.core.widget.NestedScrollView>
 
-	</android.support.design.widget.CoordinatorLayout>
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/fragement_settings_dialog.xml

@@ -8,13 +8,13 @@
 	android:fitsSystemWindows="true"
 	android:orientation="vertical">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/app_bar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:background="?attr/card_bg_color">
 
-		<android.support.v7.widget.Toolbar
+		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/action_bar_height">
@@ -30,9 +30,9 @@
 				android:textSize="@dimen/title_text_size"
 				app:typeface="@string/font_roboto_mono_bold"/>
 
-		</android.support.v7.widget.Toolbar>
+		</androidx.appcompat.widget.Toolbar>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
 	<ScrollView
 		android:layout_width="match_parent"

OsmAnd-telegram/res/layout/fragment_live_now_tab.xml

@@ -7,7 +7,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/app_bar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
 
 		</LinearLayout>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"
@@ -129,12 +129,12 @@
 			android:visibility="gone"
 			app:typeface="@string/font_roboto_regular" />
 
-		<android.support.v4.widget.SwipeRefreshLayout
+		<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 			android:id="@+id/swipe_refresh"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-			<android.support.v7.widget.RecyclerView
+			<androidx.recyclerview.widget.RecyclerView
 				android:id="@+id/recycler_view"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
@@ -142,7 +142,7 @@
 				android:paddingBottom="@dimen/list_item_content_margin"
 				android:scrollbars="vertical" />
 
-		</android.support.v4.widget.SwipeRefreshLayout>
+		</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 		<net.osmand.telegram.ui.views.TextViewEx
 			android:id="@+id/open_osmand_btn"

OsmAnd-telegram/res/layout/fragment_my_location_tab.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/app_bar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -321,14 +321,14 @@
 
 		</FrameLayout>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-		<android.support.v7.widget.RecyclerView
+		<androidx.recyclerview.widget.RecyclerView
 			android:id="@+id/recycler_view"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -355,4 +355,4 @@
 
 	</FrameLayout>
 	
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

OsmAnd-telegram/res/layout/fragment_proxy_settings_dialog.xml

@@ -12,13 +12,13 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical">
 
-		<android.support.design.widget.AppBarLayout
+		<com.google.android.material.appbar.AppBarLayout
 			android:id="@+id/app_bar_layout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:background="?attr/card_bg_color">
 
-			<android.support.v7.widget.Toolbar
+			<androidx.appcompat.widget.Toolbar
 				android:id="@+id/toolbar"
 				android:layout_width="match_parent"
 				android:layout_height="@dimen/action_bar_height">
@@ -34,7 +34,7 @@
 					android:textSize="@dimen/title_text_size"
 					app:typeface="@string/font_roboto_mono_bold" />
 
-			</android.support.v7.widget.Toolbar>
+			</androidx.appcompat.widget.Toolbar>
 
 			<View
 				android:layout_width="wrap_content"
@@ -77,7 +77,7 @@
 
 			</LinearLayout>
 
-		</android.support.design.widget.AppBarLayout>
+		</com.google.android.material.appbar.AppBarLayout>
 
 		<ScrollView
 			android:layout_width="match_parent"
@@ -324,7 +324,7 @@
 		android:layout_gravity="bottom"
 		android:orientation="vertical">
 
-		<android.support.v7.widget.AppCompatImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:scaleType="fitXY"

OsmAnd-telegram/res/layout/fragment_search_dialog.xml

@@ -5,13 +5,13 @@
 	android:fitsSystemWindows="true"
 	android:orientation="vertical">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/app_bar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:background="?attr/card_bg_color">
 
-		<android.support.v7.widget.Toolbar
+		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/action_bar_height">
@@ -49,9 +49,9 @@
 
 			</LinearLayout>
 
-		</android.support.v7.widget.Toolbar>
+		</androidx.appcompat.widget.Toolbar>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"
@@ -74,7 +74,7 @@
 			android:layout_gravity="bottom"
 			android:orientation="vertical">
 
-			<android.support.v7.widget.AppCompatImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:scaleType="fitXY"

OsmAnd-telegram/res/layout/fragment_set_time_dialog.xml

@@ -9,7 +9,7 @@
 	android:background="?attr/card_bg_color"
 	android:orientation="vertical">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:background="?attr/card_bg_color">
@@ -81,14 +81,14 @@
 
 		</LinearLayout>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1">
 
-		<android.support.v7.widget.RecyclerView
+		<androidx.recyclerview.widget.RecyclerView
 			android:id="@+id/recycler_view"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"

OsmAnd-telegram/res/layout/fragment_timeline_tab.xml

@@ -6,7 +6,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/app_bar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -133,9 +133,9 @@
 
 		</FrameLayout>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
-	<android.support.v4.widget.SwipeRefreshLayout
+	<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 		android:id="@+id/swipe_refresh"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
@@ -158,6 +158,6 @@
 
 		</FrameLayout>
 
-	</android.support.v4.widget.SwipeRefreshLayout>
+	</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </LinearLayout>

OsmAnd-telegram/res/layout/fragment_user_gpx_info.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -511,4 +511,4 @@
 
 	</ScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

OsmAnd-telegram/res/layout/login_dialog.xml

@@ -96,7 +96,7 @@
 			android:minHeight="@dimen/action_bar_height"
 			android:orientation="horizontal">
 
-			<android.support.v7.widget.AppCompatImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/back_button"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"

OsmAnd-telegram/res/values-ar-rSA/strings.xml

@@ -71,7 +71,7 @@
     <string name="min_logging_speed">الحد الأدنى لسرعة التسجيل</string>
     <string name="min_logging_speed_descr">عامل التصفية: لا تسجيل أقل من السرعة المحددة</string>
     <string name="gpx_settings">إعدادات GPX</string>
-    <string name="timeline_no_data_descr">ليس لدينا بيانات تم جمعها لليوم المحدد</string>
+    <string name="timeline_no_data_descr">تهانينا، صندوق الوارد فارغ</string>
     <string name="timeline_no_data">لا توجد بيانات</string>
     <string name="shared_string_end">نهاية</string>
     <string name="shared_string_start">بدء</string>
@@ -90,11 +90,11 @@
     <string name="shared_string_suggested">اقترح</string>
     <string name="status_widget_title">تتبع حالة أوسماند</string>
     <string name="back_to_osmand">العودة إلى OsmAnd</string>
-    <string name="last_update_from_telegram_date">آخر تحديث من تيليجرام: %1$s</string>
+    <string name="last_update_from_telegram_date">الرسائل الجديدة تظهر هنا</string>
     <string name="last_response_date">الرد الأخير:٪ 1 $ s</string>
     <string name="last_update_from_telegram_duration">آخر تحديث من تيليجرام: %1$s قبل</string>
     <string name="last_response_duration">الرد الأخير: قبل٪ 1 $ s</string>
-    <string name="shared_string_error_short">خطا</string>
+    <string name="shared_string_error_short">تهانينا، صندوق الوارد فارغ</string>
     <string name="device_added_successfully">%1$s المضاف.</string>
     <string name="shared_string_add">إضافة</string>
     <string name="error_adding_new_device">تعذر إضافة جهاز جديد</string>

OsmAnd-telegram/res/values-ar/strings.xml

@@ -6,7 +6,7 @@
     <string name="disable_monitoring">تعطيل العرض</string>
     <string name="location_recording_enabled">تسجيل الموقع ممكن</string>
     <string name="timeline_description">تمكين العرض لتوفير جميع المواقع في السجل.</string>
-    <string name="app_name_short">متتبعOsmAnd</string>
+    <string name="app_name_short">متتبع أوسماند</string>
     <string name="shared_string_telegram">تيليجرام</string>
     <string name="privacy_policy_use_telegram">يستخدم تيليجرام (تطبيق المراسلة) للاتصال والتواصل مع الأشخاص.</string>
     <string name="shared_string_later">لاحقا</string>

OsmAnd-telegram/res/values-ast/strings.xml

@@ -175,7 +175,7 @@
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_use_telegram">Telegram (l\'aplicación de mensaxería) emplégase pa coneutar y comunicase cola xente.</string>
     <string name="privacy_policy_telegram_client">El rastrexador d\'OsmAnd ye unu de los clientes qu\'emplega la plataforma abierta Telegram. Los tos contautos pueden emplegar cualquier otru cliente de Telegram.</string>
-    <string name="privacy_policy_agree">Al primir siguir, aceutes les condiciones de la Política d\'intimidá de Telegram y la Política d\'intimidá d\'OsmAnd.</string>
+    <string name="privacy_policy_agree">Al primir siguir, aceutes les condiciones de les Polítiques d\'intimidá de Telegram y d\'OsmAnd.</string>
     <string name="shared_string_accept">Aceutar</string>
     <string name="telegram_privacy_policy">Política d\'intimidá de Telegram</string>
     <string name="osmand_privacy_policy">Política d\'intimidá d\'OsmAnd</string>
@@ -221,4 +221,51 @@
     <string name="shared_string_start">Principiu</string>
     <string name="set_time_timeline_descr">Seleiciona la hora de visualización</string>
     <string name="start_end_date">Data d\'Aniciu — Fin</string>
+    <string name="time_zone_descr">Seleiciona\'l fusu horariu a amosar nos tos mensaxes d\'allugamientu.</string>
+    <string name="time_zone">Fusu horariu</string>
+    <string name="units_and_formats">Unidaes y formatos</string>
+    <string name="buffer_time_descr">Tiempu máximu pa caltener puntos na memoria intermedia</string>
+    <string name="buffer_time">Tiempu de caducidá de la memoria intermedia</string>
+    <string name="shared_string_suggested">Suxerencia</string>
+    <string name="status_widget_title">Estau de OsmAnd Tracker</string>
+    <string name="back_to_osmand">Volver a OsmAnd</string>
+    <string name="last_update_from_telegram_date">Caberu anovamientu dende Telegram: %1$s</string>
+    <string name="last_response_date">Cabera respuesta: %1$s</string>
+    <string name="last_update_from_telegram_duration">Caberu anovamientu dende Telegram: va %1$s</string>
+    <string name="last_response_duration">Cabera respuesta: va %1$s</string>
+    <string name="duration_ago">va %1$s</string>
+    <string name="shared_string_error_short">ERR</string>
+    <string name="connecting_to_the_internet">Coneutando a Internet</string>
+    <string name="battery_optimization_description">Desactiva la optimización de la batería pa OsmAnd Tracker de mou que nun se desconecte de sópitu cuando tea en segundu planu.</string>
+    <string name="not_sent_yet">Inda nun s\'unvió</string>
+    <string name="not_found_yet">Entá nun s\'alcontró</string>
+    <string name="re_send_location">Re-unviar l\'allugamientu</string>
+    <string name="share_location_as">Compartir allugamientu como</string>
+    <string name="shared_string_sort">Ordenar</string>
+    <string name="choose_osmand">Seleiciona la versión d\'OsmAnd a utilizar</string>
+    <string name="time_ago">va</string>
+    <string name="last_response">Última respuesta</string>
+    <string name="logout_no_internet_msg">Conecta a Internet pa zarrar la sesión de Telegram correutamente.</string>
+    <string name="stop_sharing_all">Compartir ta activáu (desactivar)</string>
+    <string name="already_registered_in_telegram">Precises una cuenta rexistrada en Telegram y un númberu de teléfonu</string>
+    <string name="set_visible_time_for_all">Indica l\'horariu de visibilidá pa toos</string>
+    <string name="my_location_search_hint">Buscar: Grupu o contactu</string>
+    <string name="start_location_sharing">Compartir allugamientu</string>
+    <string name="show_on_map">Ver nel mapa</string>
+    <string name="enter_code">Escribir el códigu</string>
+    <string name="shared_string_login">Aniciar sesión</string>
+    <string name="initialization">Principiando</string>
+    <string name="logging_out">Zarrando sesión</string>
+    <string name="closing">Zarrando</string>
+    <string name="no_location_permission">La app nun tien permisu d\'accesu a los datos d\'allugamientu.</string>
+    <string name="location_service_no_gps_available">Seleiciona unu de los fornidores d\'allugamientu pa compartir el to allugamientu.</string>
+    <string name="osmand_service">Mou en segundu planu</string>
+    <string name="share_location">Compartir allugamientu</string>
+    <string name="show_users_on_map">Amosar usuarios nel mapa</string>
+    <string name="active_chats">Charres actives</string>
+    <string name="saved_messages">Mensaxes guardaos</string>
+    <string name="unit_of_length_descr">Cambia les unidaes de midida de distancia.</string>
+    <string name="unit_of_length">Unidaes de llonxitú</string>
+    <string name="unit_of_speed_system_descr">Definir la unidá de velocidá.</string>
+    <string name="unit_of_speed_system">Unidá de velocidá</string>
 </resources>

OsmAnd-telegram/res/values-sl/strings.xml

@@ -208,4 +208,5 @@
     <string name="location_recording_enabled">Beleženje trenutnega mesta je omogočeno</string>
     <string name="units_and_formats">Enote in zapisi</string>
     <string name="unit_of_length_descr">Izbor enote za prikaz razdalje.</string>
+    <string name="unit_of_length">Enote dolžine</string>
 </resources>

OsmAnd-telegram/res/values-uk/strings.xml

@@ -156,7 +156,7 @@
     <string name="shared_string_hour_short">г</string>
     <string name="shared_string_minute_short">хв</string>
     <string name="shared_string_second_short">сек</string>
-    <string name="welcome_descr"> <b>OsmAnd Tracker</b> дозволяє Вам транслювати свою позицію та бачити позицію інших в OsmAnd.<br/> <br/>Застосунок використовує Telegram API та потребує облікового запису Telegram.</string>
+    <string name="welcome_descr"><b>OsmAnd Tracker</b> дозволяє Вам транслювати свою позицію та бачити позицію інших в OsmAnd.<br/><br/>Застосунок використовує Telegram API та потребує облікового запису Telegram.</string>
     <string name="my_location">Моя позиція</string>
     <string name="send_my_location_desc">Встановіть мінімальний інтервал між надсиланням позиції.</string>
     <string name="expire_at">Діє до</string>

OsmAnd-telegram/src/net/osmand/aidl/copyfile/CopyFileParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidl.copyfile;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class CopyFileParams implements Parcelable {
 	private String fileName;

OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java

@@ -3,7 +3,8 @@ package net.osmand.aidl.customization;
 import android.annotation.SuppressLint;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class OsmandSettingsInfoParams implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.java

@@ -4,8 +4,9 @@ import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class OsmandSettingsParams implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidl.customization;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.java

@@ -3,7 +3,8 @@ package net.osmand.aidl.gpx;
 import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class AGpxBitmap implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.java

@@ -2,8 +2,9 @@ package net.osmand.aidl.gpx;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class AGpxFile implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/gpx/ASelectedGpxFile.java

@@ -2,8 +2,9 @@ package net.osmand.aidl.gpx;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class ASelectedGpxFile implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/gpx/GpxColorParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidl.gpx;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class GpxColorParams implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java

@@ -2,8 +2,9 @@ package net.osmand.aidl.navdrawer;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class NavDrawerFooterParams implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java

@@ -2,8 +2,9 @@ package net.osmand.aidl.navdrawer;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class NavDrawerHeaderParams implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerItem.java

@@ -2,8 +2,9 @@ package net.osmand.aidl.navdrawer;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class NavDrawerItem implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java

@@ -2,7 +2,8 @@ package net.osmand.aidl.navdrawer;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;

OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.java

@@ -2,7 +2,8 @@ package net.osmand.aidl.tiles;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class ASqliteDbFile implements Parcelable {
 

OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt

@@ -2,11 +2,11 @@ package net.osmand.telegram
 
 import android.content.Context
 import android.location.LocationManager
-import android.support.annotation.ColorRes
-import android.support.annotation.DrawableRes
-import android.support.annotation.StringRes
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import net.osmand.PlatformUtil
 import net.osmand.telegram.helpers.OsmandAidlHelper
 import net.osmand.telegram.helpers.ShareLocationHelper.Companion.MAX_MESSAGES_IN_TDLIB_PER_CHAT

OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt

@@ -5,8 +5,8 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.utils.OsmandFormatter

OsmAnd-telegram/src/net/osmand/telegram/notifications/TelegramNotification.kt

@@ -3,8 +3,8 @@ package net.osmand.telegram.notifications
 import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.ui.MainActivity
 import net.osmand.telegram.ui.OPEN_MY_LOCATION_TAB_KEY
@@ -53,7 +53,7 @@ abstract class TelegramNotification(protected var app: TelegramApplication, val
 			app.notificationHelper.createNotificationChannel()
 		}
 		val builder = NotificationCompat.Builder(app, NotificationHelper.NOTIFICATION_CHANEL_ID)
-				.setVisibility(android.support.v4.app.NotificationCompat.VISIBILITY_PUBLIC)
+				.setVisibility(androidx.core.app.NotificationCompat.VISIBILITY_PUBLIC)
 				.setPriority(priority)
 				.setOngoing(ongoing && !wearable)
 				.setContentIntent(contentPendingIntent)

OsmAnd-telegram/src/net/osmand/telegram/ui/AddNewDeviceBottomSheet.kt

@@ -3,10 +3,6 @@ package net.osmand.telegram.ui
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
@@ -16,8 +12,9 @@ import android.view.WindowManager
 import android.widget.EditText
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
-import net.osmand.telegram.TelegramSettings
 import net.osmand.telegram.ui.views.BottomSheetDialog
 import net.osmand.telegram.utils.AndroidNetworkUtils
 import net.osmand.telegram.utils.OsmandApiUtils
@@ -171,7 +168,7 @@ class AddNewDeviceBottomSheet : BaseDialogFragment() {
 		const val MAX_DEVICE_NAME_LENGTH = 200
 
 		private const val TAG = "AddNewDeviceBottomSheet"
-		fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment): Boolean {
 			return try {
 				AddNewDeviceBottomSheet().apply {
 					setTargetFragment(target, NEW_DEVICE_REQUEST_CODE)

OsmAnd-telegram/src/net/osmand/telegram/ui/BaseDialogFragment.kt

@@ -2,7 +2,7 @@ package net.osmand.telegram.ui
 
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 
@@ -17,9 +17,9 @@ open class BaseDialogFragment : DialogFragment() {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		when {
-			Build.VERSION.SDK_INT >= 23 -> setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Transparent)
+			Build.VERSION.SDK_INT >= 23 -> setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Transparent)
-			Build.VERSION.SDK_INT >= 19 -> setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Translucent)
+			Build.VERSION.SDK_INT >= 19 -> setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Translucent)
-			else -> setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar)
+			else -> setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar)
 		}
 	}
 }

OsmAnd-telegram/src/net/osmand/telegram/ui/BatteryOptimizationBottomSheet.kt

@@ -6,13 +6,12 @@ import android.os.Build
 import android.os.Bundle
 import android.os.PowerManager
 import android.provider.Settings
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.PlatformUtil
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
@@ -79,7 +78,7 @@ class BatteryOptimizationBottomSheet : DialogFragment() {
 
 		private const val TAG = "BatteryOptimizationBottomSheet"
 
-		fun showInstance(fm: FragmentManager): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager): Boolean {
 			return try {
 				BatteryOptimizationBottomSheet().show(fm, TAG)
 				true

OsmAnd-telegram/src/net/osmand/telegram/ui/ChooseOsmAndBottomSheet.kt

@@ -1,15 +1,13 @@
 package net.osmand.telegram.ui
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.TelegramSettings
@@ -77,7 +75,7 @@ class ChooseOsmAndBottomSheet : DialogFragment() {
 
 		private const val TAG = "ChooseOsmAndBottomSheet"
 
-		fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment): Boolean {
 			return try {
 				ChooseOsmAndBottomSheet().apply {
 					setTargetFragment(target, OSMAND_CHOSEN_REQUEST_CODE)

OsmAnd-telegram/src/net/osmand/telegram/ui/DisableSharingBottomSheet.kt

@@ -3,15 +3,13 @@ package net.osmand.telegram.ui
 import android.graphics.ColorMatrix
 import android.graphics.ColorMatrixColorFilter
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.helpers.TelegramUiHelper
@@ -86,7 +84,7 @@ class DisableSharingBottomSheet : DialogFragment() {
 		private const val TAG = "DisableSharingBottomSheet"
 		private const val CHATS_COUNT_KEY = "chats_count"
 
-		fun showInstance(fm: FragmentManager, target: Fragment, chatsCount: Int): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment, chatsCount: Int): Boolean {
 			return try {
 				DisableSharingBottomSheet().apply {
 					arguments = Bundle().apply { putInt(CHATS_COUNT_KEY, chatsCount) }

OsmAnd-telegram/src/net/osmand/telegram/ui/DisconnectTelegramBottomSheet.kt

@@ -1,13 +1,12 @@
 package net.osmand.telegram.ui
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
 import net.osmand.telegram.ui.views.BottomSheetDialog
 
@@ -48,7 +47,7 @@ class DisconnectTelegramBottomSheet : DialogFragment() {
 
 		private const val TAG = "DisconnectTelegramBottomSheet"
 
-		fun showInstance(fm: FragmentManager): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager): Boolean {
 			return try {
 				DisconnectTelegramBottomSheet().show(fm, TAG)
 				true

OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt

@@ -3,11 +3,6 @@ package net.osmand.telegram.ui
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.ListPopupWindow
-import android.support.v7.widget.RecyclerView
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -17,6 +12,10 @@ import android.widget.ArrayAdapter
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.appcompat.widget.ListPopupWindow
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import net.osmand.Location
 import net.osmand.data.LatLon
 import net.osmand.telegram.R
@@ -72,16 +71,16 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 
 		AndroidUtils.addStatusBarPadding19v(context!!, appBarLayout)
 		adapter = LiveNowListAdapter()
-		mainView.findViewById<RecyclerView>(R.id.recycler_view).apply {
+		mainView.findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.recycler_view).apply {
 			layoutManager = LinearLayoutManager(context)
 			adapter = this@LiveNowTabFragment.adapter
-			addOnScrollListener(object : RecyclerView.OnScrollListener() {
+			addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
-				override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+				override fun onScrollStateChanged(recyclerView: androidx.recyclerview.widget.RecyclerView, newState: Int) {
 					super.onScrollStateChanged(recyclerView, newState)
-					locationUiUpdateAllowed = newState == RecyclerView.SCROLL_STATE_IDLE
+					locationUiUpdateAllowed = newState == androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 					when (newState) {
-						RecyclerView.SCROLL_STATE_DRAGGING -> animateOpenOsmAndBtn(false)
+						androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING -> animateOpenOsmAndBtn(false)
-						RecyclerView.SCROLL_STATE_IDLE -> animateOpenOsmAndBtn(true)
+						androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE -> animateOpenOsmAndBtn(true)
 					}
 				}
 			})
@@ -98,7 +97,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 			}
 		}
 
-		mainView.findViewById<SwipeRefreshLayout>(R.id.swipe_refresh).apply {
+		mainView.findViewById<androidx.swiperefreshlayout.widget.SwipeRefreshLayout>(R.id.swipe_refresh).apply {
 			setOnRefreshListener {
 				app.shareLocationHelper.checkNetworkType()
 				app.telegramHelper.scanChatsHistory()
@@ -398,7 +397,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 		)
 	}
 
-	inner class LiveNowListAdapter : RecyclerView.Adapter<BaseViewHolder>() {
+	inner class LiveNowListAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<BaseViewHolder>() {
 
 		private val menuList =
 			listOf(getString(R.string.shared_string_off), getString(R.string.shared_string_all))
@@ -603,7 +602,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener, TelegramIncomingMessage
 			}
 		}
 
-		abstract inner class BaseViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+		abstract inner class BaseViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
 			val title: TextView? = view.findViewById(R.id.title)
 			val locationViewContainer: View? = view.findViewById(R.id.location_view_container)

OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt

@@ -8,10 +8,6 @@ import android.graphics.Rect
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.support.annotation.StringRes
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.AppCompatImageView
 import android.text.*
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
@@ -24,6 +20,9 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.*
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.ContextCompat
 import net.osmand.PlatformUtil
 import net.osmand.telegram.R
 import net.osmand.telegram.utils.AndroidNetworkUtils
@@ -57,12 +56,12 @@ class LoginDialogFragment : BaseDialogFragment() {
 
 		private var countryPhoneCode: String = "+"
 
-		fun showWelcomeDialog(fragmentManager: FragmentManager) {
+		fun showWelcomeDialog(fragmentManager: androidx.fragment.app.FragmentManager) {
 			welcomeDialogShown = true
 			showDialog(fragmentManager, welcomeDialog = true)
 		}
 
-		fun showDialog(fragmentManager: FragmentManager, loginDialogType: LoginDialogType? = null, welcomeDialog: Boolean = false, privacyPolicyAgreed: Boolean = false) {
+		fun showDialog(fragmentManager: androidx.fragment.app.FragmentManager, loginDialogType: LoginDialogType? = null, welcomeDialog: Boolean = false, privacyPolicyAgreed: Boolean = false) {
 			try {
 
 				/*
@@ -95,13 +94,13 @@ class LoginDialogFragment : BaseDialogFragment() {
 			}
 		}
 
-		fun dismiss(fragmentManager: FragmentManager) {
+		fun dismiss(fragmentManager: androidx.fragment.app.FragmentManager) {
 			val loginDialogFragment = getFragment(fragmentManager)
 			loginDialogFragment?.dismissedManually = true
 			loginDialogFragment?.dismissAllowingStateLoss()
 		}
 
-		private fun getFragment(fragmentManager: FragmentManager): LoginDialogFragment? {
+		private fun getFragment(fragmentManager: androidx.fragment.app.FragmentManager): LoginDialogFragment? {
 			return fragmentManager.findFragmentByTag(TAG) as LoginDialogFragment?
 		}
 	}

OsmAnd-telegram/src/net/osmand/telegram/ui/LogoutBottomSheet.kt

@@ -1,14 +1,12 @@
 package net.osmand.telegram.ui
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
 import net.osmand.telegram.ui.views.BottomSheetDialog
 
@@ -61,7 +59,7 @@ class LogoutBottomSheet : DialogFragment() {
 
 		private const val TAG = "DisableSharingBottomSheet"
 
-		fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment): Boolean {
 			return try {
 				LogoutBottomSheet().apply {
 					setTargetFragment(target, LOGOUT_REQUEST_CODE)

OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt

@@ -5,21 +5,16 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.support.design.widget.BottomNavigationView
-import android.support.design.widget.CoordinatorLayout
-import android.support.design.widget.Snackbar
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentPagerAdapter
-import android.support.v4.view.PagerAdapter
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.ListPopupWindow
 import android.view.Gravity
 import android.view.View
 import android.widget.*
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.ListPopupWindow
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentPagerAdapter
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.snackbar.Snackbar
 import net.osmand.PlatformUtil
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
@@ -35,7 +30,6 @@ import net.osmand.telegram.utils.OsmandApiUtils
 import org.drinkless.td.libcore.telegram.TdApi
 import java.io.File
 import java.lang.ref.WeakReference
-import java.time.MonthDay
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -69,8 +63,8 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 
 	private lateinit var buttonsBar: LinearLayout
 	private lateinit var bottomNav: BottomNavigationView
-	private lateinit var coordinatorLayout: CoordinatorLayout
+	private lateinit var coordinatorLayout: androidx.coordinatorlayout.widget.CoordinatorLayout
-	private lateinit var viewPager: ViewPager
+	private lateinit var viewPager: androidx.viewpager.widget.ViewPager
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -163,7 +157,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 		}
 	}
 
-	override fun onAttachFragment(fragment: Fragment?) {
+	override fun onAttachFragment(fragment: androidx.fragment.app.Fragment?) {
 		if (fragment is TelegramListener) {
 			listeners.add(WeakReference(fragment))
 		}
@@ -521,16 +515,16 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 		}
 	}
 
-	class ViewPagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) {
+	class ViewPagerAdapter(fm: androidx.fragment.app.FragmentManager) : FragmentPagerAdapter(fm) {
 
-		private val fragments = listOf<Fragment>(MyLocationTabFragment(), LiveNowTabFragment(), TimelineTabFragment())
+		private val fragments = listOf<androidx.fragment.app.Fragment>(MyLocationTabFragment(), LiveNowTabFragment(), TimelineTabFragment())
 
 		override fun getItem(position: Int) = fragments[position]
 
 		override fun getCount() = fragments.size
 
 		override fun getItemPosition(`object`: Any): Int {
-			return PagerAdapter.POSITION_NONE
+			return androidx.viewpager.widget.PagerAdapter.POSITION_NONE
 		}
 	}
 }

OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt

@@ -10,11 +10,6 @@ import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.support.design.widget.AppBarLayout
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
@@ -23,6 +18,11 @@ import android.util.TypedValue
 import android.view.*
 import android.view.animation.LinearInterpolator
 import android.widget.*
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.appbar.AppBarLayout
 import net.osmand.PlatformUtil
 import net.osmand.telegram.*
 import net.osmand.telegram.helpers.LocationMessages
@@ -206,15 +206,15 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 				.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_action_search_dark))
 		}
 
-		mainView.findViewById<RecyclerView>(R.id.recycler_view).apply {
+		mainView.findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.recycler_view).apply {
 			layoutManager = LinearLayoutManager(context)
 			adapter = this@MyLocationTabFragment.adapter
-			addOnScrollListener(object : RecyclerView.OnScrollListener() {
+			addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
-				override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+				override fun onScrollStateChanged(recyclerView: androidx.recyclerview.widget.RecyclerView, newState: Int) {
 					super.onScrollStateChanged(recyclerView, newState)
 					when (newState) {
-						RecyclerView.SCROLL_STATE_DRAGGING -> animateStartSharingBtn(false)
+						androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING -> animateStartSharingBtn(false)
-						RecyclerView.SCROLL_STATE_IDLE -> animateStartSharingBtn(true)
+						androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE -> animateStartSharingBtn(true)
 					}
 				}
 			})
@@ -614,7 +614,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 	}
 
 	inner class MyLocationListAdapter :
-		RecyclerView.Adapter<MyLocationListAdapter.BaseViewHolder>() {
+		androidx.recyclerview.widget.RecyclerView.Adapter<MyLocationListAdapter.BaseViewHolder>() {
 		var items = mutableListOf<Any>()
 			set(value) {
 				field = value
@@ -921,7 +921,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 
 		override fun getItemCount() = items.size
 
-		abstract inner class BaseViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+		abstract inner class BaseViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
 			val title: TextView? = view.findViewById(R.id.title)
 			val description: TextView? = view.findViewById(R.id.description)

OsmAnd-telegram/src/net/osmand/telegram/ui/ProxySettingsDialogFragment.kt

@@ -2,10 +2,6 @@ package net.osmand.telegram.ui
 
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.Toolbar
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
@@ -13,11 +9,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.*
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
 import net.osmand.telegram.R
-import net.osmand.telegram.TelegramSettings.ProxyType
+import net.osmand.telegram.TelegramSettings.*
-import net.osmand.telegram.TelegramSettings.ProxyPref
-import net.osmand.telegram.TelegramSettings.ProxyMTProtoPref
-import net.osmand.telegram.TelegramSettings.ProxySOCKS5Pref
 
 class ProxySettingsDialogFragment : BaseDialogFragment() {
 
@@ -202,7 +197,7 @@ class ProxySettingsDialogFragment : BaseDialogFragment() {
 		private const val TAG = "ProxySettingsDialogFragment"
 		const val PROXY_PREFERENCES_UPDATED_REQUEST_CODE = 6
 
-		fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment): Boolean {
 			return try {
 				ProxySettingsDialogFragment().apply {
 					setTargetFragment(target, PROXY_PREFERENCES_UPDATED_REQUEST_CODE)

OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt

@@ -4,18 +4,16 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import net.osmand.Location
 import net.osmand.PlatformUtil
 import net.osmand.data.LatLon
@@ -105,10 +103,10 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 			layoutManager = LinearLayoutManager(context)
 			adapter = this@SearchDialogFragment.adapter
 			setEmptyView(emptyView)
-			addOnScrollListener(object : RecyclerView.OnScrollListener() {
+			addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
-				override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+				override fun onScrollStateChanged(recyclerView: androidx.recyclerview.widget.RecyclerView, newState: Int) {
 					super.onScrollStateChanged(recyclerView, newState)
-					val scrolling = newState != RecyclerView.SCROLL_STATE_IDLE
+					val scrolling = newState != androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 					locationUiUpdateAllowed = !scrolling
 					if (scrolling) {
 						hideKeyboard()
@@ -352,7 +350,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 		outState.putLongArray(SELECTED_USERS_KEY, selectedUsers.toLongArray())
 	}
 
-	inner class SearchAdapter : RecyclerView.Adapter<SearchAdapter.ChatViewHolder>() {
+	inner class SearchAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<SearchAdapter.ChatViewHolder>() {
 
 		var items = mutableListOf<TdApi.Object>()
 			set(value) {
@@ -513,7 +511,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 
 		override fun getItemCount() = items.size
 
-		inner class ChatViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+		inner class ChatViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
 			val title: TextView? = view.findViewById(R.id.title)
 			val locationViewContainer: View? = view.findViewById(R.id.location_view_container)
@@ -575,7 +573,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 		const val SEARCH_ITEMS_REQUEST_CODE = 3
 		const val CLEAR_SELECTED_ITEMS_REQUEST_CODE = 4
 
-		fun showInstance(fm: FragmentManager, target: Fragment?, selectedChats: Set<Long>, selectedUsers: Set<Long>): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment?, selectedChats: Set<Long>, selectedUsers: Set<Long>): Boolean {
 			return try {
 				SearchDialogFragment().apply {
 					arguments = Bundle().apply {

OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeBottomSheet.kt

@@ -4,14 +4,12 @@ import android.app.DatePickerDialog
 import android.app.TimePickerDialog
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.ui.views.BottomSheetDialog
@@ -167,7 +165,7 @@ class SetTimeBottomSheet : DialogFragment() {
 
 		private const val TAG = "SetTimeBottomSheet"
 
-		fun showInstance(fm: FragmentManager, target: Fragment, start: Long, end: Long): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment, start: Long, end: Long): Boolean {
 			return try {
 				SetTimeBottomSheet().apply {
 					arguments = Bundle().apply {

OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt

@@ -2,15 +2,13 @@ package net.osmand.telegram.ui
 
 import android.app.TimePickerDialog
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import net.osmand.Location
 import net.osmand.data.LatLon
 import net.osmand.telegram.R
@@ -65,13 +63,13 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 
 		updateTimeForAllRow()
 
-		view.findViewById<RecyclerView>(R.id.recycler_view).apply {
+		view.findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.recycler_view).apply {
 			layoutManager = LinearLayoutManager(context)
 			adapter = this@SetTimeDialogFragment.adapter
-			addOnScrollListener(object : RecyclerView.OnScrollListener() {
+			addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
-				override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+				override fun onScrollStateChanged(recyclerView: androidx.recyclerview.widget.RecyclerView, newState: Int) {
 					super.onScrollStateChanged(recyclerView, newState)
-					locationUiUpdateAllowed = newState == RecyclerView.SCROLL_STATE_IDLE
+					locationUiUpdateAllowed = newState == androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 				}
 			})
 		}
@@ -289,7 +287,7 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 		adapter.items = items
 	}
 
-	inner class SetTimeListAdapter : RecyclerView.Adapter<ChatViewHolder>() {
+	inner class SetTimeListAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<ChatViewHolder>() {
 
 		var items: List<TdApi.Object> = emptyList()
 			set(value) {
@@ -384,7 +382,7 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 
 		override fun getItemCount() = items.size
 
-		inner class ChatViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+		inner class ChatViewHolder(val view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
 			val title: TextView? = view.findViewById(R.id.title)
 			val directionIcon: ImageView? = view.findViewById(R.id.direction_icon)
@@ -408,7 +406,7 @@ class SetTimeDialogFragment : BaseDialogFragment(), TelegramLocationListener, Te
 		private const val DEFAULT_VISIBLE_TIME_SECONDS = 60 * 60L // 1 hour
 		private const val NO_VALUE = -1L
 
-		fun showInstance(fm: FragmentManager, chatIds: Set<Long>, usersIds: Set<Long>, target: Fragment): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, chatIds: Set<Long>, usersIds: Set<Long>, target: androidx.fragment.app.Fragment): Boolean {
 			return try {
 				val chats = mutableListOf<Long>()
 				for (id in chatIds) {

OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt

@@ -4,10 +4,6 @@ import android.content.Intent
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.ListPopupWindow
-import android.support.v7.widget.Toolbar
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
 import android.view.Gravity
@@ -15,6 +11,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.appcompat.widget.ListPopupWindow
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramSettings
 import net.osmand.telegram.TelegramSettings.ListPreference
@@ -402,7 +401,7 @@ class SettingsDialogFragment : BaseDialogFragment() {
 
 		private const val TAG = "SettingsDialogFragment"
 
-		fun showInstance(fm: FragmentManager): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager): Boolean {
 			return try {
 				SettingsDialogFragment().show(fm, TAG)
 				true

OsmAnd-telegram/src/net/osmand/telegram/ui/SharingStatusBottomSheet.kt

@@ -1,16 +1,14 @@
 package net.osmand.telegram.ui
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.TelegramSettings
@@ -108,7 +106,7 @@ class SharingStatusBottomSheet : DialogFragment() {
 	companion object {
 		const val SHARING_STATUS_REQUEST_CODE = 5
 		private const val TAG = "SharingStatusBottomSheet"
-		fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, target: androidx.fragment.app.Fragment): Boolean {
 			return try {
 				SharingStatusBottomSheet().apply {
 					setTargetFragment(target, SHARING_STATUS_REQUEST_CODE)

OsmAnd-telegram/src/net/osmand/telegram/ui/SortByBottomSheet.kt

@@ -1,16 +1,14 @@
 package net.osmand.telegram.ui
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.TelegramSettings
@@ -87,8 +85,8 @@ class SortByBottomSheet : DialogFragment() {
 		private const val TAG = "SortByBottomSheet"
 
 		fun showInstance(
-			fm: FragmentManager,
+			fm: androidx.fragment.app.FragmentManager,
-			target: Fragment
+			target: androidx.fragment.app.Fragment
 		): Boolean {
 			return try {
 				SortByBottomSheet().apply {

OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt

@@ -7,11 +7,6 @@ import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.support.annotation.DrawableRes
-import android.support.v4.app.Fragment
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,6 +14,9 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.Switch
 import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.helpers.LocationMessages
@@ -110,7 +108,7 @@ class TimelineTabFragment : Fragment() {
 			}
 		}
 
-		mainView.findViewById<SwipeRefreshLayout>(R.id.swipe_refresh).apply {
+		mainView.findViewById<androidx.swiperefreshlayout.widget.SwipeRefreshLayout>(R.id.swipe_refresh).apply {
 			setOnRefreshListener {
 				updateList()
 				isRefreshing = false
@@ -224,7 +222,7 @@ class TimelineTabFragment : Fragment() {
 		return list
 	}
 
-	inner class LiveNowListAdapter : RecyclerView.Adapter<BaseViewHolder>() {
+	inner class LiveNowListAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<BaseViewHolder>() {
 
 		var items: List<ListItem> = emptyList()
 			set(value) {
@@ -298,7 +296,7 @@ class TimelineTabFragment : Fragment() {
 
 		override fun getItemCount() = items.size
 
-		inner class BaseViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+		inner class BaseViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
 			val title: TextView? = view.findViewById(R.id.title)
 			val description: TextView? = view.findViewById(R.id.description)

OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt

@@ -7,9 +7,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.LayerDrawable
 import android.os.*
-import android.support.design.widget.Snackbar
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ForegroundColorSpan
@@ -22,6 +19,8 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
+import com.google.android.material.snackbar.Snackbar
 import net.osmand.GPXUtilities
 import net.osmand.PlatformUtil
 import net.osmand.aidl.gpx.AGpxBitmap
@@ -490,7 +489,7 @@ class UserGpxInfoFragment : BaseDialogFragment() {
 		private const val UPDATE_TRACK_INTERVAL_MS = 30 * 1000L // 30 sec
 		private const val TRACK_UPDATE_MSG_ID = 1001
 
-		fun showInstance(fm: FragmentManager, userId: Int, chatId: Long, deviceName: String, start: Long, end: Long): Boolean {
+		fun showInstance(fm: androidx.fragment.app.FragmentManager, userId: Int, chatId: Long, deviceName: String, start: Long, end: Long): Boolean {
 			return try {
 				val fragment = UserGpxInfoFragment().apply {
 					arguments = Bundle().apply {

OsmAnd-telegram/src/net/osmand/telegram/ui/views/EmptyStateRecyclerView.kt

@@ -1,15 +1,14 @@
 package net.osmand.telegram.ui.views
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
 import android.view.View
 
-class EmptyStateRecyclerView : RecyclerView {
+class EmptyStateRecyclerView : androidx.recyclerview.widget.RecyclerView {
 
 	private var emptyView: View? = null
 
-	private val emptyStateObserver = object : RecyclerView.AdapterDataObserver() {
+	private val emptyStateObserver = object : androidx.recyclerview.widget.RecyclerView.AdapterDataObserver() {
 		override fun onChanged() {
 			checkIfEmpty()
 		}
@@ -33,7 +32,7 @@ class EmptyStateRecyclerView : RecyclerView {
 		defStyle
 	)
 
-	override fun setAdapter(adapter: RecyclerView.Adapter<*>?) {
+	override fun setAdapter(adapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>?) {
 		val oldAdapter = getAdapter()
 		oldAdapter?.unregisterAdapterDataObserver(emptyStateObserver)
 		super.setAdapter(adapter)

OsmAnd-telegram/src/net/osmand/telegram/ui/views/LockableViewPager.kt

@@ -1,11 +1,10 @@
 package net.osmand.telegram.ui.views
 
 import android.content.Context
-import android.support.v4.view.ViewPager
 import android.util.AttributeSet
 import android.view.MotionEvent
 
-class LockableViewPager : ViewPager {
+class LockableViewPager : androidx.viewpager.widget.ViewPager {
 	var swipeLocked: Boolean = false
 
 	constructor(context: Context) : super(context) {}

OsmAnd-telegram/src/net/osmand/telegram/ui/views/TextViewEx.kt

@@ -2,8 +2,8 @@ package net.osmand.telegram.ui.views
 
 import android.content.Context
 import android.content.res.TypedArray
-import android.support.v7.widget.AppCompatTextView
 import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
 import net.osmand.telegram.R
 import net.osmand.telegram.helpers.FontCache
 

OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt

@@ -14,21 +14,19 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.StateListDrawable
 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.design.widget.Snackbar
-import android.support.v4.app.ActivityCompat
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.FileProvider
 import android.util.TypedValue
 import android.util.TypedValue.COMPLEX_UNIT_DIP
 import android.view.View
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import com.google.android.material.snackbar.Snackbar
 import net.osmand.telegram.R
 import java.io.File
 
@@ -62,9 +60,9 @@ object AndroidUtils {
 		}
 	}
 
-	fun dismissAllDialogs(fm: FragmentManager) {
+	fun dismissAllDialogs(fm: androidx.fragment.app.FragmentManager) {
 		for (fragment in fm.fragments) {
-			if (fragment is DialogFragment) {
+			if (fragment is androidx.fragment.app.DialogFragment) {
 				fragment.dismissAllowingStateLoss()
 			}
 			dismissAllDialogs(fragment.childFragmentManager)
@@ -169,7 +167,7 @@ object AndroidUtils {
 
 	fun setSnackbarTextColor(snackbar: Snackbar, @ColorRes colorId: Int) {
 		val view = snackbar.view
-		val tv = view.findViewById(android.support.design.R.id.snackbar_action) as TextView
+		val tv = view.findViewById(com.google.android.material.R.id.snackbar_action) as TextView
 		tv.setTextColor(ContextCompat.getColor(view.context, colorId))
 	}
 

OsmAnd-telegram/src/net/osmand/telegram/utils/UiUtils.kt

@@ -7,15 +7,15 @@ import android.graphics.drawable.LayerDrawable
 import android.hardware.Sensor
 import android.hardware.SensorManager
 import android.os.AsyncTask
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.annotation.DrawableRes
-import android.support.v4.content.ContextCompat
-import android.support.v4.graphics.drawable.DrawableCompat
 import android.view.Surface
 import android.view.WindowManager
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import net.osmand.Location
 import net.osmand.PlatformUtil
 import net.osmand.data.LatLon

OsmAnd/AndroidManifest-free.xml

@@ -20,7 +20,7 @@
             android:process="net.osmand"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             tools:replace="android:authorities"
             android:authorities="net.osmand.fileprovider"/>
     </application>

OsmAnd/AndroidManifest-freecustom.xml

@@ -18,7 +18,7 @@
             android:process="net.osmand.freecustom"
             tools:replace="android:process"/>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="net.osmand.freecustom.fileprovider"
             tools:replace="android:authorities"/>
     </application>

OsmAnd/AndroidManifest-freedev.xml

@@ -17,7 +17,7 @@
             android:process="net.osmand.dev"
             tools:replace="android:process"/>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="net.osmand.dev.fileprovider"
             tools:replace="android:authorities"/>
     </application>

OsmAnd/AndroidManifest-freehuawei.xml

@@ -13,7 +13,7 @@
 		</activity>
 
 		<provider
-			android:name="android.support.v4.content.FileProvider"
+			android:name="androidx.core.content.FileProvider"
 			android:authorities="net.osmand.huawei.fileprovider"
 			tools:replace="android:authorities" />
 		<service

OsmAnd/AndroidManifest-huawei.xml

@@ -13,7 +13,7 @@
 		</activity>
 
 		<provider
-			android:name="android.support.v4.content.FileProvider"
+			android:name="androidx.core.content.FileProvider"
 			android:authorities="net.osmand.plus.huawei.fileprovider"
 			tools:replace="android:authorities" />
 		<service

OsmAnd/AndroidManifest.xml

@@ -67,7 +67,7 @@
         <activity android:name="net.osmand.plus.activities.ExitActivity" />
         
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="net.osmand.plus.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true" >

OsmAnd/build.gradle

@@ -455,13 +455,13 @@ task appStart(type: Exec) {
 dependencies {
 	implementation project(path: ':OsmAnd-java', configuration: 'android')
 	implementation project(':OsmAnd-api')
-	implementation 'com.android.support:multidex:1.0.1'
+	implementation 'androidx.multidex:multidex:2.0.1'
-	implementation 'com.android.support:gridlayout-v7:27.1.1'
+	implementation 'androidx.gridlayout:gridlayout:1.0.0'
-	implementation 'com.android.support:cardview-v7:27.1.1'
+	implementation 'androidx.cardview:cardview:1.0.0'
-	implementation 'com.android.support:appcompat-v7:27.1.1'
+	implementation 'androidx.appcompat:appcompat:1.1.0'
-	implementation 'com.android.support:design:27.1.1'
+	implementation 'com.google.android.material:material:1.2.0-alpha05'
-	implementation 'com.android.support:customtabs:27.1.1'
+	implementation 'androidx.browser:browser:1.0.0'
-	implementation 'com.android.support:preference-v7:27.1.1'
+	implementation 'androidx.preference:preference:1.1.0'
 	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
 
 	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
@@ -495,7 +495,7 @@ dependencies {
 		exclude group: 'com.android.support'
 	}
 	implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
-	implementation ("com.github.HITGIF:TextFieldBoxes:1.3.5"){
+	implementation ("com.github.HITGIF:TextFieldBoxes:1.4.5"){
 		exclude group: 'com.android.support'
 	}
 

OsmAnd/res/drawable/img_settings_customize_configure_map_day.xml

@@ -0,0 +1,21 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#EEE7E6" android:pathData="M16,39h216v83h-216z"/>
+    <path android:fillColor="#ffffff" android:pathData="M16,124h216v76h-216z"/>
+    <path android:fillColor="#E2DBDB" android:pathData="M16,124l216,-0l0,-2l-216,-0z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M34,154C39.523,154 44,149.523 44,144C44,138.477 39.523,134 34,134C28.477,134 24,138.477 24,144C24,149.523 28.477,154 34,154Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M58,139C58,137.343 59.343,136 61,136H139C140.657,136 142,137.343 142,139C142,140.657 140.657,142 139,142H61C59.343,142 58,140.657 58,139Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M58,182C58,180.343 59.343,179 61,179H139C140.657,179 142,180.343 142,182C142,183.657 140.657,185 139,185H61C59.343,185 58,183.657 58,182Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M58,149.5C58,148.672 58.672,148 59.5,148H104.5C105.328,148 106,148.672 106,149.5C106,150.328 105.328,151 104.5,151H59.5C58.672,151 58,150.328 58,149.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M58,192.5C58,191.672 58.672,191 59.5,191H104.5C105.328,191 106,191.672 106,192.5C106,193.328 105.328,194 104.5,194H59.5C58.672,194 58,193.328 58,192.5Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M34,197C39.523,197 44,192.523 44,187C44,181.477 39.523,177 34,177C28.477,177 24,181.477 24,187C24,192.523 28.477,197 34,197Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M194,143C194,140.239 196.239,138 199,138H215C217.761,138 220,140.239 220,143C220,145.761 217.761,148 215,148H199C196.239,148 194,145.761 194,143Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M194,186C194,183.239 196.239,181 199,181H215C217.761,181 220,183.239 220,186C220,188.761 217.761,191 215,191H199C196.239,191 194,188.761 194,186Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M213,150C216.866,150 220,146.866 220,143C220,139.134 216.866,136 213,136C209.134,136 206,139.134 206,143C206,146.866 209.134,150 213,150Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M213,193C216.866,193 220,189.866 220,186C220,182.134 216.866,179 213,179C209.134,179 206,182.134 206,186C206,189.866 209.134,193 213,193Z"/>
+    <path android:fillColor="#8F8B8A" android:pathData="M16,24.025h216v15h-216z"/>
+    <path android:fillColor="#ffffff" android:pathData="M203,29H198V34H203V29Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+</vector>

OsmAnd/res/drawable/img_settings_customize_configure_map_night.xml

@@ -0,0 +1,20 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#060A0D" android:pathData="M16,39h216v85h-216z"/>
+    <path android:fillColor="#323334" android:pathData="M16,124h216v76h-216z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M34,154C39.523,154 44,149.523 44,144C44,138.477 39.523,134 34,134C28.477,134 24,138.477 24,144C24,149.523 28.477,154 34,154Z"/>
+    <path android:fillColor="#727272" android:pathData="M58,139C58,137.343 59.343,136 61,136H139C140.657,136 142,137.343 142,139C142,140.657 140.657,142 139,142H61C59.343,142 58,140.657 58,139Z"/>
+    <path android:fillColor="#727272" android:pathData="M58,182C58,180.343 59.343,179 61,179H139C140.657,179 142,180.343 142,182C142,183.657 140.657,185 139,185H61C59.343,185 58,183.657 58,182Z"/>
+    <path android:fillColor="#59595A" android:pathData="M58,149.5C58,148.672 58.672,148 59.5,148H104.5C105.328,148 106,148.672 106,149.5C106,150.328 105.328,151 104.5,151H59.5C58.672,151 58,150.328 58,149.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M58,192.5C58,191.672 58.672,191 59.5,191H104.5C105.328,191 106,191.672 106,192.5C106,193.328 105.328,194 104.5,194H59.5C58.672,194 58,193.328 58,192.5Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M34,197C39.523,197 44,192.523 44,187C44,181.477 39.523,177 34,177C28.477,177 24,181.477 24,187C24,192.523 28.477,197 34,197Z"/>
+    <path android:fillColor="#59595A" android:pathData="M194,143C194,140.239 196.239,138 199,138H215C217.761,138 220,140.239 220,143C220,145.761 217.761,148 215,148H199C196.239,148 194,145.761 194,143Z"/>
+    <path android:fillColor="#59595A" android:pathData="M194,186C194,183.239 196.239,181 199,181H215C217.761,181 220,183.239 220,186C220,188.761 217.761,191 215,191H199C196.239,191 194,188.761 194,186Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M213,150C216.866,150 220,146.866 220,143C220,139.134 216.866,136 213,136C209.134,136 206,139.134 206,143C206,146.866 209.134,150 213,150Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M213,193C216.866,193 220,189.866 220,186C220,182.134 216.866,179 213,179C209.134,179 206,182.134 206,186C206,189.866 209.134,193 213,193Z"/>
+    <path android:fillColor="#2D2F2F" android:pathData="M16,24.025h216v15h-216z"/>
+    <path android:fillColor="#727272" android:pathData="M203,29H198V34H203V29Z"/>
+    <path android:fillColor="#727272" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+    <path android:fillColor="#727272" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+</vector>

OsmAnd/res/drawable/img_settings_customize_context_menu_day.xml

@@ -0,0 +1,30 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#EEE7E6" android:pathData="M16,0h216v42h-216z"/>
+    <path android:fillColor="#E2DBDB" android:pathData="M16,44l216,-0l0,-2l-216,-0z"/>
+    <path android:fillColor="#ffffff" android:pathData="M16,44h216v59h-216z"/>
+    <path android:fillColor="#F0F0F0" android:pathData="M16,103H232V173C232,174.657 230.657,176 229,176H19C17.343,176 16,174.657 16,173V103Z"/>
+    <path android:fillColor="#E6E6E6" android:pathData="M16,152h216v1h-216z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M31,143.5C31,142.672 31.672,142 32.5,142H53.5C54.328,142 55,142.672 55,143.5C55,144.328 54.328,145 53.5,145H32.5C31.672,145 31,144.328 31,143.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M85,143.5C85,142.672 85.672,142 86.5,142H107.5C108.328,142 109,142.672 109,143.5C109,144.328 108.328,145 107.5,145H86.5C85.672,145 85,144.328 85,143.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M139,143.5C139,142.672 139.672,142 140.5,142H161.5C162.328,142 163,142.672 163,143.5C163,144.328 162.328,145 161.5,145H140.5C139.672,145 139,144.328 139,143.5Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M193,143.5C193,142.672 193.672,142 194.5,142H215.5C216.328,142 217,142.672 217,143.5C217,144.328 216.328,145 215.5,145H194.5C193.672,145 193,144.328 193,143.5Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M43,131C48.523,131 53,126.523 53,121C53,115.477 48.523,111 43,111C37.477,111 33,115.477 33,121C33,126.523 37.477,131 43,131Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M97,131C102.523,131 107,126.523 107,121C107,115.477 102.523,111 97,111C91.477,111 87,115.477 87,121C87,126.523 91.477,131 97,131Z"/>
+    <path android:fillColor="#B3B3B3" android:fillType="evenOdd" android:pathData="M151,131C156.523,131 161,126.523 161,121C161,115.477 156.523,111 151,111C145.477,111 141,115.477 141,121C141,126.523 145.477,131 151,131Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M200,128C200,129.105 199.105,130 198,130C196.895,130 196,129.105 196,128C196,126.895 196.895,126 198,126C199.105,126 200,126.895 200,128Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M207,128C207,129.105 206.105,130 205,130C203.895,130 203,129.105 203,128C203,126.895 203.895,126 205,126C206.105,126 207,126.895 207,128Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M212,130C213.105,130 214,129.105 214,128C214,126.895 213.105,126 212,126C210.895,126 210,126.895 210,128C210,129.105 210.895,130 212,130Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M200,121C200,122.105 199.105,123 198,123C196.895,123 196,122.105 196,121C196,119.895 196.895,119 198,119C199.105,119 200,119.895 200,121Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M207,121C207,122.105 206.105,123 205,123C203.895,123 203,122.105 203,121C203,119.895 203.895,119 205,119C206.105,119 207,119.895 207,121Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M212,123C213.105,123 214,122.105 214,121C214,119.895 213.105,119 212,119C210.895,119 210,119.895 210,121C210,122.105 210.895,123 212,123Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M200,114C200,115.105 199.105,116 198,116C196.895,116 196,115.105 196,114C196,112.895 196.895,112 198,112C199.105,112 200,112.895 200,114Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M207,114C207,115.105 206.105,116 205,116C203.895,116 203,115.105 203,114C203,112.895 203.895,112 205,112C206.105,112 207,112.895 207,114Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M212,116C213.105,116 214,115.105 214,114C214,112.895 213.105,112 212,112C210.895,112 210,112.895 210,114C210,115.105 210.895,116 212,116Z"/>
+    <path android:fillColor="#D2D2D2" android:pathData="M30,70L84,70A3,3 0,0 1,87 73L87,73A3,3 0,0 1,84 76L30,76A3,3 0,0 1,27 73L27,73A3,3 0,0 1,30 70z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M30,56L108,56A3,3 0,0 1,111 59L111,59A3,3 0,0 1,108 62L30,62A3,3 0,0 1,27 59L27,59A3,3 0,0 1,30 56z"/>
+    <path android:fillColor="#FF8800" android:fillType="evenOdd" android:pathData="M214,72C219.523,72 224,67.523 224,62C224,56.477 219.523,52 214,52C208.477,52 204,56.477 204,62C204,67.523 208.477,72 214,72Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M26.5,163C25.672,163 25,163.672 25,164.5C25,165.328 25.672,166 26.5,166H59.5C60.328,166 61,165.328 61,164.5C61,163.672 60.328,163 59.5,163H26.5Z"/>
+    <path android:fillColor="#B3B3B3" android:pathData="M189.5,163C188.672,163 188,163.672 188,164.5C188,165.328 188.672,166 189.5,166H221.5C222.328,166 223,165.328 223,164.5C223,163.672 222.328,163 221.5,163H189.5Z"/>
+</vector>

OsmAnd/res/drawable/img_settings_customize_context_menu_night.xml

@@ -0,0 +1,29 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#060A0D" android:pathData="M16,0h216v44h-216z"/>
+    <path android:fillColor="#1C1C1C" android:pathData="M16,44h216v59h-216z"/>
+    <path android:fillColor="#28292A" android:pathData="M16,103H232V173C232,174.657 230.657,176 229,176H19C17.343,176 16,174.657 16,173V103Z"/>
+    <path android:fillColor="#2C3033" android:pathData="M16,152h216v1h-216z"/>
+    <path android:fillColor="#59595A" android:pathData="M31,143.5C31,142.672 31.672,142 32.5,142H53.5C54.328,142 55,142.672 55,143.5C55,144.328 54.328,145 53.5,145H32.5C31.672,145 31,144.328 31,143.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M85,143.5C85,142.672 85.672,142 86.5,142H107.5C108.328,142 109,142.672 109,143.5C109,144.328 108.328,145 107.5,145H86.5C85.672,145 85,144.328 85,143.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M139,143.5C139,142.672 139.672,142 140.5,142H161.5C162.328,142 163,142.672 163,143.5C163,144.328 162.328,145 161.5,145H140.5C139.672,145 139,144.328 139,143.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M193,143.5C193,142.672 193.672,142 194.5,142H215.5C216.328,142 217,142.672 217,143.5C217,144.328 216.328,145 215.5,145H194.5C193.672,145 193,144.328 193,143.5Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M43,131C48.523,131 53,126.523 53,121C53,115.477 48.523,111 43,111C37.477,111 33,115.477 33,121C33,126.523 37.477,131 43,131Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M97,131C102.523,131 107,126.523 107,121C107,115.477 102.523,111 97,111C91.477,111 87,115.477 87,121C87,126.523 91.477,131 97,131Z"/>
+    <path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M151,131C156.523,131 161,126.523 161,121C161,115.477 156.523,111 151,111C145.477,111 141,115.477 141,121C141,126.523 145.477,131 151,131Z"/>
+    <path android:fillColor="#727272" android:pathData="M200,128C200,129.105 199.105,130 198,130C196.895,130 196,129.105 196,128C196,126.895 196.895,126 198,126C199.105,126 200,126.895 200,128Z"/>
+    <path android:fillColor="#727272" android:pathData="M207,128C207,129.105 206.105,130 205,130C203.895,130 203,129.105 203,128C203,126.895 203.895,126 205,126C206.105,126 207,126.895 207,128Z"/>
+    <path android:fillColor="#727272" android:pathData="M212,130C213.105,130 214,129.105 214,128C214,126.895 213.105,126 212,126C210.895,126 210,126.895 210,128C210,129.105 210.895,130 212,130Z"/>
+    <path android:fillColor="#727272" android:pathData="M200,121C200,122.105 199.105,123 198,123C196.895,123 196,122.105 196,121C196,119.895 196.895,119 198,119C199.105,119 200,119.895 200,121Z"/>
+    <path android:fillColor="#727272" android:pathData="M207,121C207,122.105 206.105,123 205,123C203.895,123 203,122.105 203,121C203,119.895 203.895,119 205,119C206.105,119 207,119.895 207,121Z"/>
+    <path android:fillColor="#727272" android:pathData="M212,123C213.105,123 214,122.105 214,121C214,119.895 213.105,119 212,119C210.895,119 210,119.895 210,121C210,122.105 210.895,123 212,123Z"/>
+    <path android:fillColor="#727272" android:pathData="M200,114C200,115.105 199.105,116 198,116C196.895,116 196,115.105 196,114C196,112.895 196.895,112 198,112C199.105,112 200,112.895 200,114Z"/>
+    <path android:fillColor="#727272" android:pathData="M207,114C207,115.105 206.105,116 205,116C203.895,116 203,115.105 203,114C203,112.895 203.895,112 205,112C206.105,112 207,112.895 207,114Z"/>
+    <path android:fillColor="#727272" android:pathData="M212,116C213.105,116 214,115.105 214,114C214,112.895 213.105,112 212,112C210.895,112 210,112.895 210,114C210,115.105 210.895,116 212,116Z"/>
+    <path android:fillColor="#59595A" android:pathData="M30,70L84,70A3,3 0,0 1,87 73L87,73A3,3 0,0 1,84 76L30,76A3,3 0,0 1,27 73L27,73A3,3 0,0 1,30 70z"/>
+    <path android:fillColor="#727272" android:pathData="M30,56L108,56A3,3 0,0 1,111 59L111,59A3,3 0,0 1,108 62L30,62A3,3 0,0 1,27 59L27,59A3,3 0,0 1,30 56z"/>
+    <path android:fillColor="#E69122" android:fillType="evenOdd" android:pathData="M214,72C219.523,72 224,67.523 224,62C224,56.477 219.523,52 214,52C208.477,52 204,56.477 204,62C204,67.523 208.477,72 214,72Z"/>
+    <path android:fillColor="#59595A" android:pathData="M26.5,163C25.672,163 25,163.672 25,164.5C25,165.328 25.672,166 26.5,166H59.5C60.328,166 61,165.328 61,164.5C61,163.672 60.328,163 59.5,163H26.5Z"/>
+    <path android:fillColor="#59595A" android:pathData="M189.5,163C188.672,163 188,163.672 188,164.5C188,165.328 188.672,166 189.5,166H221.5C222.328,166 223,165.328 223,164.5C223,163.672 222.328,163 221.5,163H189.5Z"/>
+</vector>

OsmAnd/res/drawable/img_settings_customize_drawer_day.xml

@@ -0,0 +1,30 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h248v200h-248z"/>
+        <path android:fillColor="#EEE7E6" android:pathData="M166,24h66v177h-66z"/>
+        <path android:fillColor="#8F8B8A" android:pathData="M166,24h66v15h-66z"/>
+        <path android:fillColor="#ffffff" android:pathData="M203,29H198V34H203V29Z"/>
+        <path android:fillColor="#ffffff" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+        <path android:fillColor="#ffffff" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+        <path android:fillColor="#ffffff" android:pathData="M16,72h150v128h-150z"/>
+        <path android:fillColor="#BDD7FF" android:pathData="M16,24h150v48h-150z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,39C58,37.343 59.343,36 61,36H139C140.657,36 142,37.343 142,39C142,40.657 140.657,42 139,42H61C59.343,42 58,40.657 58,39Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,53C58,51.343 59.343,50 61,50H115C116.657,50 118,51.343 118,53C118,54.657 116.657,56 115,56H61C59.343,56 58,54.657 58,53Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#237BFF" android:fillType="evenOdd" android:pathData="M34,52C39.523,52 44,47.523 44,42C44,36.477 39.523,32 34,32C28.477,32 24,36.477 24,42C24,47.523 28.477,52 34,52Z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,95C58,93.343 59.343,92 61,92H139C140.657,92 142,93.343 142,95C142,96.657 140.657,98 139,98H61C59.343,98 58,96.657 58,95Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,138C58,136.343 59.343,135 61,135H139C140.657,135 142,136.343 142,138C142,139.657 140.657,141 139,141H61C59.343,141 58,139.657 58,138Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M61,178C59.343,178 58,179.343 58,181C58,182.657 59.343,184 61,184H139C140.657,184 142,182.657 142,181C142,179.343 140.657,178 139,178H61Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#B3B3B3" android:pathData="M34,105C39.523,105 44,100.523 44,95C44,89.477 39.523,85 34,85C28.477,85 24,89.477 24,95C24,100.523 28.477,105 34,105Z"/>
+        <path android:fillColor="#B3B3B3" android:pathData="M34,148C39.523,148 44,143.523 44,138C44,132.477 39.523,128 34,128C28.477,128 24,132.477 24,138C24,143.523 28.477,148 34,148Z"/>
+        <path android:fillColor="#B3B3B3" android:pathData="M44,181C44,186.523 39.523,191 34,191C28.477,191 24,186.523 24,181C24,175.477 28.477,171 34,171C39.523,171 44,175.477 44,181Z"/>
+        <path android:fillAlpha="0.1" android:fillColor="#000000"
+            android:pathData="M166,24h2v176h-2z" android:strokeAlpha="0.1"/>
+    </group>
+</vector>

OsmAnd/res/drawable/img_settings_customize_drawer_night.xml

@@ -0,0 +1,30 @@
+<vector android:autoMirrored="true" android:height="200dp"
+    android:viewportHeight="200" android:viewportWidth="248"
+    android:width="248dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h248v200h-248z"/>
+        <path android:fillColor="#060A0D" android:pathData="M166,24h66v177h-66z"/>
+        <path android:fillColor="#2D2F2F" android:pathData="M166,24h66v15h-66z"/>
+        <path android:fillColor="#727272" android:pathData="M203,29H198V34H203V29Z"/>
+        <path android:fillColor="#727272" android:pathData="M209,31.5C209,30.119 210.119,29 211.5,29C212.881,29 214,30.119 214,31.5C214,32.881 212.881,34 211.5,34C210.119,34 209,32.881 209,31.5Z"/>
+        <path android:fillColor="#727272" android:pathData="M222.5,34L225,29H220L222.5,34Z"/>
+        <path android:fillColor="#323334" android:pathData="M16,72h150v128h-150z"/>
+        <path android:fillColor="#1F2D41" android:pathData="M16,24h150v48h-150z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,39C58,37.343 59.343,36 61,36H139C140.657,36 142,37.343 142,39C142,40.657 140.657,42 139,42H61C59.343,42 58,40.657 58,39Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#237BFF"
+            android:pathData="M58,53C58,51.343 59.343,50 61,50H115C116.657,50 118,51.343 118,53C118,54.657 116.657,56 115,56H61C59.343,56 58,54.657 58,53Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#237BFF" android:fillType="evenOdd" android:pathData="M34,52C39.523,52 44,47.523 44,42C44,36.477 39.523,32 34,32C28.477,32 24,36.477 24,42C24,47.523 28.477,52 34,52Z"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,95C58,93.343 59.343,92 61,92H139C140.657,92 142,93.343 142,95C142,96.657 140.657,98 139,98H61C59.343,98 58,96.657 58,95Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M58,138C58,136.343 59.343,135 61,135H139C140.657,135 142,136.343 142,138C142,139.657 140.657,141 139,141H61C59.343,141 58,139.657 58,138Z" android:strokeAlpha="0.5"/>
+        <path android:fillAlpha="0.5" android:fillColor="#B3B3B3"
+            android:pathData="M61,178C59.343,178 58,179.343 58,181C58,182.657 59.343,184 61,184H139C140.657,184 142,182.657 142,181C142,179.343 140.657,178 139,178H61Z" android:strokeAlpha="0.5"/>
+        <path android:fillColor="#727272" android:pathData="M34,105C39.523,105 44,100.523 44,95C44,89.477 39.523,85 34,85C28.477,85 24,89.477 24,95C24,100.523 28.477,105 34,105Z"/>
+        <path android:fillColor="#727272" android:pathData="M34,148C39.523,148 44,143.523 44,138C44,132.477 39.523,128 34,128C28.477,128 24,132.477 24,138C24,143.523 28.477,148 34,148Z"/>
+        <path android:fillColor="#727272" android:pathData="M44,181C44,186.523 39.523,191 34,191C28.477,191 24,186.523 24,181C24,175.477 28.477,171 34,171C39.523,171 44,175.477 44,181Z"/>
+        <path android:fillAlpha="0.1" android:fillColor="#000000"
+            android:pathData="M166,24h2v176h-2z" android:strokeAlpha="0.1"/>
+    </group>
+</vector>

OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml

@@ -51,7 +51,7 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/create_button"
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="wrap_content"
@@ -59,7 +59,7 @@
         android:layout_gravity="center_vertical"
         android:text="@string/shared_string_add"/>
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/cancel_button"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
         android:layout_width="wrap_content"

OsmAnd/res/layout-land/context_menu_card_dialog.xml

@@ -22,7 +22,7 @@
             android:clickable="true"
             android:orientation="horizontal">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/close_button"
                 style="@style/Widget.AppCompat.ActionButton"
                 android:layout_width="56dp"
@@ -69,7 +69,7 @@
 
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/more_button"
                 style="@style/Widget.AppCompat.ActionButton"
                 android:layout_width="48dp"