refactor: extract hardcoded strings

allows fix for #529

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -2340,9 +2340,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void updateTitleTextView(Recipient recipient) {
     String userPublicKey = TextSecurePreferences.getLocalNumber(this);
     if (recipient == null) {
-      titleTextView.setText("Compose");
+      titleTextView.setText(R.string.ConversationActivity_compose);
     } else if (recipient.getAddress().toString().toLowerCase().equals(userPublicKey)) {
-      titleTextView.setText(getResources().getString(R.string.note_to_self));
+      titleTextView.setText(R.string.note_to_self);
     } else {
       boolean hasName = (recipient.getName() != null && !recipient.getName().isEmpty());
       titleTextView.setText(hasName ? recipient.getName() : recipient.getAddress().toString());
@@ -2363,13 +2363,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     subtitleTextView.setVisibility(View.VISIBLE);
     if (recipient.isMuted()) {
       muteIndicatorImageView.setVisibility(View.VISIBLE);
-      subtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
+      subtitleTextView.setText(getString(R.string.ConversationActivity_muted_until_date,DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault())));
     } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) {
       OpenGroupV2 openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadId);
       if (openGroup != null) {
         Integer userCount = DatabaseFactory.getLokiAPIDatabase(this).getUserCount(openGroup.getRoom(),openGroup.getServer());
         if (userCount == null) { userCount = 0; }
-        subtitleTextView.setText(userCount + " members");
+        subtitleTextView.setText(getString(R.string.ConversationActivity_member_count,userCount));
       } else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
         subtitleTextView.setText(recipient.getAddress().toString());
       } else {

app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationBottomSheet.kt

@@ -1,54 +0,0 @@
-package org.thoughtcrime.securesms.loki.dialogs
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.fragment_key_pair_migration_bottom_sheet.*
-import network.loki.messenger.R
-import org.thoughtcrime.securesms.ApplicationContext
-
-class KeyPairMigrationBottomSheet : BottomSheetDialogFragment() {
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_key_pair_migration_bottom_sheet, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        upgradeNowButton.setOnClickListener { upgradeNow() }
-        upgradeLaterButton.setOnClickListener { upgradeLater() }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val dialog = super.onCreateDialog(savedInstanceState)
-        dialog.setOnShowListener {
-            val d = dialog as BottomSheetDialog
-            val bottomSheet = d.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)!!
-            BottomSheetBehavior.from(bottomSheet).state = BottomSheetBehavior.STATE_EXPANDED
-            BottomSheetBehavior.from(bottomSheet).isHideable = false
-        }
-        isCancelable = false
-        return dialog
-    }
-
-    private fun upgradeNow() {
-        val applicationContext = requireContext().applicationContext as ApplicationContext
-        applicationContext.clearAllData(true)
-    }
-
-    private fun upgradeLater() {
-        val dialog = AlertDialog.Builder(requireContext())
-        dialog.setMessage("You won't be able to send or receive messages until you upgrade.")
-        dialog.setPositiveButton(R.string.ok) { _, _ ->
-            dismiss()
-        }
-        dialog.create().show()
-    }
-}

app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/KeyPairMigrationSuccessBottomSheet.kt

@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.loki.dialogs
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.Toast
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.fragment_key_pair_migration_success_bottom_sheet.*
-import network.loki.messenger.R
-import org.session.libsession.utilities.TextSecurePreferences
-
-class KeyPairMigrationSuccessBottomSheet : BottomSheetDialogFragment() {
-
-    private val sessionID by lazy {
-        TextSecurePreferences.getLocalNumber(requireContext())
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_key_pair_migration_success_bottom_sheet, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        sessionIDTextView.text = sessionID
-        copyButton.setOnClickListener { copySessionID() }
-        okButton.setOnClickListener { dismiss() }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val dialog = super.onCreateDialog(savedInstanceState)
-        // Expand the bottom sheet by default
-        dialog.setOnShowListener {
-            val d = dialog as BottomSheetDialog
-            val bottomSheet = d.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-            BottomSheetBehavior.from(bottomSheet!!).setState(BottomSheetBehavior.STATE_EXPANDED);
-        }
-        return dialog
-    }
-
-    private fun copySessionID() {
-        val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        val clip = ClipData.newPlainText("Session ID", sessionID)
-        clipboard.setPrimaryClip(clip)
-        Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
-    }
-}

