octo/tooot
octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-04-13 09:51:58 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #226 from tooot-app/main

Browse Source 
Patch v3.4.4
This commit is contained in:
xmflsct 2022-02-12 22:17:21 +01:00 committed by GitHub
commit eb87fe689b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -27,11 +27,9 @@ jobs:
token: ${{ secrets.EXPO_TOKEN }} token: ${{ secrets.EXPO_TOKEN }}
- name: -- Step 4 -- Install node dependencies - name: -- Step 4 -- Install node dependencies
run: yarn install run: yarn install
- name: -- Step 5 -- Install native dependencies - name: -- Step 5 -- Install ruby dependencies
run: npx pod-install
- name: -- Step 6 -- Install ruby dependencies
run: bundle install run: bundle install
- name: -- Step 7 -- Run fastlane - name: -- Step 6 -- Run fastlane
env: env:
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
ENVIRONMENT: ${{ steps.branch.outputs.branch }} ENVIRONMENT: ${{ steps.branch.outputs.branch }}

1
fastlane/Fastfile
View File

@ -208,6 +208,7 @@ lane :build do
puts("Release #{GITHUB_RELEASE} exists. Continue with building React Native only.") puts("Release #{GITHUB_RELEASE} exists. Continue with building React Native only.")
else else
puts("Release #{GITHUB_RELEASE} does not exist. Create new release as well as new native build.") puts("Release #{GITHUB_RELEASE} does not exist. Create new release as well as new native build.")
cocoapods(clean_install: true, podfile: "./ios/Podfile", deployment: true)
build_ios build_ios
build_android build_android
case ENVIRONMENT case ENVIRONMENT

21
src/components/Timeline/Shared/Attachment/Image.tsx
View File

@ -28,17 +28,16 @@ const AttachmentImage = React.memo(
uri={{ original: image.preview_url, remote: image.remote_url }} uri={{ original: image.preview_url, remote: image.remote_url }}
blurhash={image.blurhash} blurhash={image.blurhash}
onPress={onPress} onPress={onPress}
style={[ style={{
{ aspectRatio:
aspectRatio: total > 1 ||
total > 1 || !image.meta?.original?.width ||
!image.meta?.original?.width || !image.meta?.original?.height
!image.meta?.original?.height || ? attachmentAspectRatio({ total, index })
image.meta.original.width / image.meta.original.height > 2 : image.meta.original.height / image.meta.original.width > 2
? attachmentAspectRatio({ total, index }) ? 0.5
: image.meta.original.width / image.meta.original.height : image.meta.original.width / image.meta.original.height
} }}
]}
/> />
</View> </View>
) )