diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff19d32d..e4f0878f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,10 +4,11 @@
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
-<!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
-<!--    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />-->
+    <!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
+    <!--    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />-->
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -23,6 +24,7 @@
     <queries>
         <package android:name="org.torproject.android" />
         <package android:name="com.dropbox.android" />
+
         <intent>
             <action android:name="android.intent.action.OPEN_DOCUMENT" />
             <category android:name="android.intent.category.OPENABLE" />
@@ -42,17 +44,17 @@
     <application
         android:name=".SaveApp"
         android:allowBackup="false"
-        android:fullBackupContent="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
+        android:fullBackupContent="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme.NoActionBar"
-        tools:replace="android:icon,android:allowBackup"
-        tools:ignore="UnusedAttribute,LockedOrientationActivity">
+        tools:ignore="UnusedAttribute,LockedOrientationActivity"
+        tools:replace="android:icon,android:allowBackup">
         <!-- task affinity lets us define within which 'task' does a activity belong to.
         By default, the activity has the same task affinity as its root
         Trail of bits ticket: https://github.com/OpenArchive/OA-Trail-of-Bits/issues/23
@@ -91,7 +93,8 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="application/*" />
                 <data android:mimeType="audio/*" />
                 <data android:mimeType="image/*" />
@@ -105,60 +108,63 @@
         <activity
             android:name=".services.webdav.WebDavActivity"
             android:label="@string/title_activity_login"
-            android:windowSoftInputMode="adjustPan"
-            android:taskAffinity="" />
+            android:taskAffinity=""
+            android:windowSoftInputMode="adjustPan" />
 
-        <activity android:name=".features.internetarchive.presentation.InternetArchiveActivity"
+        <activity
+            android:name=".features.internetarchive.presentation.InternetArchiveActivity"
             android:label="@string/title_activity_login"
             android:taskAffinity="" />
 
-        <activity
-            android:name=".services.gdrive.GDriveActivity" />
+        <activity android:name=".services.gdrive.GDriveActivity" />
 
         <activity
             android:name=".features.settings.FoldersActivity"
-            android:label="@string/folders"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/folders" />
 
-        <activity android:name=".features.settings.GeneralSettingsActivity"
-            android:label="@string/general"
+        <activity
+            android:name=".features.settings.GeneralSettingsActivity"
             android:exported="false"
+            android:label="@string/general"
             android:taskAffinity="" />
 
-        <activity android:name=".features.settings.ProofModeSettingsActivity"
-            android:label="@string/proofmode"
+        <activity
+            android:name=".features.settings.ProofModeSettingsActivity"
             android:exported="false"
+            android:label="@string/proofmode"
             android:taskAffinity="" />
 
-        <activity android:name=".features.media.PreviewActivity"
-            android:label="@string/preview_media"
+        <activity
+            android:name=".features.media.PreviewActivity"
             android:exported="false"
+            android:label="@string/preview_media"
             android:taskAffinity="" />
 
         <activity
             android:name=".features.media.ReviewActivity"
-            android:label="@string/edit_media_info"
-            android:windowSoftInputMode="stateHidden"
             android:exported="false"
-            android:taskAffinity="" />
+            android:label="@string/edit_media_info"
+            android:taskAffinity=""
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
             android:name=".features.onboarding.SpaceSetupActivity"
-            android:label="@string/title_activity_first_start"
-            android:windowSoftInputMode="adjustPan"
             android:exported="false"
-            android:taskAffinity="" />
+            android:label="@string/title_activity_first_start"
+            android:taskAffinity=""
+            android:windowSoftInputMode="adjustPan" />
 
         <activity
             android:name=".features.onboarding.Onboarding23Activity"
-            android:noHistory="true"
             android:exported="false"
+            android:noHistory="true"
             android:taskAffinity="" />
 
         <activity
             android:name=".features.onboarding.Onboarding23InstructionsActivity"
-            android:noHistory="true"
             android:exported="false"
+            android:noHistory="true"
             android:taskAffinity="" />
 
         <activity
@@ -182,6 +188,21 @@
             android:label="@string/health_checks"
             android:taskAffinity="" />
 
+        <activity
+            android:name=".features.settings.passcode.passcode_setup.PasscodeSetupActivity"
+            android:label="@string/passcode_setup"
+            android:screenOrientation="portrait"
+            android:taskAffinity=""
+            android:windowSoftInputMode="stateHidden" />
+
+        <activity
+            android:name=".features.settings.passcode.passcode_entry.PasscodeEntryActivity"
+            android:excludeFromRecents="true"
+            android:label="@string/passcode_entry"
+            android:noHistory="true"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
+
         <meta-data
             android:name="DOMAIN_PACKAGE_NAME"
             android:value="net.opendasharchive.openarchive.db" />
@@ -215,9 +236,9 @@
 
         <service
             android:name=".upload.UploadService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"
             android:foregroundServiceType="dataSync"
-            android:exported="false" />
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
     </application>
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt b/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt
index 5eab795f..4f729118 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt
@@ -9,6 +9,7 @@ import info.guardianproject.netcipher.proxy.OrbotHelper
 import net.opendasharchive.openarchive.core.di.coreModule
 import net.opendasharchive.openarchive.core.di.featuresModule
 import net.opendasharchive.openarchive.core.logger.AppLogger
+import net.opendasharchive.openarchive.features.settings.passcode.PasscodeManager
 import net.opendasharchive.openarchive.util.Prefs
 import net.opendasharchive.openarchive.util.Theme
 import org.koin.android.ext.koin.androidContext
