Compare commits

..

7 Commits

Author SHA1 Message Date
GitHub Actions
fb9e8bc277 chore: bump version to 4.11.108 [skip ci] 2026-05-13 01:12:28 +00:00
803a076f98 Merge branch 'master' of http://synbox.ruv.wtf:8418/litruv/cinny-mobile
All checks were successful
Build / increment-version (push) Successful in 7s
Build / build-android (push) Successful in 4m34s
Build / create-release (push) Successful in 14s
2026-05-13 11:12:22 +10:00
86d284b353 fix: update subproject commit reference in cinny 2026-05-13 11:12:17 +10:00
6207d18b3c fix: update version code and name in build.gradle; adjust Modal component in ShareRoomPicker 2026-05-13 11:12:09 +10:00
GitHub Actions
8d2e35d1bc chore: bump version to 4.11.107 [skip ci] 2026-05-13 00:40:41 +00:00
6845398755 Merge branch 'master' of http://synbox.ruv.wtf:8418/litruv/cinny-mobile
All checks were successful
Build / increment-version (push) Successful in 7s
Build / build-android (push) Successful in 4m32s
Build / create-release (push) Successful in 14s
2026-05-13 10:40:34 +10:00
be52b0fa08 fix(mobile): update version code and name, adjust padding in ShareRoomPicker component 2026-05-13 10:40:31 +10:00
4 changed files with 27 additions and 21 deletions

View File

@@ -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 1778632862
versionName "2026-04-26.041552.151" versionName "2026-05-13.004102.796"
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

Submodule cinny updated: 7ef9939d8a...b9b0dce40b

View File

@@ -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,
@@ -144,16 +145,17 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
inset: 0, inset: 0,
zIndex: 999, zIndex: 999,
backgroundColor: '#1a1d23', backgroundColor: '#1a1d23',
paddingTop: '60px',
}} }}
> >
<Header <Header
size="500" size="500"
style={{ padding: config.space.S400, paddingTop: '60px' }} 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' : ''}`}
@@ -170,6 +172,7 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
<Box <Box
style={{ style={{
padding: config.space.S200, padding: config.space.S200,
paddingTop: config.space.S300,
}} }}
> >
<Input <Input
@@ -185,7 +188,7 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
</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: config.space.S300 }} 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,13 +264,15 @@ 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 (
<OverlayCenter style={{ zIndex: 9999 }}> <Overlay open backdrop={<OverlayBackdrop />}>
<OverlayCenter>
<FocusTrap <FocusTrap
focusTrapOptions={{ focusTrapOptions={{
initialFocus: false, initialFocus: false,
@@ -275,9 +280,9 @@ export function ShareRoomPicker({ share, onPick, onDismiss }: ShareRoomPickerPro
escapeDeactivates: stopPropagation, escapeDeactivates: stopPropagation,
}} }}
> >
<Modal size="300" style={{ zIndex: 9999 }}> <Modal style={{ maxWidth: '280px' }}>
<Box direction="Column" gap="100" 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> })()}
</>
); );
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "paarrot", "name": "paarrot",
"version": "4.11.106", "version": "4.11.108",
"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"