Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into prepare_importing_finish

Browse source 
# Conflicts:
#	OsmAnd/res/layout/fragment_import.xml
#	OsmAnd/res/layout/fragment_import_duplicates.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/UiUtilities.java
#	OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
#	OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
This commit is contained in:
veliymolfar 2020-03-05 11:02:45 +02:00
commit bb9858e577
877 changed files with 4945 additions and 4161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-api/build.gradle
View file

@ -5,8 +5,8 @@ group = 'com.github.osmandapp.osmand'
version = '2.0.0'
android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion 28
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) {

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

2
OsmAnd-java/src/main/java/net/osmand/IndexConstants.java
View file

@ -42,7 +42,7 @@ public class IndexConstants {
public static final String OSMAND_SETTINGS_FILE_EXT = ".osf";
public static final String ROUTING_FILE_EXT = ".xml";
public static final String ROUTING_AND_RENDERING_FILE_EXT = ".xml";
public static final String RENDERER_INDEX_EXT = ".render.xml"; //$NON-NLS-1$

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

@ -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());

12
OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java
View file

@ -236,9 +236,9 @@ public class RoutingConfiguration {
String id = parser.getAttributeValue("", "id");
String type = parser.getAttributeValue("", "type");
boolean defaultValue = Boolean.parseBoolean(parser.getAttributeValue("", "default"));
if (type.equalsIgnoreCase("boolean")) {
if ("boolean".equalsIgnoreCase(type)) {
currentRouter.registerBooleanParameter(id, Algorithms.isEmpty(group) ? null : group, name, description, defaultValue);
} else if(type.equalsIgnoreCase("numeric")) {
} else if ("numeric".equalsIgnoreCase(type)) {
String values = parser.getAttributeValue("", "values");
String valueDescriptions = parser.getAttributeValue("", "valueDescriptions");
String[] strValues = values.split(",");
@ -292,7 +292,7 @@ public class RoutingConfiguration {
for (int i = 0; i < stack.size(); i++) {
addSubclause(stack.get(i), ctx);
}
} else if(stack.size() > 0 && stack.peek().tagName.equals("select")) {
} else if (stack.size() > 0 && "select".equals(stack.peek().tagName)) {
addSubclause(rr, ctx);
}
stack.push(rr);
@ -312,11 +312,11 @@ public class RoutingConfiguration {
if (!Algorithms.isEmpty(rr.t)) {
ctx.getLastRule().registerAndTagValueCondition(rr.t, Algorithms.isEmpty(rr.v) ? null : rr.v, not);
}
if (rr.tagName.equals("gt")) {
if ("gt".equals(rr.tagName)) {
ctx.getLastRule().registerGreatCondition(rr.value1, rr.value2, rr.type);
} else if (rr.tagName.equals("le")) {
} else if ("le".equals(rr.tagName)) {
ctx.getLastRule().registerLessCondition(rr.value1, rr.value2, rr.type);
} else if (rr.tagName.equals("eq")) {
} else if ("eq".equals(rr.tagName)) {
ctx.getLastRule().registerEqualCondition(rr.value1, rr.value2, rr.type);
}
}

2
OsmAnd-telegram/AndroidManifest.xml
View file

@ -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">

10
OsmAnd-telegram/build.gradle
View file

@ -142,12 +142,12 @@ 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 'com.android.support:design:28.0.0-rc01'
implementation 'com.android.support:customtabs:28.0.0-rc01'
implementation 'com.android.support:support-annotations:28.0.0-rc01'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.annotation:annotation:1.0.0'
implementation 'commons-logging:commons-logging-api:1.1'
implementation 'com.android.support:recyclerview-v7:28.0.0-rc01'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.vividsolutions:jts-core:1.14.0'
implementation("com.github.HITGIF:TextFieldBoxes:1.4.4") {
exclude group: 'com.android.support'

8
OsmAnd-telegram/res/layout/activity_main.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_add_new_device.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_battery_optimization.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_choose_osmand.xml
View file

@ -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"

4
OsmAnd-telegram/res/layout/bottom_sheet_dialog.xml
View file

@ -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>

8
OsmAnd-telegram/res/layout/bottom_sheet_disable_sharing.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_disconnect_telegram.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_logout.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_set_time.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_sharing_status.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/bottom_sheet_sort_by.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
View file

@ -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"

10
OsmAnd-telegram/res/layout/fragment_live_now_tab.xml
View file

@ -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"

10
OsmAnd-telegram/res/layout/fragment_my_location_tab.xml
View file

@ -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>

10
OsmAnd-telegram/res/layout/fragment_proxy_settings_dialog.xml
View file

@ -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"

10
OsmAnd-telegram/res/layout/fragment_search_dialog.xml
View file

@ -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"

6
OsmAnd-telegram/res/layout/fragment_set_time_dialog.xml
View file

@ -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"

8
OsmAnd-telegram/res/layout/fragment_timeline_tab.xml
View file

@ -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>

4
OsmAnd-telegram/res/layout/fragment_user_gpx_info.xml
View file

@ -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>

2
OsmAnd-telegram/res/layout/login_dialog.xml
View file

@ -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"

6
OsmAnd-telegram/res/values-ar-rSA/strings.xml
View file

@ -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>

8
OsmAnd-telegram/res/values-ar/strings.xml
View file

@ -13,7 +13,7 @@
<string name="osmand_service">حالة وضع السكون</string>
<string name="nm_h">ميل بحري</string>
<string name="si_nm_h">ميل بحري في الساعة (عقدة)</string>
<string name="si_km_m">كم ، متر</string>
<string name="si_km_m">كم ، م</string>
<string name="shared_string_end">نهاية</string>
<string name="saved_messages">الرسائل المحفوظة</string>
<string name="shared_string_update">تحديث</string>
@ -43,7 +43,7 @@
<string name="yard">ياردة</string>
<string name="foot">قدم</string>
<string name="mile">ميل</string>
<string name="km">كلم</string>
<string name="km">كم</string>
<string name="m">م</string>
<string name="nm">ميل بحري</string>
<string name="min_mile">د/م</string>
@ -58,7 +58,7 @@
<string name="si_mi_feet">ميل ، قدم</string>
<string name="si_mi_yard">ميل ، ياردة</string>
<string name="si_nm">ميل بحري</string>
<string name="si_mi_meters">ميل ، متر</string>
<string name="si_mi_meters">ميل ، م</string>
<string name="shared_string_search">بحث</string>
<string name="altitude">الارتفاع</string>
<string name="shared_string_enable">تفعيل</string>
@ -252,7 +252,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="set_time_timeline_descr">تحديد وقت للعرض</string>
<string name="start_end_date">تاريخ البدء — تاريخ الانتهاء</string>

14
OsmAnd-telegram/res/values-ast/strings.xml
View file

@ -221,4 +221,18 @@
<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>
</resources>

2
OsmAnd-telegram/res/values-ca/strings.xml
View file

@ -241,7 +241,7 @@
<string name="min_logging_speed">Velocitat mínima de registre</string>
<string name="min_logging_speed_descr">Filtre: no s\'enregistra per sota de la velocitat seleccionada</string>
<string name="gpx_settings">Configuració GPX</string>
<string name="timeline_no_data_descr">No hem recopilat dades per al dia seleccionat</string>
<string name="timeline_no_data_descr">No hem recopilat dades del dia seleccionat</string>
<string name="timeline_no_data">No hi ha dades</string>
<string name="shared_string_end">Finalitza</string>
<string name="shared_string_start">Comença</string>

1
OsmAnd-telegram/res/values-da/strings.xml
View file

@ -268,4 +268,5 @@
<string name="last_update_from_telegram_duration">Sidste opdatering fra Telegram: %1$s siden</string>
<string name="last_response_duration">Sidste svar: %1$s siden</string>
<string name="duration_ago">%1$s siden</string>
<string name="shared_string_error_short">ERR</string>
</resources>

6
OsmAnd-telegram/res/values-fi/strings.xml
View file

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<resources>
<string name="shared_string_disable">Pois käytöstä</string>
<string name="shared_string_save">Tallenna</string>
<string name="add_device">Lisää laite</string>
</resources>

1
OsmAnd-telegram/res/values-sl/strings.xml
View file

@ -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>

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

@ -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;

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

@ -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 {

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

@ -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 {

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

@ -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;

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

@ -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 {

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

@ -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 {

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

@ -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 {

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

@ -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 {

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

@ -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 {

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

@ -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 {

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

@ -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 {

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

@ -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;

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

@ -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 {

6
OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
View file

@ -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

4
OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt
View file

@ -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 android.support.v4.content.ContextCompat
import androidx.core.app.NotificationCompat
import androidx.core.content.ContextCompat
import net.osmand.telegram.R
import net.osmand.telegram.TelegramApplication
import net.osmand.telegram.utils.OsmandFormatter

6
OsmAnd-telegram/src/net/osmand/telegram/notifications/TelegramNotification.kt
View file

@ -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 android.support.v4.app.NotificationManagerCompat
import androidx.core.app.NotificationCompat
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)

9
OsmAnd-telegram/src/net/osmand/telegram/ui/AddNewDeviceBottomSheet.kt
View file

@ -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)

8
OsmAnd-telegram/src/net/osmand/telegram/ui/BaseDialogFragment.kt
View file

@ -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 >= 19 -> setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Translucent)
else -> setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar)
Build.VERSION.SDK_INT >= 23 -> setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Transparent)
Build.VERSION.SDK_INT >= 19 -> setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar_Translucent)
else -> setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar)
}
}
}

7
OsmAnd-telegram/src/net/osmand/telegram/ui/BatteryOptimizationBottomSheet.kt
View file

@ -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

8
OsmAnd-telegram/src/net/osmand/telegram/ui/ChooseOsmAndBottomSheet.kt
View file

@ -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)

8
OsmAnd-telegram/src/net/osmand/telegram/ui/DisableSharingBottomSheet.kt
View file

@ -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) }

7
OsmAnd-telegram/src/net/osmand/telegram/ui/DisconnectTelegramBottomSheet.kt
View file

@ -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

27
OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
View file

@ -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() {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
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)
RecyclerView.SCROLL_STATE_IDLE -> animateOpenOsmAndBtn(true)
androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING -> animateOpenOsmAndBtn(false)
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)

15
OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
View file

@ -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?
}
}