app/src/main/res/layout-sw400dp/activity_landing.xml

@@ -59,6 +59,6 @@
         android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
-        android:text="Link a Device" />
+        android:text="@string/activity_link_device_link_device" />
 
 </LinearLayout>

app/src/main/res/layout-sw400dp/activity_pn_mode.xml

@@ -19,7 +19,7 @@
             android:textSize="@dimen/very_large_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Message Notifications" />
+            android:text="@string/activity_pn_mode_message_notifications" />
 
         <TextView
             android:layout_width="match_parent"
@@ -29,7 +29,7 @@
             android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:text="There are two ways Session can notify you of new messages." />
+            android:text="@string/activity_pn_mode_explanation" />
 
         <org.thoughtcrime.securesms.loki.views.PNModeView
             android:id="@+id/fcmOptionView"
@@ -48,7 +48,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Fast Mode" />
+                android:text="@string/activity_pn_mode_fast_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -56,7 +56,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers." />
+                android:text="@string/activity_pn_mode_fast_mode_explanation" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -86,7 +86,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Slow Mode" />
+                android:text="@string/activity_pn_mode_slow_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -94,7 +94,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="Session will occasionally check for new messages in the background." />
+                android:text="@string/activity_pn_mode_slow_mode_explanation" />
 
         </org.thoughtcrime.securesms.loki.views.PNModeView>
 

app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -69,6 +70,7 @@
         android:textColor="?android:textColorTertiary"
         android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout-sw400dp/activity_register.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -38,7 +39,7 @@
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/very_large_spacing"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <View
         android:layout_width="match_parent"
@@ -74,6 +75,7 @@
         android:textColor="?android:textColorTertiary"
         android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout-sw400dp/activity_seed.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -47,7 +47,7 @@
         android:gravity="center"
         android:textSize="16sp"
         android:textAlignment="center"
-        android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
+        tools:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
     <TextView
         android:id="@+id/revealButton"

app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml

@@ -18,7 +18,7 @@
         android:textSize="@dimen/very_large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Recovery Phrase" />
+        android:text="@string/fragment_recovery_phrase_title" />
 
     <TextView
         android:layout_width="match_parent"
@@ -28,7 +28,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="To link your device, enter the recovery phrase that was given to you when you signed up." />
+        android:text="@string/activity_restore_explanation" />
 
     <EditText
         style="@style/SessionEditText"

app/src/main/res/layout-sw400dp/view_seed_reminder.xml

@@ -36,7 +36,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:textStyle="bold"
-                android:text="You're almost finished! 80%" />
+                android:text="@string/view_seed_reminder_title" />
 
             <TextView
                 android:id="@+id/subtitleTextView"
@@ -47,7 +47,7 @@
                 android:textSize="@dimen/very_small_font_size"
                 android:lines="2"
                 android:alpha="0.6"
-                android:text="Secure your account by saving your recovery phrase" />
+                android:text="@string/view_seed_reminder_subtitle_1" />
 
         </LinearLayout>
 
@@ -64,7 +64,7 @@
             android:layout_height="28dp"
             android:layout_marginLeft="4dp"
             android:textStyle="normal"
-            android:text="Continue" />
+            android:text="@string/continue_2" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_backup_restore.xml

@@ -99,7 +99,8 @@
                 android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
                 android:textColor="@color/text"
                 android:textColorLink="@color/text"
-                android:textSize="@dimen/very_small_font_size" /> <!-- Intentionally not yet translated -->
+                android:textSize="@dimen/very_small_font_size"
+                tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
         </LinearLayout>
 

app/src/main/res/layout/activity_home.xml

@@ -42,7 +42,7 @@
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="64dp"
                     android:fontFamily="sans-serif-medium"
-                    android:text="Session"
+                    android:text="@string/app_name"
                     android:textColor="@color/text"
                     android:textSize="@dimen/very_large_font_size" />
 

app/src/main/res/layout/activity_landing.xml

@@ -59,6 +59,6 @@
         android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
-        android:text="Link a Device" />
+        android:text="@string/activity_link_device_link_device" />
 
 </LinearLayout>

app/src/main/res/layout/activity_open_group_guidelines.xml

@@ -18,7 +18,7 @@
             android:textSize="@dimen/large_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Community Guidelines" />
