diff --git a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java index 65eca55367..db9593f6be 100644 --- a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java +++ b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java @@ -17,6 +17,7 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import androidx.navigation.Navigation; import com.google.samples.quickstart.admobexample.R; @@ -26,6 +27,7 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + Navigation.findNavController(this, R.id.nav_host_fragment).setGraph(R.navigation.nav_graph_java); } } diff --git a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt index d9d7bab6ed..6cc6424b35 100644 --- a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt +++ b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt @@ -2,6 +2,7 @@ package com.google.samples.quickstart.admobexample.kotlin import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import androidx.navigation.findNavController import com.google.samples.quickstart.admobexample.R class MainActivity : AppCompatActivity() { @@ -9,5 +10,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + + findNavController(R.id.nav_host_fragment).setGraph(R.navigation.nav_graph_kotlin) } } diff --git a/admob/app/src/main/res/layout/activity_main.xml b/admob/app/src/main/res/layout/activity_main.xml index 0869517285..7b3dcd099a 100644 --- a/admob/app/src/main/res/layout/activity_main.xml +++ b/admob/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:navGraph="@navigation/nav_graph" /> + app:layout_constraintTop_toTopOf="parent" /> diff --git a/admob/app/src/main/res/navigation/nav_graph_java.xml b/admob/app/src/main/res/navigation/nav_graph_java.xml new file mode 100644 index 0000000000..1cddaeed73 --- /dev/null +++ b/admob/app/src/main/res/navigation/nav_graph_java.xml @@ -0,0 +1,24 @@ + + + + + + + + + + \ No newline at end of file diff --git a/admob/app/src/main/res/navigation/nav_graph.xml b/admob/app/src/main/res/navigation/nav_graph_kotlin.xml similarity index 95% rename from admob/app/src/main/res/navigation/nav_graph.xml rename to admob/app/src/main/res/navigation/nav_graph_kotlin.xml index e84636fe53..20f7f732e3 100644 --- a/admob/app/src/main/res/navigation/nav_graph.xml +++ b/admob/app/src/main/res/navigation/nav_graph_kotlin.xml @@ -2,7 +2,7 @@