Fix account number ui in account settings

Changes:
* Increases the size of the show/hide and copy buttons.
* Auto-resize the account number if the font scaling makes it too wide.

2 files changed, 2 insertions, 5 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
index 7d9dc711bd..9e5d68d585 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
@@ -11,10 +11,6 @@ import net.mullvad.mullvadvpn.R
 
 class CopyableInformationView : InformationView {
     var clipboardLabel: String? = null
-        set(value) {
-            field = value
-            shouldEnable = value != null
-        }
 
     var copiedToast: String? = null
 
@@ -43,6 +39,7 @@ class CopyableInformationView : InformationView {
             visibility = View.VISIBLE
             setOnClickListener { copyToClipboard() }
         }
+        shouldEnable = false
     }
 
     private fun loadAttributes(attributes: AttributeSet) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
index fec64d9e14..42f78b3b4a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
@@ -92,7 +92,7 @@ open class InformationView : LinearLayout {
 
             is Masking.None -> {
                 informationDisplay.transformationMethod = null
-                toggleMaskingButton.visibility = GONE
+                toggleMaskingButton.visibility = INVISIBLE
             }
         }