Merge branch 'migrate-account-view-to-compose-droid-63'

2 files changed, 23 insertions, 0 deletions

diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
index 11394ca8dd..37447483c2 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
@@ -7,6 +7,7 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import android.service.quicksettings.Tile
+import android.widget.Toast
 
 object SdkUtils {
     fun getSupportedPendingIntentFlags(): Int {
@@ -35,4 +36,10 @@ object SdkUtils {
         } else {
             @Suppress("DEPRECATION") getInstalledPackages(flags)
         }
+
+    fun showCopyToastIfNeeded(context: Context, message: String) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+        }
+    }
 }
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/StringExtensions.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/StringExtensions.kt
index 934ba1d635..3fa4ec3034 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/StringExtensions.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/StringExtensions.kt
@@ -6,6 +6,8 @@ import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 
 private const val EXPIRY_FORMAT = "YYYY-MM-dd HH:mm:ss z"
+private const val BIG_DOT_CHAR = "●"
+private const val SPACE_CHAR = ' '
 
 fun String.capitalizeFirstCharOfEachWord(): String {
     return split(" ")
@@ -27,3 +29,17 @@ fun String.appendHideNavOnReleaseBuild(): String =
     } else {
         this
     }
+
+fun String.groupWithSpaces(groupCharSize: Int = 4): String {
+    return fold(StringBuilder()) { formattedText, nextDigit ->
+            if ((formattedText.length % (groupCharSize + 1)) == groupCharSize) {
+                formattedText.append(SPACE_CHAR)
+            }
+            formattedText.append(nextDigit)
+        }
+        .toString()
+}
+
+fun String.groupPasswordModeWithSpaces(groupCharSize: Int = 4): String {
+    return BIG_DOT_CHAR.repeat(this.length).groupWithSpaces(groupCharSize)
+}