diff --git a/res/layout-sw400dp/activity_display_name_v2.xml b/res/layout-sw400dp/activity_display_name_v2.xml
index 00bafed0aa..11de7b28c2 100644
--- a/res/layout-sw400dp/activity_display_name_v2.xml
+++ b/res/layout-sw400dp/activity_display_name_v2.xml
@@ -29,7 +29,7 @@
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
- android:text="This is how others will be able to recognize you." />
+ android:text="This will be your name when you use Session." />
+ android:text="Create Session ID" />
+ android:text="Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
+ android:text="Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session." />
+ android:text="Enter an open group URL" />
+ android:text="This will be your name when you use Session." />
+ android:text="Create Session ID" />
+ android:text="You haven't linked any devices yet" />
+ android:text="Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
+ android:text="Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session." />
+ android:text="Devices" />
+ android:text="Recovery Phrase" />
diff --git a/res/layout/dialog_link_device_master_mode.xml b/res/layout/dialog_link_device_master_mode.xml
index 04adef415a..725a11eee7 100644
--- a/res/layout/dialog_link_device_master_mode.xml
+++ b/res/layout/dialog_link_device_master_mode.xml
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_spacing"
- android:text="Create a new account on your other device and click "Link to an existing account" to start the linking process"
+ android:text="Open Session on your secondary device and tap "Link to an existing account""
android:textColor="@color/text"
android:alpha="0.6"
android:textSize="@dimen/small_font_size"
diff --git a/res/layout/dialog_seed.xml b/res/layout/dialog_seed.xml
index f4ef4eb968..44fd747301 100644
--- a/res/layout/dialog_seed.xml
+++ b/res/layout/dialog_seed.xml
@@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_spacing"
- android:text="This is your personal recovery phrase. It can be used to restore your account or migrate your account to a new device."
+ android:text="This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device."
android:textColor="@color/text"
android:textSize="@dimen/small_font_size"
android:textAlignment="center"
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
index c08bec5d5f..84a522bf44 100644
--- a/res/layout/fragment_enter_chat_url.xml
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -28,7 +28,7 @@
android:textColor="@color/text"
android:alpha="0.6"
android:textAlignment="center"
- android:text="Enter the URL of the channel you'd like to join" />
+ android:text="Enter an open group URL" />
diff --git a/res/layout/fragment_view_my_qr_code.xml b/res/layout/fragment_view_my_qr_code.xml
index f0c997548c..c0aea06bbb 100644
--- a/res/layout/fragment_view_my_qr_code.xml
+++ b/res/layout/fragment_view_my_qr_code.xml
@@ -54,7 +54,7 @@
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:textAlignment="center"
- android:text="This is your unique public QR code. Other users can scan this to start a conversation with you." />
+ android:text="This is your QR code. Other users can scan it to start a session with you." />
{
val result = ScanQRCodeWrapperFragment()
result.delegate = activity
- result.message = "Users can share their QR code by going into their account settings and tapping \"Share QR Code\""
+ result.message = "Scan a user’s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings."
result
}
else -> throw IllegalStateException()
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
index d6ef797828..2b2b5bef08 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
@@ -33,7 +33,7 @@ class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCode
// Set content view
setContentView(R.layout.activity_join_public_chat)
// Set title
- supportActionBar!!.title = "Join Channel"
+ supportActionBar!!.title = "Join Open Group"
// Set up view pager
viewPager.adapter = adapter
tabLayout.setupWithViewPager(viewPager)
@@ -100,7 +100,7 @@ private class JoinPublicChatActivityAdapter(val activity: JoinPublicChatActivity
1 -> {
val result = ScanQRCodeWrapperFragment()
result.delegate = activity
- result.message = "Scan the QR code of the channel you'd like to join"
+ result.message = "Scan the QR code of the open group you'd like to join"
result
}
else -> throw IllegalStateException()
@@ -109,7 +109,7 @@ private class JoinPublicChatActivityAdapter(val activity: JoinPublicChatActivity
override fun getPageTitle(index: Int): CharSequence? {
return when (index) {
- 0 -> "Enter Channel URL"
+ 0 -> "Open Group URL"
1 -> "Scan QR Code"
else -> throw IllegalStateException()
}
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt
index a728c007c4..b9275ef4f8 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt
@@ -43,7 +43,7 @@ class LinkedDevicesActivity : PassphraseRequiredActionBarActivity, LoaderManager
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
super.onCreate(savedInstanceState, isReady)
setContentView(R.layout.activity_linked_devices)
- supportActionBar!!.title = "Linked Devices"
+ supportActionBar!!.title = "Devices"
recyclerView.adapter = linkedDevicesAdapter
recyclerView.layoutManager = LinearLayoutManager(this)
linkDeviceButton.setOnClickListener { linkDevice() }
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
index f7d5afdee1..3969631aad 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
@@ -3,14 +3,10 @@ package org.thoughtcrime.securesms.loki.redesign.activities
import android.Manifest
import android.content.Intent
import android.graphics.Bitmap
-import android.graphics.Typeface
import android.os.Bundle
import android.os.Environment
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentPagerAdapter
-import android.text.Spannable
-import android.text.SpannableStringBuilder
-import android.text.style.StyleSpan
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -124,9 +120,9 @@ class ViewMyQRCodeFragment : Fragment() {
val size = toPx(280, resources)
val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size, false, false)
qrCodeImageView.setImageBitmap(qrCode)
- val explanation = SpannableStringBuilder("This is your unique public QR code. Other users can scan this to start a conversation with you.")
- explanation.setSpan(StyleSpan(Typeface.BOLD), 8, 34, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
- explanationTextView.text = explanation
+// val explanation = SpannableStringBuilder("This is your unique public QR code. Other users can scan this to start a conversation with you.")
+// explanation.setSpan(StyleSpan(Typeface.BOLD), 8, 34, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+ explanationTextView.text = "This is your QR code. Other users can scan it to start a session with you."
shareButton.setOnClickListener { shareQRCode() }
}
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
index b15ecfcd14..59bcf5b256 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
@@ -38,7 +38,7 @@ class SeedActivity : BaseActionBarActivity() {
val seedReminderViewTitle = SpannableString("You're almost finished! 90%")
seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
seedReminderView.title = seedReminderViewTitle
- seedReminderView.subtitle = "Press the redacted words to view your recovery phrase and secure your account"
+ seedReminderView.subtitle = "Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID."
seedReminderView.setProgress(90, false)
seedReminderView.hideContinueButton()
var redactedSeed = seed