8
OsmAnd-telegram/src/net/osmand/telegram/ui/LogoutBottomSheet.kt
View file

@ -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)

32
OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
View file

@ -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 viewPager: ViewPager
private lateinit var coordinatorLayout: androidx.coordinatorlayout.widget.CoordinatorLayout
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
}
}
}

24
OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
View file

@ -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() {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
override fun onScrollStateChanged(recyclerView: androidx.recyclerview.widget.RecyclerView, newState: Int) {
super.onScrollStateChanged(recyclerView, newState)
when (newState) {
RecyclerView.SCROLL_STATE_DRAGGING -> animateStartSharingBtn(false)
RecyclerView.SCROLL_STATE_IDLE -> animateStartSharingBtn(true)
androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING -> animateStartSharingBtn(false)
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)

13
OsmAnd-telegram/src/net/osmand/telegram/ui/ProxySettingsDialogFragment.kt
View file

@ -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.ProxyPref
import net.osmand.telegram.TelegramSettings.ProxyMTProtoPref
import net.osmand.telegram.TelegramSettings.ProxySOCKS5Pref
import net.osmand.telegram.TelegramSettings.*
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)

22
OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
View file

@ -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() {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
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 {

8
OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeBottomSheet.kt
View file

@ -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 {

20
OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt
View file

@ -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() {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
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) {

9
OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
View file

@ -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

10
OsmAnd-telegram/src/net/osmand/telegram/ui/SharingStatusBottomSheet.kt
View file

@ -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)

12
OsmAnd-telegram/src/net/osmand/telegram/ui/SortByBottomSheet.kt
View file

@ -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,
target: Fragment
fm: androidx.fragment.app.FragmentManager,
target: androidx.fragment.app.Fragment
): Boolean {
return try {
SortByBottomSheet().apply {

14
OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt
View file

@ -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)

7
OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt
View file

@ -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 {

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

@ -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)

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

@ -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) {}

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

@ -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

22
OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
View file

@ -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))
}

10
OsmAnd-telegram/src/net/osmand/telegram/utils/UiUtils.kt
View file

@ -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

2
OsmAnd/AndroidManifest.xml
View file

@ -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" >

14
OsmAnd/build.gradle
View file

@ -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 'com.android.support:gridlayout-v7:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:customtabs:27.1.1'
implementation 'com.android.support:preference-v7:27.1.1'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.browser:browser:1.0.0'
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'

12
OsmAnd/res/drawable/ic_speed_camera_disabled.xml Normal file
View file

@ -0,0 +1,12 @@
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M20,4H4V20H20V4ZM4,2C2.8954,2 2,2.8954 2,4V20C2,21.1046 2.8954,22 4,22H20C21.1046,22 22,21.1046 22,20V4C22,2.8954 21.1046,2 20,2H4Z"/>
<path android:fillColor="#727272" android:pathData="M7.4142,17H11.9999C12.5522,17 12.9999,16.5523 12.9999,16V11.4143L9.9445,14.4697C9.7695,15.197 9.197,15.7695 8.4697,15.9446L7.4142,17Z"/>
<path android:fillColor="#727272" android:pathData="M8.4691,13.1167L7.1166,14.4692C7.0422,14.3293 7,14.1696 7,14C7,13.4477 7.4477,13 8,13C8.1695,13 8.3292,13.0422 8.4691,13.1167Z"/>
<path android:fillColor="#727272" android:pathData="M9.1919,12.3939C8.8591,12.1464 8.4466,12 8,12C6.8954,12 6,12.8954 6,14C6,14.4467 6.1464,14.8591 6.3938,15.192L5.1166,16.4692C5.0421,16.3293 4.9999,16.1696 4.9999,16V8C4.9999,7.4477 5.4476,7 5.9999,7H11.9999C12.5522,7 12.9999,7.4477 12.9999,8V8.5859L11.9973,9.5885C11.999,9.5592 11.9999,9.5297 11.9999,9.5C11.9999,8.6716 11.3283,8 10.4999,8C9.6715,8 8.9999,8.6716 8.9999,9.5C8.9999,10.3284 9.6715,11 10.4999,11C10.5296,11 10.5591,10.9992 10.5883,10.9975L9.1919,12.3939Z"/>
<path android:fillColor="#727272" android:pathData="M13.9999,10.4143L15.4142,9H15.9999V14H13.9999V10.4143Z"/>
<path android:fillColor="#727272" android:pathData="M10.4999,10C10.776,10 10.9999,9.7762 10.9999,9.5C10.9999,9.2239 10.776,9 10.4999,9C10.2238,9 9.9999,9.2239 9.9999,9.5C9.9999,9.7762 10.2238,10 10.4999,10Z"/>
<path android:fillColor="#727272" android:pathData="M16.9999,10H17.9999V11.0666H18.9999V14H17.9999V16H13.9999V15H16.9999V10Z"/>
<path android:fillColor="#727272" android:fillType="evenOdd" android:pathData="M3.2929,19.2929L19.2929,3.2929L20.7071,4.7071L4.7071,20.7071L3.2929,19.2929Z"/>
</vector>

15
OsmAnd/res/drawable/img_speed_camera_warning.xml Normal file
View file

@ -0,0 +1,15 @@
<vector android:autoMirrored="true" android:height="92dp"
android:viewportHeight="92" android:viewportWidth="92"
android:width="92dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M36,54C36,56.7614 33.7614,59 31,59C28.2386,59 26,56.7614 26,54C26,51.2386 28.2386,49 31,49C33.7614,49 36,51.2386 36,54Z"/>
<path android:fillColor="#000000" android:pathData="M43,37C44.6569,37 46,35.6569 46,34C46,32.3431 44.6569,31 43,31C41.3431,31 40,32.3431 40,34C40,35.6569 41.3431,37 43,37Z"/>
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M19,29C19,27.3431 20.3431,26 22,26H48C49.6569,26 51,27.3431 51,29V63C51,64.6569 49.6569,66 48,66H22C20.3431,66 19,64.6569 19,63V29ZM31,62C35.4183,62 39,58.4183 39,54C39,49.5817 35.4183,46 31,46C26.5817,46 23,49.5817 23,54C23,58.4183 26.5817,62 31,62ZM48,34C48,36.7614 45.7614,39 43,39C40.2386,39 38,36.7614 38,34C38,31.2386 40.2386,29 43,29C45.7614,29 48,31.2386 48,34Z"/>
<path android:fillColor="#000000" android:pathData="M53,33H61V55H53V33Z"/>
<path android:fillColor="#000000" android:pathData="M63,39H65V42H73V54H65V59H53V57H63V39Z"/>
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M8,14C8,10.6863 10.6863,8 14,8H78C81.3137,8 84,10.6863 84,14V77C84,80.3137 81.3137,83 78,83H14C10.6863,83 8,80.3137 8,77V14ZM14,14H78V77H14V14Z"/>
<path android:fillColor="#EE5622"
android:pathData="M60.5071,52.532L61.2286,52.9701L60.5071,52.532L44.5991,78.7335C44.2072,79.3789 44,80.1195 44,80.8745C44,83.153 45.847,85 48.1255,85H49H81H81.8745C84.153,85 86,83.153 86,80.8745C86,80.1195 85.7928,79.3789 85.4009,78.7335L69.4929,52.532L68.6381,53.051L69.4929,52.532C68.9778,51.6836 68.2305,50.9972 67.3443,50.5541C66.6178,50.1909 65.8136,50 65,50C64.1864,50 63.3822,50.1909 62.6557,50.5541C61.7695,50.9972 61.0222,51.6836 60.5071,52.532Z"
android:strokeColor="#D13C06" android:strokeWidth="2"/>
<path android:fillColor="#ffffff" android:pathData="M65,60C63.8954,60 63,60.8954 63,62V70C63,71.1046 63.8954,72 65,72C66.1046,72 67,71.1046 67,70V62C67,60.8954 66.1046,60 65,60Z"/>
<path android:fillColor="#ffffff" android:pathData="M65,76C63.8954,76 63,76.8954 63,78C63,79.1046 63.8954,80 65,80C66.1046,80 67,79.1046 67,78C67,76.8954 66.1046,76 65,76Z"/>
</vector>

4
OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
View file

@ -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"

4
OsmAnd/res/layout-land/context_menu_card_dialog.xml
View file

@ -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"

8
OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
View file

@ -7,14 +7,14 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:background="@color/route_info_bottom_view_bg_dark">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/coordinate_input_toolbar"
android:layout_width="match_parent"
android:layout_height="48dp"
@ -70,9 +70,9 @@
</LinearLayout>
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/hand_container"

18
OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
View file

@ -9,12 +9,12 @@
android:background="?attr/activity_background_color"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_map_toolbar"
android:background="?attr/actionModeBackground">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_map_toolbar"
@ -57,9 +57,9 @@
tools:drawableEnd="@drawable/ic_action_car_dark" />
</LinearLayout>
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
@ -183,7 +183,7 @@
android:text="@string/show_direction"
android:textAppearance="@style/TextAppearance.ListItemTitle"/>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/distance_indication_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -325,7 +325,7 @@
android:text="@string/show_arrows_on_the_map"
android:textAppearance="@style/TextAppearance.ListItemTitle"/>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/show_arrows_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -387,7 +387,7 @@
android:text="@string/show_guide_line"
android:textAppearance="@style/TextAppearance.ListItemTitle"/>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/show_guide_line_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -449,7 +449,7 @@
android:text="@string/one_tap_active"
android:textAppearance="@style/TextAppearance.ListItemTitle"/>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/one_tap_active_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -512,7 +512,7 @@
android:text="@string/keep_passed_markers"
android:textAppearance="@style/TextAppearance.ListItemTitle"/>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/keep_passed_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

6
OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml
View file

@ -16,7 +16,7 @@
android:background="?attr/left_menu_view_bg"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/plan_route_toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_map_toolbar"
@ -97,7 +97,7 @@
android:paddingEnd="@dimen/list_content_padding" />
</LinearLayout>
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
<ProgressBar
android:id="@+id/snap_to_road_progress_bar"
@ -114,7 +114,7 @@
android:layout_height="match_parent"
android:background="@color/activity_background_color_dark">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/markers_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

2
OsmAnd/res/layout-land/map_hud_top.xml
View file

@ -634,7 +634,7 @@
android:visibility="gone"
osmand:typeface="@string/font_roboto_medium"/>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/widget_top_bar_switch"
android:layout_width="wrap_content"
android:layout_height="56dp"

4
OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
View file

@ -50,7 +50,7 @@
</LinearLayout>
<android.support.v7.widget.AppCompatButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/apply_button"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
@ -58,7 +58,7 @@
android:layout_gravity="center_vertical"
android:text="@string/shared_string_apply"/>
<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"

4
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -14,7 +14,7 @@
android:clickable="true"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="@dimen/dashboard_map_toolbar"
@ -24,7 +24,7 @@
app:contentInsetLeft="72dp"
app:contentInsetStart="72dp">
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
<ScrollView
android:id="@+id/editor_scroll_view"

2
OsmAnd/res/layout-land/quick_action_widget.xml
View file

@ -14,7 +14,7 @@
android:clickable="true"
android:orientation="vertical">
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="200dp" />

2
OsmAnd/res/layout-land/quick_action_widget_page.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.GridLayout
<androidx.gridlayout.widget.GridLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:grid="http://schemas.android.com/apk/res-auto"
android:id="@+id/grid"

Some files were not shown because too many files have changed in this diff Show more