Skip to content

SES-3893 and SES-3894 #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2025
Merged

SES-3893 and SES-3894 #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.preferences

import android.Manifest
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.graphics.BitmapFactory
Expand Down Expand Up @@ -36,7 +35,6 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
Expand Down Expand Up @@ -178,7 +176,7 @@ class SettingsActivity : ScreenLockActionBarActivity() {
viewModel.permanentlyHidePassword()
}
}
private var showDonateDialog: Boolean by mutableStateOf(false)
private var urlToOPen: String? by mutableStateOf(null)
private var showAvatarDialog: Boolean by mutableStateOf(false)
private var showAvatarPickerOptionCamera: Boolean by mutableStateOf(false)
private var showAvatarPickerOptions: Boolean by mutableStateOf(false)
Expand Down Expand Up @@ -207,14 +205,14 @@ class SettingsActivity : ScreenLockActionBarActivity() {
// set the compose dialog content
binding.composeLayout.setThemedContent {
SettingsComposeContent(
showDonateDialog = showDonateDialog,
showUrlDialog = urlToOPen,
showAvatarDialog = showAvatarDialog,
startAvatarSelection = ::startAvatarSelection,
saveAvatar = viewModel::saveAvatar,
removeAvatar = viewModel::removeAvatar,
showAvatarPickerOptions = showAvatarPickerOptions,
showCamera = showAvatarPickerOptionCamera,
hideDonateDialog = { showDonateDialog = false },
hideUrlDialog = { urlToOPen = null },
onSheetDismissRequest = { showAvatarPickerOptions = false },
onGalleryPicked = {
pickPhotoLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
Expand Down Expand Up @@ -272,7 +270,7 @@ class SettingsActivity : ScreenLockActionBarActivity() {
}

binding.sentLogoImageView.setSafeOnClickListener {
openUrl("https://token.getsession.org")
urlToOPen = "https://token.getsession.org"
}

applyCommonWindowInsetsOnViews(mainScrollView = binding.scrollView)
Expand Down Expand Up @@ -538,7 +536,7 @@ class SettingsActivity : ScreenLockActionBarActivity() {
modifier = Modifier.qaTag(R.string.qa_settings_item_donate),
colors = primaryTextButtonColors()
) {
showDonateDialog = true
urlToOPen = "https://session.foundation/donate#app"
}
Divider()

Expand Down Expand Up @@ -601,7 +599,7 @@ class SettingsActivity : ScreenLockActionBarActivity() {
LargeItemButton(R.string.sessionNotifications, R.drawable.ic_volume_2, Modifier.contentDescription(R.string.AccessibilityId_notifications)) { push<NotificationSettingsActivity>() }
Divider()

LargeItemButton(R.string.sessionConversations, R.drawable.ic_message_square, Modifier.contentDescription(R.string.AccessibilityId_sessionConversations)) { push<ChatSettingsActivity>() }
LargeItemButton(R.string.sessionConversations, R.drawable.ic_users_round, Modifier.contentDescription(R.string.AccessibilityId_sessionConversations)) { push<ChatSettingsActivity>() }
Divider()

LargeItemButton(R.string.sessionAppearance, R.drawable.ic_paintbrush_vertical, Modifier.contentDescription(R.string.AccessibilityId_sessionAppearance)) { push<AppearanceSettingsActivity>() }
Expand Down Expand Up @@ -644,12 +642,12 @@ class SettingsActivity : ScreenLockActionBarActivity() {

@Composable
fun SettingsComposeContent(
showDonateDialog: Boolean,
showUrlDialog: String?,
showAvatarDialog: Boolean,
startAvatarSelection: ()->Unit,
saveAvatar: ()->Unit,
removeAvatar: ()->Unit,
hideDonateDialog: ()->Unit,
hideUrlDialog: ()->Unit,
showAvatarPickerOptions: Boolean,
showCamera: Boolean,
onSheetDismissRequest: () -> Unit,
Expand All @@ -666,10 +664,10 @@ class SettingsActivity : ScreenLockActionBarActivity() {
}

// donate confirmationAdd commentMore actions
if(showDonateDialog){
if(showUrlDialog != null){
OpenURLAlertDialog(
url = "https://session.foundation/donate#app",
onDismissRequest = hideDonateDialog
url = showUrlDialog,
onDismissRequest = hideUrlDialog
)
}

Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_users_round.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="50" android:viewportWidth="50" android:width="24dp">

<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M7.575,30.492C11.091,26.975 15.86,25 20.833,25C25.806,25 30.575,26.975 34.091,30.492C37.608,34.008 39.583,38.777 39.583,43.75C39.583,44.901 38.65,45.833 37.5,45.833C36.349,45.833 35.416,44.901 35.416,43.75C35.416,39.882 33.88,36.173 31.145,33.438C28.41,30.703 24.701,29.167 20.833,29.167C16.965,29.167 13.256,30.703 10.521,33.438C7.786,36.173 6.25,39.882 6.25,43.75C6.25,44.901 5.317,45.833 4.166,45.833C3.016,45.833 2.083,44.901 2.083,43.75C2.083,38.777 4.058,34.008 7.575,30.492Z"/>

<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M20.833,8.333C16.231,8.333 12.5,12.064 12.5,16.667C12.5,21.269 16.231,25 20.833,25C25.435,25 29.166,21.269 29.166,16.667C29.166,12.064 25.435,8.333 20.833,8.333ZM8.333,16.667C8.333,9.763 13.929,4.167 20.833,4.167C27.737,4.167 33.333,9.763 33.333,16.667C33.333,23.57 27.737,29.167 20.833,29.167C13.929,29.167 8.333,23.57 8.333,16.667Z"/>

<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M34.77,6.645C35.357,5.656 36.635,5.329 37.625,5.916C39.392,6.964 40.874,8.432 41.939,10.189C43.004,11.946 43.619,13.939 43.73,15.991C43.841,18.042 43.445,20.09 42.576,21.952C42.068,23.041 41.408,24.047 40.619,24.941C44.518,28.739 47.916,34.955 47.916,41.667C47.916,42.817 46.984,43.75 45.833,43.75C44.682,43.75 43.75,42.817 43.75,41.667C43.75,35.394 39.971,29.457 36.25,26.667C35.725,26.273 35.416,25.656 35.416,25C35.416,24.344 35.725,23.727 36.249,23.333C37.345,22.511 38.221,21.432 38.8,20.191C39.379,18.949 39.644,17.584 39.569,16.216C39.495,14.849 39.085,13.52 38.375,12.349C37.665,11.177 36.678,10.199 35.499,9.5C34.51,8.913 34.183,7.635 34.77,6.645Z"/>

</vector>