From a4580a8320cbd734911d6eacc2fd14c851da8941 Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Mon, 26 Apr 2021 09:27:37 +0300 Subject: [PATCH] [android] Update dependencies Signed-off-by: Roman Tsisyk --- android/build.gradle | 70 ++----------------- .../src/com/mapswithme/maps/MwmActivity.java | 9 --- .../maps/bookmarks/BookmarksListFragment.java | 8 +-- 3 files changed, 11 insertions(+), 76 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 74d92052e8..28bc7e94cb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -92,7 +92,7 @@ dependencies { } // 3-party - implementation 'com.google.code.gson:gson:2.6.1' + implementation 'com.google.code.gson:gson:2.8.6' // BottomSheet implementation 'com.cocosw:bottomsheet:1.5.0@aar' implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar' @@ -101,19 +101,17 @@ dependencies { // Java concurrency annotations implementation 'net.jcip:jcip-annotations:1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.work:work-runtime:2.2.0' - implementation('uk.co.samuelwall:material-tap-target-prompt:3.1.0', { - exclude group: 'androidx.lifecycle', module: 'lifecycle-extensions' - }) + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.work:work-runtime:2.5.0' implementation 'com.google.android:flexbox:1.0.0' implementation 'com.trafi:anchor-bottom-sheet-behavior:0.13-alpha' implementation 'com.github.yoksnod:MPAndroidChart:3.2.0-alpha' - implementation 'com.google.android.material:material:1.3.0-alpha03' + implementation 'com.google.android.material:material:1.4.0-alpha02' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0' - implementation 'androidx.preference:preference:1.1.0' - implementation 'androidx.fragment:fragment:1.1.0' + implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.fragment:fragment:1.3.3' + implementation 'androidx.recyclerview:recyclerview:1.2.0' } def run(cmd) { @@ -158,60 +156,6 @@ def osName = System.properties['os.name'].toLowerCase() project.ext.appId = 'app.omaps' project.ext.appName = 'OrganicMaps' -configurations.all { - if (it.getName().contains("lint")) - return - - resolutionStrategy { - force 'com.android.support:multidex:' + propMultiDexVersion - - force 'com.google.android.gms:play-services-location:17.0.0' - force 'com.google.android.gms:play-services-analytics:17.0.0' - force 'com.google.android.gms:play-services-plus:17.0.0' - force 'com.google.android.gms:play-services-gcm:17.0.0' - force 'com.google.android.gms:play-services-auth:17.0.0' - force 'com.google.android.gms:play-services-basement:17.1.1' - force 'com.google.android.gms:play-services-base:17.0.0' - force 'com.google.android.gms:play-services-tasks:17.0.0' - force 'com.google.android.gms:play-services-stats:17.0.0' - - force 'android.arch.core:runtime:1.1.1' - force 'android.arch.core:common:1.1.1' - force 'androidx.legacy:legacy-support-core-utils:1.0.0-rc01' - force 'androidx.loader:loader:1.0.0-rc01' - force 'androidx.lifecycle:lifecycle-viewmodel:2.1.0' - force 'androidx.lifecycle:lifecycle-common:2.1.0' - force 'androidx.arch.core:core-common:2.0.0-rc01' - force 'androidx.arch.core:core-runtime:2.0.0-rc01' - force 'androidx.lifecycle:lifecycle-runtime:2.1.0' - force 'androidx.lifecycle:lifecycle-livedata-core:2.1.0' - force 'androidx.lifecycle:lifecycle-extensions:2.1.0' - force 'androidx.work:work-runtime:2.2.0' - force "org.jetbrains.kotlin:kotlin-stdlib:1.3.31" - force "com.google.code.gson:gson:2.8.5" - force "com.google.guava:guava:27.0.1-jre" - force "com.android.installreferrer:installreferrer:1.1" - force "com.google.firebase:firebase-iid:16.0.0" - force "com.google.firebase:firebase-measurement-connector:18.0.0" - force "com.google.firebase:firebase-iid-interop:17.0.0" - force "com.google.firebase:firebase-common:19.3.0" - force "com.google.android.material:material:1.3.0-alpha03" - force "androidx.constraintlayout:constraintlayout:1.1.3" - force "androidx.vectordrawable:vectordrawable:1.1.0" - force "androidx.coordinatorlayout:coordinatorlayout:1.1.0" - force "androidx.collection:collection:1.1.0" - force "androidx.fragment:fragment:1.1.0" - force "androidx.preference:preference:1.1.0" - force "androidx.appcompat:appcompat:1.2.0" - force "androidx.annotation:annotation:1.1.0" - force "androidx.core:core:1.3.1" - force "androidx.versionedparcelable:versionedparcelable:1.1.0" - force "androidx.recyclerview:recyclerview:1.2.0-alpha02" - - failOnVersionConflict() - } -} - android { buildFeatures { dataBinding = true diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 49549353ff..142fbb4775 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -110,8 +110,6 @@ import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; import com.mapswithme.util.permissions.PermissionsResult; -import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; - import java.util.Objects; import java.util.Stack; @@ -134,7 +132,6 @@ public class MwmActivity extends BaseMwmFragmentActivity PlacePageController.SlideListener, AlertDialogCallback, RoutingModeListener, AppBackgroundTracker.OnTransitionListener, - MaterialTapTargetPrompt.PromptStateChangeListener, OnIsolinesLayerToggleListener, NoConnectionListener, MapWidgetOffsetsProvider @@ -1859,12 +1856,6 @@ public class MwmActivity extends BaseMwmFragmentActivity .show(); } - @Override - public void onPromptStateChanged(@NonNull MaterialTapTargetPrompt prompt, int state) - { - // No op. - } - @Override public void onTransit(boolean foreground) { diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java index d0818d14a8..ec649ab565 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java @@ -17,7 +17,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.MergeAdapter; +import androidx.recyclerview.widget.ConcatAdapter; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; @@ -47,7 +47,7 @@ import com.mapswithme.util.UiUtils; import java.util.List; -public class BookmarksListFragment extends BaseMwmRecyclerFragment +public class BookmarksListFragment extends BaseMwmRecyclerFragment implements BookmarkManager.BookmarksSharingListener, BookmarkManager.BookmarksSortingListener, BookmarkManager.BookmarksLoadingListener, @@ -115,10 +115,10 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment @NonNull @Override - protected MergeAdapter createAdapter() + protected ConcatAdapter createAdapter() { BookmarkCategory category = mCategoryDataSource.getData(); - return new MergeAdapter(initAndGetCollectionAdapter(category.getId()), + return new ConcatAdapter(initAndGetCollectionAdapter(category.getId()), new BookmarkListAdapter(mCategoryDataSource)); }