Merge pull request #6894 from vector-im/feature/bma/remove_fragment_module

Remove fragment module

Author: bmarty

changelog.d/6894.misc

@@ -0,0 +1 @@
+Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members.

docs/hilt_migration.md

@@ -7,8 +7,8 @@ Hilt is built on top of Dagger 2 and simplify usage by removing needs to create
 When you create a new feature, you should have the following:
 
 Annotate your Activity with @AndroidEntryPoint
+Annotate your Fragment with @AndroidEntryPoint
 If you have a BottomSheetFragment => Annotate it with @AndroidEntryPoint
-Otherwise => Add your Fragment to the FragmentModule
 Add your ViewModel.Factory to the MavericksViewModelModule
 Makes sure your ViewModel as the following code:
 

tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl

@@ -18,10 +18,10 @@ import javax.inject.Inject
 data class ${fragmentArgsClass}() : Parcelable
 </#if>
 
-//TODO add this fragment into FragmentModule
-class ${fragmentClass} @Inject constructor(
-        private val viewModelFactory: ${viewModelClass}.Factory
-) : VectorBaseFragment(), ${viewModelClass}.Factory by viewModelFactory {
+@AndroidEntryPoint
+class ${fragmentClass}() :
+    VectorBaseFragment(),
+    ${viewModelClass}.Factory by viewModelFactory {
 
 	<#if createFragmentArgs>
 		private val fragmentArgs: ${fragmentArgsClass} by args()

vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt

@@ -28,7 +28,8 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentDebugMemoryLeaksBinding
 
 @AndroidEntryPoint
-class DebugMemoryLeaksFragment : VectorBaseFragment<FragmentDebugMemoryLeaksBinding>() {
+class DebugMemoryLeaksFragment :
+        VectorBaseFragment<FragmentDebugMemoryLeaksBinding>() {
 
     private val viewModel: DebugMemoryLeaksViewModel by fragmentViewModel()
 

vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt

@@ -16,7 +16,6 @@
 
 package im.vector.app.core.di
 
-import androidx.fragment.app.FragmentFactory
 import androidx.lifecycle.ViewModelProvider
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
@@ -25,6 +24,5 @@ import dagger.hilt.android.components.ActivityComponent
 @InstallIn(ActivityComponent::class)
 @EntryPoint
 interface ActivityEntryPoint {
-    fun fragmentFactory(): FragmentFactory
     fun viewModelFactory(): ViewModelProvider.Factory
 }

vector/src/main/java/im/vector/app/core/di/FragmentKey.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.dialogs
+
+import androidx.fragment.app.Fragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
+import javax.inject.Inject
+
+/**
+ * Factory for [GalleryOrCameraDialogHelper].
+ */
+class GalleryOrCameraDialogHelperFactory @Inject constructor(
+        private val colorProvider: ColorProvider,
+        private val clock: Clock,
+) {
+    fun create(fragment: Fragment): GalleryOrCameraDialogHelper {
+        return GalleryOrCameraDialogHelper(fragment, colorProvider, clock)
+    }
+}

vector/src/main/java/im/vector/app/core/di/FragmentModule.kt

@@ -21,7 +21,6 @@ import android.app.Activity
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -39,8 +38,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.util.Consumer
 import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentFactory
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
@@ -67,7 +64,6 @@ import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.restart
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.extensions.singletonEntryPoint
-import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.AndroidSystemSettingsProvider
 import im.vector.app.core.utils.ToolbarConfig
@@ -169,7 +165,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
     lateinit var navigator: Navigator
         private set
-    private lateinit var fragmentFactory: FragmentFactory
 
     private lateinit var activeSessionHolder: ActiveSessionHolder
     private lateinit var vectorPreferences: VectorPreferences
@@ -210,8 +205,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
         val singletonEntryPoint = singletonEntryPoint()
         val activityEntryPoint = EntryPointAccessors.fromActivity(this, ActivityEntryPoint::class.java)
         ThemeUtils.setActivityTheme(this, getOtherThemes())
-        fragmentFactory = activityEntryPoint.fragmentFactory()
-        supportFragmentManager.fragmentFactory = fragmentFactory
         viewModelFactory = activityEntryPoint.viewModelFactory()
         super.onCreate(savedInstanceState)
         addOnMultiWindowModeChangedListener(onMultiWindowModeChangedListener)
@@ -464,12 +457,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
         bugReporter.inMultiWindowMode = it.isInMultiWindowMode
     }
 
-    protected fun createFragment(fragmentClass: Class<out Fragment>, argsParcelable: Parcelable? = null): Fragment {
-        return fragmentFactory.instantiate(classLoader, fragmentClass.name).apply {
-            arguments = argsParcelable?.toMvRxBundle()
-        }
-    }
-
     /* ==========================================================================================
      * PRIVATE METHODS
      * ========================================================================================== */