Skip to content

Commit 10e1f27

Browse files
committed
refactor MainActivity into ui package
1 parent d70b566 commit 10e1f27

5 files changed

Lines changed: 16 additions & 7 deletions

File tree

app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ if (file('signing.gradle').exists()) {
77
}
88

99
android {
10+
dataBinding {
11+
enabled true
12+
}
1013
compileSdkVersion 31
1114
buildToolsVersion "30.0.2"
1215

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<activity
1717
android:exported="true"
18-
android:name=".MainActivity"
18+
android:name=".ui.MainActivity"
1919
android:label="@string/title_activity_main"
2020
android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
2121
<intent-filter>

app/src/main/java/tw/idv/palatis/xappdebug/MainActivity.java renamed to app/src/main/java/tw/idv/palatis/xappdebug/ui/MainActivity.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
package tw.idv.palatis.xappdebug;
1+
package tw.idv.palatis.xappdebug.ui;
22

33
import android.os.Bundle;
44

5-
import com.google.android.material.navigation.NavigationView;
6-
75
import androidx.appcompat.app.AppCompatActivity;
86
import androidx.appcompat.widget.Toolbar;
97
import androidx.drawerlayout.widget.DrawerLayout;
108
import androidx.navigation.NavController;
119
import androidx.navigation.Navigation;
10+
import androidx.navigation.fragment.NavHostFragment;
1211
import androidx.navigation.ui.AppBarConfiguration;
1312
import androidx.navigation.ui.NavigationUI;
1413

14+
import com.google.android.material.navigation.NavigationView;
15+
16+
import tw.idv.palatis.xappdebug.R;
17+
1518
public class MainActivity extends AppCompatActivity {
1619

1720
private AppBarConfiguration mAppBarConfiguration;
@@ -31,7 +34,8 @@ protected void onCreate(Bundle savedInstanceState) {
3134
mAppBarConfiguration = new AppBarConfiguration.Builder(R.id.nav_apps, R.id.nav_about)
3235
.setDrawerLayout(drawer)
3336
.build();
34-
final NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
37+
final NavHostFragment navFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
38+
final NavController navController = navFragment.getNavController();
3539
NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration);
3640
NavigationUI.setupWithNavController(navigationView, navController);
3741
}
@@ -41,4 +45,5 @@ public boolean onSupportNavigateUp() {
4145
final NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
4246
return NavigationUI.navigateUp(navController, mAppBarConfiguration) || super.onSupportNavigateUp();
4347
}
48+
4449
}

app/src/main/res/layout/app_bar_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
tools:context=".MainActivity">
7+
tools:context=".ui.MainActivity">
88

99
<com.google.android.material.appbar.AppBarLayout
1010
android:layout_width="match_parent"

app/src/main/res/layout/content_main.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
app:layout_behavior="@string/appbar_scrolling_view_behavior"
88
tools:showIn="@layout/app_bar_main">
99

10-
<fragment
10+
<androidx.fragment.app.FragmentContainerView
1111
android:id="@+id/nav_host_fragment"
1212
android:name="androidx.navigation.fragment.NavHostFragment"
1313
android:layout_width="match_parent"
@@ -16,6 +16,7 @@
1616
app:layout_constraintLeft_toLeftOf="parent"
1717
app:layout_constraintRight_toRightOf="parent"
1818
app:layout_constraintTop_toTopOf="parent"
19+
app:layout_constraintBottom_toBottomOf="parent"
1920
app:navGraph="@navigation/mobile_navigation" />
2021

2122
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)