Skip to content

Commit 3ff015b

Browse files
authored
refactor(admob): create a separate nav graph for the java sample (#1250)
1 parent 6b5baed commit 3ff015b

File tree

5 files changed

+31
-3
lines changed

5 files changed

+31
-3
lines changed

admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import android.os.Bundle;
1919
import androidx.appcompat.app.AppCompatActivity;
20+
import androidx.navigation.Navigation;
2021

2122
import com.google.samples.quickstart.admobexample.R;
2223

@@ -26,6 +27,7 @@ public class MainActivity extends AppCompatActivity {
2627
protected void onCreate(Bundle savedInstanceState) {
2728
super.onCreate(savedInstanceState);
2829
setContentView(R.layout.activity_main);
30+
Navigation.findNavController(this, R.id.nav_host_fragment).setGraph(R.navigation.nav_graph_java);
2931
}
3032

3133
}

admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt

+3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ package com.google.samples.quickstart.admobexample.kotlin
22

33
import android.os.Bundle
44
import androidx.appcompat.app.AppCompatActivity
5+
import androidx.navigation.findNavController
56
import com.google.samples.quickstart.admobexample.R
67

78
class MainActivity : AppCompatActivity() {
89

910
override fun onCreate(savedInstanceState: Bundle?) {
1011
super.onCreate(savedInstanceState)
1112
setContentView(R.layout.activity_main)
13+
14+
findNavController(R.id.nav_host_fragment).setGraph(R.navigation.nav_graph_kotlin)
1215
}
1316
}

admob/app/src/main/res/layout/activity_main.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
app:layout_constraintBottom_toBottomOf="parent"
1616
app:layout_constraintLeft_toLeftOf="parent"
1717
app:layout_constraintRight_toRightOf="parent"
18-
app:layout_constraintTop_toTopOf="parent"
19-
app:navGraph="@navigation/nav_graph" />
18+
app:layout_constraintTop_toTopOf="parent" />
2019

2120
</androidx.constraintlayout.widget.ConstraintLayout>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:id="@+id/nav_graph_java"
6+
app:startDestination="@id/FirstFragment">
7+
8+
<fragment
9+
android:id="@+id/FirstFragment"
10+
android:name="com.google.samples.quickstart.admobexample.java.FirstFragment"
11+
android:label="@string/first_fragment_title"
12+
tools:layout="@layout/fragment_first">
13+
14+
<action
15+
android:id="@+id/action_FirstFragment_to_SecondFragment"
16+
app:destination="@id/SecondFragment" />
17+
</fragment>
18+
<fragment
19+
android:id="@+id/SecondFragment"
20+
android:name="com.google.samples.quickstart.admobexample.java.SecondFragment"
21+
android:label="@string/second_fragment_title"
22+
tools:layout="@layout/fragment_second">
23+
</fragment>
24+
</navigation>

admob/app/src/main/res/navigation/nav_graph.xml renamed to admob/app/src/main/res/navigation/nav_graph_kotlin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
android:id="@+id/nav_graph"
5+
android:id="@+id/nav_graph_kotlin"
66
app:startDestination="@id/FirstFragment">
77

88
<fragment

0 commit comments

Comments
 (0)