Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d2e35d1bc | ||
| 6845398755 | |||
| be52b0fa08 | |||
|
|
298bcfd1e3 | ||
| fce1736312 |
@@ -27,8 +27,8 @@ android {
|
|||||||
applicationId "com.paarrot.app"
|
applicationId "com.paarrot.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 1777176952
|
versionCode 1778632712
|
||||||
versionName "2026-04-26.041552.151"
|
versionName "2026-05-13.003832.344"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
|||||||
2
cinny
2
cinny
Submodule cinny updated: 7ef9939d8a...b2fd65c8cb
@@ -127,7 +127,8 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
const fileCount = share.files.length;
|
const fileCount = share.files.length;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Overlay open backdrop={<OverlayBackdrop />}>
|
<>
|
||||||
|
<Overlay open>
|
||||||
<FocusTrap
|
<FocusTrap
|
||||||
focusTrapOptions={{
|
focusTrapOptions={{
|
||||||
initialFocus: false,
|
initialFocus: false,
|
||||||
@@ -143,17 +144,18 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
position: 'fixed',
|
position: 'fixed',
|
||||||
inset: 0,
|
inset: 0,
|
||||||
zIndex: 999,
|
zIndex: 999,
|
||||||
backgroundColor: 'var(--bg-surface)',
|
backgroundColor: '#1a1d23',
|
||||||
|
paddingTop: '60px',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Header
|
<Header
|
||||||
size="500"
|
size="500"
|
||||||
style={{ padding: config.space.S400, paddingTop: config.space.S500 }}
|
style={{ padding: config.space.S400 }}
|
||||||
>
|
>
|
||||||
<Box grow="Yes" direction="Column" gap="100">
|
<Box grow="Yes" direction="Column" gap="100" style={{ minWidth: 0, maxWidth: '80%' }}>
|
||||||
<Text size="H4">Share to Room</Text>
|
<Text size="H4">Share to Room</Text>
|
||||||
{(previewText || fileCount > 0) && (
|
{(previewText || fileCount > 0) && (
|
||||||
<Text size="T200" priority="300" style={{ opacity: 0.7 }}>
|
<Text size="T200" priority="300" style={{ opacity: 0.7, wordBreak: 'break-word', whiteSpace: 'normal' }}>
|
||||||
{previewText
|
{previewText
|
||||||
? `"${previewText}${(share.text?.length ?? 0) > 80 ? '…' : ''}"`
|
? `"${previewText}${(share.text?.length ?? 0) > 80 ? '…' : ''}"`
|
||||||
: `${fileCount} file${fileCount !== 1 ? 's' : ''}`}
|
: `${fileCount} file${fileCount !== 1 ? 's' : ''}`}
|
||||||
@@ -169,8 +171,8 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
|
|
||||||
<Box
|
<Box
|
||||||
style={{
|
style={{
|
||||||
paddingTop: config.space.S200,
|
padding: config.space.S200,
|
||||||
paddingBottom: config.space.S200,
|
paddingTop: config.space.S300,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Input
|
<Input
|
||||||
@@ -181,11 +183,12 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
variant="Background"
|
variant="Background"
|
||||||
outlined
|
outlined
|
||||||
autoFocus
|
autoFocus
|
||||||
|
style={{ width: '100%' }}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Scroll ref={scrollRef} size="300" hideTrack style={{ flex: 1, minHeight: 0 }}>
|
<Scroll ref={scrollRef} size="300" hideTrack style={{ flex: 1, minHeight: 0 }}>
|
||||||
<Box style={{ padding: config.space.S300, paddingTop: 0 }} direction="Column">
|
<Box style={{ padding: config.space.S300 }} direction="Column">
|
||||||
{vItems.length === 0 && (
|
{vItems.length === 0 && (
|
||||||
<Box
|
<Box
|
||||||
style={{ padding: `${config.space.S700} 0` }}
|
style={{ padding: `${config.space.S700} 0` }}
|
||||||
@@ -261,12 +264,14 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
</Scroll>
|
</Scroll>
|
||||||
</Box>
|
</Box>
|
||||||
</FocusTrap>
|
</FocusTrap>
|
||||||
|
</Overlay>
|
||||||
|
|
||||||
{confirmRoomId && (() => {
|
{confirmRoomId && (() => {
|
||||||
const room = getRoom(confirmRoomId);
|
const room = getRoom(confirmRoomId);
|
||||||
const roomName = room?.name ?? confirmRoomId;
|
const roomName = room?.name ?? confirmRoomId;
|
||||||
const isDm = mDirects.has(confirmRoomId);
|
const isDm = mDirects.has(confirmRoomId);
|
||||||
return (
|
return (
|
||||||
|
<Overlay open backdrop={<OverlayBackdrop />}>
|
||||||
<OverlayCenter>
|
<OverlayCenter>
|
||||||
<FocusTrap
|
<FocusTrap
|
||||||
focusTrapOptions={{
|
focusTrapOptions={{
|
||||||
@@ -275,9 +280,9 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
escapeDeactivates: stopPropagation,
|
escapeDeactivates: stopPropagation,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Modal size="300">
|
<Modal size="300" style={{ maxWidth: '280px', maxHeight: 'fit-content' }}>
|
||||||
<Box direction="Column" gap="400" style={{ padding: config.space.S400 }}>
|
<Box direction="Column" gap="100" style={{ padding: config.space.S300 }}>
|
||||||
<Box direction="Column" gap="200">
|
<Box direction="Column" gap="100">
|
||||||
<Text size="H4">Share to {isDm ? 'Person' : 'Room'}?</Text>
|
<Text size="H4">Share to {isDm ? 'Person' : 'Room'}?</Text>
|
||||||
<Text size="T300" priority="300">
|
<Text size="T300" priority="300">
|
||||||
Send to <strong>{roomName}</strong>?
|
Send to <strong>{roomName}</strong>?
|
||||||
@@ -303,8 +308,9 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
|
|||||||
</Modal>
|
</Modal>
|
||||||
</FocusTrap>
|
</FocusTrap>
|
||||||
</OverlayCenter>
|
</OverlayCenter>
|
||||||
);
|
</Overlay>
|
||||||
})()}
|
);
|
||||||
</Overlay>
|
})()}
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paarrot",
|
"name": "paarrot",
|
||||||
"version": "4.11.105",
|
"version": "4.11.107",
|
||||||
"description": "Paarrot - A Matrix client based on Cinny",
|
"description": "Paarrot - A Matrix client based on Cinny",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18.0.0"
|
"node": ">=18.0.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user