Skip to content

Use Navigation in Firestore #1268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 15, 2021
Merged

Use Navigation in Firestore #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90d9ce8
Use Navigation in Firestore
samtstern Mar 15, 2021
4692aec
Delete test
samtstern Mar 15, 2021
fb2fcbf
Downgrade jcenter()
samtstern Mar 15, 2021
70513ba
Update firestore/app/src/main/res/navigation/nav_graph_kotlin.xml
samtstern Mar 15, 2021
1c6eb6c
Update firestore/app/src/main/java/com/google/firebase/example/fireea…
samtstern Mar 15, 2021
9197edb
Review comments
samtstern Mar 15, 2021
95585a1
More jcenter() downgrades
samtstern Mar 15, 2021
5cba4ce
wildcard import
samtstern Mar 15, 2021
653212e
Fix compile
samtstern Mar 15, 2021
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
4 changes: 2 additions & 2 deletions analytics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

buildscript {
repositories {
jcenter()
mavenLocal()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
Expand All @@ -17,7 +17,7 @@ allprojects {
repositories {
//mavenLocal() must be listed at the top to facilitate testing
mavenLocal()
jcenter()
google()
jcenter()
}
}
6 changes: 3 additions & 3 deletions app-indexing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

buildscript {
repositories {
jcenter()
mavenLocal()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
Expand All @@ -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()
}
}
4 changes: 2 additions & 2 deletions auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

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

Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down
4 changes: 2 additions & 2 deletions config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

buildscript {
repositories {
jcenter()
mavenLocal()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
Expand All @@ -17,7 +17,7 @@ allprojects {
repositories {
//mavenLocal() must be listed at the top to facilitate testing
mavenLocal()
jcenter()
google()
jcenter()
}
}
4 changes: 2 additions & 2 deletions crash/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

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

Expand Down
4 changes: 2 additions & 2 deletions database/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

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

Expand Down
7 changes: 5 additions & 2 deletions firestore/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'androidx.navigation.safeargs'

android {
testBuildType "release"
Expand Down Expand Up @@ -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'

Expand Down
113 changes: 0 additions & 113 deletions ...store/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions firestore/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions firestore/app/src/main/java/com/google/firebase/example/fireeats/EntryChoiceActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down
4 changes: 2 additions & 2 deletions ...ore/app/src/main/java/com/google/firebase/example/fireeats/java/FilterDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down
Loading