--- a/geekdroid-firebase/build.gradle.kts Tue Nov 29 14:47:37 2022 -0400
+++ b/geekdroid-firebase/build.gradle.kts Tue Nov 29 15:05:58 2022 -0400
@@ -44,19 +44,19 @@
api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services")
- implementation("com.jakewharton.timber:timber:4.7.1")
+ implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.crashlytics.sdk.android:crashlytics:2.10.1")
- implementation("com.google.firebase:firebase-crashlytics:17.1.1")
+ implementation("com.google.firebase:firebase-crashlytics:18.3.2")
- api("com.google.firebase:firebase-firestore-ktx:21.5.0")
- implementation("com.google.firebase:firebase-auth:19.3.2")
+ api("com.google.firebase:firebase-firestore-ktx:24.4.1")
+ implementation("com.google.firebase:firebase-auth:21.1.0")
// not firebase but they often work together so here we are
- implementation("com.google.android.gms:play-services-location:17.0.0")
+ implementation("com.google.android.gms:play-services-location:21.0.1")
// not firebase but similar to gms api
- implementation("com.google.android.play:core:1.7.3")
+ implementation("com.google.android.play:core:1.10.3")
// fix for guava conflict
// firebase depends on a older version of these dependencies while testImplementation dependencies
--- a/geekdroid-firebase/src/main/java/com/geekorum/geekdroid/gms/LocationServices.kt Tue Nov 29 14:47:37 2022 -0400
+++ b/geekdroid-firebase/src/main/java/com/geekorum/geekdroid/gms/LocationServices.kt Tue Nov 29 15:05:58 2022 -0400
@@ -32,7 +32,7 @@
import kotlin.coroutines.resumeWithException
@RequiresPermission(anyOf = ["android.permission.ACCESS_COARSE_LOCATION", "android.permission.ACCESS_FINE_LOCATION"])
-suspend fun FusedLocationProviderClient.requestLocation(locationRequest: LocationRequest): Location {
+suspend fun FusedLocationProviderClient.requestLocation(locationRequest: LocationRequest): Location? {
return suspendCancellableCoroutine { cont ->
val locationCallback = object : LocationCallback() {
override fun onLocationResult(result: LocationResult) {
--- a/geekdroid/build.gradle.kts Tue Nov 29 14:47:37 2022 -0400
+++ b/geekdroid/build.gradle.kts Tue Nov 29 15:05:58 2022 -0400
@@ -64,18 +64,18 @@
}
dependencies {
- implementation("androidx.recyclerview:recyclerview:1.1.0")
- implementation("androidx.appcompat:appcompat:1.1.0")
- implementation("com.google.android.material:material:1.1.0")
- implementation("androidx.constraintlayout:constraintlayout:1.1.3")
- implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
- implementation("androidx.annotation:annotation:1.1.0")
- implementation("androidx.preference:preference:1.1.1")
- implementation("androidx.core:core-ktx:1.3.1")
- implementation("androidx.fragment:fragment-ktx:1.2.5")
+ implementation("androidx.recyclerview:recyclerview:1.2.1")
+ implementation("androidx.appcompat:appcompat:1.5.1")
+ implementation("com.google.android.material:material:1.7.0")
+ api("androidx.constraintlayout:constraintlayout:2.1.4")
+ implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
+ implementation("androidx.annotation:annotation:1.5.0")
+ implementation("androidx.preference:preference:1.2.0")
+ implementation("androidx.core:core-ktx:1.9.0")
+ implementation("androidx.fragment:fragment-ktx:1.5.4")
implementation("com.squareup.picasso:picasso:2.5.2")
- implementation("com.squareup.okhttp3:okhttp:4.6.0")
+ implementation("com.squareup.okhttp3:okhttp:4.10.0")
val daggerVersion = "2.44.1"
implementation(enforcedDaggerPlatform(daggerVersion))
@@ -89,15 +89,15 @@
implementation(enforcedPlatform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.5"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
- implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0")
- implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0")
+ implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1")
+ implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1")
testImplementation("androidx.arch.core:core-testing:2.1.0")
- implementation("androidx.room:room-runtime:2.2.5")
- implementation("androidx.browser:browser:1.2.0")
- implementation("androidx.work:work-runtime:2.4.0")
- implementation("androidx.navigation:navigation-common-ktx:2.3.0")
- implementation("androidx.navigation:navigation-fragment:2.3.0")
+ implementation("androidx.room:room-runtime:2.4.3")
+ implementation("androidx.browser:browser:1.4.0")
+ implementation("androidx.work:work-runtime:2.7.1")
+ implementation("androidx.navigation:navigation-common-ktx:2.5.3")
+ implementation("androidx.navigation:navigation-fragment:2.5.3")
}
--- a/geekdroid/src/main/java/com/geekorum/geekdroid/app/BottomSheetDialogActivity.kt Tue Nov 29 14:47:37 2022 -0400
+++ b/geekdroid/src/main/java/com/geekorum/geekdroid/app/BottomSheetDialogActivity.kt Tue Nov 29 15:05:58 2022 -0400
@@ -109,7 +109,7 @@
private fun initializeBottomSheet() {
binding = ActivityBottomSheetDialogBinding.inflate(layoutInflater, null, false)
behavior = BottomSheetBehavior.from(binding.bottomSheet)
- behavior.setBottomSheetCallback(callbackDelegator)
+ behavior.addBottomSheetCallback(callbackDelegator)
behavior.isHideable = cancelable
// We treat the CoordinatorLayout as outside the dialog though it is technically inside
binding.touchOutside.setOnClickListener {
@@ -133,7 +133,7 @@
}
}
- override fun performAccessibilityAction(host: View, action: Int, args: Bundle): Boolean {
+ override fun performAccessibilityAction(host: View, action: Int, args: Bundle?): Boolean {
if (action == AccessibilityNodeInfoCompat.ACTION_DISMISS && cancelable) {
finish()
return true
@@ -164,7 +164,7 @@
fun shouldFinishOnTouchOutside(): Boolean {
if (!canceledOnTouchOutsideSet) {
- val a = obtainStyledAttributes(
+ obtainStyledAttributes(
intArrayOf(android.R.attr.windowCloseOnTouchOutside)).use {
cancelOnTouchOutside = it.getBoolean(0, true)
}
--- a/geekdroid/src/main/java/com/geekorum/geekdroid/views/banners/Banners.kt Tue Nov 29 14:47:37 2022 -0400
+++ b/geekdroid/src/main/java/com/geekorum/geekdroid/views/banners/Banners.kt Tue Nov 29 15:05:58 2022 -0400
@@ -100,7 +100,7 @@
private fun bindExtendedBanner(binding: ViewBannerExtendedBinding, banner: BannerSpec) {
binding.message.text = banner.message
- binding.icon.setImageIcon(banner.icon?.toIcon())
+ binding.icon.setImageIcon(banner.icon?.toIcon(binding.icon.context))
if (banner.icon == null) {
binding.icon.visibility = View.GONE
}