|
|
@ -16,19 +16,19 @@ import androidx.compose.material.Icon
|
|
|
|
import androidx.compose.material.IconButton
|
|
|
|
import androidx.compose.material.IconButton
|
|
|
|
import androidx.compose.material.Surface
|
|
|
|
import androidx.compose.material.Surface
|
|
|
|
import androidx.compose.material.Text
|
|
|
|
import androidx.compose.material.Text
|
|
|
|
import androidx.compose.material.icons.Icons.Filled
|
|
|
|
|
|
|
|
import androidx.compose.material.icons.filled.Close
|
|
|
|
|
|
|
|
import androidx.compose.runtime.Composable
|
|
|
|
import androidx.compose.runtime.Composable
|
|
|
|
import androidx.compose.ui.Alignment
|
|
|
|
import androidx.compose.ui.Alignment
|
|
|
|
import androidx.compose.ui.Modifier
|
|
|
|
import androidx.compose.ui.Modifier
|
|
|
|
import androidx.compose.ui.geometry.Offset
|
|
|
|
import androidx.compose.ui.geometry.Offset
|
|
|
|
import androidx.compose.ui.graphics.Brush
|
|
|
|
import androidx.compose.ui.graphics.Brush
|
|
|
|
import androidx.compose.ui.graphics.Color
|
|
|
|
import androidx.compose.ui.graphics.Color
|
|
|
|
|
|
|
|
import androidx.compose.ui.res.painterResource
|
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
|
import androidx.compose.ui.tooling.preview.Preview
|
|
|
|
import androidx.compose.ui.tooling.preview.Preview
|
|
|
|
import androidx.compose.ui.unit.Dp
|
|
|
|
import androidx.compose.ui.unit.Dp
|
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.R
|
|
|
|
|
|
|
|
import org.mozilla.fenix.R.drawable
|
|
|
|
import org.mozilla.fenix.theme.FirefoxTheme
|
|
|
|
import org.mozilla.fenix.theme.FirefoxTheme
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -124,7 +124,7 @@ fun CFRPopupContent(
|
|
|
|
.size(48.dp)
|
|
|
|
.size(48.dp)
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
Icon(
|
|
|
|
Icon(
|
|
|
|
imageVector = Filled.Close,
|
|
|
|
painter = painterResource(drawable.mozac_ic_close_20),
|
|
|
|
contentDescription = stringResource(R.string.cfr_dismiss_button_default_content_description),
|
|
|
|
contentDescription = stringResource(R.string.cfr_dismiss_button_default_content_description),
|
|
|
|
modifier = Modifier
|
|
|
|
modifier = Modifier
|
|
|
|
// Following alignment and padding are necessary to visually align the middle
|
|
|
|
// Following alignment and padding are necessary to visually align the middle
|
|
|
|