Commit 6c0234e6 authored by Tamas Szentpeteri's avatar Tamas Szentpeteri
Browse files

Backed out 2 changesets (bug 1885586) for causing linting issues on... 

Backed out 2 changesets (bug 1885586) for causing linting issues on ExtensionsSubmenu.kt. CLOSED TREE.

Backed out changeset 915bb0581b36 (bug 1885586)
Backed out changeset eaa64c0cf588 (bug 1885586)
parent 15867e6c

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ExtensionsSubmenu.kt

+38 −22
Original line number Diff line number Diff line
@@ -5,11 +5,16 @@ 
package org.mozilla.fenix.components.menu.compose



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.painterResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.unit.dp

import org.mozilla.fenix.R

import org.mozilla.fenix.components.menu.compose.header.SubmenuHeader

import org.mozilla.fenix.compose.annotation.LightDarkPreview
@@ -25,13 +30,23 @@ internal fun ExtensionsSubmenu( 
    onManageExtensionsMenuClick: () -> Unit,

    onDiscoverMoreExtensionsMenuClick: () -> Unit,

) {

    MenuScaffold(

        header = {

    Column {

        SubmenuHeader(

            header = stringResource(id = R.string.browser_menu_extensions),

            onClick = onBackButtonClick,

        )

        },



        Spacer(modifier = Modifier.height(8.dp))



        Column(

            modifier = Modifier

                .padding(

                    start = 16.dp,

                    top = 12.dp,

                    end = 16.dp,

                    bottom = 32.dp,

                ),

            verticalArrangement = Arrangement.spacedBy(32.dp),

        ) {

            MenuGroup {

                MenuItem(
@@ -51,6 +66,7 @@ internal fun ExtensionsSubmenu( 
            }

        }

    }

}



@LightDarkPreview

@Composable

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt

+50 −34
Original line number Diff line number Diff line
@@ -5,12 +5,17 @@ 
package org.mozilla.fenix.components.menu.compose



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.painterResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp

import mozilla.components.service.fxa.manager.AccountState

import mozilla.components.service.fxa.manager.AccountState.NotAuthenticated

import mozilla.components.service.fxa.store.Account
@@ -74,8 +79,7 @@ internal fun MainMenu( 
    onCustomizeHomepageMenuClick: () -> Unit,

    onNewInFirefoxMenuClick: () -> Unit,

) {

    MenuScaffold(

        header = {

    Column {

        MenuHeader(

            account = account,

            accountState = accountState,
@@ -83,7 +87,18 @@ internal fun MainMenu( 
            onHelpButtonClick = onHelpButtonClick,

            onSettingsButtonClick = onSettingsButtonClick,

        )

        },



        Spacer(modifier = Modifier.height(8.dp))



        Column(

            modifier = Modifier

                .padding(

                    start = 16.dp,

                    top = 12.dp,

                    end = 16.dp,

                    bottom = 32.dp,

                ),

            verticalArrangement = Arrangement.spacedBy(32.dp),

        ) {

            NewTabsMenuGroup(

                accessPoint = accessPoint,
@@ -116,6 +131,7 @@ internal fun MainMenu( 
            }

        }

    }

}



@Composable

private fun NewTabsMenuGroup(

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MenuScaffold.kt

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/* This Source Code Form is subject to the terms of the Mozilla Public

 * 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.components.menu.compose



import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.ColumnScope

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.rememberScrollState

import androidx.compose.foundation.verticalScroll

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.input.nestedscroll.nestedScroll

import androidx.compose.ui.platform.rememberNestedScrollInteropConnection

import androidx.compose.ui.unit.dp



/**

 * A scaffold for a menu UI that implements the basic layout structure with [header] and [content].

 *

 * @param header The Composable header block to render.

 * @param content The Composable content block to render.

 * @param modifier [Modifier] to be applied to the layout.

 */

@Composable

internal fun MenuScaffold(

    header: @Composable ColumnScope.() -> Unit,

    content: @Composable ColumnScope.() -> Unit,

    modifier: Modifier = Modifier,

) {

    Column(

        modifier = modifier.nestedScroll(rememberNestedScrollInteropConnection()),

    ) {

        header()



        Spacer(modifier = Modifier.height(8.dp))



        Column(

            modifier = Modifier

                .verticalScroll(rememberScrollState())

                .padding(

                    start = 16.dp,

                    top = 12.dp,

                    end = 16.dp,

                    bottom = 32.dp,

                ),

            verticalArrangement = Arrangement.spacedBy(32.dp),

        ) {

            content()

        }

    }

}

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/SaveSubmenu.kt

+54 −38
Original line number Diff line number Diff line
@@ -5,12 +5,17 @@ 
package org.mozilla.fenix.components.menu.compose



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.painterResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp

import org.mozilla.fenix.R

import org.mozilla.fenix.components.menu.compose.header.SubmenuHeader

import org.mozilla.fenix.compose.Divider
@@ -32,13 +37,23 @@ internal fun SaveSubmenu( 
    onSaveToCollectionMenuClick: () -> Unit,

    onSaveAsPDFMenuClick: () -> Unit,

) {

    MenuScaffold(

        header = {

    Column {

        SubmenuHeader(

            header = stringResource(id = R.string.browser_menu_save),

            onClick = onBackButtonClick,

        )

        },



        Spacer(modifier = Modifier.height(8.dp))



        Column(

            modifier = Modifier

                .padding(

                    start = 16.dp,

                    top = 12.dp,

                    end = 16.dp,

                    bottom = 32.dp,

                ),

            verticalArrangement = Arrangement.spacedBy(32.dp),

        ) {

            MenuGroup {

                BookmarkMenuItem(
@@ -81,6 +96,7 @@ internal fun SaveSubmenu( 
            }

        }

    }

}



@Composable

private fun BookmarkMenuItem(

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt

+53 −37
Original line number Diff line number Diff line
@@ -5,12 +5,17 @@ 
package org.mozilla.fenix.components.menu.compose



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.painterResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp

import org.mozilla.fenix.R

import org.mozilla.fenix.components.menu.compose.header.SubmenuHeader

import org.mozilla.fenix.compose.Divider
@@ -32,13 +37,23 @@ internal fun ToolsSubmenu( 
    onShareMenuClick: () -> Unit,

    onOpenInAppMenuClick: () -> Unit,

) {

    MenuScaffold(

        header = {

    Column {

        SubmenuHeader(

            header = stringResource(id = R.string.browser_menu_tools),

            onClick = onBackButtonClick,

        )

        },



        Spacer(modifier = Modifier.height(8.dp))



        Column(

            modifier = Modifier

                .padding(

                    start = 16.dp,

                    top = 12.dp,

                    end = 16.dp,

                    bottom = 32.dp,

                ),

            verticalArrangement = Arrangement.spacedBy(32.dp),

        ) {

            MenuGroup {

                ReaderViewMenuItem(
@@ -79,6 +94,7 @@ internal fun ToolsSubmenu( 
            }

        }

    }

}



@Composable

private fun ReaderViewMenuItem(