+            android:text="@string/ConversationActivity_open_group_guidelines" />
 
         <TextView
             android:id="@+id/communityGuidelinesTextView"

app/src/main/res/layout/activity_pn_mode.xml

@@ -19,7 +19,7 @@
             android:textSize="@dimen/large_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Message Notifications" />
+            android:text="@string/activity_pn_mode_message_notifications" />
 
         <TextView
             android:layout_width="match_parent"
@@ -29,7 +29,7 @@
             android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:text="There are two ways Session can notify you of new messages." />
+            android:text="@string/activity_pn_mode_explanation" />
 
         <org.thoughtcrime.securesms.loki.views.PNModeView
             android:id="@+id/fcmOptionView"
@@ -48,7 +48,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Fast Mode" />
+                android:text="@string/activity_pn_mode_fast_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -56,7 +56,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="You’ll be notified of new messages reliably and immediately using Google’s notification servers." />
+                android:text="@string/activity_pn_mode_fast_mode_explanation" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -86,7 +86,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textStyle="bold"
-                android:text="Slow Mode" />
+                android:text="@string/activity_pn_mode_slow_mode" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -94,7 +94,7 @@
                 android:layout_marginTop="4dp"
                 android:textSize="@dimen/very_small_font_size"
                 android:textColor="@color/text"
-                android:text="Session will occasionally check for new messages in the background." />
+                android:text="@string/activity_pn_mode_slow_mode_explanation" />
 
         </org.thoughtcrime.securesms.loki.views.PNModeView>
 

app/src/main/res/layout/activity_recovery_phrase_restore.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -69,6 +70,7 @@
         android:textColorLink="@color/text"
         android:textSize="@dimen/very_small_font_size"
         android:textColor="@color/text"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout/activity_register.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -35,11 +36,11 @@
         android:id="@+id/publicKeyTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="18dp"
+        android:textSize="18sp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <View
         android:layout_width="match_parent"
@@ -75,6 +76,7 @@
         android:textColor="?android:textColorTertiary"
         android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
+        android:text="By using this service, you agree to our Terms of Service and Privacy Policy"
+        tools:ignore="HardcodedText" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>

app/src/main/res/layout/activity_seed.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -47,7 +47,7 @@
         android:gravity="center"
         android:textSize="14sp"
         android:textAlignment="center"
-        android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
+        tools:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
     <TextView
         android:id="@+id/revealButton"

app/src/main/res/layout/activity_settings.xml

@@ -76,7 +76,7 @@
                 android:textColor="@color/text"
                 android:fontFamily="@font/space_mono_regular"
                 android:textAlignment="center"
-                android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+                tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -211,7 +211,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textStyle="bold"
                 android:gravity="center"
-                android:text="Help us Translate Session" />
+                android:text="@string/activity_settings_help_translate_session" />
 
             <TextView
                 android:id="@+id/versionTextView"

app/src/main/res/layout/contact_selection_list_fragment.xml

@@ -13,7 +13,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="You don't have any contacts yet"
+            android:text="@string/fragment_contact_selection_empty_contacts"
             android:textSize="@dimen/medium_font_size" />
 
     </LinearLayout>

app/src/main/res/layout/conversation_activity.xml

@@ -57,7 +57,7 @@
                     android:layout_height="wrap_content"
                     android:maxLines="1"
                     android:ellipsize="end"
-                    android:text="Conversation"
+                    tools:text="Conversation"
                     android:textColor="@color/text"
                     android:textSize="@dimen/large_font_size"
                     android:fontFamily="sans-serif-medium" />
@@ -83,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:maxLines="1"
                         android:ellipsize="end"
-                        android:text="26 members"
+                        tools:text="26 members"
                         android:textColor="@color/text"
                         android:textSize="@dimen/small_font_size" />
 
@@ -217,7 +217,7 @@
                 android:layout_height="wrap_content"
                 android:background="?android:attr/windowBackground"
                 android:paddingStart="5dip"
-                android:text="160/160 (1)"
+                tools:text="160/160 (1)"
                 android:visibility="gone" />
 
             <ViewStub

app/src/main/res/layout/dialog_seed.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/default_dialog_background_inset"
     android:gravity="center_horizontal"
     android:orientation="vertical"
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
         android:padding="@dimen/small_spacing"
