diff --git a/res/layout/activity_display_name_v2.xml b/res/layout/activity_display_name_v2.xml
index af21fa9e15..467cc8d98a 100644
--- a/res/layout/activity_display_name_v2.xml
+++ b/res/layout/activity_display_name_v2.xml
@@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
- android:layout_marginTop="@dimen/large_spacing"
+ android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
@@ -37,7 +37,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
- android:layout_marginTop="@dimen/large_spacing"
+ android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:hint="Enter a display name" />
diff --git a/res/layout/activity_register.xml b/res/layout/activity_register.xml
index 027d20ffc5..af260c2265 100644
--- a/res/layout/activity_register.xml
+++ b/res/layout/activity_register.xml
@@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
- android:layout_marginTop="@dimen/large_spacing"
+ android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
@@ -37,7 +37,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
- android:layout_marginTop="@dimen/large_spacing"
+ android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
diff --git a/res/layout/activity_restore.xml b/res/layout/activity_restore.xml
index 6155291bb9..d8951e878c 100644
--- a/res/layout/activity_restore.xml
+++ b/res/layout/activity_restore.xml
@@ -38,7 +38,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
- android:layout_marginTop="@dimen/medium_spacing"
+ android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:hint="Enter your seed" />
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index 81410f42bf..7fc95f0ba0 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -16,7 +16,7 @@
android:id="@+id/profilePictureView"
android:layout_width="@dimen/large_profile_picture_size"
android:layout_height="@dimen/large_profile_picture_size"
- android:layout_marginTop="@dimen/large_spacing" />
+ android:layout_marginTop="@dimen/medium_spacing" />
+ android:layout_marginRight="@dimen/large_spacing" />
+ android:layout_width="280dp"
+ android:layout_height="280dp" />
@@ -47,12 +47,11 @@
android:id="@+id/explanationTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/very_large_spacing"
+ android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="20dp"
- android:layout_marginRight="@dimen/very_large_spacing"
+ android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
- android:fontFamily="@font/space_mono_regular"
android:textAlignment="center"
android:text="This is your unique public QR code. Other users may scan this in order to begin a conversation with you." />
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
index 006c051579..dfb0fe8483 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
@@ -23,11 +23,6 @@ class DisplayNameActivity : BaseActionBarActivity() {
registerButton.setOnClickListener { register() }
}
- override fun onResume() {
- super.onResume()
- displayNameEditText.requestFocus()
- }
-
private fun register() {
val displayName = displayNameEditText.text.toString().trim()
if (displayName.isEmpty()) {
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
index 6a9790c673..a0cbed08ab 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
@@ -121,7 +121,7 @@ class ViewMyQRCodeFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- val size = toPx(240, resources)
+ val size = toPx(280, resources)
val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size)
qrCodeImageView.setImageBitmap(qrCode)
val explanation = SpannableStringBuilder("This is your unique public QR code. Other users may scan this in order to begin a conversation with you.")
@@ -137,7 +137,7 @@ class ViewMyQRCodeFragment : Fragment() {
val file = File(directory, fileName)
file.createNewFile()
val fos = FileOutputStream(file)
- val size = toPx(240, resources)
+ val size = toPx(280, resources)
val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size, false)
qrCode.compress(Bitmap.CompressFormat.PNG, 100, fos)
fos.flush()
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt
index 6e7aa93f94..120eddf126 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt
@@ -7,6 +7,7 @@ import android.content.Intent
import android.graphics.Typeface
import android.net.Uri
import android.os.Bundle
+import android.os.Handler
import android.text.Spannable
import android.text.SpannableStringBuilder
import android.text.style.StyleSpan
@@ -87,7 +88,32 @@ class RegisterActivity : BaseActionBarActivity() {
}
private fun updatePublicKeyTextView() {
- publicKeyTextView.text = keyPair!!.hexEncodedPublicKey
+ val hexEncodedPublicKey = keyPair!!.hexEncodedPublicKey
+ val characterCount = hexEncodedPublicKey.count()
+ var count = 0
+ val limit = 40
+ fun animate() {
+ val numberOfIndexesToShuffle = (0 until (40 - count)).random()
+ val indexesToShuffle = (0 until characterCount).shuffled().subList(0, numberOfIndexesToShuffle)
+ var mangledHexEncodedPublicKey = hexEncodedPublicKey
+ for (index in indexesToShuffle) {
+ try {
+ mangledHexEncodedPublicKey = mangledHexEncodedPublicKey.substring(0, index) + "0123456789abcdef________________".random() + mangledHexEncodedPublicKey.substring(index + 1, mangledHexEncodedPublicKey.count())
+ } catch (exception: Exception) {
+ // Do nothing
+ }
+ }
+ count += 1
+ if (count < limit) {
+ publicKeyTextView.text = mangledHexEncodedPublicKey
+ Handler().postDelayed({
+ animate()
+ }, 40)
+ } else {
+ publicKeyTextView.text = hexEncodedPublicKey
+ }
+ }
+ animate()
}
// endregion
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt
index 6cf18b0670..70bc4aee56 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt
@@ -44,11 +44,6 @@ class RestoreActivity : BaseActionBarActivity() {
termsButton.text = termsExplanation
termsButton.setOnClickListener { showTerms() }
}
-
- override fun onResume() {
- super.onResume()
- mnemonicEditText.requestFocus()
- }
// endregion
// region General