TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-16 22:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move RecoveryPassword out of onboarding

Browse Source
This commit is contained in:
Andrew 2024-06-17 18:17:26 +09:30
parent c13eb75128
commit aa6b7d4c89
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -158,7 +158,7 @@
android:label="@string/activity_edit_closed_group_title" android:label="@string/activity_edit_closed_group_title"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name="org.thoughtcrime.securesms.onboarding.recoverypassword.RecoveryPasswordActivity" android:name="org.thoughtcrime.securesms.recoverypassword.RecoveryPasswordActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name="org.thoughtcrime.securesms.contacts.SelectContactsActivity" android:name="org.thoughtcrime.securesms.contacts.SelectContactsActivity"

8
app/src/main/java/org/thoughtcrime/securesms/onboarding/recoverypassword/RecoveryPassword.kt → app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPassword.kt
View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.onboarding.recoverypassword package org.thoughtcrime.securesms.recoverypassword
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.border import androidx.compose.foundation.border
@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.ui.h8
@Preview @Preview
@Composable @Composable
fun PreviewRecoveryPasswordScreen( private fun PreviewRecoveryPasswordScreen(
@PreviewParameter(SessionColorsParameterProvider::class) colors: Colors @PreviewParameter(SessionColorsParameterProvider::class) colors: Colors
) { ) {
PreviewTheme(colors) { PreviewTheme(colors) {
@ -53,7 +53,7 @@ fun PreviewRecoveryPasswordScreen(
} }
@Composable @Composable
fun RecoveryPasswordScreen( internal fun RecoveryPasswordScreen(
seed: String = "", seed: String = "",
copySeed:() -> Unit = {}, copySeed:() -> Unit = {},
onHide:() -> Unit = {} onHide:() -> Unit = {}
@ -71,7 +71,7 @@ fun RecoveryPasswordScreen(
} }
@Composable @Composable
fun RecoveryPasswordCell(seed: String, copySeed:() -> Unit = {}) { private fun RecoveryPasswordCell(seed: String, copySeed:() -> Unit = {}) {
var showQr by remember { var showQr by remember {
mutableStateOf(false) mutableStateOf(false)
} }

2
app/src/main/java/org/thoughtcrime/securesms/onboarding/recoverypassword/RecoveryPasswordActivity.kt → app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.onboarding.recoverypassword package org.thoughtcrime.securesms.recoverypassword
import android.os.Bundle import android.os.Bundle
import androidx.activity.viewModels import androidx.activity.viewModels

3
app/src/main/java/org/thoughtcrime/securesms/onboarding/recoverypassword/RecoveryPasswordViewModel.kt → app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordViewModel.kt
View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.onboarding.recoverypassword package org.thoughtcrime.securesms.recoverypassword
import android.app.Application import android.app.Application
import android.content.ClipData import android.content.ClipData
@ -18,7 +18,6 @@ import javax.inject.Inject
class RecoveryPasswordViewModel @Inject constructor( class RecoveryPasswordViewModel @Inject constructor(
private val application: Application private val application: Application
): AndroidViewModel(application) { ): AndroidViewModel(application) {
val prefs = AppTextSecurePreferences(application) val prefs = AppTextSecurePreferences(application)
fun permanentlyHidePassword() { fun permanentlyHidePassword() {