Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ android {

dependencies {
// Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
implementation(platform("com.google.firebase:firebase-bom:33.16.0"))
implementation(platform("com.google.firebase:firebase-bom:34.0.0"))

// Firestore
implementation("com.google.firebase:firebase-firestore-ktx")
implementation("com.google.firebase:firebase-firestore")

// Other Firebase/Play services deps
implementation("com.google.firebase:firebase-auth-ktx")
implementation("com.google.firebase:firebase-auth")

// Pinned to 20.7.0 as a workaround for issue https://github.com/firebase/quickstart-android/issues/1647
implementation("com.google.android.gms:play-services-auth:20.7.0")
Expand All @@ -65,8 +65,8 @@ dependencies {
implementation("com.google.android.material:material:1.12.0")
implementation("androidx.multidex:multidex:2.0.1")
implementation("androidx.recyclerview:recyclerview:1.4.0")
implementation("androidx.navigation:navigation-fragment-ktx:2.9.2")
implementation("androidx.navigation:navigation-ui-ktx:2.9.2")
implementation("androidx.navigation:navigation-fragment-ktx:2.9.3")
implementation("androidx.navigation:navigation-ui-ktx:2.9.3")
implementation("androidx.startup:startup-runtime:1.2.0")

// Android architecture components
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import com.firebase.ui.auth.ErrorCodes
import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract
import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult
import com.google.android.material.snackbar.Snackbar
import com.google.firebase.auth.ktx.auth
import com.google.firebase.auth.auth
import com.google.firebase.example.fireeats.databinding.FragmentMainBinding
import com.google.firebase.example.fireeats.adapter.RestaurantAdapter
import com.google.firebase.example.fireeats.model.Restaurant
Expand All @@ -30,8 +30,8 @@ import com.google.firebase.firestore.DocumentSnapshot
import com.google.firebase.firestore.FirebaseFirestore
import com.google.firebase.firestore.FirebaseFirestoreException
import com.google.firebase.firestore.Query
import com.google.firebase.firestore.ktx.firestore
import com.google.firebase.ktx.Firebase
import com.google.firebase.firestore.firestore
import com.google.firebase.Firebase

class MainFragment : Fragment(),
FilterDialogFragment.FilterListener,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.DialogFragment
import com.google.firebase.auth.ktx.auth
import com.google.firebase.auth.auth
import com.google.firebase.example.fireeats.databinding.DialogRatingBinding
import com.google.firebase.example.fireeats.model.Rating
import com.google.firebase.ktx.Firebase
import com.google.firebase.Firebase

/**
* Dialog Fragment containing rating form.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import com.google.firebase.firestore.FirebaseFirestore
import com.google.firebase.firestore.FirebaseFirestoreException
import com.google.firebase.firestore.ListenerRegistration
import com.google.firebase.firestore.Query
import com.google.firebase.firestore.ktx.firestore
import com.google.firebase.firestore.ktx.toObject
import com.google.firebase.ktx.Firebase
import com.google.firebase.firestore.firestore
import com.google.firebase.firestore.toObject
import com.google.firebase.Firebase

class RestaurantDetailFragment : Fragment(),
EventListener<DocumentSnapshot>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.firebase.example.fireeats.databinding.ItemRatingBinding
import com.google.firebase.example.fireeats.model.Rating
import com.google.firebase.firestore.Query
import com.google.firebase.firestore.ktx.toObject
import com.google.firebase.firestore.toObject
import java.text.SimpleDateFormat
import java.util.Locale

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.google.firebase.example.fireeats.model.Restaurant
import com.google.firebase.example.fireeats.util.RestaurantUtil
import com.google.firebase.firestore.DocumentSnapshot
import com.google.firebase.firestore.Query
import com.google.firebase.firestore.ktx.toObject
import com.google.firebase.firestore.toObject

/**
* RecyclerView adapter for a list of Restaurants.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package com.google.firebase.example.fireeats.util
import android.content.Context
import androidx.startup.Initializer
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.auth.ktx.auth
import com.google.firebase.auth.auth
import com.google.firebase.example.fireeats.BuildConfig
import com.google.firebase.ktx.Firebase
import com.google.firebase.Firebase

class AuthInitializer : Initializer<FirebaseAuth> {
// The host '10.0.2.2' is a special IP address to let the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.content.Context
import androidx.startup.Initializer
import com.google.firebase.example.fireeats.BuildConfig
import com.google.firebase.firestore.FirebaseFirestore
import com.google.firebase.firestore.ktx.firestore
import com.google.firebase.ktx.Firebase
import com.google.firebase.firestore.firestore
import com.google.firebase.Firebase

class FirestoreInitializer : Initializer<FirebaseFirestore> {

Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask

plugins {
id("com.android.application") version "8.11.1" apply false
id("com.android.library") version "8.11.1" apply false
id("com.android.application") version "8.12.0" apply false
id("com.android.library") version "8.12.0" apply false
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
id("com.google.gms.google-services") version "4.4.3" apply false
id("androidx.navigation.safeargs") version "2.9.2" apply false
id("androidx.navigation.safeargs") version "2.9.3" apply false
id("com.github.ben-manes.versions") version "0.52.0" apply true
}

Expand Down