Merge pull request #400 from Automattic/mlumeau/376-missing-action-Gr…

…avatar-icon QuickEditor: Missing action on gravatar icon
Automattic · Oct 18, 2024 · 881711b · 881711b
2 parents 650945e + 6050124
commit 881711b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/gravatar-quickeditor/api/gravatar-quickeditor.api b/gravatar-quickeditor/api/gravatar-quickeditor.api
@@ -128,14 +128,12 @@ public final class com/gravatar/quickeditor/ui/components/ComposableSingletons$Q
  public static field lambda-1 Lkotlin/jvm/functions/Function2;
  public static field lambda-2 Lkotlin/jvm/functions/Function3;
  public static field lambda-3 Lkotlin/jvm/functions/Function3;
- public static field lambda-4 Lkotlin/jvm/functions/Function3;
- public static field lambda-5 Lkotlin/jvm/functions/Function2;
+ public static field lambda-4 Lkotlin/jvm/functions/Function2;
  public fun <init> ()V
  public final fun getLambda-1$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
  public final fun getLambda-2$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function3;
  public final fun getLambda-3$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function3;
- public final fun getLambda-4$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function3;
- public final fun getLambda-5$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
+ public final fun getLambda-4$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
 }
 
 public final class com/gravatar/quickeditor/ui/components/ComposableSingletons$SelectableAvatarKt {

diff --git a/gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/components/QETopBar.kt b/gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/components/QETopBar.kt
@@ -1,5 +1,6 @@
 package com.gravatar.quickeditor.ui.components
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
@@ -24,7 +25,7 @@ import com.gravatar.quickeditor.R
 import com.gravatar.ui.GravatarTheme
 
 @Composable
-internal fun QETopBar(onDoneClick: () -> Unit, modifier: Modifier = Modifier) {
+internal fun QETopBar(onDoneClick: () -> Unit, modifier: Modifier = Modifier, onGravatarIconClick: () -> Unit = {}) {
  GravatarCenterAlignedTopAppBar(
  modifier = modifier,
  title = {
@@ -49,6 +50,7 @@ internal fun QETopBar(onDoneClick: () -> Unit, modifier: Modifier = Modifier) {
  tint = MaterialTheme.colorScheme.primary,
  contentDescription = stringResource(id = R.string.gravatar),
  modifier = Modifier
+ .clickable(onClick = onGravatarIconClick)
  .size(34.dp)
  .padding(end = 8.dp),
  )
@@ -107,6 +109,6 @@ private fun GravatarCenterAlignedTopAppBar(
 @Composable
 private fun QETopBarPreview() {
  GravatarTheme {
- QETopBar(onDoneClick = {})
+ QETopBar(onDoneClick = {}, onGravatarIconClick = {})
  }
 }
diff --git a/...ain/java/com/gravatar/quickeditor/ui/editor/bottomsheet/GravatarQuickEditorBottomSheet.kt b/...ain/java/com/gravatar/quickeditor/ui/editor/bottomsheet/GravatarQuickEditorBottomSheet.kt
@@ -24,6 +24,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.window.core.layout.WindowHeightSizeClass
@@ -36,6 +37,7 @@ import com.composables.core.SheetDetent
 import com.composables.core.SheetDetent.Companion.FullyExpanded
 import com.composables.core.SheetDetent.Companion.Hidden
 import com.composables.core.rememberModalBottomSheetState
+import com.gravatar.GravatarConstants
 import com.gravatar.quickeditor.ui.components.QEDragHandle
 import com.gravatar.quickeditor.ui.components.QETopBar
 import com.gravatar.quickeditor.ui.editor.AuthenticationMethod
@@ -117,6 +119,7 @@ private fun GravatarModalBottomSheet(
  content: @Composable () -> Unit,
 ) {
  val coroutineScope = rememberCoroutineScope()
+ val uriHandler = LocalUriHandler.current
 
  LaunchedEffect(modalBottomSheetState.currentDetent) {
  if (modalBottomSheetState.currentDetent == Hidden) {
@@ -166,6 +169,9 @@ private fun GravatarModalBottomSheet(
  modalBottomSheetState.currentDetent = Hidden
  }
  },
+ onGravatarIconClick = {
+ uriHandler.openUri(GravatarConstants.GRAVATAR_SIGN_IN_URL)
+ },
  )
  content()
  }

diff --git a/gravatar-quickeditor/src/test/java/com/gravatar/quickeditor/ui/components/QETopBarTest.kt b/gravatar-quickeditor/src/test/java/com/gravatar/quickeditor/ui/components/QETopBarTest.kt
@@ -8,12 +8,12 @@ import org.robolectric.annotation.Config
 class QETopBarTest : RoborazziTest() {
  @Test
  fun qrTopBarLight() = gravatarScreenshotTest {
- QETopBar(onDoneClick = {})
+ QETopBar(onDoneClick = {}, onGravatarIconClick = {})
  }
 
  @Test
  @Config(qualifiers = "+night")
  fun qrTopBarDark() = gravatarScreenshotTest {
- QETopBar(onDoneClick = {})
+ QETopBar(onDoneClick = {}, onGravatarIconClick = {})
  }
 }