-        android:text="habitat kiwi amply iceberg dog nerves spiderman soft match partial awakened maximum degrees"
+        tools:text="habitat kiwi amply iceberg dog nerves spiderman soft match partial awakened maximum degrees"
         android:textColor="@color/text"
         android:textSize="@dimen/small_font_size"
         android:textAlignment="center" />

app/src/main/res/layout/fragment_enter_public_key.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -60,7 +60,7 @@
         android:textColor="@color/text"
         android:fontFamily="@font/space_mono_regular"
         android:textAlignment="center"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_key_pair_migration_bottom_sheet.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:padding="@dimen/large_spacing"
-    app:behavior_hideable="false"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-    <ImageView
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_shield"
-        android:tint="?android:textColorPrimary" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="Session IDs Just Got Better"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="We’ve upgraded Session IDs to make them even more private and secure. To ensure your continued privacy you're now required to upgrade."
-        android:textSize="@dimen/medium_font_size"
-        android:textAlignment="center" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="Your existing contacts and conversations will be lost, but you’ll be able to use Session knowing you have the best privacy and security possible."
-        android:textSize="@dimen/medium_font_size"
-        android:textAlignment="center" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/upgradeNowButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/very_large_spacing"
-        android:text="Upgrade Now" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/upgradeLaterButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="Upgrade Later" />
-
-</LinearLayout>

app/src/main/res/layout/fragment_key_pair_migration_success_bottom_sheet.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:padding="@dimen/large_spacing"
-    app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-    <ImageView
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_shield"
-        android:tint="?android:textColorPrimary" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="Upgrade Successful!"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="Your new and improved Session ID is:"
-        android:textSize="@dimen/medium_font_size"
-        android:textAlignment="center" />
-
-    <TextView
-        style="@style/SessionIDTextView"
-        android:id="@+id/sessionIDTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="18dp"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/copyButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/very_large_spacing"
-        android:text="Copy" />
-
-    <Button
-        style="@style/Widget.Session.Button.Common.UnimportantOutline"
-        android:id="@+id/okButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="@string/ok" />
-
-</LinearLayout>

app/src/main/res/layout/fragment_recovery_phrase.xml

@@ -18,7 +18,7 @@
         android:textSize="@dimen/large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Recovery Phrase" />
+        android:text="@string/fragment_recovery_phrase_title" />
 
     <TextView
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_scan_qr_code.xml

@@ -30,7 +30,7 @@
             android:layout_weight="1"
             android:padding="@dimen/very_large_spacing"
             android:gravity="center"
-            android:text="Scan a user’s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings."
+            android:text="@string/activity_create_private_chat_scan_qr_code_explanation"
             android:background="?android:windowBackground"
             android:textSize="@dimen/small_font_size"
             android:textColor="?android:textColorTertiary" />

app/src/main/res/layout/fragment_user_details_bottom_sheet.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:gravity="center_horizontal"
     android:paddingLeft="@dimen/large_spacing"
@@ -26,7 +26,7 @@
         android:textSize="@dimen/massive_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Spiderman" />
+        tools:text="Spiderman" />
 
     <TextView
         style="@style/SessionIDTextView"
@@ -36,7 +36,7 @@
         android:textSize="@dimen/large_font_size"
         android:layout_marginTop="@dimen/large_spacing"
         android:textIsSelectable="true"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentOutline"

app/src/main/res/layout/fragment_view_my_qr_code.xml

@@ -32,7 +32,7 @@
                 android:textColor="@color/text"
                 android:textStyle="bold"
                 android:textAlignment="center"
-                android:text="Scan Me" />
+                android:text="@string/fragment_view_my_qr_code_title" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -59,7 +59,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textAlignment="center"
-                android:text="This is your QR code. Other users can scan it to start a session with you." />
+                android:text="@string/fragment_view_my_qr_code_explanation" />
 
             <Button
                 style="@style/Widget.Session.Button.Common.UnimportantOutline"
@@ -68,7 +68,7 @@
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_marginTop="28dp"
                 android:layout_marginBottom="@dimen/medium_spacing"
-                android:text="Share" />
+                android:text="@string/share" />
 
         </LinearLayout>
 

app/src/main/res/layout/prompt_passphrase_activity.xml

@@ -50,7 +50,7 @@
             style="@style/Signal.Text.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Session is Locked"
+            android:text="@string/activity_prompt_passphrase_session_locked"
             android:textStyle="bold"
             android:textSize="@dimen/large_font_size"
             android:textAlignment="center"
