TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'on' into on-2

Browse Source
This commit is contained in:
Andrew 2024-05-15 11:34:17 +09:30
commit 272f223ca0
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
View File

@ -113,7 +113,7 @@ class LandingActivity : BaseActionBarActivity() {
modifier = Modifier modifier = Modifier
.width(262.dp) .width(262.dp)
.align(Alignment.CenterHorizontally) .align(Alignment.CenterHorizontally)
.contentDescription(R.string.AccessibilityId_privacy_policy_link), .contentDescription(R.string.AccessibilityId_open_url),
fontSize = 11.sp, fontSize = 11.sp,
lineHeight = 13.sp, lineHeight = 13.sp,
onClick = ::openDialog onClick = ::openDialog

5
app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt
View File

@ -28,7 +28,8 @@ import org.session.libsession.utilities.TextSecurePreferences
import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.BaseActionBarActivity
import org.thoughtcrime.securesms.dependencies.ConfigFactory import org.thoughtcrime.securesms.dependencies.ConfigFactory
import org.thoughtcrime.securesms.onboarding.messagenotifications.startPNModeActivity import org.thoughtcrime.securesms.onboarding.messagenotifications.MessageNotificationsActivity
import org.thoughtcrime.securesms.onboarding.messagenotifications.startMessageNotificationsActivity
import org.thoughtcrime.securesms.onboarding.pickname.startPickDisplayNameActivity import org.thoughtcrime.securesms.onboarding.pickname.startPickDisplayNameActivity
import org.thoughtcrime.securesms.ui.AppTheme import org.thoughtcrime.securesms.ui.AppTheme
import org.thoughtcrime.securesms.ui.ProgressArc import org.thoughtcrime.securesms.ui.ProgressArc
@ -61,7 +62,7 @@ class LoadingActivity: BaseActionBarActivity() {
when { when {
skipped -> startPickDisplayNameActivity(true, flags) skipped -> startPickDisplayNameActivity(true, flags)
else -> startPNModeActivity(flags) else -> startMessageNotificationsActivity(flags)
} }
} }

2
app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt
View File

@ -165,7 +165,7 @@ fun NotificationRadioButton(
} }
} }
fun Context.startPNModeActivity(flags: Int = 0) { fun Context.startMessageNotificationsActivity(flags: Int = 0) {
Intent(this, MessageNotificationsActivity::class.java) Intent(this, MessageNotificationsActivity::class.java)
.also { it.flags = flags } .also { it.flags = flags }
.also(::startActivity) .also(::startActivity)

5
app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt
View File

@ -34,7 +34,8 @@ import network.loki.messenger.R
import org.session.libsession.utilities.AppTextSecurePreferences import org.session.libsession.utilities.AppTextSecurePreferences
import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.BaseActionBarActivity
import org.thoughtcrime.securesms.onboarding.messagenotifications.startPNModeActivity import org.thoughtcrime.securesms.onboarding.messagenotifications.MessageNotificationsActivity
import org.thoughtcrime.securesms.onboarding.messagenotifications.startMessageNotificationsActivity
import org.thoughtcrime.securesms.ui.AppTheme import org.thoughtcrime.securesms.ui.AppTheme
import org.thoughtcrime.securesms.ui.PreviewTheme import org.thoughtcrime.securesms.ui.PreviewTheme
import org.thoughtcrime.securesms.ui.base import org.thoughtcrime.securesms.ui.base
@ -68,7 +69,7 @@ class PickDisplayNameActivity : BaseActionBarActivity() {
lifecycleScope.launch { lifecycleScope.launch {
viewModel.eventFlow.collect { viewModel.eventFlow.collect {
startPNModeActivity() startMessageNotificationsActivity()
} }
} }
} }

1
app/src/main/res/values/strings.xml
View File

@ -1117,6 +1117,7 @@
<string name="AccessibilityId_error_message">Error message</string> <string name="AccessibilityId_error_message">Error message</string>
<string name="AccessibilityId_hide_recovery_password_button">Hide recovery password button</string> <string name="AccessibilityId_hide_recovery_password_button">Hide recovery password button</string>
<string name="AccessibilityId_confirm_button">Confirm button</string> <string name="AccessibilityId_confirm_button">Confirm button</string>
<string name="AccessibilityId_open_url">Open URL</string>
<string name="accountIdErrorInvalid">This Account ID is invalid. Please check and try again.</string> <string name="accountIdErrorInvalid">This Account ID is invalid. Please check and try again.</string>
<string name="enter_account_id">Enter Account ID</string> <string name="enter_account_id">Enter Account ID</string>
<string name="accountIdOrOnsEnter">Enter account ID or ONS</string> <string name="accountIdOrOnsEnter">Enter account ID or ONS</string>