Merge branch 'master' of https://github.com/firebase/quickstart-android into add_generate_link_to_quickstart

Cristian Avalos · Cristian Avalos · commit 5c9bb8785170 · 2022-10-10T15:30:09.000-07:00
diff --git a/admob/app/build.gradle b/admob/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.samples.quickstart.admobexample'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/admob/app/src/main/AndroidManifest.xml b/admob/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.samples.quickstart.admobexample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- [SNIPPET modify_app_permissions]
         Include required permissions for Google Mobile Ads to run.
diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.firebase.quickstart.analytics'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/analytics/app/src/main/AndroidManifest.xml b/analytics/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.quickstart.analytics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/appdistribution/app/build.gradle b/appdistribution/app/build.gradle
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+    namespace 'com.google.firebase.appdistributionquickstart'
     compileSdkVersion 33
     defaultConfig {
         applicationId "com.google.firebase.appdistributionquickstart"
diff --git a/appdistribution/app/src/main/AndroidManifest.xml b/appdistribution/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.appdistributionquickstart">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name="androidx.multidex.MultiDexApplication"
diff --git a/auth/app/build.gradle b/auth/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.firebase.quickstart.auth'
     compileSdkVersion 33
     flavorDimensions "minSdkVersion"
 
diff --git a/auth/app/src/main/AndroidManifest.xml b/auth/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase.quickstart.auth">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/config/app/build.gradle b/config/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.samples.quickstart.config'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/config/app/src/main/AndroidManifest.xml b/config/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.quickstart.config" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/crash/app/build.gradle b/crash/app/build.gradle
@@ -8,6 +8,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.samples.quickstart.crash'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/crash/app/src/main/AndroidManifest.xml b/crash/app/src/main/AndroidManifest.xml
@@ -11,8 +11,7 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.quickstart.crash">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
diff --git a/database/app/build.gradle b/database/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.firebase.quickstart.database'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/database/app/src/main/AndroidManifest.xml b/database/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.database">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/dynamiclinks/app/build.gradle b/dynamiclinks/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 check.dependsOn 'assembleMainFlavorDebugAndroidTest'
 
 android {
+    namespace 'com.google.firebase.quickstart.deeplinks'
     compileSdkVersion 33
     flavorDimensions "irrelevant"
 
diff --git a/dynamiclinks/app/src/main/AndroidManifest.xml b/dynamiclinks/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.deeplinks" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle
@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace 'com.google.firebase.example.fireeats'
     testBuildType "release"
     compileSdkVersion 33
 
diff --git a/firestore/app/src/androidTest/AndroidManifest.xml b/firestore/app/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.google.firebase.example.fireeats"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:tools="http://schemas.android.com/tools">
 
   <uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
 
diff --git a/firestore/app/src/main/AndroidManifest.xml b/firestore/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.example.fireeats">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/java/RestaurantDetailFragment.java b/firestore/app/src/main/java/com/google/firebase/example/fireeats/java/RestaurantDetailFragment.java
@@ -12,6 +12,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
+import androidx.navigation.fragment.NavHostFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.bumptech.glide.Glide;
@@ -144,7 +145,7 @@ private void onRestaurantLoaded(Restaurant restaurant) {
     }
 
     public void onBackArrowClicked(View view) {
-        requireActivity().onBackPressed();
+        NavHostFragment.findNavController(this).popBackStack();
     }
 
     public void onAddRatingClicked(View view) {
diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RestaurantDetailFragment.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RestaurantDetailFragment.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bumptech.glide.Glide
 import com.google.android.gms.tasks.Task
@@ -134,7 +135,7 @@ class RestaurantDetailFragment : Fragment(),
     }
 
     private fun onBackArrowClicked() {
-        requireActivity().onBackPressed()
+        findNavController().popBackStack()
     }
 
     private fun onAddRatingClicked() {
diff --git a/functions/app/build.gradle b/functions/app/build.gradle
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+    namespace 'com.google.samples.quickstart.functions'
     // Changes the test build type for instrumented tests to "stage".
     testBuildType "release"
     compileSdkVersion 33
diff --git a/functions/app/src/androidTest/AndroidManifest.xml b/functions/app/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.google.samples.quickstart.functions"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:tools="http://schemas.android.com/tools">
 
   <uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
 
diff --git a/functions/app/src/main/AndroidManifest.xml b/functions/app/src/main/AndroidManifest.xml
@@ -9,8 +9,7 @@ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.quickstart.functions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+    namespace 'com.google.firebase.fiamquickstart'
     compileSdkVersion 33
     defaultConfig {
         applicationId "com.google.firebase.fiamquickstart"
diff --git a/inappmessaging/app/src/main/AndroidManifest.xml b/inappmessaging/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.fiamquickstart">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name="androidx.multidex.MultiDexApplication"
diff --git a/internal/chooserx/build.gradle b/internal/chooserx/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace 'com.firebase.example.internal'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/internal/chooserx/src/main/AndroidManifest.xml b/internal/chooserx/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.firebase.example.internal">
+<manifest>
 </manifest>
diff --git a/internal/lintchecks/build.gradle b/internal/lintchecks/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.library'
 }
 android {
+    namespace 'com.firebase.lintchecks'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/internal/lintchecks/src/main/AndroidManifest.xml b/internal/lintchecks/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.firebase.lintchecks" />
+<manifest />
diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.firebase.quickstart.fcm'
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/messaging/app/src/main/AndroidManifest.xml b/messaging/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase.quickstart.fcm">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
diff --git a/perf/app/build.gradle b/perf/app/build.gradle
@@ -8,6 +8,7 @@ plugins {
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
+    namespace 'com.google.firebase.quickstart.perfmon'
     compileSdkVersion 33
     defaultConfig {
         applicationId "com.google.firebase.quickstart.perfmon"
diff --git a/perf/app/src/main/AndroidManifest.xml b/perf/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.perfmon">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/storage/app/build.gradle b/storage/app/build.gradle
@@ -29,6 +29,7 @@ android {
     buildFeatures {
         viewBinding = true
     }
+    namespace 'com.google.firebase.quickstart.firebasestorage'
 }
 
 dependencies {
diff --git a/storage/app/src/main/AndroidManifest.xml b/storage/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.quickstart.firebasestorage">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Used only for testing purposes, not required for Firebase Storage -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
	`8`	`+ namespace 'com.google.firebase.appdistributionquickstart'`
`8`	`9`	`compileSdkVersion 33`
`9`	`10`	`defaultConfig {`
`10`	`11`	`applicationId "com.google.firebase.appdistributionquickstart"`