@@ -73,7 +73,6 @@
             android:id="@+id/lock_screen_auth_container"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
-            android:text="Tap to Unlock"/>
+            android:text="@string/activity_prompt_passphrase_tap_to_unlock"/>
-
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/share_activity.xml

@@ -23,7 +23,7 @@
 
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:text="Share"
+                      android:text="@string/share"
                       android:fontFamily="sans-serif-medium"
                       android:textSize="@dimen/very_large_font_size"
                       android:layout_alignParentStart="true"

app/src/main/res/layout/view_conversation.xml

@@ -63,7 +63,7 @@
                     android:textSize="@dimen/small_font_size"
                     android:textColor="@color/text"
                     android:alpha="0.4"
-                    android:text="9:41 AM" />
+                    tools:text="9:41 AM" />
 
             </LinearLayout>
 

app/src/main/res/layout/view_open_group_guidelines.xml

@@ -33,7 +33,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:textStyle="bold"
-                android:text="Pinned message" />
+                android:text="@string/open_group_guidelines_pinned_message" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:maxLines="2"
-                android:text="Community guidelines" />
+                android:text="@string/open_group_guidelines_community_guidelines" />
 
         </LinearLayout>
 
@@ -60,7 +60,7 @@
             android:layout_marginRight="12dp"
             android:textSize="@dimen/small_font_size"
             android:textStyle="normal"
-            android:text="Read" />
+            android:text="@string/open_group_guidelines_read" />
 
     </LinearLayout>
 

app/src/main/res/layout/view_seed_reminder.xml

@@ -36,7 +36,7 @@
                 android:textColor="@color/text"
                 android:textSize="@dimen/small_font_size"
                 android:textStyle="bold"
-                android:text="You're almost finished! 80%" />
+                android:text="@string/view_seed_reminder_title" />
 
             <TextView
                 android:id="@+id/subtitleTextView"
@@ -47,7 +47,7 @@
                 android:textSize="@dimen/very_small_font_size"
                 android:lines="2"
                 android:alpha="0.6"
-                android:text="Secure your account by saving your recovery phrase" />
+                android:text="@string/view_seed_reminder_subtitle_1" />
 
         </LinearLayout>
 
@@ -64,7 +64,7 @@
             android:layout_height="28dp"
             android:layout_marginLeft="4dp"
             android:textStyle="normal"
-            android:text="Continue" />
+            android:text="@string/continue_2" />
 
     </LinearLayout>
 

app/src/main/res/menu/conversation_list_search.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <item
-            android:id="@+id/action_filter_search"
+        android:id="@+id/action_filter_search"
-            android:title=" "
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
-            app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="collapseActionView|always"
-            app:showAsAction="collapseActionView|always" />
+        android:title="" />
 
 </menu>

app/src/main/res/menu/menu_pn_mode.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="Learn More"
+        android:title="@string/activity_path_learn_more_button_title"
         android:id="@+id/learnMoreButton"
         android:icon="@drawable/ic_info_outline_white_24dp"
         app:showAsAction="always" />

app/src/main/res/values/strings.xml

@@ -73,6 +73,10 @@
     <string name="ConversationActivity_select_contact_info">Select contact info</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sorry, there was an error setting your attachment.</string>
     <string name="ConversationActivity_message">Message</string>
+    <string name="ConversationActivity_compose">Compose</string>
+    <string name="ConversationActivity_muted_until_date">Muted until %1$s</string>
+    <string name="ConversationActivity_member_count">%1$d members</string>
+    <string name="ConversationActivity_open_group_guidelines">Community Guidelines</string>
 
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
     <string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
@@ -419,6 +423,9 @@
     <!-- open_group_invitation_view -->
     <string name="open_group_invitation_view__join_accessibility_description">Join</string>
     <string name="open_group_invitation_view__open_group_invitation">Open group invitation</string>
+    <string name="open_group_guidelines_pinned_message">Pinned message</string>
+    <string name="open_group_guidelines_community_guidelines">Community guidelines</string>
+    <string name="open_group_guidelines_read">Read</string>
 
     <!-- QuoteView -->
     <string name="QuoteView_audio">Audio</string>
@@ -694,6 +701,7 @@
     <string name="activity_seed_explanation">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.</string>
     <string name="activity_seed_reveal_button_title">Hold to reveal</string>
 
