Commit 5fac2896 authored by clairehurst's avatar clairehurst 🌱 Committed by Dan Ballard
Browse files

fixup! [android] Disable features and functionality 

Bug 45098: Remove share link button
parent fcb13195

mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ActionContainer.kt

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ import mozilla.components.compose.browser.toolbar.ui.TabCounter 
import mozilla.components.compose.browser.toolbar.ui.ActionButton as ActionButtonComposable

import mozilla.components.ui.icons.R as iconsR



import mozilla.components.compose.browser.toolbar.concept.NoopAction



/**

 * A container for displaying [Action]s.

 *
@@ -122,6 +124,8 @@ fun ActionContainer( 
                        )

                    }

                }



                else -> NoopAction()

            }

        }

    }

mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/concept/Action.kt

+2 −0
Original line number Diff line number Diff line
@@ -189,3 +189,5 @@ sealed class Action { 
        val onClick: BrowserToolbarInteraction,

    ) : Action()

}



class NoopAction : Action()

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt

+4 −6
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ import mozilla.components.lib.state.Action as MVIAction 
import mozilla.components.ui.icons.R as iconsR

import mozilla.components.ui.tabcounter.R as tabcounterR



import mozilla.components.compose.browser.toolbar.concept.NoopAction



@VisibleForTesting

internal sealed class DisplayActions(override val source: Source) : BrowserToolbarEvent {

    data class MenuClicked(override val source: Source) : DisplayActions(source)
@@ -1318,17 +1320,13 @@ class BrowserToolbarMiddleware( 
            )

        }



        ToolbarAction.Share -> ActionButtonRes(

            drawableResId = iconsR.drawable.mozac_ic_share_android_24,

            contentDescription = R.string.browser_menu_share,

            onClick = ShareClicked(source),

        )



        ToolbarAction.Homepage -> ActionButtonRes(

            drawableResId = iconsR.drawable.mozac_ic_home_24,

            contentDescription = R.string.browser_menu_homepage,

            onClick = HomepageClicked(source),

        )



        else -> NoopAction()

    }



    private fun buildSiteInfoAction(