From c9b379af9930819a237ce16f775745090bddcb69 Mon Sep 17 00:00:00 2001
From: Andrew Haisting <142518658+ahaisting-livefront@users.noreply.github.com>
Date: Tue, 7 Nov 2023 11:53:26 -0600
Subject: [PATCH] Re-organize String extensions to correct packages and update
 test name (#219)

---
 .../x8bit/bitwarden/data/platform/util/StringExtensions.kt | 7 -------
 .../bitwarden/ui/platform/base/util/StringExtensions.kt    | 6 ++++++
 .../ui/platform/feature/settings/about/AboutScreen.kt      | 2 +-
 .../{StringExtensionTest.kt => StringExtensionsTest.kt}    | 2 +-
 .../ui/platform/feature/settings/about/AboutScreenTest.kt  | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename app/src/test/java/com/x8bit/bitwarden/ui/platform/base/util/{StringExtensionTest.kt => StringExtensionsTest.kt} (98%)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt
index f4b651e02..c9cc32acf 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt
@@ -1,7 +1,5 @@
 package com.x8bit.bitwarden.data.platform.util
 
-import androidx.compose.ui.text.AnnotatedString
-
 /**
  * Returns the original [String] only if:
  *
@@ -12,8 +10,3 @@ import androidx.compose.ui.text.AnnotatedString
  */
 fun String?.orNullIfBlank(): String? =
     this?.takeUnless { it.isBlank() }
-
-/**
- * Returns the [String] as an [AnnotatedString].
- */
-fun String.toAnnotatedString(): AnnotatedString = AnnotatedString(text = this)
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt
index 0fe5c93f5..fd9264693 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt
@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.ui.platform.base.util
 
+import androidx.compose.ui.text.AnnotatedString
 import java.net.URI
 
 /**
@@ -21,3 +22,8 @@ fun String.isValidUri(): Boolean =
     } catch (_: IllegalArgumentException) {
         false
     }
+
+/**
+ * Returns the [String] as an [AnnotatedString].
+ */
+fun String.toAnnotatedString(): AnnotatedString = AnnotatedString(text = this)
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt
index 5d2b4c183..3c9131fcb 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt
@@ -43,11 +43,11 @@ import androidx.core.net.toUri
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.x8bit.bitwarden.R
-import com.x8bit.bitwarden.data.platform.util.toAnnotatedString
 import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
 import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.Text
 import com.x8bit.bitwarden.ui.platform.base.util.asText
+import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
 import com.x8bit.bitwarden.ui.platform.components.BitwardenExternalLinkRow
 import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
 import com.x8bit.bitwarden.ui.platform.components.BitwardenWideSwitch
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensionTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensionsTest.kt
similarity index 98%
rename from app/src/test/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensionTest.kt
rename to app/src/test/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensionsTest.kt
index 2ccea4292..9777cffa4 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensionTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensionsTest.kt
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
-class StringExtensionTest {
+class StringExtensionsTest {
 
     @Test
     fun `emails without an @ character should be invalid`() {
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreenTest.kt
index 73a97e865..f0d7ceef6 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreenTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreenTest.kt
@@ -8,10 +8,10 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.core.net.toUri
-import com.x8bit.bitwarden.data.platform.util.toAnnotatedString
 import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
 import com.x8bit.bitwarden.ui.platform.base.util.IntentHandler
 import com.x8bit.bitwarden.ui.platform.base.util.asText
+import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just