diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 93c17c7fd8..e4f56d6844 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -30,7 +30,7 @@ import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.ext.toTab
import org.mozilla.fenix.lib.Do
import org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior
-import org.mozilla.fenix.utils.deleteAndQuit
+import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
/**
* An interface that handles the view manipulation of the BrowserToolbar, triggered by the Interactor
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 2fe58371d4..5a77370330 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -64,6 +64,8 @@ import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.metrics
import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.account.AccountAuthErrorPreference
+import org.mozilla.fenix.settings.account.AccountPreference
import org.mozilla.fenix.utils.ItsNotBrokenSnack
@SuppressWarnings("TooManyFunctions", "LargeClass")
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
index 33f298e108..d55fe2a8ea 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountAuthErrorPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountAuthErrorPreference.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
similarity index 97%
rename from app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
index 558a8e6c08..adc72c2db3 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountPreference.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountProblemFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountProblemFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/AccountProblemFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/AccountProblemFragment.kt
index b80b18433e..22fdc081d5 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/AccountProblemFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountProblemFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
index 02206ba3a7..ae990de9ab 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SignOutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
import android.app.Dialog
import android.os.Bundle
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt
index a22e552bc0..99c74eb7aa 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/TurnOnSyncFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
import android.os.Bundle
import android.view.LayoutInflater
diff --git a/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt
similarity index 87%
rename from app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt
index b96021778a..a6eab0d4b7 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.utils
+package org.mozilla.fenix.settings.deletebrowsingdata
import android.app.Activity
import kotlinx.coroutines.CoroutineScope
@@ -11,9 +11,6 @@ import kotlinx.coroutines.joinAll
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.settings.DefaultDeleteBrowsingDataController
-import org.mozilla.fenix.settings.DeleteBrowsingDataController
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
/**
* Deletes selected browsing data and finishes the activity.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataController.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataController.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
index b7bf2b8c78..790aa31163 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataController.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
import android.content.Context
import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
similarity index 98%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
index 2b15e61875..6f36b3d4c5 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
import android.content.DialogInterface
import android.os.Bundle
@@ -44,7 +44,7 @@ class DeleteBrowsingDataFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- controller = DefaultDeleteBrowsingDataController(context!!)
+ controller = DefaultDeleteBrowsingDataController(requireContext())
sessionObserver = object : SessionManager.Observer {
override fun onSessionAdded(session: Session) = updateTabCount()
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
similarity index 97%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
index 716afe38f7..47188ee0c1 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitFragment.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitFragment.kt
index 7d19ac1905..d86159f0ca 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
@@ -13,6 +13,7 @@ import androidx.preference.SwitchPreference
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.SharedPreferenceUpdater
class DeleteBrowsingDataOnQuitFragment : PreferenceFragmentCompat() {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitType.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt
similarity index 93%
rename from app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitType.kt
rename to app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt
index a6d53fe9ee..794d16a9d1 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataOnQuitType.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
import android.content.Context
import androidx.annotation.StringRes
diff --git a/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt
index d9726cdce1..9caa2f2f9d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/RadioSearchEngineListPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/RadioSearchEngineListPreference.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.search
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
similarity index 95%
rename from app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
index 7ca54b6b4d..445c582728 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.search
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
@@ -11,6 +11,7 @@ import androidx.preference.SwitchPreference
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.SharedPreferenceUpdater
class SearchEngineFragment : PreferenceFragmentCompat() {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
similarity index 99%
rename from app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt
rename to app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
index 81ba56011a..9d685f8819 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineListPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.search
import android.content.Context
import android.content.res.Resources
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
similarity index 97%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
index 3c8b5e3023..e3bf5ab956 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
@@ -20,6 +20,7 @@ import org.jetbrains.anko.yesButton
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.getPreferenceKey
+import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.PhoneFeature.CAMERA
import org.mozilla.fenix.settings.PhoneFeature.LOCATION
import org.mozilla.fenix.settings.PhoneFeature.MICROPHONE
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
similarity index 99%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsExceptionsFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
index 0a54e89052..f00ccce7ae 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
import android.os.Bundle
import android.view.LayoutInflater
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
similarity index 92%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
index f0e974a449..024c754ce2 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
@@ -13,6 +13,7 @@ import androidx.preference.PreferenceFragmentCompat
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.PhoneFeature
@SuppressWarnings("TooManyFunctions")
class SitePermissionsFragment : PreferenceFragmentCompat() {
@@ -69,7 +70,8 @@ class SitePermissionsFragment : PreferenceFragmentCompat() {
}
private fun navigateToPhoneFeature(phoneFeature: PhoneFeature) {
- val directions = SitePermissionsFragmentDirections.actionSitePermissionsToManagePhoneFeatures(phoneFeature.id)
+ val directions = SitePermissionsFragmentDirections
+ .actionSitePermissionsToManagePhoneFeatures(phoneFeature.id)
Navigation.findNavController(view!!).navigate(directions)
}
}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManageExceptionsPhoneFeatureFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
index 8a56ab1b3f..ab1810b397 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
import android.content.Intent
import android.net.Uri
@@ -27,6 +27,9 @@ import org.jetbrains.anko.yesButton
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.PhoneFeature
+import org.mozilla.fenix.settings.initBlockedByAndroidView
+import org.mozilla.fenix.settings.setStartCheckedIndicator
@SuppressWarnings("TooManyFunctions")
class SitePermissionsManageExceptionsPhoneFeatureFragment : Fragment() {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManagePhoneFeatureFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManagePhoneFeatureFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
index c25c250d81..314fe6db80 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsManagePhoneFeatureFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.sitepermissions
import android.content.Intent
import android.graphics.Color
@@ -27,6 +27,9 @@ import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.BL
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.settings.PhoneFeature
+import org.mozilla.fenix.settings.initBlockedByAndroidView
+import org.mozilla.fenix.settings.setStartCheckedIndicator
import org.mozilla.fenix.utils.Settings
@SuppressWarnings("TooManyFunctions")
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index d29430b41a..026e82a092 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -22,7 +22,7 @@ import org.mozilla.fenix.Config
import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.MozillaProductDetector
import org.mozilla.fenix.ext.getPreferenceKey
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
+import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
import org.mozilla.fenix.settings.PhoneFeature
import java.security.InvalidParameterException
diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml
index 780c4901dc..441dbab7ae 100644
--- a/app/src/main/res/layout/fragment_delete_browsing_data.xml
+++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml
@@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
-
-
-
+ android:name="org.mozilla.fenix.settings.account.AccountProblemFragment">
+ android:name="org.mozilla.fenix.settings.account.SignOutFragment" />
@@ -582,7 +582,7 @@
-
-
@@ -120,4 +120,4 @@
android:key="@string/pref_key_about"
android:title="@string/preferences_about" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/xml/search_engine_preferences.xml b/app/src/main/res/xml/search_engine_preferences.xml
index 4c3620010b..c6a947ae00 100644
--- a/app/src/main/res/xml/search_engine_preferences.xml
+++ b/app/src/main/res/xml/search_engine_preferences.xml
@@ -9,7 +9,7 @@
android:title="@string/preferences_default_search_engine"
android:selectable="false"
app:iconSpaceReserved="false">
-
().toTab(any()) } returns currentSessionAsTab
mockkStatic(
- "org.mozilla.fenix.utils.DeleteAndQuitKt"
+ "org.mozilla.fenix.settings.deletebrowsingdata.DeleteAndQuitKt"
)
every { deleteAndQuit(any(), any()) } just Runs
diff --git a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsFragmentStoreTest.kt
similarity index 84%
rename from app/src/test/java/org/mozilla/fenix/settings/AccountSettingsFragmentStoreTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsFragmentStoreTest.kt
index 4592302743..c751863e4e 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsFragmentStoreTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsFragmentStoreTest.kt
@@ -2,16 +2,12 @@
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotSame
import org.junit.Test
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentAction
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentState
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentStore
-import org.mozilla.fenix.settings.account.LastSyncTime
class AccountSettingsFragmentStoreTest {
diff --git a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt
similarity index 84%
rename from app/src/test/java/org/mozilla/fenix/settings/AccountSettingsInteractorTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt
index d418447871..f817975d95 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/AccountSettingsInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/account/AccountSettingsInteractorTest.kt
@@ -2,7 +2,7 @@
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.account
import androidx.navigation.NavController
import androidx.navigation.NavDestination
@@ -12,10 +12,6 @@ import io.mockk.verify
import org.junit.Assert.assertEquals
import org.junit.Test
import org.mozilla.fenix.R
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentAction
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentDirections
-import org.mozilla.fenix.settings.account.AccountSettingsInteractor
-import org.mozilla.fenix.settings.account.AccountSettingsFragmentStore
class AccountSettingsInteractorTest {
diff --git a/app/src/test/java/org/mozilla/fenix/settings/DefaultDeleteBrowsingDataControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
similarity index 98%
rename from app/src/test/java/org/mozilla/fenix/settings/DefaultDeleteBrowsingDataControllerTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
index 74494a221c..b13a4d5581 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/DefaultDeleteBrowsingDataControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package org.mozilla.fenix.settings
+package org.mozilla.fenix.settings.deletebrowsingdata
import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/app/src/test/java/org/mozilla/fenix/utils/DeleteAndQuitTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
similarity index 97%
rename from app/src/test/java/org/mozilla/fenix/utils/DeleteAndQuitTest.kt
rename to app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
index b55b8b3b85..d2e31280cd 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/DeleteAndQuitTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
@@ -4,7 +4,7 @@
@file:Suppress("DEPRECATION")
-package org.mozilla.fenix.utils
+package org.mozilla.fenix.settings.deletebrowsingdata
import androidx.test.ext.junit.runners.AndroidJUnit4
import io.mockk.every
@@ -30,7 +30,7 @@ import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.PermissionStorage
import org.mozilla.fenix.ext.clearAndCommit
import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
+import org.mozilla.fenix.utils.Settings
import org.robolectric.annotation.Config
@ObsoleteCoroutinesApi
diff --git a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
index 9128542e8d..cd67c17667 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
@@ -19,7 +19,7 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.ext.clearAndCommit
import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.settings.DeleteBrowsingDataOnQuitType
+import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
import org.mozilla.fenix.settings.PhoneFeature
import org.robolectric.annotation.Config