Use Navigation in Firestore (#1268)

Author: samtstern

analytics/build.gradle

@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenLocal()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -17,7 +17,7 @@ allprojects {
     repositories {
          //mavenLocal() must be listed at the top to facilitate testing
         mavenLocal()
-        jcenter()
         google()
+        jcenter()
     }
 }

app-indexing/build.gradle

@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenLocal()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -15,9 +15,9 @@ buildscript {
 
 allprojects {
     repositories {
-         //mavenLocal() must be listed at the top to facilitate testing
+        // mavenLocal() must be listed at the top to facilitate testing
         mavenLocal()
-        jcenter()
         google()
+        jcenter()
     }
 }

auth/build.gradle

@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenLocal()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -17,8 +17,8 @@ allprojects {
     repositories {
          //mavenLocal() must be listed at the top to facilitate testing
         mavenLocal()
-        jcenter()
         google()
+        jcenter()
     }
 }
 

build.gradle

@@ -11,6 +11,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.5'
         classpath 'com.google.firebase:perf-plugin:1.3.5'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.4'
     }
 }
 

config/build.gradle

@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenLocal()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -17,7 +17,7 @@ allprojects {
     repositories {
         //mavenLocal() must be listed at the top to facilitate testing
         mavenLocal()
-        jcenter()
         google()
+        jcenter()
     }
 }

crash/build.gradle

@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenLocal()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -18,8 +18,8 @@ allprojects {
     repositories {
         //mavenLocal() must be listed at the top to facilitate testing
         mavenLocal()
-        jcenter()
         google()
+        jcenter()
     }
 }
 

database/build.gradle

@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenLocal()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -17,8 +17,8 @@ allprojects {
     repositories {
         //mavenLocal() must be listed at the top to facilitate testing
         mavenLocal()
-        jcenter()
         google()
+        jcenter()
     }
 }
 

firestore/app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'androidx.navigation.safeargs'
 
 android {
     testBuildType "release"
@@ -62,17 +63,19 @@ dependencies {
 
     // Support Libs
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core:1.3.2'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.media:media:1.2.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
 
     // Android architecture components
-    implementation 'androidx.lifecycle:lifecycle-runtime:2.3.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.3.0'
 

firestore/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java

@@ -22,22 +22,10 @@
 
         <activity
             android:name=".java.MainActivity"
-            android:theme="@style/AppTheme.Activity">
-
-        </activity>
-
-        <activity
-            android:name=".java.RestaurantDetailActivity"
             android:theme="@style/AppTheme.Activity" />
 
         <activity
             android:name=".kotlin.MainActivity"
-            android:theme="@style/AppTheme.Activity">
-
-        </activity>
-
-        <activity
-            android:name=".kotlin.RestaurantDetailActivity"
             android:theme="@style/AppTheme.Activity" />
     </application>
 

firestore/app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@ package com.google.firebase.example.fireeats
 import android.content.Intent
 import com.firebase.example.internal.BaseEntryChoiceActivity
 import com.firebase.example.internal.Choice
+import com.google.firebase.example.fireeats.kotlin.MainActivity
 
 class EntryChoiceActivity : BaseEntryChoiceActivity() {
 

firestore/app/src/main/java/com/google/firebase/example/fireeats/EntryChoiceActivity.kt

@@ -55,8 +55,8 @@ public void onDestroyView() {
     public void onAttach(Context context) {
         super.onAttach(context);
 
-        if (context instanceof FilterListener) {
-            mFilterListener = (FilterListener) context;
+        if (getParentFragment() instanceof FilterListener) {
+            mFilterListener = (FilterListener) getParentFragment();
         }
     }