Skip to content

Commit

Permalink
Rename MessagesFragmentV.Model to MessagesV.Model
Browse files Browse the repository at this point in the history
  • Loading branch information
MikolajRatajczyk committed Jun 16, 2019
1 parent 05e2918 commit be760ab
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.shapeapp.shape.R
import com.shapeapp.shape.data.Message
import com.shapeapp.shape.ui.messages.MessagesFragmentDirections
import com.shapeapp.shape.mockupsmakers.MessageMockups
import com.shapeapp.shape.mockupsmakers.UsersMockups
import com.shapeapp.shape.recyclerviewadapters.MessagesPreviewRecyclerViewAdapter
Expand All @@ -27,7 +26,7 @@ import kotlinx.android.synthetic.main.fragment_messages.*
*/
class MessagesFragment : Fragment() {

private lateinit var viewModel: MessagesFragmentViewModel
private lateinit var viewModel: MessagesViewModel

private val sentMessagesRecyclerViewAdapter = MessagesPreviewRecyclerViewAdapter(emptyList())
private val receivedMessagesRecyclerViewAdapter = MessagesPreviewRecyclerViewAdapter(emptyList())
Expand All @@ -44,7 +43,7 @@ class MessagesFragment : Fragment() {
val messagesRepository = MessagesRepository
val viewModelFactory = MessagesFragmentViewModelFactory(messagesRepository)
viewModel =
activity?.run { ViewModelProviders.of(this, viewModelFactory).get(MessagesFragmentViewModel::class.java) }
activity?.run { ViewModelProviders.of(this, viewModelFactory).get(MessagesViewModel::class.java) }
?: throw Exception("Invalid Activity")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import androidx.lifecycle.ViewModelProvider
import com.shapeapp.shape.repositories.MessagesRepository

/**
* Knows how to initiate [MessagesFragmentViewModel]
* Knows how to initiate [MessagesViewModel]
*/
class MessagesFragmentViewModelFactory(private val messagesRepository: MessagesRepository) :
ViewModelProvider.NewInstanceFactory() {

@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
return MessagesFragmentViewModel(messagesRepository) as T
return MessagesViewModel(messagesRepository) as T
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.shapeapp.shape.repositories.MessagesRepository
/**
* [ViewModel] for [MessagesFragment]
*/
class MessagesFragmentViewModel(private val messagesRepository: MessagesRepository) : ViewModel() {
class MessagesViewModel(private val messagesRepository: MessagesRepository) : ViewModel() {

// TODO: finish

Expand Down

0 comments on commit be760ab

Please sign in to comment.