From ef9944184444e80fcc8ea8ae380f9b08def17c9d Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sun, 23 May 2021 23:05:22 +0200 Subject: [PATCH] various dependency updates --- app/build.gradle | 28 ++++++------- .../vonforst/evmap/fragment/MapFragment.kt | 14 ++++--- app/src/main/res/navigation/nav_graph.xml | 40 +++++++++---------- build.gradle | 16 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 51 insertions(+), 49 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 84e0f6f9..72f2b258 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,16 +98,15 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.core:core-ktx:1.5.0-rc01' - implementation "androidx.activity:activity-ktx:1.1.0" - implementation "androidx.fragment:fragment-ktx:1.2.5" + implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.core:core-ktx:1.5.0' + implementation "androidx.activity:activity-ktx:1.2.3" + implementation "androidx.fragment:fragment-ktx:1.3.4" implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.2.0' implementation 'androidx.browser:browser:1.3.0' implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660' implementation 'com.squareup.retrofit2:retrofit:2.9.0' @@ -122,13 +121,13 @@ dependencies { implementation "com.mikepenz:aboutlibraries-core:$about_libs_version" implementation "com.mikepenz:aboutlibraries:$about_libs_version" implementation 'com.airbnb.android:lottie:3.4.0' - implementation 'io.michaelrocks:bimap:1.0.2' + implementation 'io.michaelrocks.bimap:bimap:1.1.0' implementation 'com.mapzen.android:lost:3.0.2' implementation 'com.google.guava:guava:29.0-android' implementation 'com.github.pengrad:mapscaleview:1.6.0' // Android Auto - googleImplementation 'androidx.car.app:app:1.0.0-rc01' + googleImplementation 'androidx.car.app:app:1.0.0' // AnyMaps def anyMapsVersion = '1f050d860f' @@ -139,7 +138,7 @@ dependencies { // Google Maps v3 Beta googleImplementation 'com.google.android.libraries.maps:maps:3.1.0-beta' googleImplementation name:'places-maps-sdk-3.1.0-beta', ext:'aar' - googleImplementation 'com.android.volley:volley:1.1.1' + googleImplementation 'com.android.volley:volley:1.2.0' googleImplementation 'com.google.android.gms:play-services-base:17.5.0' googleImplementation 'com.google.android.gms:play-services-basement:17.5.0' googleImplementation 'com.google.android.gms:play-services-gcm:17.0.0' @@ -157,23 +156,22 @@ dependencies { } // navigation library - def nav_version = "2.3.2" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" // viewmodel library - def lifecycle_version = "2.2.0" + def lifecycle_version = "2.3.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" // room library - def room_version = "2.2.6" + def room_version = "2.3.0" implementation "androidx.room:room-runtime:$room_version" kapt "androidx.room:room-compiler:$room_version" implementation "androidx.room:room-ktx:$room_version" // billing library - def billing_version = "3.0.2" + def billing_version = "4.0.0" googleImplementation "com.android.billingclient:billing:$billing_version" googleImplementation "com.android.billingclient:billing-ktx:$billing_version" @@ -189,7 +187,7 @@ dependencies { kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2" - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } private static String decode(String s, String key) { diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt index 5525ce96..294e9db5 100644 --- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt @@ -224,15 +224,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac setupObservers() setupClickListeners() setupAdapters() - - val navController = findNavController() (activity as? MapsActivity)?.setSupportActionBar(binding.toolbar) - binding.toolbar.setupWithNavController( - navController, - (requireActivity() as MapsActivity).appBarConfiguration - ) val prefs = PreferenceDataSource(requireContext()) + val navController = findNavController() if (!prefs.welcomeDialogShown) { try { navController.navigate(R.id.action_map_to_welcome) @@ -252,6 +247,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac super.onResume() val hostActivity = activity as? MapsActivity ?: return hostActivity.fragmentCallback = this + + val navController = findNavController() + binding.toolbar.setupWithNavController( + navController, + (requireActivity() as MapsActivity).appBarConfiguration + ) + vm.reloadPrefs() if (requestingLocationUpdates && ContextCompat.checkSelfPermission( requireContext(), diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index f476f09b..1478199b 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -13,31 +13,31 @@ + app:enterAnim="@animator/nav_default_enter_anim" + app:exitAnim="@animator/nav_default_exit_anim" + app:popEnterAnim="@animator/nav_default_pop_enter_anim" + app:popExitAnim="@animator/nav_default_pop_exit_anim" /> + app:exitAnim="@animator/nav_default_exit_anim" + app:enterAnim="@animator/nav_default_enter_anim" + app:popEnterAnim="@animator/nav_default_pop_enter_anim" + app:popExitAnim="@animator/nav_default_pop_exit_anim" /> + app:exitAnim="@animator/nav_default_exit_anim" + app:enterAnim="@animator/nav_default_enter_anim" + app:popEnterAnim="@animator/nav_default_pop_enter_anim" + app:popExitAnim="@animator/nav_default_pop_exit_anim" /> + app:exitAnim="@animator/nav_default_exit_anim" + app:enterAnim="@animator/nav_default_enter_anim" + app:popEnterAnim="@animator/nav_default_pop_enter_anim" + app:popExitAnim="@animator/nav_default_pop_exit_anim" /> @@ -91,10 +91,10 @@ + app:exitAnim="@animator/nav_default_exit_anim" + app:enterAnim="@animator/nav_default_enter_anim" + app:popEnterAnim="@animator/nav_default_enter_anim" + app:popExitAnim="@animator/nav_default_exit_anim" />