Move saveFocusWhenNavigatingBack() calls from onCreate() to onCreateView()

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt

@@ -54,12 +54,8 @@ class SettingsFragment : Fragment() {
     @Inject
     lateinit var localSettings: LocalSettings
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
         return FragmentSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }
 

app/src/main/java/com/infomaniak/mail/ui/main/settings/appearance/swipe/SwipeActionsSettingsFragment.kt

@@ -44,12 +44,8 @@ class SwipeActionsSettingsFragment : Fragment() {
     @Inject
     lateinit var localSettings: LocalSettings
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
         return FragmentSwipeActionsSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }
 

app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/MailboxSettingsFragment.kt

@@ -37,12 +37,8 @@ class MailboxSettingsFragment : Fragment() {
     private var binding: FragmentMailboxSettingsBinding by safeBinding()
     private val navigationArgs: MailboxSettingsFragmentArgs by navArgs()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
         return FragmentMailboxSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }
 

app/src/main/java/com/infomaniak/mail/ui/main/settings/privacy/DataManagementSettingsFragment.kt

@@ -38,12 +38,8 @@ class DataManagementSettingsFragment : Fragment() {
 
     private var binding: FragmentDataManagementSettingsBinding by safeBinding()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        saveFocusWhenNavigatingBack(getLayout = { binding.linearLayoutContainer }, lifecycle)
         return FragmentDataManagementSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }
 

app/src/main/java/com/infomaniak/mail/ui/main/user/AccountFragment.kt

@@ -84,12 +84,8 @@ class AccountFragment : Fragment(), MailboxListFragment {
     @Inject
     lateinit var descriptionDialog: DescriptionAlertDialog
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        saveFocusWhenNavigatingBack(getLayout = { binding.constraintLayoutContainer }, lifecycle)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        saveFocusWhenNavigatingBack(getLayout = { binding.constraintLayoutContainer }, lifecycle)
         return FragmentAccountBinding.inflate(inflater, container, false).also { binding = it }.root
     }