Add account selection activity and support profile locks (#736)

app/src/main/AndroidManifest.xml

@@ -96,12 +96,6 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true">
-            <intent-filter android:exported="true">
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
 
             <!-- cloudstreamplayer://encodedUrl?name=Dune -->
             <intent-filter>
@@ -165,6 +159,22 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".ui.account.AccountSelectActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation"
+            android:exported="true"
+            android:resizeableActivity="true">
+            <intent-filter android:exported="true">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".ui.EasterEggMonke"
             android:exported="true" />

app/src/main/java/com/lagradost/cloudstream3/ui/WhoIsWatchingAdapter.kt

@@ -55,7 +55,6 @@ class WhoIsWatchingAdapter(
             editCallBack = editCallBack,
         )
 
-
     override fun onBindViewHolder(holder: WhoIsWatchingHolder, position: Int) =
         holder.bind(currentList.getOrNull(position))
 
@@ -70,10 +69,15 @@ class WhoIsWatchingAdapter(
         fun bind(card: DataStoreHelper.Account?) {
             when (binding) {
                 is WhoIsWatchingAccountBinding -> binding.apply {
-                    if(card == null) return@apply
+                    if (card == null) return@apply
                     outline.isVisible = card.keyIndex == DataStoreHelper.selectedKeyIndex
                     profileText.text = card.name
                     profileImageBackground.setImage(card.image)
+
+                    // Handle the lock indicator
+                    val isLocked = card.lockPin != null
+                    lockIcon.isVisible = isLocked
+
                     root.setOnClickListener {
                         selectCallBack(card)
                     }

app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt

@@ -0,0 +1,64 @@
+package com.lagradost.cloudstream3.ui.account
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.databinding.AccountListItemBinding
+import com.lagradost.cloudstream3.ui.result.setImage
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+
+class AccountAdapter(
+    private val accounts: List<DataStoreHelper.Account>,
+    private val onItemClick: (DataStoreHelper.Account) -> Unit
+) : RecyclerView.Adapter<AccountAdapter.AccountViewHolder>() {
+
+    inner class AccountViewHolder(private val binding: AccountListItemBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(account: DataStoreHelper.Account) {
+            val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
+
+            binding.accountName.text = account.name
+            binding.accountImage.setImage(account.image)
+            binding.lockIcon.isVisible = account.lockPin != null
+            binding.outline.isVisible = isLastUsedAccount
+
+            if (isTvSettings()) {
+                binding.root.isFocusableInTouchMode = true
+                if (isLastUsedAccount) {
+                    binding.root.requestFocus()
+                }
+            }
+
+            binding.root.setOnClickListener {
+                onItemClick(account)
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccountViewHolder {
+        val binding = AccountListItemBinding.inflate(
+            LayoutInflater.from(parent.context), parent, false
+        )
+
+        if (isTvSettings()) {
+            val layoutParams = binding.root.layoutParams as RecyclerView.LayoutParams
+            val marginInDp = 5 // Set the margin to 5dp
+            val marginInPixels = (marginInDp * parent.resources.displayMetrics.density).toInt()
+            layoutParams.setMargins(marginInPixels, marginInPixels, marginInPixels, marginInPixels)
+            binding.root.layoutParams = layoutParams
+        }
+
+        return AccountViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: AccountViewHolder, position: Int) {
+        holder.bind(accounts[position])
+    }
+
+    override fun getItemCount(): Int {
+        return accounts.size
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountDialog.kt

@@ -0,0 +1,115 @@
+package com.lagradost.cloudstream3.ui.account
+
+import android.content.Context
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.LockPinDialogBinding
+import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+
+object AccountDialog {
+    // TODO add account creation dialog to allow creating accounts directly from AccountSelectActivity
+
+    fun showPinInputDialog(
+        context: Context,
+        currentPin: String?,
+        editAccount: Boolean,
+        callback: (String?) -> Unit
+    ) {
+        fun TextView.visibleWithText(@StringRes textRes: Int) {
+            visibility = View.VISIBLE
+            setText(textRes)
+        }
+
+        fun View.isVisible() = visibility == View.VISIBLE
+
+        val binding = LockPinDialogBinding.inflate(LayoutInflater.from(context))
+
+        val isPinSet = currentPin != null
+        val isNewPin = editAccount && !isPinSet
+        val isEditPin = editAccount && isPinSet
+
+        val titleRes = if (isEditPin) R.string.enter_current_pin else R.string.enter_pin
+
+        val dialog = AlertDialog.Builder(context, R.style.AlertDialogCustom)
+            .setView(binding.root)
+            .setTitle(titleRes)
+            .setNegativeButton(R.string.cancel) { _, _ ->
+                callback.invoke(null)
+            }
+            .setOnCancelListener {
+                callback.invoke(null)
+            }
+            .setOnDismissListener {
+                if (binding.pinEditTextError.isVisible()) {
+                    callback.invoke(null)
+                }
+            }
+            .create()
+
+        var isPinValid = false
+
+        binding.pinEditText.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                val enteredPin = s.toString()
+                val isEnteredPinValid = enteredPin.length == 4
+
+                if (isEnteredPinValid) {
+                    if (isPinSet) {
+                        if (enteredPin != currentPin) {
+                            binding.pinEditTextError.visibleWithText(R.string.pin_error_incorrect)
+                            binding.pinEditText.text = null
+                            isPinValid = false
+                        } else {
+                            binding.pinEditTextError.visibility = View.GONE
+                            isPinValid = true
+
+                            callback.invoke(enteredPin)
+                            dialog.dismissSafe()
+                        }
+                    } else {
+                        binding.pinEditTextError.visibility = View.GONE
+                        isPinValid = true
+                    }
+                } else if (isNewPin) {
+                    binding.pinEditTextError.visibleWithText(R.string.pin_error_length)
+                    isPinValid = false
+                }
+            }
+
+            override fun afterTextChanged(s: Editable?) {}
+        })
+
+        // Detect IME_ACTION_DONE
+        binding.pinEditText.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_DONE && isPinValid) {
+                val enteredPin = binding.pinEditText.text.toString()
+                callback.invoke(enteredPin)
+                dialog.dismissSafe()
+            }
+            true
+        }
+
+        // We don't want to accidentally have the dialog dismiss when clicking outside of it.
+        // That is what the cancel button is for.
+        dialog.setCanceledOnTouchOutside(false)
+
+        dialog.show()
+
+        // Auto focus on PIN input and show keyboard
+        binding.pinEditText.requestFocus()
+        binding.pinEditText.postDelayed({
+            val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.showSoftInput(binding.pinEditText, InputMethodManager.SHOW_IMPLICIT)
+        }, 200)
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt

@@ -0,0 +1,91 @@
+package com.lagradost.cloudstream3.ui.account
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.CommonActivity.loadThemes
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ActivityAccountSelectBinding
+import com.lagradost.cloudstream3.databinding.ActivityAccountSelectTvBinding
+import com.lagradost.cloudstream3.ui.account.AccountDialog.showPinInputDialog
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getAccounts
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+
+class AccountSelectActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        CommonActivity.init(this)
+        loadThemes(this)
+
+        window.navigationBarColor = colorFromAttribute(R.attr.primaryBlackBackground)
+
+        val binding = if (isTvSettings()) {
+            ActivityAccountSelectTvBinding.inflate(layoutInflater)
+        } else ActivityAccountSelectBinding.inflate(layoutInflater)
+
+        setContentView(binding.root)
+
+        val recyclerView: RecyclerView = binding.root.findViewById(R.id.account_recycler_view)
+
+        val accounts = getAccounts(this@AccountSelectActivity)
+
+        // Don't show account selection if there is only
+        // one account that exists
+        if (accounts.count() <= 1) {
+            navigateToMainActivity()
+            return
+        }
+
+        val adapter = AccountAdapter(accounts) { selectedAccount ->
+            // Handle the selected account
+            onAccountSelected(selectedAccount)
+        }
+        recyclerView.adapter = adapter
+
+        recyclerView.layoutManager = if (isTvSettings()) {
+            LinearLayoutManager(this)
+        } else GridLayoutManager(this, 2)
+    }
+
+    private fun onAccountSelected(selectedAccount: DataStoreHelper.Account) {
+        if (selectedAccount.lockPin != null) {
+            // The selected account has a PIN set, prompt the user to enter the PIN
+            showPinInputDialog(this@AccountSelectActivity, selectedAccount.lockPin, false) { pin ->
+                if (pin == null) return@showPinInputDialog
+                // Pin is correct, proceed to main activity
+                setAccount(selectedAccount)
+                navigateToMainActivity()
+            }
+        } else {
+            // No PIN set for the selected account, proceed to main activity
+            setAccount(selectedAccount)
+            navigateToMainActivity()
+        }
+    }
+
+    private fun setAccount(account: DataStoreHelper.Account) {
+        // Don't reload if it is the same account
+        if (DataStoreHelper.selectedKeyIndex == account.keyIndex) {
+            return
+        }
+
+        DataStoreHelper.selectedKeyIndex = account.keyIndex
+
+        MainActivity.bookmarksUpdatedEvent(true)
+        MainActivity.reloadHomeEvent(true)
+    }
+
+    private fun navigateToMainActivity() {
+        val mainIntent = Intent(this, MainActivity::class.java)
+        startActivity(mainIntent)
+        finish() // Finish the account selection activity
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt

@@ -6,6 +6,7 @@ import android.text.Editable
 import android.view.LayoutInflater
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -26,8 +27,8 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.WhoIsWatchingAdapter
+import com.lagradost.cloudstream3.ui.account.AccountDialog.showPinInputDialog
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.UiImage
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.ui.result.setImage
@@ -136,6 +137,8 @@ object DataStoreHelper {
         val customImage: String? = null,
         @JsonProperty("defaultImageIndex")
         val defaultImageIndex: Int,
+        @JsonProperty("lockPin")
+        val lockPin: String? = null,
     ) {
         val image: UiImage
             get() = customImage?.let { UiImage.Image(it) } ?: UiImage.Drawable(
@@ -230,36 +233,86 @@ object DataStoreHelper {
 
         binding.profilePic.setImage(account.image)
         binding.profilePic.setOnClickListener {
-            // rolls the image forwards once
+            // Roll the image forwards once
             currentEditAccount =
                 currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % profileImages.size)
             binding.profilePic.setImage(currentEditAccount.image)
         }
 
         binding.applyBtt.setOnClickListener {
-            val currentAccounts = accounts.toMutableList()
+            if (currentEditAccount.lockPin != null) {
-
+                // Ask for the current PIN
-            val overrideIndex =
+                showPinInputDialog(context, currentEditAccount.lockPin, false) { pin ->
-                currentAccounts.indexOfFirst { it.keyIndex == currentEditAccount.keyIndex }
+                    if (pin == null) return@showPinInputDialog
-
+                    // PIN is correct, proceed to update the account
-            // if an account is found that has the same keyIndex then override that one, if not then append it
+                    performAccountUpdate(currentEditAccount)
-            if (overrideIndex != -1) {
+                    dialog.dismissSafe()
-                currentAccounts[overrideIndex] = currentEditAccount
+                }
             } else {
-                currentAccounts.add(currentEditAccount)
+                // No lock PIN set, proceed to update the account
+                performAccountUpdate(currentEditAccount)
+                dialog.dismissSafe()
             }
-
-            // Save the current homepage for new accounts
-            val currentHomePage = DataStoreHelper.currentHomePage
-
-            // set the new default account as well as add the key for the new account
-            setAccount(currentEditAccount, false)
-            DataStoreHelper.currentHomePage = currentHomePage
-
-            accounts = currentAccounts.toTypedArray()
-
-            dialog.dismissSafe()
         }
+
+        // Handle setting or changing the PIN
+
+        if (currentEditAccount.keyIndex == getDefaultAccount(context).keyIndex) {
+            binding.lockProfileCheckbox.isVisible = false
+            if (currentEditAccount.lockPin != null) {
+                currentEditAccount = currentEditAccount.copy(lockPin = null)
+            }
+        }
+
+        var canSetPin = true
+
+        binding.lockProfileCheckbox.isChecked = currentEditAccount.lockPin != null
+
+        binding.lockProfileCheckbox.setOnCheckedChangeListener { _, isChecked ->
+            if (isChecked) {
+                if (canSetPin) {
+                    showPinInputDialog(context, null, true) { pin ->
+                        if (pin == null) {
+                            binding.lockProfileCheckbox.isChecked = false
+                            return@showPinInputDialog
+                        }
+
+                        currentEditAccount = currentEditAccount.copy(lockPin = pin)
+                    }
+                }
+            } else {
+                if (currentEditAccount.lockPin != null) {
+                    // Ask for the current PIN
+                    showPinInputDialog(context, currentEditAccount.lockPin, true) { pin ->
+                        if (pin == null || pin != currentEditAccount.lockPin) {
+                            canSetPin = false
+                            binding.lockProfileCheckbox.isChecked = true
+                        } else {
+                            currentEditAccount = currentEditAccount.copy(lockPin = null)
+                        }
+                    }
+                }
+            }
+        }
+
+        canSetPin = true
+    }
+
+    private fun performAccountUpdate(account: Account) {
+        val currentAccounts = accounts.toMutableList()
+
+        val overrideIndex = currentAccounts.indexOfFirst { it.keyIndex == account.keyIndex }
+
+        if (overrideIndex != -1) {
+            currentAccounts[overrideIndex] = account
+        } else {
+            currentAccounts.add(account)
+        }
+
+        val currentHomePage = this.currentHomePage
+        setAccount(account, false)
+        this.currentHomePage = currentHomePage
+        accounts = currentAccounts.toTypedArray()
     }
 
     private fun getDefaultAccount(context: Context): Account {
@@ -272,10 +325,18 @@ object DataStoreHelper {
         }
     }
 
+    fun getAccounts(context: Context): List<Account> {
+        return accounts.toMutableList().apply {
+            val item = getDefaultAccount(context)
+            remove(item)
+            add(0, item)
+        }
+    }
+
     fun showWhoIsWatching(context: Context) {
-        val binding: WhoIsWatchingBinding = WhoIsWatchingBinding.inflate(
+        val binding: WhoIsWatchingBinding = WhoIsWatchingBinding.inflate(LayoutInflater.from(context))
-            LayoutInflater.from(context)
+        val builder = BottomSheetDialog(context)
-        )
+        builder.setContentView(binding.root)
 
         val showAccount = accounts.toMutableList().apply {
             val item = getDefaultAccount(context)
@@ -283,22 +344,25 @@ object DataStoreHelper {
             add(0, item)
         }
 
-        val builder =
-            BottomSheetDialog(context)
-        builder.setContentView(binding.root)
         val accountName = context.getString(R.string.account)
 
-        binding.profilesRecyclerview.setLinearListLayout(
+        binding.profilesRecyclerview.setLinearListLayout(isHorizontal = true)
-            isHorizontal = true,
-            nextUp = FOCUS_SELF,
-            nextDown = FOCUS_SELF,
-            nextLeft = FOCUS_SELF,
-            nextRight = FOCUS_SELF
-        )
         binding.profilesRecyclerview.adapter = WhoIsWatchingAdapter(
             selectCallBack = { account ->
-                setAccount(account, true)
+                // Check if the selected account has a lock PIN set
-                builder.dismissSafe()
+                if (account.lockPin != null) {
+                    // Prompt for the lock pin
+                    showPinInputDialog(context, account.lockPin, false) { pin ->
+                        if (pin == null) return@showPinInputDialog
+                        // Pin is correct, unlock the profile
+                        setAccount(account, true)
+                        builder.dismissSafe()
+                    }
+                } else {
+                    // No lock PIN set, directly set the account
+                    setAccount(account, true)
+                    builder.dismissSafe()
+                }
             },
             addAccountCallback = {
                 val currentAccounts = accounts
@@ -334,7 +398,6 @@ object DataStoreHelper {
         builder.show()
     }
 
-
     data class PosDur(
         @JsonProperty("position") val position: Long,
         @JsonProperty("duration") val duration: Long

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/card_view"
+    android:layout_width="110dp"
+    android:layout_height="110dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="?attr/primaryGrayBackground"
+    android:foreground="?attr/selectableItemBackground"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    android:layout_margin="10dp"
+    android:focusable="true"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintDimensionRatio="1"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHeight_percent="0.4"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/account_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.4"
+            android:contentDescription="@string/profile_background_des"
+            android:scaleType="centerCrop" />
+
+        <View
+            android:id="@+id/outline"
+            tools:visibility="visible"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/outline_card"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/lock_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="top|end"
+            android:layout_margin="4dp"
+            android:src="@drawable/video_locked"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/account_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:padding="10dp"
+            android:textSize="16sp" />
+
+    </androidx.cardview.widget.CardView>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/primaryBlackBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="36dp"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/select_an_account"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/account_recycler_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp" />
+
+</LinearLayout>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/primaryBlackBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="36dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textAlignment="center"
+        android:text="@string/select_an_account"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/account_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp" />
+
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/pinEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="@string/pin"
+        android:inputType="numberPassword"
+        android:maxLength="4" />
+
+    <TextView
+        android:id="@+id/pinEditTextError"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:visibility="gone" />
+
+</LinearLayout>

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

@@ -35,6 +35,15 @@
         android:background="@drawable/outline_card"
         android:visibility="gone" />
 
+    <ImageView
+        android:id="@+id/lock_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="4dp"
+        android:src="@drawable/video_locked"
+        android:visibility="gone" />
+
     <TextView
         android:id="@+id/profile_text"
         tools:text="@string/mobile_data"

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

@@ -77,6 +77,12 @@
             android:textColorHint="?attr/grayTextColor"
             tools:ignore="LabelFor" />
 
+        <CheckBox
+            android:id="@+id/lockProfileCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/lock_profile" />
+
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -717,4 +717,13 @@
 
 
     <string name="tv_no_focus_tag" translatable="false">tv_no_focus_tag</string>
+
+
+    <string name="enter_pin">Enter PIN</string>
+    <string name="enter_current_pin">Enter Current PIN</string>
+    <string name="lock_profile">Lock Profile</string>
+    <string name="pin">PIN</string>
+    <string name="pin_error_incorrect">Incorrect PIN. Please try again.</string>
+    <string name="pin_error_length">PIN must be 4 characters</string>
+    <string name="select_an_account">Select an Account</string>
 </resources>