@@ -24,16 +25,14 @@ class SaveApp : SugarApp() {
 
     override fun onCreate() {
         super.onCreate()
-
+        AppLogger.init(applicationContext, initDebugger = true)
+        registerActivityLifecycleCallbacks(PasscodeManager())
         startKoin {
             androidLogger(Level.DEBUG)
             androidContext(this@SaveApp)
             modules(coreModule, featuresModule)
         }
 
-        if(BuildConfig.DEBUG) {
-            AppLogger.init(applicationContext, initDebugger = true)
-        }
 
         val config = ImagePipelineConfig.newBuilder(this)
             .setProgressiveJpegConfig(SimpleProgressiveJpegConfig())
@@ -61,4 +60,4 @@ class SaveApp : SugarApp() {
 
 //        oh.init()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/core/di/FeaturesModule.kt b/app/src/main/java/net/opendasharchive/openarchive/core/di/FeaturesModule.kt
index 8892fc31..8f6e196d 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/core/di/FeaturesModule.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/core/di/FeaturesModule.kt
@@ -1,9 +1,52 @@
 package net.opendasharchive.openarchive.core.di
 
+import android.content.Context
 import net.opendasharchive.openarchive.features.internetarchive.internetArchiveModule
+import net.opendasharchive.openarchive.features.settings.passcode.AppConfig
+import net.opendasharchive.openarchive.features.settings.passcode.HapticManager
+import net.opendasharchive.openarchive.features.settings.passcode.HashingStrategy
+import net.opendasharchive.openarchive.features.settings.passcode.PBKDF2HashingStrategy
+import net.opendasharchive.openarchive.features.settings.passcode.passcode_entry.PasscodeEntryViewModel
+import net.opendasharchive.openarchive.features.settings.passcode.PasscodeRepository
+import net.opendasharchive.openarchive.features.settings.passcode.passcode_setup.PasscodeSetupViewModel
+import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 
 val featuresModule = module {
     includes(internetArchiveModule)
     // TODO: have some registry of feature modules
+
+    single {
+        AppConfig(
+            passcodeLength = 6,
+            enableHapticFeedback = true,
+            maxRetryLimitEnabled = false,
+            biometricAuthEnabled = false,
+            maxFailedAttempts = 5
+        )
+    }
+
+    single {
+        HapticManager(
+            appConfig = get<AppConfig>(),
+        )
+    }
+
+    single<HashingStrategy> {
+        PBKDF2HashingStrategy()
+    }
+
+    single { AppConfig() }
+
+    single {
+        val hashingStrategy: HashingStrategy = PBKDF2HashingStrategy()
+
+        PasscodeRepository(
+            context = get<Context>(),
+            config = get<AppConfig>(),
+            hashingStrategy = hashingStrategy
+        )
+    }
+    viewModel { PasscodeEntryViewModel(get(), get()) }
+    viewModel { PasscodeSetupViewModel(get(), get()) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt
index cb3870e9..cafc804b 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/core/BaseActivity.kt
@@ -5,7 +5,7 @@ import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import net.opendasharchive.openarchive.util.Prefs
 
-abstract class BaseActivity: AppCompatActivity() {
+abstract class BaseActivity : AppCompatActivity() {
 
     companion object {
         const val EXTRA_DATA_SPACE = "space"
@@ -29,7 +29,8 @@ abstract class BaseActivity: AppCompatActivity() {
     }
 
     fun updateScreenshotPrevention() {
-        if (Prefs.prohibitScreenshots) {
+        if (Prefs.passcodeEnabled || Prefs.prohibitScreenshots) {
+            // Prevent screenshots and recent apps preview
             window.setFlags(
                 WindowManager.LayoutParams.FLAG_SECURE,
                 WindowManager.LayoutParams.FLAG_SECURE
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/Module.kt b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/Module.kt
index f512d6b9..a7c18b17 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/Module.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/internetarchive/Module.kt
@@ -10,7 +10,7 @@ import net.opendasharchive.openarchive.features.internetarchive.infrastructure.m
 import net.opendasharchive.openarchive.features.internetarchive.infrastructure.repository.InternetArchiveRepository
 import net.opendasharchive.openarchive.features.internetarchive.presentation.details.InternetArchiveDetailsViewModel
 import net.opendasharchive.openarchive.features.internetarchive.presentation.login.InternetArchiveLoginViewModel
-import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 
 typealias InternetArchiveGson = Gson
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt
index a85ccc80..db392f4b 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt
@@ -1,27 +1,88 @@
 package net.opendasharchive.openarchive.features.settings
 
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
-import net.opendasharchive.openarchive.CleanInsightsManager
 import net.opendasharchive.openarchive.R
 import net.opendasharchive.openarchive.databinding.ActivitySettingsContainerBinding
 import net.opendasharchive.openarchive.features.core.BaseActivity
+import net.opendasharchive.openarchive.features.settings.passcode.PasscodeRepository
+import net.opendasharchive.openarchive.features.settings.passcode.passcode_setup.PasscodeSetupActivity
 import net.opendasharchive.openarchive.util.Prefs
 import net.opendasharchive.openarchive.util.Theme
+import org.koin.android.ext.android.inject
+
 
 class GeneralSettingsActivity: BaseActivity() {
 
     class Fragment: PreferenceFragmentCompat() {
 
-        private var mCiConsentPref: SwitchPreferenceCompat? = null
+        private val passcodeRepository by inject<PasscodeRepository>()
+
+//        private var mCiConsentPref: SwitchPreferenceCompat? = null
+
+        private var passcodePreference: SwitchPreferenceCompat? = null
+
+        private val activityResultLauncher = registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                val passcodeEnabled = result.data?.getBooleanExtra("passcode_enabled", false) ?: false
+                passcodePreference?.isChecked = passcodeEnabled
+            } else {
+                passcodePreference?.isChecked = false
+            }
+        }
 
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             setPreferencesFromResource(R.xml.prefs_general, rootKey)
 
+            passcodePreference = findPreference(Prefs.PASSCODE_ENABLED)
+
+//            findPreference<Preference>(Prefs.PASSCODE_ENABLED)?.setOnPreferenceChangeListener { _, newValue ->
+//                //Prefs.lockWithPasscode = newValue as Boolean
+//                if (newValue as? Boolean == true) {
+//
+//                    val intent = Intent(context, PasscodeSetupActivity::class.java)
+//                    activityResultLauncher.launch(intent)
+//                }
+//                false
+//            }
+
+
+            passcodePreference?.setOnPreferenceChangeListener { _, newValue ->
+                val enabled = newValue as Boolean
+                if (enabled) {
+                    // Launch PasscodeSetupActivity
+                    val intent = Intent(context, PasscodeSetupActivity::class.java)
+                    activityResultLauncher.launch(intent)
+                } else {
+                    // Show confirmation dialog
+                    AlertDialog.Builder(requireContext())
+                        .setTitle("Disable Passcode")
+                        .setMessage("Are you sure you want to disable the passcode?")
+                        .setPositiveButton("Yes") { _, _ ->
+                            passcodeRepository.clearPasscode()
+                            passcodePreference?.isChecked = false
+
+                            // Update the FLAG_SECURE dynamically
+                            (activity as? BaseActivity)?.updateScreenshotPrevention()
+                        }
+                        .setNegativeButton("No") { _, _ ->
+                            passcodePreference?.isChecked = true
+                        }
+                        .show()
+                }
+                // Return false to avoid the preference updating immediately
+                false
+            }
+
 //            findPreference<Preference>(Prefs.USE_TOR)?.setOnPreferenceChangeListener { _, newValue ->
 //                val activity = activity ?: return@setOnPreferenceChangeListener true
 //
@@ -81,11 +142,11 @@ class GeneralSettingsActivity: BaseActivity() {
 //            }
         }
 
-        override fun onResume() {
-            super.onResume()
-
-            mCiConsentPref?.isChecked = CleanInsightsManager.hasConsent()
-        }
+//        override fun onResume() {
+//            super.onResume()
+//
+//            mCiConsentPref?.isChecked = CleanInsightsManager.hasConsent()
+//        }
     }
 
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/AppConfig.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/AppConfig.kt
new file mode 100644
index 00000000..d62779e7
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/AppConfig.kt
@@ -0,0 +1,9 @@
+package net.opendasharchive.openarchive.features.settings.passcode
+
+data class AppConfig(
+    val passcodeLength: Int = 6,
+    val enableHapticFeedback: Boolean = true,
+    val maxRetryLimitEnabled: Boolean = false,
+    val biometricAuthEnabled: Boolean = false,
+    val maxFailedAttempts: Int = 5
+)
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/BiometricAuthenticator.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/BiometricAuthenticator.kt
new file mode 100644
index 00000000..54abcefe
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/BiometricAuthenticator.kt
@@ -0,0 +1,55 @@
+package net.opendasharchive.openarchive.features.settings.passcode
+
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import net.opendasharchive.openarchive.features.core.BaseActivity
+
+class BiometricAuthenticator(
+    private val activity: BaseActivity, private val config: AppConfig
+) {
+
+    private val biometricManager = BiometricManager.from(activity)
+    private var biometricPrompt: BiometricPrompt? = null
+
+    fun isBiometricAvailable(): Boolean {
+        return config.biometricAuthEnabled && biometricManager.canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) == BiometricManager.BIOMETRIC_SUCCESS
+    }
+
+    fun authenticate(
+        onSuccess: () -> Unit,
+        onFailure: (errorMessage: String) -> Unit
+    ) {
+        val executor = ContextCompat.getMainExecutor(activity)
+
+        biometricPrompt = BiometricPrompt(
+            activity,
+            executor,
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                    onSuccess()
+                }
+
+                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                    onFailure("Biometric authentication failed: $errString")
+                }
+
+                override fun onAuthenticationFailed() {
+                    onFailure("Biometric authentication failed")
+                }
+            }
+        )
+
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle("Biometric Authentication")
+            .setSubtitle("Use your fingerprint or face to unlock")
+            .setNegativeButtonText("Use Passcode")
+            .build()
+
+        biometricPrompt?.authenticate(promptInfo)
+    }
+
+    fun cancelAuthentication() {
+        biometricPrompt?.cancelAuthentication()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/HapticManager.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/HapticManager.kt
new file mode 100644
index 00000000..fa6b2322
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/HapticManager.kt
@@ -0,0 +1,31 @@
+package net.opendasharchive.openarchive.features.settings.passcode
+
+import androidx.compose.ui.hapticfeedback.HapticFeedback
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+
+enum class AppHapticFeedbackType {
+    KeyPress,
+    Error,
+}
+
+class HapticManager(
+    private val appConfig: AppConfig
+) {
+    private var hapticFeedback: HapticFeedback? = null
+
+    fun init(hapticFeedback: HapticFeedback) {
+        this.hapticFeedback = hapticFeedback
+    }
+
+    fun performHapticFeedback(type: AppHapticFeedbackType) {
+        if (!appConfig.enableHapticFeedback) return
+
+        hapticFeedback?.let {
+            // Using Compose HapticFeedback
+            when (type) {
+                AppHapticFeedbackType.KeyPress -> it.performHapticFeedback(HapticFeedbackType.LongPress)
+                AppHapticFeedbackType.Error -> it.performHapticFeedback(HapticFeedbackType.LongPress)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/PasscodeManager.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/PasscodeManager.kt
new file mode 100644
index 00000000..88101b99
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/PasscodeManager.kt
@@ -0,0 +1,67 @@
+package net.opendasharchive.openarchive.features.settings.passcode
+
+import android.app.Activity
+import android.app.Application
+import android.content.Intent
+import android.os.Bundle
+import net.opendasharchive.openarchive.features.settings.passcode.passcode_entry.PasscodeEntryActivity
+import net.opendasharchive.openarchive.features.settings.passcode.passcode_setup.PasscodeSetupActivity
+import net.opendasharchive.openarchive.util.Prefs
+
+class PasscodeManager: Application.ActivityLifecycleCallbacks {
+
+    companion object {
+        const val KEY_FAILED_ATTEMPTS = "passcode_failed_attempts"
+        const val KEY_LOCKOUT_TIME = "passcode_lockout_time"
+        const val LOCKOUT_DURATION_MS = 5 * 60 * 1000L // 5 minutes
+    }
+
+    private var activityReferences = 0
+    private var isActivityChangingConfigurations = false
+    private var isAppInForeground = false
+
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        // Not implemented
+    }
+
+    override fun onActivityStarted(activity: Activity) {
+        if (++activityReferences == 1 && !isActivityChangingConfigurations) {
+            // App enters foreground
+            isAppInForeground = true
+            if (shouldShowPasscode(activity)) {
+                val intent = Intent(activity, PasscodeEntryActivity::class.java)
+                activity.startActivity(intent)
+            }
+        }
+    }
+
+    override fun onActivityResumed(activity: Activity) {
+        // Not implemented
+    }
+
+    override fun onActivityPaused(activity: Activity) {
+        // Not implemented
+    }
+
+    override fun onActivityStopped(activity: Activity) {
+        isActivityChangingConfigurations = activity.isChangingConfigurations
+        if (--activityReferences == 0 && !isActivityChangingConfigurations) {
+            // App goes to background
+            isAppInForeground = false
+        }
+    }
+
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+        // Not implemented
+    }
+
+    override fun onActivityDestroyed(activity: Activity) {
+        // Not implemented
+    }
+
+    private fun shouldShowPasscode(activity: Activity): Boolean {
+        return Prefs.passcodeEnabled &&
+                activity !is PasscodeEntryActivity &&
+                activity !is PasscodeSetupActivity
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/PasscodeRepository.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/PasscodeRepository.kt
new file mode 100644
index 00000000..16e08df6
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/PasscodeRepository.kt
@@ -0,0 +1,176 @@
+package net.opendasharchive.openarchive.features.settings.passcode
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.util.Base64
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
+import net.opendasharchive.openarchive.util.Prefs
+import org.bouncycastle.crypto.generators.SCrypt
+import java.security.SecureRandom
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.PBEKeySpec
+
+interface HashingStrategy {
+    suspend fun hash(passcode: String, salt: ByteArray): ByteArray
+    suspend fun generateSalt(): ByteArray
+    val saltLength: Int
+}
+
+// PBKDF2HashingStrategy.kt
+class PBKDF2HashingStrategy : HashingStrategy {
+
+    companion object {
+        private const val ITERATIONS = 65536
+        private const val KEY_LENGTH = 256
+        private const val HASH_ALGORITHM = "PBKDF2WithHmacSHA256"
+        private const val SALT_LENGTH = 16
+    }
+
+    override val saltLength: Int
+        get() = SALT_LENGTH
+
+    override suspend fun generateSalt(): ByteArray {
+        val random = SecureRandom()
+        return ByteArray(SALT_LENGTH).also { random.nextBytes(it) }
+    }
+
+    override suspend fun hash(passcode: String, salt: ByteArray): ByteArray {
+        val spec = PBEKeySpec(passcode.toCharArray(), salt, ITERATIONS, KEY_LENGTH)
+        val skf = SecretKeyFactory.getInstance(HASH_ALGORITHM)
+        return skf.generateSecret(spec).encoded
+    }
+}
+
+// ScryptHashingStrategy.kt
+class ScryptHashingStrategy : HashingStrategy {
+
+    companion object {
+        private const val N = 16384  // CPU/Memory cost parameter
+        private const val r = 8      // Block size
+        private const val p = 1      // Parallelization parameter
+        private const val KEY_LENGTH = 32 // 256 bits
+        private const val SALT_LENGTH = 16
+    }
+
+    override val saltLength: Int
+        get() = SALT_LENGTH
+
+    override suspend fun generateSalt(): ByteArray {
+        val random = SecureRandom()
+        return ByteArray(SALT_LENGTH).also { random.nextBytes(it) }
+    }
+
+    override suspend fun hash(passcode: String, salt: ByteArray): ByteArray {
+        return SCrypt.generate(passcode.toByteArray(), salt, N, r, p, KEY_LENGTH)
+    }
+}
+
+class PasscodeRepository(
+    context: Context,
+    private val config: AppConfig,
+    private val hashingStrategy: HashingStrategy
+) {
+
+    companion object {
+        private const val SECURE_PREF_NAME = "secret_shared_prefs"
+        private const val KEY_PASSCODE_HASH = "passcode_hash"
+        private const val KEY_PASSCODE_SALT = "passcode_salt"
+    }
+
+    private val encryptedPrefs: SharedPreferences
+
+    init {
+        val masterKey = MasterKey.Builder(context)
+            .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+            .build()
+
+        encryptedPrefs = EncryptedSharedPreferences.create(
+            context,
+            SECURE_PREF_NAME,
+            masterKey,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        )
+    }
+
+    suspend fun generateSalt(): ByteArray {
+        return hashingStrategy.generateSalt()
+    }
+
+    suspend fun hashPasscode(passcode: String, salt: ByteArray): ByteArray {
+        return hashingStrategy.hash(passcode, salt)
+    }
+
+    fun storePasscodeHashAndSalt(hash: ByteArray, salt: ByteArray) {
+        with(encryptedPrefs.edit()) {
+            putString(KEY_PASSCODE_HASH, Base64.encodeToString(hash, Base64.DEFAULT))
+            putString(KEY_PASSCODE_SALT, Base64.encodeToString(salt, Base64.DEFAULT))
+            apply()
+        }
+        setPasscodeEnabled(true)
+    }
+
+    fun getPasscodeHashAndSalt(): Pair<ByteArray?, ByteArray?> {
+        val hashBase64 = encryptedPrefs.getString(KEY_PASSCODE_HASH, null)
+        val saltBase64 = encryptedPrefs.getString(KEY_PASSCODE_SALT, null)
+        val passcodeHash = hashBase64?.let { Base64.decode(it, Base64.DEFAULT) }
+        val passcodeSalt = saltBase64?.let { Base64.decode(it, Base64.DEFAULT) }
+        return Pair(passcodeHash, passcodeSalt)
+    }
+
+    fun setPasscodeEnabled(enabled: Boolean) {
+        Prefs.passcodeEnabled = enabled
+    }
+
+    fun isPasscodeEnabled(): Boolean {
+        return Prefs.passcodeEnabled
+    }
+
+    fun clearPasscode() {
+        with(encryptedPrefs.edit()) {
+            remove(KEY_PASSCODE_HASH)
+            remove(KEY_PASSCODE_SALT)
+            apply()
+        }
+        setPasscodeEnabled(false)
+    }
+
+    fun recordFailedAttempt() {
+        val failedAttempts = Prefs.getInt(PasscodeManager.KEY_FAILED_ATTEMPTS, 0) + 1
+        Prefs.putInt(PasscodeManager.KEY_FAILED_ATTEMPTS, failedAttempts)
+        if (config.maxRetryLimitEnabled && failedAttempts >= config.maxFailedAttempts) {
+            Prefs.putLong(PasscodeManager.KEY_LOCKOUT_TIME, System.currentTimeMillis())
+        }
+    }
+
+    fun isLockedOut(): Boolean {
+        if (!config.maxRetryLimitEnabled) return false
+        val lockoutTime = Prefs.getLong(PasscodeManager.KEY_LOCKOUT_TIME, 0L)
+        if (lockoutTime == 0L) {
+            return false
+        }
+        val elapsedTime = System.currentTimeMillis() - lockoutTime
+        return if (elapsedTime >= PasscodeManager.LOCKOUT_DURATION_MS) {
+            // Lockout duration passed, reset failed attempts and lockout time
+            resetFailedAttempts()
+            false
+        } else {
+            true
+        }
+    }
+
+    fun isMaxRetryLimitEnabled(): Boolean {
+        return config.maxRetryLimitEnabled
+    }
+
+    fun getRemainingAttempts(): Int {
+        val failedAttempts = Prefs.getInt(PasscodeManager.KEY_FAILED_ATTEMPTS, 0)
+        return config.maxFailedAttempts - failedAttempts
+    }
+
+    fun resetFailedAttempts() {
+        Prefs.putInt(PasscodeManager.KEY_FAILED_ATTEMPTS, 0)
+        Prefs.putLong(PasscodeManager.KEY_LOCKOUT_TIME, 0L)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/DefaultScaffold.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/DefaultScaffold.kt
new file mode 100644
index 00000000..5b379134
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/DefaultScaffold.kt
@@ -0,0 +1,51 @@
+package net.opendasharchive.openarchive.features.settings.passcode.components
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.receiveAsFlow
+
+object MessageManager {
+    private val _messageChannel = Channel<String>(Channel.BUFFERED)
+    val messageFlow = _messageChannel.receiveAsFlow()
+
+    suspend fun showMessage(message: String) {
+        _messageChannel.send(message)
+    }
+}
+
+@Composable
+fun DefaultScaffold(
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit
+) {
+
+    val snackbarHostState = remember { SnackbarHostState() }
+
+    LaunchedEffect(Unit) {
+        MessageManager.messageFlow.collectLatest { message ->
+            snackbarHostState.showSnackbar(message)
+        }
+    }
+
+    Scaffold(
+        modifier = modifier.fillMaxSize(),
+        snackbarHost = {
+            SnackbarHost(hostState = snackbarHostState)
+        },
+        content = { paddingValues ->
+            Box(modifier = Modifier.padding(paddingValues)) {
+                content()
+            }
+        }
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/NumericKeypad.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/NumericKeypad.kt
new file mode 100644
index 00000000..6186a99a
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/NumericKeypad.kt
@@ -0,0 +1,164 @@
+package net.opendasharchive.openarchive.features.settings.passcode.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
+import net.opendasharchive.openarchive.features.settings.passcode.AppHapticFeedbackType
+import net.opendasharchive.openarchive.features.settings.passcode.HapticManager
+import org.koin.compose.koinInject
+
+private val keys = listOf(
+    "1", "2", "3",
+    "4", "5", "6",
+    "7", "8", "9",
+    "", "0"
+)
+
+@Composable
+fun NumericKeypad(
+    isEnabled: Boolean = true,
+    onNumberClick: (String) -> Unit,
+) {
+
+    Box(
+        modifier = Modifier,
+        contentAlignment = Alignment.Center
+    ) {
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(3),
+            modifier = Modifier
+                .padding(horizontal = 32.dp),
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            items(keys, key = { it }) { label ->
+                Box(
+                    modifier = Modifier
+                        .size(72.dp),
+                    contentAlignment = Alignment.Center
+                ) {
+                    if (label.isNotEmpty()) {
+                        NumberButton(
+                            label = label,
+                            enabled = isEnabled,
+                            onClick = {
+                                onNumberClick(label)
+                            }
+                        )
+                    } else {
+                        Spacer(modifier = Modifier.size(72.dp))
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun NumericKeypadPreview() {
+    Theme {
+        Scaffold {
+            Box(
+                modifier = Modifier.padding(it),
+                contentAlignment = Alignment.Center
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .background(MaterialTheme.colorScheme.background),
+                    verticalArrangement = Arrangement.SpaceAround,
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+
+
+                    // Custom numeric keypad
+                    NumericKeypad(
+                        isEnabled = true,
+                        onNumberClick = { number ->
+
+                        }
+                    )
+
+                    Spacer(modifier = Modifier.height(16.dp))
+
+
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun NumberButton(
+    label: String,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+    hapticManager: HapticManager = koinInject()
+) {
+
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val backgroundColor by animateColorAsState(
+        targetValue = if (isPressed) MaterialTheme.colorScheme.primary.copy(alpha = 0.5f) else Color.Transparent,
+        animationSpec = spring(),
+        label = ""
+    )
+
+    Box(
+        modifier = Modifier
+            .background(color = backgroundColor, shape = CircleShape)
+            .clickable(
+                interactionSource = interactionSource,
+                indication = null,
+                enabled = enabled,
+                onClick = {
+                    hapticManager.performHapticFeedback(AppHapticFeedbackType.KeyPress)
+                    onClick()
+                }
+            )
+            .border(width = 2.dp, color = MaterialTheme.colorScheme.primary, shape = CircleShape)
+            .size(72.dp),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            text = label,
+            style = TextStyle(
+                fontSize = 24.sp,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colorScheme.onBackground
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/PasscodeDots.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/PasscodeDots.kt
new file mode 100644
index 00000000..a23886ba
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/components/PasscodeDots.kt
@@ -0,0 +1,70 @@
+package net.opendasharchive.openarchive.features.settings.passcode.components
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import kotlin.math.roundToInt
+
+@Composable
+fun PasscodeDots(
+    passcodeLength: Int,
+    currentPasscodeLength: Int,
+    shouldShake: Boolean = false
+) {
+
+    val shakeOffset = remember { Animatable(0f) }
+
+    LaunchedEffect(shouldShake) {
+        if (shouldShake) {
+            val offsets = listOf(25f, 15f, 10f)
+            for (offset in offsets) {
+                shakeOffset.animateTo(
+                    targetValue = offset, // Move right
+                    animationSpec = tween(durationMillis = 100)
+                )
+                shakeOffset.animateTo(
+                    targetValue = -offset, // Move left
+                    animationSpec = tween(durationMillis = 100)
+                )
+            }
+            shakeOffset.animateTo(
+                targetValue = 0f, // Reset to original position
+                animationSpec = tween(durationMillis = 50)
+            )
+        }
+    }
+
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.offset {
+            IntOffset(shakeOffset.value.roundToInt(), 0)
+        }
+    ) {
+        repeat(passcodeLength) { index ->
+            Box(
+                modifier = Modifier
+                    .size(20.dp)
+                    .background(
+                        color = if (index < currentPasscodeLength) MaterialTheme.colorScheme.primary
+                        else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.3f),
+                        shape = CircleShape
+                    )
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryActivity.kt
new file mode 100644
index 00000000..5faca597
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryActivity.kt
@@ -0,0 +1,57 @@
+package net.opendasharchive.openarchive.features.settings.passcode.passcode_entry
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.compose.setContent
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
+import net.opendasharchive.openarchive.features.core.BaseActivity
+import net.opendasharchive.openarchive.features.settings.passcode.PasscodeRepository
+import net.opendasharchive.openarchive.features.settings.passcode.components.DefaultScaffold
+import org.koin.android.ext.android.inject
+
+class PasscodeEntryActivity : BaseActivity() {
+
+    private val repository: PasscodeRepository by inject()
+
+    private val onBackPressedCallback = object : OnBackPressedCallback(enabled = true) {
+        override fun handleOnBackPressed() {
+            // Do nothing to prevent back navigation
+            moveTaskToBack(true)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Set up the OnBackPressedCallback
+        onBackPressedDispatcher.addCallback(onBackPressedCallback)
+
+
+        // Check if passcode is locked
+        if (repository.isLockedOut()) {
+            Toast.makeText(
+                this,
+                "App is locked due to multiple failed attempts. Please try again later.",
+                Toast.LENGTH_LONG
+            ).show()
+            finishAndRemoveTask()
+            return
+        }
+
+        setContent {
+            Theme {
+                DefaultScaffold {
+                    PasscodeEntryScreen(
+                        onPasscodeSuccess = {
+                            finish()
+                        },
+                        onExit = {
+                            finishAffinity()
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryScreen.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryScreen.kt
new file mode 100644
index 00000000..9eecbed5
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryScreen.kt
@@ -0,0 +1,225 @@
+package net.opendasharchive.openarchive.features.settings.passcode.passcode_entry
+
+import android.content.res.Configuration
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import kotlinx.coroutines.flow.collectLatest
+import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
+import net.opendasharchive.openarchive.features.settings.passcode.AppHapticFeedbackType
+import net.opendasharchive.openarchive.features.settings.passcode.HapticManager
+import net.opendasharchive.openarchive.features.settings.passcode.components.MessageManager
+import net.opendasharchive.openarchive.features.settings.passcode.components.NumericKeypad
+import net.opendasharchive.openarchive.features.settings.passcode.components.PasscodeDots
+import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.koinInject
+
+
+@Composable
+fun PasscodeEntryScreen(
+    onPasscodeSuccess: () -> Unit,
+    onExit: () -> Unit,
+    viewModel: PasscodeEntryViewModel = koinViewModel(),
+    hapticManager: HapticManager = koinInject()
+) {
+
+    val state by viewModel.uiState.collectAsStateWithLifecycle()
+
+
+    val hapticFeedback = LocalHapticFeedback.current
+
+    LaunchedEffect(Unit) {
+        hapticManager.init(hapticFeedback)
+    }
+
+    // Function to handle passcode entry
+    LaunchedEffect(Unit) {
+        viewModel.uiEvent.collectLatest { event ->
+            when (event) {
+                PasscodeEntryUiEvent.Success -> onPasscodeSuccess()
+
+                PasscodeEntryUiEvent.PasscodeNotSet -> {
+                    MessageManager.showMessage("Passcode not set")
+                }
+
+                is PasscodeEntryUiEvent.IncorrectPasscode -> {
+                    hapticManager.performHapticFeedback(AppHapticFeedbackType.Error)
+
+                    event.remainingAttempts?.let {
+                        val message = "Incorrect passcode. $it attempts remaining."
+                        MessageManager.showMessage(message)
+                    }
+
+                }
+
+                PasscodeEntryUiEvent.LockedOut -> {
+                    MessageManager.showMessage("Too many failed attempts. App is locked.")
+                    onExit()
+                }
+            }
+        }
+    }
+
+    PasscodeEntryScreenContent(
+        state = state,
+        onAction = viewModel::onAction,
+        onExit = onExit,
+    )
+}
+
+
+@Composable
+fun PasscodeEntryScreenContent(
+    state: PasscodeEntryScreenState,
+    onAction: (PasscodeEntryScreenAction) -> Unit,
+    onExit: () -> Unit,
+) {
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colorScheme.background),
+        verticalArrangement = Arrangement.SpaceAround,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+
+        // Top section with logo
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Top,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 24.dp)
+                .padding(bottom = 24.dp)
+        ) {
+            Image(
+                painter = painterResource(R.drawable.savelogo),
+                contentDescription = null,
+                modifier = Modifier.size(100.dp),
+                contentScale = ContentScale.Fit
+            )
+        }
+
+        // Middle section with prompt and passcode dots
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 24.dp),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+
+            Text(
+                text = "Enter Your Passcode", style = TextStyle(
+                    fontSize = 18.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = MaterialTheme.colorScheme.onBackground
+                )
+            )
+
+            Spacer(modifier = Modifier.height(32.dp))
+
+            // Passcode dots display
+            PasscodeDots(
+                passcodeLength = state.passcodeLength,
+                currentPasscodeLength = state.passcode.length,
+                shouldShake = state.shouldShake
+            )
+
+            Spacer(modifier = Modifier.height(32.dp))
+
+            // Custom numeric keypad
+            NumericKeypad(
+                isEnabled = !state.isProcessing,
+                onNumberClick = { number ->
+                    onAction(PasscodeEntryScreenAction.OnNumberClick(number))
+                }
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceAround
+            ) {
+                TextButton(
+                    onClick = {
+                        onExit()
+                    }
+                ) {
+                    Text(
+                        text = "Exit",
+                        modifier = Modifier.padding(8.dp),
+                        style = TextStyle(
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.Bold,
+                        ),
+                    )
+                }
+
+                TextButton(
+                    enabled = state.passcode.isNotEmpty(),
+                    onClick = {
+                        onAction(PasscodeEntryScreenAction.OnBackspaceClick)
+                    }
+                ) {
+                    Text(
+                        text = "Delete",
+                        modifier = Modifier.padding(8.dp),
+                        style = TextStyle(
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.Bold
+                        ),
+                    )
+                }
+
+
+            }
+
+
+        }
+    }
+}
+
+
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Preview
+@Composable
+private fun PasscodeEntryScreenPreview() {
+
+    Theme {
+        PasscodeEntryScreenContent(
+            state = PasscodeEntryScreenState(
+                passcodeLength = 6
+            ),
+            onAction = {},
+            onExit = {},
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryViewModel.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryViewModel.kt
new file mode 100644
index 00000000..1f9f8b57
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_entry/PasscodeEntryViewModel.kt
@@ -0,0 +1,136 @@
+package net.opendasharchive.openarchive.features.settings.passcode.passcode_entry
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import net.opendasharchive.openarchive.features.settings.passcode.AppConfig
+import net.opendasharchive.openarchive.features.settings.passcode.PasscodeRepository
+
+class PasscodeEntryViewModel(
+    private val repository: PasscodeRepository,
+    private val config: AppConfig
+) : ViewModel() {
+
+//    private val _passcode = MutableStateFlow("")
+//    val passcode: StateFlow<String> = _passcode.asStateFlow()
+
+//    private val _isCheckingPasscode = MutableStateFlow(false)
+//    val isCheckingPasscode: StateFlow<Boolean> = _isCheckingPasscode.asStateFlow()
+
+    private val _uiState =
+        MutableStateFlow(PasscodeEntryScreenState(passcodeLength = config.passcodeLength))
+    val uiState: StateFlow<PasscodeEntryScreenState> = _uiState.asStateFlow()
+
+    private val _uiEvent = Channel<PasscodeEntryUiEvent>()
+    val uiEvent = _uiEvent.receiveAsFlow()
+
+//    val passcodeLength: Int
+//        get() = config.passcodeLength
+
+    fun onAction(action: PasscodeEntryScreenAction) {
+        when (action) {
+            is PasscodeEntryScreenAction.OnNumberClick -> onNumberClick(action.number)
+            PasscodeEntryScreenAction.OnBackspaceClick -> onBackspaceClick()
+        }
+    }
+
+    private fun onNumberClick(number: String) {
+
+//        if (_isCheckingPasscode.value) return
+//
+//        if (_passcode.value.length >= config.passcodeLength) return
+//
+//        _passcode.value += number
+
+        _uiState.update { state ->
+            if (state.isProcessing || state.passcode.length >= config.passcodeLength) state
+            else state.copy(passcode = state.passcode + number)
+        }
+
+        if (uiState.value.passcode.length == config.passcodeLength) {
+//            _isCheckingPasscode.value = true
+            _uiState.update { it.copy(isProcessing = true) }
+            checkPasscode()
+        }
+
+    }
+
+    private fun onBackspaceClick() {
+//        if (_isCheckingPasscode.value || _passcode.value.isEmpty()) return
+//        _passcode.value = _passcode.value.dropLast(1)
+        _uiState.update { state ->
+            if (state.isProcessing || state.passcode.isEmpty()) state
+            else state.copy(passcode = state.passcode.dropLast(1))
+        }
+    }
+
+    private fun checkPasscode() = viewModelScope.launch {
+        val currentState = uiState.value
+        val currentPasscode = currentState.passcode
+        delay(200)
+        val (passcodeHash, passcodeSalt) = repository.getPasscodeHashAndSalt()
+
+        if (passcodeHash != null && passcodeSalt != null) {
+            val hash = repository.hashPasscode(currentPasscode, passcodeSalt)
+            if (hash.contentEquals(passcodeHash)) {
+                repository.resetFailedAttempts()
+                _uiEvent.send(PasscodeEntryUiEvent.Success)
+            } else {
+                repository.recordFailedAttempt()
+                val remainingAttempts: Int? = if (config.maxRetryLimitEnabled) {
+                    repository.getRemainingAttempts()
+                } else null
+
+                if (repository.isLockedOut()) {
+                    _uiEvent.send(PasscodeEntryUiEvent.LockedOut)
+                } else {
+                    _uiEvent.send(PasscodeEntryUiEvent.IncorrectPasscode(remainingAttempts))
+                }
+                _uiState.update { it.copy(shouldShake = true) }
+                delay(500)
+                _uiState.update { it.copy(shouldShake = false) }
+            }
+        } else {
+            _uiEvent.send(PasscodeEntryUiEvent.PasscodeNotSet)
+            _uiState.update { it.copy(shouldShake = true) }
+            delay(500)
+            _uiState.update { it.copy(shouldShake = false) }
+        }
+
+        _uiState.update {
+            it.copy(
+                passcode = "",
+                isProcessing = false
+            )
+        }
+//        _passcode.value = ""
+//        _isCheckingPasscode.value = false
+
+    }
+}
+
+data class PasscodeEntryScreenState(
+    val passcode: String = "",
+    val passcodeLength: Int,
+    val isProcessing: Boolean = false,
+    val shouldShake: Boolean = false
+)
+
+sealed class PasscodeEntryScreenAction {
+    data class OnNumberClick(val number: String) : PasscodeEntryScreenAction()
+    data object OnBackspaceClick : PasscodeEntryScreenAction()
+}
+
+sealed class PasscodeEntryUiEvent {
+    data object Success : PasscodeEntryUiEvent()
+    data class IncorrectPasscode(val remainingAttempts: Int? = null) : PasscodeEntryUiEvent()
+    data object PasscodeNotSet : PasscodeEntryUiEvent()
+    data object LockedOut : PasscodeEntryUiEvent()
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupActivity.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupActivity.kt
new file mode 100644
index 00000000..a7ad3859
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupActivity.kt
@@ -0,0 +1,63 @@
+package net.opendasharchive.openarchive.features.settings.passcode.passcode_setup
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.compose.setContent
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
+import net.opendasharchive.openarchive.features.core.BaseActivity
+import net.opendasharchive.openarchive.features.settings.passcode.components.DefaultScaffold
+
+class PasscodeSetupActivity : BaseActivity() {
+
+    companion object {
+        const val EXTRA_PASSCODE_ENABLED = "passcode_enabled"
+    }
+
+    private val onBackPressedCallback = object : OnBackPressedCallback(enabled = true) {
+        override fun handleOnBackPressed() {
+            setResult(RESULT_CANCELED)
+            finish()
+        }
+    }
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        onBackPressedDispatcher.addCallback(onBackPressedCallback)
+
+        setContent {
+            Theme {
+                DefaultScaffold {
+                    PasscodeSetupScreen(
+                        onPasscodeSet = {
+                            // Passcode successfully set
+                            setResult(RESULT_OK, Intent().apply {
+                                putExtra(EXTRA_PASSCODE_ENABLED, true)
+                            })
+                            finish()
+                        },
+                        onCancel = {
+                            // User canceled the setup
+                            setResult(RESULT_CANCELED)
+                            finish()
+                        }
+                    )
+                }
+            }
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            // Cancel passcode setup
+            setResult(Activity.RESULT_CANCELED)
+            finish()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupScreen.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupScreen.kt
new file mode 100644
index 00000000..e9941b15
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupScreen.kt
@@ -0,0 +1,218 @@
+package net.opendasharchive.openarchive.features.settings.passcode.passcode_setup
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import kotlinx.coroutines.flow.collectLatest
+import net.opendasharchive.openarchive.R
+import net.opendasharchive.openarchive.core.presentation.theme.Theme
+import net.opendasharchive.openarchive.features.settings.passcode.AppHapticFeedbackType
+import net.opendasharchive.openarchive.features.settings.passcode.HapticManager
+import net.opendasharchive.openarchive.features.settings.passcode.components.MessageManager
+import net.opendasharchive.openarchive.features.settings.passcode.components.NumericKeypad
+import net.opendasharchive.openarchive.features.settings.passcode.components.PasscodeDots
+import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.koinInject
+
+@Composable
+fun PasscodeSetupScreen(
+    onPasscodeSet: () -> Unit,
+    onCancel: () -> Unit,
+    viewModel: PasscodeSetupViewModel = koinViewModel(),
+    hapticManager: HapticManager = koinInject()
+) {
+
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
+    val hapticFeedback = LocalHapticFeedback.current
+
+    LaunchedEffect(Unit) {
+        hapticManager.init(hapticFeedback)
+    }
+
+    // Function to handle UI events
+    LaunchedEffect(Unit) {
+        viewModel.uiEvent.collectLatest { event ->
+            when (event) {
+                PasscodeSetupUiEvent.PasscodeSet -> onPasscodeSet()
+                PasscodeSetupUiEvent.PasscodeDoNotMatch -> {
+                    hapticManager.performHapticFeedback(AppHapticFeedbackType.Error)
+                    MessageManager.showMessage("Passcodes do not match. Try again.")
+                }
+
+                PasscodeSetupUiEvent.PasscodeCancelled -> onCancel()
+            }
+        }
+    }
+
+
+    PasscodeSetupScreenContent(
+        state = uiState,
+        onAction = viewModel::onAction,
+    )
+}
+
+@Composable
+private fun PasscodeSetupScreenContent(
+    state: PasscodeSetupUiState,
+    onAction: (PasscodeSetupUiAction) -> Unit
+) {
+
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colorScheme.background),
+        verticalArrangement = Arrangement.SpaceAround,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        // Top section with logo
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Top,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 24.dp)
+                .padding(bottom = 24.dp)
+        ) {
+            Image(
+                painter = painterResource(R.drawable.savelogo),
+                contentDescription = null,
+                modifier = Modifier.size(100.dp),
+                contentScale = ContentScale.Fit
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Text(
+                text = "Remember this PIN. If you forget it, you will need to reset the application and all data will be erased.",
+                color = MaterialTheme.colorScheme.error,
+                textAlign = TextAlign.Center,
+                fontWeight = FontWeight.Light,
+                style = MaterialTheme.typography.labelMedium
+            )
+        }
+
+
+        // Middle section with prompt and passcode dots
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 24.dp),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Text(
+                text = if (state.isConfirming) "Confirm Your Passcode" else "Set Your Passcode",
+                style = TextStyle(
+                    fontSize = 18.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = MaterialTheme.colorScheme.onBackground
+                )
+            )
+
+
+            Spacer(modifier = Modifier.height(32.dp))
+
+            // Passcode dots display
+            PasscodeDots(
+                passcodeLength = state.passcodeLength,
+                currentPasscodeLength = state.passcode.length,
+                shouldShake = state.shouldShake
+            )
+
+            Spacer(modifier = Modifier.height(32.dp))
+
+            // Custom numeric keypad
+            NumericKeypad(
+                isEnabled = !state.isProcessing,
+                onNumberClick = { number ->
+                    onAction(PasscodeSetupUiAction.OnNumberClick(number))
+                }
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceAround
+            ) {
+                TextButton(
+                    onClick = {
+                        onAction(PasscodeSetupUiAction.OnCancel)
+                    }
+                ) {
+                    Text(
+                        text = "Cancel",
+                        modifier = Modifier.padding(8.dp),
+                        style = TextStyle(
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.Bold,
+                        ),
+                    )
+                }
+
+                TextButton(
+                    enabled = state.passcode.isNotEmpty(),
+                    onClick = {
+                        onAction(PasscodeSetupUiAction.OnBackspaceClick)
+                    }
+                ) {
+                    Text(
+                        text = "Delete",
+                        modifier = Modifier.padding(8.dp),
+                        style = TextStyle(
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.Bold
+                        ),
+                    )
+                }
+
+
+            }
+        }
+    }
+}
+
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Preview
+@Composable
+private fun PasscodeSetupScreenPreview() {
+    Theme {
+        PasscodeSetupScreenContent(
+            state = PasscodeSetupUiState(
+                passcodeLength = 6
+            ),
+            onAction = {}
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupViewModel.kt b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupViewModel.kt
new file mode 100644
index 00000000..2d1eeadd
--- /dev/null
+++ b/app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/passcode_setup/PasscodeSetupViewModel.kt
@@ -0,0 +1,147 @@
+package net.opendasharchive.openarchive.features.settings.passcode.passcode_setup
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import net.opendasharchive.openarchive.features.settings.passcode.AppConfig
+import net.opendasharchive.openarchive.features.settings.passcode.PasscodeRepository
+
+class PasscodeSetupViewModel(
+    private val repository: PasscodeRepository,
+    private val config: AppConfig
+) : ViewModel() {
+
+    private val _uiState =
+        MutableStateFlow(PasscodeSetupUiState(passcodeLength = config.passcodeLength))
+    val uiState: StateFlow<PasscodeSetupUiState> = _uiState.asStateFlow()
+
+    private val _uiEvent = Channel<PasscodeSetupUiEvent>()
+    val uiEvent = _uiEvent.receiveAsFlow()
+
+    fun onAction(action: PasscodeSetupUiAction) {
+        when (action) {
+            is PasscodeSetupUiAction.OnNumberClick -> onNumberClick(action.number)
+            PasscodeSetupUiAction.OnBackspaceClick -> onBackspaceClick()
+            PasscodeSetupUiAction.OnCancel -> onCancel()
+        }
+    }
+
+    private fun onNumberClick(number: String) {
+
+//        val state = uiState.value // current state
+//
+//        if (state.isProcessing) return // Block input during processing
+//
+//        if (state.passcode.length >= config.passcodeLength) return // block race conditions
+//
+//        _uiState.update { it.copy(passcode = it.passcode + number) }
+//
+//        val newState = uiState.value // updated state
+//
+//        if (newState.passcode.length == config.passcodeLength) {
+//            _uiState.update { it.copy(isProcessing = true) }
+//            processPasscodeEntry()
+//        }
+
+        _uiState.update { state ->
+            // Block input during processing or if the passcode length is already reached
+            if (state.isProcessing || state.passcode.length >= config.passcodeLength) state
+            else state.copy(passcode = state.passcode + number)
+        }
+
+        // Process passcode only when the required length is reached
+        if (_uiState.value.passcode.length == config.passcodeLength) {
+            _uiState.update { it.copy(isProcessing = true) }
+            processPasscodeEntry()
+        }
+    }
+
+    private fun onBackspaceClick() {
+//        val state = uiState.value // current state
+//        if (state.isConfirming || state.passcode.isEmpty()) return
+//        _uiState.update { it.copy(passcode = it.passcode.dropLast(1)) }
+
+        _uiState.update { state ->
+            // Remove the last digit from the passcode if not confirming or empty
+            if (state.isProcessing || state.passcode.isEmpty()) state
+            else state.copy(passcode = state.passcode.dropLast(1))
+        }
+    }
+
+    private fun processPasscodeEntry() = viewModelScope.launch {
+        val state = uiState.value // current state
+        if (state.isConfirming) {
+            // Confirmation step
+            val passcode = state.passcode
+            delay(100)
+            val confirmPasscode = state.confirmPasscode
+            if (passcode == confirmPasscode) {
+                val salt = repository.generateSalt()
+                val hash = repository.hashPasscode(passcode, salt)
+                repository.storePasscodeHashAndSalt(hash, salt)
+                _uiEvent.send(PasscodeSetupUiEvent.PasscodeSet)
+            } else {
+                _uiState.update { it.copy(shouldShake = true) }
+                _uiEvent.send(PasscodeSetupUiEvent.PasscodeDoNotMatch)
+                delay(500) // Allow time for shake animation to complete
+                reset()
+            }
+        } else {
+            // Assigning passcode to confirm passcode and moving to confirmation step
+            delay(500)
+            val passcode = state.passcode
+            _uiState.update {
+                it.copy(
+                    confirmPasscode = passcode,
+                    passcode = "",
+                    isConfirming = true,
+                    isProcessing = false
+                )
+            }
+        }
+    }
+
+    private fun reset() {
+        _uiState.update {
+            it.copy(
+                passcode = "",
+                confirmPasscode = "",
+                isConfirming = false,
+                isProcessing = false,
+                shouldShake = false
+            )
+        }
+    }
+
+    private fun onCancel() = viewModelScope.launch {
+        _uiEvent.send(PasscodeSetupUiEvent.PasscodeCancelled)
+    }
+}
+
+data class PasscodeSetupUiState(
+    val passcode: String = "",
+    val confirmPasscode: String = "",
+    val passcodeLength: Int,
+    val isConfirming: Boolean = false,
+    val isProcessing: Boolean = false,
+    val shouldShake: Boolean = false,
+)
+
+sealed class PasscodeSetupUiAction {
+    data class OnNumberClick(val number: String) : PasscodeSetupUiAction()
+    data object OnBackspaceClick : PasscodeSetupUiAction()
+    data object OnCancel : PasscodeSetupUiAction()
+}
+
+sealed class PasscodeSetupUiEvent {
+    data object PasscodeSet : PasscodeSetupUiEvent()
+    data object PasscodeDoNotMatch : PasscodeSetupUiEvent()
+    data object PasscodeCancelled : PasscodeSetupUiEvent()
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt b/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt
index a60d3dcf..67f55697 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt
@@ -9,6 +9,7 @@ import org.witness.proofmode.ProofMode
 import org.witness.proofmode.ProofModeConstants
 
 object Prefs {
+    const val PASSCODE_ENABLED = "passcode_enabled"
     private const val DID_COMPLETE_ONBOARDING = "did_complete_onboarding"
     private const val UPLOAD_WIFI_ONLY = "upload_wifi_only"
     private const val NEARBY_USE_BLUETOOTH = "nearby_use_bluetooth"
@@ -39,6 +40,38 @@ object Prefs {
         prefs?.edit()?.commit()
     }
 
+    fun getString(key: String, defaultValue: String): String {
+        return prefs?.getString(key, defaultValue) ?: defaultValue
+    }
+
+    fun putString(key: String, value: String) {
+        prefs?.edit()?.putString(key, value)?.apply()
+    }
+
+    fun getInt(key: String, defaultValue: Int): Int {
+        return prefs?.getInt(key, defaultValue) ?: defaultValue
+    }
+
+    fun putInt(key: String, value: Int) {
+        prefs?.edit()?.putInt(key, value)?.apply()
+    }
+
+    fun getLong(key: String, defaultValue: Long): Long {
+        return prefs?.getLong(key, defaultValue) ?: defaultValue
+    }
+
+    fun putLong(key: String, value: Long) {
+        prefs?.edit()?.putLong(key, value)?.apply()
+    }
+
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
+        return prefs?.getBoolean(key, defaultValue) ?: defaultValue
+    }
+
+    fun putBoolean(key: String, value: Boolean) {
+        prefs?.edit()?.putBoolean(key, value)?.apply()
+    }
+
 //    val useNextcloudChunking: Boolean
 //        get() = prefs?.getBoolean(USE_NEXTCLOUD_CHUNKING, false) ?: false
 
@@ -117,6 +150,12 @@ object Prefs {
             prefs?.edit()?.putString(LICENSE_URL, value)?.apply()
         }
 
+    var passcodeEnabled: Boolean
+        get() = prefs?.getBoolean(PASSCODE_ENABLED, false) ?: false
+        set(value) {
+            prefs?.edit()?.putBoolean(PASSCODE_ENABLED, value)?.apply()
+        }
+
     var proofModeLocation: Boolean
         get() = prefs?.getBoolean(ProofMode.PREF_OPTION_LOCATION, false) ?: false
         set(value) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f09ccce7..b239ad34 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -274,6 +274,8 @@
     <string name="photo_gallery">Photo Gallery</string>
     <string name="files">Files</string>
     <string name="health_checks">Health Checks</string>
+    <string name="passcode_setup" translatable="false">Setup Passcode</string>
+    <string name="passcode_entry" translatable="false">Enter Passcode</string>
     <string name="help_improve_the_app_by_running_health_checks_when_uploads_fail">Help improve the app by running health checks when uploads fail.</string>
     <string name="health_checks_help_us_understand_why_uploads_fail">Health checks help us understand why uploads fail.</string>
     <string name="contribute_your_data_to_be_part_of_the_solution">Contribute your data to be part of the solution.</string>
diff --git a/app/src/main/res/xml/prefs_general.xml b/app/src/main/res/xml/prefs_general.xml
index 3d816788..916deb7d 100644
--- a/app/src/main/res/xml/prefs_general.xml
+++ b/app/src/main/res/xml/prefs_general.xml
@@ -2,6 +2,21 @@
 <PreferenceScreen
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <PreferenceCategory
+        app:layout="@layout/prefs_title"
+        app:title="Secure">
+
+        <SwitchPreferenceCompat
+            app:allowDividerAbove="true"
+            app:allowDividerBelow="false"
+            app:defaultValue="false"
+            app:iconSpaceReserved="false"
+            app:key="passcode_enabled"
+            app:singleLineTitle="false"
+            app:title="Lock app with passcode" />
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:layout="@layout/prefs_title"