fixup! Modify UI/UX (2854981a) · Commits · The Tor Project / Applications / firefox-android

fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt

+9 −9

Changes for fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt: 9 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ class HomeMenu(
		object ManageAccountAndDevices : Item()
		object WhatsNew : Item()
		object Help : Item()
		object CustomizeHome : Item()
		// object CustomizeHome : Item()
		object Settings : Item()
		object Quit : Item()
		object ReconnectSync : Item()
		@@ -175,13 +175,13 @@ class HomeMenu(
		onItemTapped.invoke(Item.Help)
		}

		val customizeHomeItem = BrowserMenuImageText(
		context.getString(R.string.browser_menu_customize_home_1),
		R.drawable.ic_customize,
		primaryTextColor,
		) {
		onItemTapped.invoke(Item.CustomizeHome)
		}
		// val customizeHomeItem = BrowserMenuImageText(
		// context.getString(R.string.browser_menu_customize_home_1),
		// R.drawable.ic_customize,
		// primaryTextColor,
		// ) {
		// onItemTapped.invoke(Item.CustomizeHome)
		// }

		// Use nimbus to set the icon and title.
		// val nimbusValidation = FxNimbus.features.nimbusValidation.value()
		@@ -217,7 +217,7 @@ class HomeMenu(
		BrowserMenuDivider(),
		whatsNewItem,
		helpItem,
		customizeHomeItem,
		// customizeHomeItem,
		settingsItem,
		quitItem
		).also { items ->

fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt

+8 −8

Changes for fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt: 8 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -103,14 +103,14 @@ class HomeMenuView(
		HomeFragmentDirections.actionGlobalSettingsFragment(),
		)
		}
		HomeMenu.Item.CustomizeHome -> {
		HomeScreen.customizeHomeClicked.record(NoExtras())

		navController.nav(
		R.id.homeFragment,
		HomeFragmentDirections.actionGlobalHomeSettingsFragment(),
		)
		}
		// HomeMenu.Item.CustomizeHome -> {
		// HomeScreen.customizeHomeClicked.record(NoExtras())
		//
		// navController.nav(
		// R.id.homeFragment,
		// HomeFragmentDirections.actionGlobalHomeSettingsFragment(),
		// )
		// }
		is HomeMenu.Item.SyncAccount -> {
		navController.nav(
		R.id.homeFragment,

fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt

+16 −16

Changes for fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt: 16 added lines, 16 removed lines.
Original line number	Diff line number	Diff line
		@@ -271,9 +271,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
		resources.getString(R.string.pref_key_tabs) -> {
		SettingsFragmentDirections.actionSettingsFragmentToTabsSettingsFragment()
		}
		resources.getString(R.string.pref_key_home) -> {
		SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment()
		}
		// resources.getString(R.string.pref_key_home) -> {
		// SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment()
		// }
		resources.getString(R.string.pref_key_search_settings) -> {
		SettingsFragmentDirections.actionSettingsFragmentToSearchEngineFragment()
		}
		@@ -674,19 +674,19 @@ class SettingsFragment : PreferenceFragmentCompat() {

		@VisibleForTesting
		internal fun setupHomepagePreference() {
		with(requirePreference<Preference>(R.string.pref_key_home)) {
		summary = context?.let {
		when {
		it.settings().alwaysOpenTheHomepageWhenOpeningTheApp ->
		getString(R.string.opening_screen_homepage_summary)
		it.settings().openHomepageAfterFourHoursOfInactivity ->
		getString(R.string.opening_screen_after_four_hours_of_inactivity_summary)
		it.settings().alwaysOpenTheLastTabWhenOpeningTheApp ->
		getString(R.string.opening_screen_last_tab_summary)
		else -> null
		}
		}
		}
		// with(requirePreference<Preference>(R.string.pref_key_home)) {
		// summary = context?.let {
		// when {
		// it.settings().alwaysOpenTheHomepageWhenOpeningTheApp ->
		// getString(R.string.opening_screen_homepage_summary)
		// it.settings().openHomepageAfterFourHoursOfInactivity ->
		// getString(R.string.opening_screen_after_four_hours_of_inactivity_summary)
		// it.settings().alwaysOpenTheLastTabWhenOpeningTheApp ->
		// getString(R.string.opening_screen_last_tab_summary)
		// else -> null
		// }
		// }
		// }
		}

		@VisibleForTesting

fenix/app/src/main/res/xml/preferences.xml

+4 −4

Changes for fenix/app/src/main/res/xml/preferences.xml: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -54,10 +54,10 @@
		android:key="@string/pref_key_tabs"
		android:title="@string/preferences_tabs" />

		<androidx.preference.Preference
		app:iconSpaceReserved="false"
		android:key="@string/pref_key_home"
		android:title="@string/preferences_home_2" />
		<!-- <androidx.preference.Preference-->
		<!-- app:iconSpaceReserved="false"-->
		<!-- android:key="@string/pref_key_home"-->
		<!-- android:title="@string/preferences_home_2" />-->

		<androidx.preference.Preference
		android:key="@string/pref_key_customize"