diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml new file mode 100644 index 0000000..02b915b --- /dev/null +++ b/.idea/git_toolbox_prj.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/najudoryeong/mineme/MainActivity.kt b/app/src/main/java/com/najudoryeong/mineme/MainActivity.kt index c85da26..942b5cb 100644 --- a/app/src/main/java/com/najudoryeong/mineme/MainActivity.kt +++ b/app/src/main/java/com/najudoryeong/mineme/MainActivity.kt @@ -13,6 +13,8 @@ import androidx.navigation.ui.setupWithNavController import com.najudoryeong.mineme.common_ui.MainActivityUtil import com.najudoryeong.mineme.databinding.ActivityMainBinding import dagger.hilt.android.AndroidEntryPoint +import com.najudoryeong.mineme.story.R.id.storyFragment +import com.najudoryeong.mineme.home.R.id.homeFragment // 하위 모듈이 MainViewModel 코드에 접근할 수 있게 MainViewModelUtil 상속 구현 @@ -44,7 +46,7 @@ class MainActivity : AppCompatActivity(), MainActivityUtil { // appbar 구성 요소 설정 // 바텀네비게이션과 연결하면 해당 프래그먼트에 네비게이션으로는 backButton x appBarConfiguration = AppBarConfiguration( - setOf(R.id.nav_home, R.id.nav_story, R.id.nav_setting) + setOf(homeFragment, storyFragment, R.id.nav_setting) ) // navController 와 actionbar 연결 diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 015dc35..5387261 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,9 +1,9 @@ -