cleanup

emeruvia · Mar 24, 2020 · 483ad95 · 483ad95
1 parent 94172fe
commit 483ad95
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/app/src/main/java/com/codingwithmitch/openapi/ui/auth/BaseAuthFragment.kt b/app/src/main/java/com/codingwithmitch/openapi/ui/auth/BaseAuthFragment.kt
@@ -1,7 +1,9 @@
 package com.codingwithmitch.openapi.ui.auth
 
 import android.content.Context
+import android.os.Bundle
 import android.util.Log
+import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -27,11 +29,15 @@ constructor(
 
     lateinit var uiCommunicationListener: UICommunicationListener
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupChannel()
+    }
+
     private fun setupChannel() = viewModel.setupChannel()
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        setupChannel()
         try{
             uiCommunicationListener = context as UICommunicationListener
         }catch(e: ClassCastException){

diff --git a/app/src/main/java/com/codingwithmitch/openapi/ui/main/account/BaseAccountFragment.kt b/app/src/main/java/com/codingwithmitch/openapi/ui/main/account/BaseAccountFragment.kt
@@ -36,6 +36,7 @@ constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupActionBarWithNavController(R.id.accountFragment, activity as AppCompatActivity)
+        setupChannel()
     }
 
     private fun setupChannel() = viewModel.setupChannel()
@@ -51,7 +52,6 @@ constructor(
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        setupChannel()
         try{
             uiCommunicationListener = context as UICommunicationListener
         }catch(e: ClassCastException){

diff --git a/app/src/main/java/com/codingwithmitch/openapi/ui/main/account/UpdateAccountFragment.kt b/app/src/main/java/com/codingwithmitch/openapi/ui/main/account/UpdateAccountFragment.kt
@@ -3,10 +3,8 @@ package com.codingwithmitch.openapi.ui.main.account
 import android.os.Bundle
 import android.util.Log
 import android.view.*
-import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
 import com.codingwithmitch.openapi.R
 import com.codingwithmitch.openapi.models.AccountProperties
 import com.codingwithmitch.openapi.ui.main.account.state.ACCOUNT_VIEW_STATE_BUNDLE_KEY
@@ -59,6 +57,7 @@ constructor(
         viewModel.stateMessage.observe(viewLifecycleOwner, Observer { stateMessage ->
 
             stateMessage?.let {
+
                 uiCommunicationListener.onResponseReceived(
                     response = it.response,
                     stateMessageCallback = object: StateMessageCallback {

diff --git a/app/src/main/java/com/codingwithmitch/openapi/ui/main/blog/BaseBlogFragment.kt b/app/src/main/java/com/codingwithmitch/openapi/ui/main/blog/BaseBlogFragment.kt
@@ -39,7 +39,7 @@ constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupActionBarWithNavController(R.id.blogFragment, activity as AppCompatActivity)
-
+        setupChannel()
     }
 
 
@@ -56,7 +56,6 @@ constructor(
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        setupChannel()
         try{
             uiCommunicationListener = context as UICommunicationListener
         }catch(e: ClassCastException){

diff --git a/app/src/main/java/com/codingwithmitch/openapi/ui/main/create_blog/BaseCreateBlogFragment.kt b/app/src/main/java/com/codingwithmitch/openapi/ui/main/create_blog/BaseCreateBlogFragment.kt
@@ -36,6 +36,7 @@ constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupActionBarWithNavController(R.id.createBlogFragment, activity as AppCompatActivity)
+        setupChannel()
     }
 
     private fun setupChannel() = viewModel.setupChannel()
@@ -51,7 +52,6 @@ constructor(
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        setupChannel()
         try{
             uiCommunicationListener = context as UICommunicationListener
         }catch(e: ClassCastException){

diff --git a/app/src/main/java/com/codingwithmitch/openapi/util/SuccessHandling.kt b/app/src/main/java/com/codingwithmitch/openapi/util/SuccessHandling.kt
@@ -13,5 +13,7 @@ class SuccessHandling {
         const val SUCCESS_BLOG_DELETED = "deleted"
         const val SUCCESS_BLOG_UPDATED = "updated"
 
+
+
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,7 @@ class SuccessHandling { @@
             const val SUCCESS_BLOG_DELETED = "deleted"
             const val SUCCESS_BLOG_UPDATED = "updated"
         }
     }