Skip to content
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

Jump to bottom

Feature/strings updates #1659

Merged
merged 37 commits into from
Sep 9, 2024
Merged

Feature/strings updates #1659

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f241328
Fixing styling issue in unread scroll to bottom button
ThomasSession Sep 2, 2024
32acd6e
Fixing up styling of Prominent buttons and "view_user" to work better…
ThomasSession Sep 2, 2024
28d59f9
Fixing strings
ThomasSession Sep 2, 2024
ea24ff6
Strings fixes
ThomasSession Sep 3, 2024
97db1fe
Reworked preferences
ThomasSession Sep 3, 2024
2704bc7
Updated the fake message in appearance
ThomasSession Sep 3, 2024
4aa68c9
Adding the ability to copy in message details
ThomasSession Sep 3, 2024
4d47354
Showing 'copy account id' in menu in 1to1 too
ThomasSession Sep 3, 2024
ffbb7d8
Updating files tab in "All media"
ThomasSession Sep 3, 2024
2f4c605
Strings updates
ThomasSession Sep 4, 2024
81f56de
Latest strings and handling bold
ThomasSession Sep 4, 2024
86f89f8
Updated constants file
ThomasSession Sep 4, 2024
d7bd0bf
Can save media in message details page now
ThomasSession Sep 4, 2024
bc067b6
Adding padding so that context menu doesn't hit the bottom of the screen
ThomasSession Sep 4, 2024
3db8b46
Strings update
ThomasSession Sep 4, 2024
7f8e9fd
Reverted changes on DMs
ThomasSession Sep 4, 2024
14207c7
Better ripple for home FAB
ThomasSession Sep 5, 2024
2c3e73b
Added a control message when the current user accepts a message request
ThomasSession Sep 5, 2024
a7843af
Updated QR screen to show dialog when permission is permanently denied
ThomasSession Sep 5, 2024
fa90b74
Using the Compose version of our QR scanning
ThomasSession Sep 5, 2024
4fd3961
Comments for future changes in JoinCommunityFragment
ThomasSession Sep 5, 2024
139f4ba
New strings + new camera permission handling
ThomasSession Sep 5, 2024
5795998
Making sure we do not crash when making/receiving a call without the …
ThomasSession Sep 2, 2024
4860adc
Added a new control message type to handle missed calls due to permis…
ThomasSession Sep 2, 2024
f44d066
Changed the missed call control message logic
ThomasSession Sep 2, 2024
2174976
Do not change the text color on emioji picker
ThomasSession Sep 6, 2024
aef0adb
[SES-2695] Incorrect message request approval on home screen
Sep 6, 2024
c38efc2
WIP for new avatar selection
ThomasSession Sep 6, 2024
c633338
Merge branch 'feature/strings-updates' of https://github.com/oxen-io/…
ThomasSession Sep 8, 2024
c0bf015
SES-2651 - New avatar picker
ThomasSession Sep 8, 2024
422b8b2
Fixing the remaining tasks
ThomasSession Sep 9, 2024
ae64189
Differentiating between voice notes and regular audio
ThomasSession Sep 9, 2024
4e2cef6
Fixing 'Leave group dialog' from inside the group settings
ThomasSession Sep 9, 2024
1761024
SES-2692 only save valid media in message details
ThomasSession Sep 9, 2024
87e3f93
SES-2675 - Standardisingdenied mic permission
ThomasSession Sep 9, 2024
85161ff
PR comment
ThomasSession Sep 9, 2024
83b08cc
Fixing Camera permissions
ThomasSession Sep 9, 2024
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
14 changes: 4 additions & 10 deletions app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,27 +74,21 @@ class AvatarSelection(
*/
fun startAvatarSelection(
includeClear: Boolean,
attemptToIncludeCamera: Boolean
): File? {
attemptToIncludeCamera: Boolean,
createTempFile: ()->File?
) {
var captureFile: File? = null
val hasCameraPermission = ContextCompat
.checkSelfPermission(
activity,
Manifest.permission.CAMERA
) == PackageManager.PERMISSION_GRANTED
if (attemptToIncludeCamera && hasCameraPermission) {
try {
captureFile = File.createTempFile("avatar-capture", ".jpg", getImageDir(activity))
} catch (e: IOException) {
Log.e("Cannot reserve a temporary avatar capture file.", e)
} catch (e: NoExternalStorageException) {
Log.e("Cannot reserve a temporary avatar capture file.", e)
}
captureFile = createTempFile()
}

val chooserIntent = createAvatarSelectionIntent(activity, captureFile, includeClear)
onPickImage.launch(chooserIntent)
return captureFile
}

private fun createAvatarSelectionIntent(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ class ConversationReactionOverlay : FrameLayout {
items += ActionItem(R.attr.menu_save_icon,
R.string.save,
{ handleActionItemClicked(Action.DOWNLOAD) },
R.string.AccessibilityId_save
R.string.AccessibilityId_saveAttachment
)
}
}
Expand Down
13 changes: 12 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.pager.HorizontalPager
Expand All @@ -46,6 +48,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.lifecycleScope
import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
Expand Down Expand Up @@ -212,7 +215,15 @@ fun CellMetadata(
senderInfo?.let {
TitledView(state.fromTitle) {
Row {
sender?.let { Avatar(it) }
sender?.let {
Avatar(
recipient = it,
modifier = Modifier
.align(Alignment.CenterVertically)
.size(46.dp)
)
Spacer(modifier = Modifier.width(LocalDimensions.current.smallSpacing))
}
TitledMonospaceText(it)
}
}
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/thoughtcrime/securesms/media/MediaOverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
Expand Down Expand Up @@ -232,7 +231,7 @@ private fun SaveAttachmentWarningDialog(
title = context.getString(R.string.warning),
text = context.resources.getString(R.string.attachmentsWarning),
buttons = listOf(
DialogButtonModel(GetString(R.string.save), GetString(R.string.AccessibilityId_save), color = LocalColors.current.danger, onClick = onAccepted),
DialogButtonModel(GetString(R.string.save), GetString(R.string.AccessibilityId_saveAttachment), color = LocalColors.current.danger, onClick = onAccepted),
DialogButtonModel(GetString(android.R.string.cancel), GetString(R.string.AccessibilityId_cancel), dismissOnClick = true)
)
)
Expand Down
Loading