[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX

Title: GitLab

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android

Commits:

  • 2854981a
    by clairehurst at 2023-10-10T18:46:34+00:00 
    fixup! Modify UI/UX

Bug 42158: Remove Customize Homepage button

4 changed files:

Changes:

  • fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
    ... ... @@ -56,7 +56,7 @@ class HomeMenu(
    56 56 
             object ManageAccountAndDevices : Item()
    57 57 
             object WhatsNew : Item()
    58 58 
             object Help : Item()
    59 
    -        object CustomizeHome : Item()
    59 
    +//        object CustomizeHome : Item()
    60 60 
             object Settings : Item()
    61 61 
             object Quit : Item()
    62 62 
             object ReconnectSync : Item()
    ... ... @@ -175,13 +175,13 @@ class HomeMenu(
    175 175 
                 onItemTapped.invoke(Item.Help)
    176 176 
             }
    177 177
    178 
    -        val customizeHomeItem = BrowserMenuImageText(
    179 
    -            context.getString(R.string.browser_menu_customize_home_1),
    180 
    -            R.drawable.ic_customize,
    181 
    -            primaryTextColor,
    182 
    -        ) {
    183 
    -            onItemTapped.invoke(Item.CustomizeHome)
    184 
    -        }
    178 
    +//        val customizeHomeItem = BrowserMenuImageText(
    179 
    +//            context.getString(R.string.browser_menu_customize_home_1),
    180 
    +//            R.drawable.ic_customize,
    181 
    +//            primaryTextColor,
    182 
    +//        ) {
    183 
    +//            onItemTapped.invoke(Item.CustomizeHome)
    184 
    +//        }
    185 185
    186 186 
             // Use nimbus to set the icon and title.
    187 187 
             // val nimbusValidation = FxNimbus.features.nimbusValidation.value()
    ... ... @@ -217,7 +217,7 @@ class HomeMenu(
    217 217 
                 BrowserMenuDivider(),
    218 218 
                 whatsNewItem,
    219 219 
                 helpItem,
    220 
    -            customizeHomeItem,
    220 
    +//            customizeHomeItem,
    221 221 
                 settingsItem,
    222 222 
                 quitItem
    223 223 
             ).also { items ->

  • fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt
    ... ... @@ -103,14 +103,14 @@ class HomeMenuView(
    103 103 
                         HomeFragmentDirections.actionGlobalSettingsFragment(),
    104 104 
                     )
    105 105 
                 }
    106 
    -            HomeMenu.Item.CustomizeHome -> {
    107 
    -                HomeScreen.customizeHomeClicked.record(NoExtras())
    108 
    -
    109 
    -                navController.nav(
    110 
    -                    R.id.homeFragment,
    111 
    -                    HomeFragmentDirections.actionGlobalHomeSettingsFragment(),
    112 
    -                )
    113 
    -            }
    106 
    +//            HomeMenu.Item.CustomizeHome -> {
    107 
    +//                HomeScreen.customizeHomeClicked.record(NoExtras())
    108 
    +//
    109 
    +//                navController.nav(
    110 
    +//                    R.id.homeFragment,
    111 
    +//                    HomeFragmentDirections.actionGlobalHomeSettingsFragment(),
    112 
    +//                )
    113 
    +//            }
    114 114 
                 is HomeMenu.Item.SyncAccount -> {
    115 115 
                     navController.nav(
    116 116 
                         R.id.homeFragment,

  • fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
    ... ... @@ -271,9 +271,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
    271 271 
                 resources.getString(R.string.pref_key_tabs) -> {
    272 272 
                     SettingsFragmentDirections.actionSettingsFragmentToTabsSettingsFragment()
    273 273 
                 }
    274 
    -            resources.getString(R.string.pref_key_home) -> {
    275 
    -                SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment()
    276 
    -            }
    274 
    +//            resources.getString(R.string.pref_key_home) -> {
    275 
    +//                SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment()
    276 
    +//            }
    277 277 
                 resources.getString(R.string.pref_key_search_settings) -> {
    278 278 
                     SettingsFragmentDirections.actionSettingsFragmentToSearchEngineFragment()
    279 279 
                 }
    ... ... @@ -674,19 +674,19 @@ class SettingsFragment : PreferenceFragmentCompat() {
    674 674
    675 675 
         @VisibleForTesting
    676 676 
         internal fun setupHomepagePreference() {
    677 
    -        with(requirePreference<Preference>(R.string.pref_key_home)) {
    678 
    -            summary = context?.let {
    679 
    -                when {
    680 
    -                    it.settings().alwaysOpenTheHomepageWhenOpeningTheApp ->
    681 
    -                        getString(R.string.opening_screen_homepage_summary)
    682 
    -                    it.settings().openHomepageAfterFourHoursOfInactivity ->
    683 
    -                        getString(R.string.opening_screen_after_four_hours_of_inactivity_summary)
    684 
    -                    it.settings().alwaysOpenTheLastTabWhenOpeningTheApp ->
    685 
    -                        getString(R.string.opening_screen_last_tab_summary)
    686 
    -                    else -> null
    687 
    -                }
    688 
    -            }
    689 
    -        }
    677 
    +//        with(requirePreference<Preference>(R.string.pref_key_home)) {
    678 
    +//            summary = context?.let {
    679 
    +//                when {
    680 
    +//                    it.settings().alwaysOpenTheHomepageWhenOpeningTheApp ->
    681 
    +//                        getString(R.string.opening_screen_homepage_summary)
    682 
    +//                    it.settings().openHomepageAfterFourHoursOfInactivity ->
    683 
    +//                        getString(R.string.opening_screen_after_four_hours_of_inactivity_summary)
    684 
    +//                    it.settings().alwaysOpenTheLastTabWhenOpeningTheApp ->
    685 
    +//                        getString(R.string.opening_screen_last_tab_summary)
    686 
    +//                    else -> null
    687 
    +//                }
    688 
    +//            }
    689 
    +//        }
    690 690 
         }
    691 691
    692 692 
         @VisibleForTesting

  • fenix/app/src/main/res/xml/preferences.xml
    ... ... @@ -54,10 +54,10 @@
    54 54 
                 android:key="@string/pref_key_tabs"
    55 55 
                 android:title="@string/preferences_tabs" />
    56 56
    57 
    -        <androidx.preference.Preference
    58 
    -            app:iconSpaceReserved="false"
    59 
    -            android:key="@string/pref_key_home"
    60 
    -            android:title="@string/preferences_home_2" />
    57 
    +<!--        <androidx.preference.Preference-->
    58 
    +<!--            app:iconSpaceReserved="false"-->
    59 
    +<!--            android:key="@string/pref_key_home"-->
    60 
    +<!--            android:title="@string/preferences_home_2" />-->
    61 61
    62 62 
             <androidx.preference.Preference
    63 63 
                 android:key="@string/pref_key_customize"

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits