From d83c09863f8080cc2ca26a8bd24a7212bc0a6114 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 29 Oct 2024 16:41:37 +0100
Subject: [PATCH] Rename some private composable functions.

---
 .../impl/incoming/IncomingVerificationView.kt |  8 +++----
 .../impl/outgoing/VerifySelfSessionView.kt    | 22 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
index 052b88f0dc..cc2c9fbd2d 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
@@ -63,7 +63,7 @@ fun IncomingVerificationView(
             )
         },
         header = {
-            HeaderContent(step = step)
+            IncomingVerificationHeader(step = step)
         },
         footer = {
             IncomingVerificationBottomMenu(
@@ -71,14 +71,14 @@ fun IncomingVerificationView(
             )
         }
     ) {
-        Content(
+        IncomingVerificationContent(
             step = step,
         )
     }
 }
 
 @Composable
-private fun HeaderContent(step: Step) {
+private fun IncomingVerificationHeader(step: Step) {
     val iconStyle = when (step) {
         Step.Canceled,
         is Step.Initial -> BigIcon.Style.Default(CompoundIcons.LockSolid())
@@ -114,7 +114,7 @@ private fun HeaderContent(step: Step) {
 }
 
 @Composable
-private fun Content(
+private fun IncomingVerificationContent(
     step: Step,
 ) {
     when (step) {
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt
index 75b189424e..fdcbf978a3 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt
@@ -120,10 +120,10 @@ fun VerifySelfSessionView(
                 )
             },
             header = {
-                HeaderContent(step = step)
+                VerifySelfSessionHeader(step = step)
             },
             footer = {
-                BottomMenu(
+                VerifySelfSessionBottomMenu(
                     screenState = state,
                     onCancelClick = ::cancelOrResetFlow,
                     onEnterRecoveryKey = onEnterRecoveryKey,
@@ -132,7 +132,7 @@ fun VerifySelfSessionView(
                 )
             }
         ) {
-            Content(
+            VerifySelfSessionContent(
                 flowState = step,
                 onLearnMoreClick = onLearnMoreClick,
             )
@@ -156,9 +156,9 @@ fun VerifySelfSessionView(
 }
 
 @Composable
-private fun HeaderContent(step: Step) {
+private fun VerifySelfSessionHeader(step: Step) {
     val iconStyle = when (step) {
-        VerifySelfSessionState.Step.Loading -> error("Should not happen")
+        Step.Loading -> error("Should not happen")
         is Step.Initial, Step.AwaitingOtherDeviceResponse -> BigIcon.Style.Default(CompoundIcons.LockSolid())
         Step.Canceled -> BigIcon.Style.AlertSolid
         Step.Ready, is Step.Verifying -> BigIcon.Style.Default(CompoundIcons.Reaction())
@@ -166,7 +166,7 @@ private fun HeaderContent(step: Step) {
         is Step.Skipped -> return
     }
     val titleTextId = when (step) {
-        VerifySelfSessionState.Step.Loading -> error("Should not happen")
+        Step.Loading -> error("Should not happen")
         is Step.Initial, Step.AwaitingOtherDeviceResponse -> R.string.screen_identity_confirmation_title
         Step.Canceled -> CommonStrings.common_verification_cancelled
         Step.Ready -> R.string.screen_session_verification_compare_emojis_title
@@ -178,7 +178,7 @@ private fun HeaderContent(step: Step) {
         is Step.Skipped -> return
     }
     val subtitleTextId = when (step) {
-        VerifySelfSessionState.Step.Loading -> error("Should not happen")
+        Step.Loading -> error("Should not happen")
         is Step.Initial, Step.AwaitingOtherDeviceResponse -> R.string.screen_identity_confirmation_subtitle
         Step.Canceled -> R.string.screen_session_verification_cancelled_subtitle
         Step.Ready -> R.string.screen_session_verification_ready_subtitle
@@ -198,12 +198,12 @@ private fun HeaderContent(step: Step) {
 }
 
 @Composable
-private fun Content(
+private fun VerifySelfSessionContent(
     flowState: Step,
     onLearnMoreClick: () -> Unit,
 ) {
     when (flowState) {
-        is VerifySelfSessionState.Step.Initial -> {
+        is Step.Initial -> {
             ContentInitial(onLearnMoreClick)
         }
         is Step.Verifying -> {
@@ -232,7 +232,7 @@ private fun ContentInitial(
 }
 
 @Composable
-private fun BottomMenu(
+private fun VerifySelfSessionBottomMenu(
     screenState: VerifySelfSessionState,
     onEnterRecoveryKey: () -> Unit,
     onResetKey: () -> Unit,
@@ -245,7 +245,7 @@ private fun BottomMenu(
     val isVerifying = (verificationViewState as? Step.Verifying)?.state is AsyncData.Loading<Unit>
 
     when (verificationViewState) {
-        VerifySelfSessionState.Step.Loading -> error("Should not happen")
+        Step.Loading -> error("Should not happen")
         is Step.Initial -> {
             VerificationBottomMenu {
                 if (verificationViewState.isLastDevice) {