+    <string name="view_seed_reminder_title">You\'re almost finished! 80%</string>
     <string name="view_seed_reminder_subtitle_1">Secure your account by saving your recovery phrase</string>
     <string name="view_seed_reminder_subtitle_2">Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID.</string>
     <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
@@ -745,6 +753,7 @@
     <string name="activity_settings_invite_button_title">Invite</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
+    <string name="activity_settings_help_translate_session">Help us Translate Session</string>
 
     <string name="activity_notification_settings_title">Notifications</string>
     <string name="activity_notification_settings_style_section_title">Notification Style</string>
@@ -769,6 +778,7 @@
     <string name="activity_qr_code_view_my_qr_code_tab_title">View My QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_tab_title">Scan QR Code</string>
     <string name="activity_qr_code_view_scan_qr_code_explanation">Scan someone\'s QR code to start a conversation with them</string>
+    <string name="fragment_view_my_qr_code_title">Scan Me</string>
 
     <string name="fragment_view_my_qr_code_explanation">This is your QR code. Other users can scan it to start a session with you.</string>
     <string name="fragment_view_my_qr_code_share_title">Share QR Code</string>
@@ -776,6 +786,7 @@
     <string name="fragment_contact_selection_contacts_title">Contacts</string>
     <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
     <string name="fragment_contact_selection_open_groups_title">Open Groups</string>
+    <string name="fragment_contact_selection_empty_contacts">You don\'t have any contacts yet</string>
 
     <!-- Next round of translation -->
 
@@ -815,6 +826,22 @@
     <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
     <!--  LinkDeviceActivity  -->
     <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
+    <string name="activity_link_device_link_device">Link a Device</string>
     <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
 
+    <string name="activity_pn_mode_message_notifications">Message Notifications</string>
+    <string name="activity_pn_mode_explanation">There are two ways Session can notify you of new messages.</string>
+    <string name="activity_pn_mode_fast_mode">Fast Mode</string>
+    <string name="activity_pn_mode_slow_mode">Slow Mode</string>
+    <string name="activity_pn_mode_fast_mode_explanation">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
+    <string name="activity_pn_mode_slow_mode_explanation">Session will occasionally check for new messages in the background.</string>
+
+    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
+
+    <string name="activity_prompt_passphrase_session_locked">Session is Locked</string>
+    <string name="activity_prompt_passphrase_tap_to_unlock">Tap to Unlock</string>
+
+
+
+
 </resources>

app/src/main/res/values/vector_paths.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Play Icon -->
-    <string name="play_icon_upper_path_data">M 44 32 L 44 64 L 100 64 L 100 64 Z</string>
+    <string name="play_icon_upper_path_data" translatable="false">M 44 32 L 44 64 L 100 64 L 100 64 Z</string>
-    <string name="play_icon_bottom_path_data">M 44 96 L 44 64 L 100 64 L 100 64 Z</string>
+    <string name="play_icon_bottom_path_data" translatable="false">M 44 96 L 44 64 L 100 64 L 100 64 Z</string>
 
     <!-- Pause Icon -->
-    <string name="pause_icon_upper_path_data">M 32 40 L 32 56  L 96 56 L 96 40 Z</string>
+    <string name="pause_icon_upper_path_data" translatable="false">M 32 40 L 32 56  L 96 56 L 96 40 Z</string>
-    <string name="pause_icon_bottom_path_data">M 32 88 L 32 72 L 96 72 L 96 88 Z</string>
+    <string name="pause_icon_bottom_path_data" translatable="false">M 32 88 L 32 72 L 96 72 L 96 88 Z</string>
 
     <!-- Groups -->
-    <string name="play_icon_group_top">upperpart</string>
+    <string name="play_icon_group_top" translatable="false">upperpart</string>
-    <string name="play_icon_group_bottom">bottompart</string>
+    <string name="play_icon_group_bottom" translatable="false">bottompart</string>
-    <string name="play_icon_group_parts">parts</string>
+    <string name="play_icon_group_parts" translatable="false">parts</string>
 
     <!-- Path Name -->
-    <string name="play_icon_top_path_name">upper</string>
+    <string name="play_icon_top_path_name" translatable="false">upper</string>
-    <string name="play_icon_bottom_path_name">bottom</string>
+    <string name="play_icon_bottom_path_name" translatable="false">bottom</string>
 
 </resources>