Replace fragment references to viewLifecycleOwner

Original issue: android/architecture-components-samples#47
chornonoh-vova · Jan 11, 2019 · 68c10ac · 68c10ac
1 parent 96cf0b1
commit 68c10ac
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/FilesFragment.kt b/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/FilesFragment.kt
@@ -92,11 +92,11 @@ class FilesFragment : Fragment() {
         App.netComponent?.inject(filesViewModel)
         filesViewModel.init(user, repo)
 
-        filesViewModel.currentPath.observe(this, Observer {
+        filesViewModel.currentPath.observe(viewLifecycleOwner, Observer {
             currentPath.text = "/$it"
         })
 
-        filesViewModel.getBranches().observe(this, Observer {
+        filesViewModel.getBranches().observe(viewLifecycleOwner, Observer {
             if (it != null) {
                 val branches = Array(it.size) { i ->
                     it[i].name

diff --git a/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/IssuesFragment.kt b/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/IssuesFragment.kt
@@ -61,7 +61,7 @@ class IssuesFragment: Fragment() {
         App.netComponent?.inject(issuesViewModel)
         issuesViewModel.init(user, repo)
 
-        issuesViewModel.getIssues().observe(this, Observer {
+        issuesViewModel.getIssues().observe(viewLifecycleOwner, Observer {
             if (it != null) {
                 listLoading.visibility = View.GONE
                 issuesAdapter.dataset = it
@@ -74,7 +74,7 @@ class IssuesFragment: Fragment() {
     }
 
     private val bottom: BottomReachedListener = {
-        issuesViewModel.getNextPage().observe(this, Observer { issues ->
+        issuesViewModel.getNextPage().observe(viewLifecycleOwner, Observer { issues ->
             val dataset = issuesAdapter.dataset.toMutableList()
             dataset.addAll(issues)
             issuesAdapter.dataset = dataset

diff --git a/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/RepoOverviewFragment.kt b/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/RepoOverviewFragment.kt
@@ -40,7 +40,7 @@ class RepoOverviewFragment: Fragment() {
 
         repositoryViewModel.init(user, repo)
 
-        repositoryViewModel.getTopics(user, repo)?.observe(this, Observer { topic ->
+        repositoryViewModel.getTopics(user, repo)?.observe(viewLifecycleOwner, Observer { topic ->
             topic.names.forEach {
                 val chip = Chip(activity)
                 chip.text = it
@@ -50,9 +50,9 @@ class RepoOverviewFragment: Fragment() {
             }
         })
 
-        repositoryViewModel.getReadme(user, repo)?.observe(this, Observer { file ->
-            repositoryViewModel.getFile(file)?.observe(this, Observer { markdown ->
-                repositoryViewModel.getReadmeHtml(markdown, "$user/$repo")?.observe(this, Observer { html ->
+        repositoryViewModel.getReadme(user, repo)?.observe(viewLifecycleOwner, Observer { file ->
+            repositoryViewModel.getFile(file)?.observe(viewLifecycleOwner, Observer { markdown ->
+                repositoryViewModel.getReadmeHtml(markdown, "$user/$repo")?.observe(viewLifecycleOwner, Observer { html ->
                     val data = """
                     <html>
                     <head>

diff --git a/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/ReposFragment.kt b/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/ReposFragment.kt
@@ -66,7 +66,7 @@ class ReposFragment : Fragment() {
         App.netComponent?.inject(reposViewModel)
         reposViewModel.multipleInit(mode, user)
 
-        reposViewModel.getRepos()?.observe(this, Observer {
+        reposViewModel.getRepos()?.observe(viewLifecycleOwner, Observer {
             if (it != null) {
                 listLoading.visibility = View.GONE
                 reposAdapter.dataset = it

diff --git a/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/UserFragment.kt b/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/UserFragment.kt
@@ -58,7 +58,7 @@ class UserFragment : Fragment() {
         App.netComponent?.inject(userViewModel)
         userViewModel.singleInit(user)
 
-        userViewModel.getUser()?.observe(this, Observer { user ->
+        userViewModel.getUser()?.observe(viewLifecycleOwner, Observer { user ->
             if (user != null) {
                 listLoading.visibility = View.GONE
                 login.text = user.login

diff --git a/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/UsersFragment.kt b/app/src/main/java/com/hbvhuwe/explorergithub/ui/fragments/UsersFragment.kt
@@ -72,7 +72,7 @@ class UsersFragment : Fragment() {
         App.netComponent?.inject(userViewModel)
         userViewModel.multipleInit(mode, user, repo)
 
-        userViewModel.getUsers()?.observe(this, Observer {
+        userViewModel.getUsers()?.observe(viewLifecycleOwner, Observer {
             if (it != null) {
                 listLoading.visibility = View.GONE
                 usersAdapter.dataset = it