mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-22 01:40:07 +01:00
Fix kotlin compiler warnings.
This commit is contained in:
committed by
Alex Hart
parent
8984b763fb
commit
3761859681
@@ -4,7 +4,6 @@ import androidx.fragment.app.FragmentActivity
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import org.thoughtcrime.securesms.conversation.colors.ChatColors
|
||||
import org.thoughtcrime.securesms.recipients.RecipientId
|
||||
import org.thoughtcrime.securesms.util.SingleLiveEvent
|
||||
@@ -60,7 +59,7 @@ class ChatColorSelectionViewModel(private val repository: ChatColorSelectionRepo
|
||||
val repository = ChatColorSelectionRepository.create(activity, recipientId)
|
||||
val viewModelFactory = Factory(repository)
|
||||
|
||||
return ViewModelProviders.of(activity, viewModelFactory).get(ChatColorSelectionViewModel::class.java)
|
||||
return ViewModelProvider(activity, viewModelFactory).get(ChatColorSelectionViewModel::class.java)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ import androidx.appcompat.widget.AppCompatSeekBar
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.graphics.ColorUtils
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.navigation.Navigation
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||
import org.thoughtcrime.securesms.R
|
||||
@@ -54,7 +54,7 @@ class CustomChatColorCreatorPageFragment :
|
||||
val chatColorSelectionViewModel: ChatColorSelectionViewModel = ChatColorSelectionViewModel.getOrCreate(requireActivity(), args.recipientId)
|
||||
val page: Int = requireArguments().getInt(PAGE_ARG)
|
||||
val factory: CustomChatColorCreatorViewModel.Factory = CustomChatColorCreatorViewModel.Factory(MAX_SEEK_DIVISIONS, ChatColors.Id.forLongValue(args.chatColorId), args.recipientId, createRepository())
|
||||
val viewModel: CustomChatColorCreatorViewModel = ViewModelProviders.of(
|
||||
val viewModel: CustomChatColorCreatorViewModel = ViewModelProvider(
|
||||
requireParentFragment(),
|
||||
factory
|
||||
)[CustomChatColorCreatorViewModel::class.java]
|
||||
|
||||
Reference in New Issue
Block a user