Skip to content

Fix fragment container view crash and switchmap import #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 14, 2020
Merged

Fix fragment container view crash and switchmap import #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef94e6f
Fix switchMap import
daniel-stoneuk Jul 14, 2020
76003a8
Fix fragment container view crash
daniel-stoneuk Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions app/src/main/java/guide/graphql/toc/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,37 @@ package guide.graphql.toc

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.findNavController
import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.NavigationUI
import guide.graphql.toc.databinding.ActivityMainBinding


class MainActivity : AppCompatActivity() {

private lateinit var binding: ActivityMainBinding
private lateinit var navController: NavController

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

binding = ActivityMainBinding.inflate(layoutInflater)

val navHostFragment = supportFragmentManager
.findFragmentById(R.id.nav_host_fragment) as NavHostFragment?

navController = navHostFragment!!.navController

setContentView(binding.root)
setSupportActionBar(binding.toolbar)

NavigationUI.setupActionBarWithNavController(
this,
findNavController(R.id.nav_host_fragment)
navController
)
}

override fun onSupportNavigateUp(): Boolean {
return findNavController(R.id.nav_host_fragment).navigateUp() || super.onSupportNavigateUp()
return navController.navigateUp() || super.onSupportNavigateUp()
}
}
3 changes: 0 additions & 3 deletions app/src/main/java/guide/graphql/toc/ui/chapters/ChaptersViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package guide.graphql.toc.ui.chapters

import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.liveData
import com.apollographql.apollo.coroutines.toDeferred
Expand All @@ -13,8 +12,6 @@ import guide.graphql.toc.apolloClient

class ChaptersViewModel : ViewModel() {

val bookId: LiveData<Int> = MutableLiveData(0)

val chapterList: LiveData<Resource<List<ChaptersQuery.Chapter>>> = liveData {
emit(Resource.loading(null))
try {
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/guide/graphql/toc/ui/sections/SectionsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package guide.graphql.toc.ui.sections

import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.*
import com.apollographql.apollo.coroutines.toDeferred
import com.apollographql.apollo.exception.ApolloException
import guide.graphql.toc.Resource
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:theme="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>

<fragment
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
Expand Down