parent
ac950f6b97
commit
709588572a
|
@ -11,6 +11,7 @@ import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import kotlinx.android.synthetic.main.fragment_create_collection.view.*
|
import kotlinx.android.synthetic.main.fragment_create_collection.view.*
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
@ -28,7 +29,9 @@ import org.mozilla.fenix.mvi.getManagedEmitter
|
||||||
|
|
||||||
class CreateCollectionFragment : DialogFragment() {
|
class CreateCollectionFragment : DialogFragment() {
|
||||||
private lateinit var collectionCreationComponent: CollectionCreationComponent
|
private lateinit var collectionCreationComponent: CollectionCreationComponent
|
||||||
private val viewModel: CreateCollectionViewModel by activityViewModels()
|
private val viewModel: CreateCollectionViewModel by activityViewModels {
|
||||||
|
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||||
|
}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
|
@ -17,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.navigation.NavController
|
import androidx.navigation.NavController
|
||||||
import androidx.navigation.NavDirections
|
import androidx.navigation.NavDirections
|
||||||
|
@ -58,7 +59,9 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), BackHandler, Accou
|
||||||
private lateinit var signInView: SignInView
|
private lateinit var signInView: SignInView
|
||||||
private lateinit var bookmarkInteractor: BookmarkFragmentInteractor
|
private lateinit var bookmarkInteractor: BookmarkFragmentInteractor
|
||||||
|
|
||||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||||
|
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||||
|
}
|
||||||
|
|
||||||
var currentRoot: BookmarkNode? = null
|
var currentRoot: BookmarkNode? = null
|
||||||
private val navigation by lazy { findNavController() }
|
private val navigation by lazy { findNavController() }
|
||||||
|
|
|
@ -16,6 +16,7 @@ import android.view.ViewGroup
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.navigation.Navigation
|
import androidx.navigation.Navigation
|
||||||
import kotlinx.android.synthetic.main.fragment_add_bookmark_folder.*
|
import kotlinx.android.synthetic.main.fragment_add_bookmark_folder.*
|
||||||
|
@ -32,7 +33,9 @@ import org.mozilla.fenix.library.bookmarks.BookmarksSharedViewModel
|
||||||
|
|
||||||
class AddBookmarkFolderFragment : Fragment() {
|
class AddBookmarkFolderFragment : Fragment() {
|
||||||
|
|
||||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||||
|
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||||
|
}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
|
@ -21,6 +21,7 @@ import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.navigation.Navigation
|
import androidx.navigation.Navigation
|
||||||
import androidx.core.view.MenuItemCompat.setContentDescription
|
import androidx.core.view.MenuItemCompat.setContentDescription
|
||||||
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import com.jakewharton.rxbinding3.widget.textChanges
|
import com.jakewharton.rxbinding3.widget.textChanges
|
||||||
import com.uber.autodispose.AutoDispose
|
import com.uber.autodispose.AutoDispose
|
||||||
import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
|
import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
|
||||||
|
@ -53,7 +54,9 @@ import java.util.concurrent.TimeUnit
|
||||||
class EditBookmarkFragment : Fragment() {
|
class EditBookmarkFragment : Fragment() {
|
||||||
|
|
||||||
private lateinit var guidToEdit: String
|
private lateinit var guidToEdit: String
|
||||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||||
|
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||||
|
}
|
||||||
private var bookmarkNode: BookmarkNode? = null
|
private var bookmarkNode: BookmarkNode? = null
|
||||||
private var bookmarkParent: BookmarkNode? = null
|
private var bookmarkParent: BookmarkNode? = null
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.navigation.fragment.findNavController
|
import androidx.navigation.fragment.findNavController
|
||||||
import kotlinx.android.synthetic.main.fragment_select_bookmark_folder.*
|
import kotlinx.android.synthetic.main.fragment_select_bookmark_folder.*
|
||||||
|
@ -41,7 +42,9 @@ import org.mozilla.fenix.library.bookmarks.SignInView
|
||||||
@SuppressWarnings("TooManyFunctions")
|
@SuppressWarnings("TooManyFunctions")
|
||||||
class SelectBookmarkFolderFragment : Fragment(), AccountObserver {
|
class SelectBookmarkFolderFragment : Fragment(), AccountObserver {
|
||||||
|
|
||||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||||
|
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||||
|
}
|
||||||
private var folderGuid: String? = null
|
private var folderGuid: String? = null
|
||||||
private var bookmarkNode: BookmarkNode? = null
|
private var bookmarkNode: BookmarkNode? = null
|
||||||
private lateinit var signInView: SignInView
|
private lateinit var signInView: SignInView
|
||||||
|
|
Loading…
Reference in New Issue