Fix image looks cropped In the Preview page #8804

mollfpr · 2022-04-27T17:59:58Z

Details

The container height of ImageView is not calculated right. Use onLayout to get the height of view and use the height to get the correct aspect ratio of the image and the container.
To remove the extra space on the Android attachment modal, set shouldAddTopSafeAreaPadding only on iOS.

Fixed Issues

$ #8115

Tests

Open the app
Go to a chat
Click on the "+" sign
Select add Attachment
Select a screenshot (mad from your phone)
Verify that image is not cropped
View the image attachment that already sends
Verify that image is not cropped
On Android verify that the extra space on header is gone

Verify that no errors appear in the JS console

PR Review Checklist

Contributor (PR Author) Checklist

PR Reviewer Checklist

QA Steps

Open the app
Go to a chat
Click on the "+" sign
Select add Attachment
Select a screenshot (mad from your phone)
Verify that image is not cropped
View the image attachment that already sends
Verify that image is not cropped
On Android verify that the extra space on header is gone

Verify that no errors appear in the JS console

Screenshots

Web

screen-recording-2022-04-28-at-001441_OPmDjIIA.mp4

Mobile Web

screen-recording-2022-04-28-at-002128_HCHQXpgR.mp4

screen-recording-2022-04-28-at-002226_lavPlAEH.mp4

Desktop

screen-recording-2022-04-28-at-002457_SGBSqGvX.mp4

iOS

screen-recording-2022-04-28-at-003039_YbCTeXb8.mp4

Android

screen-recording-2022-04-28-at-005258_PFsJEebF.mp4

mollfpr · 2022-04-29T10:09:14Z

bump @Santhosh-Sellavel @AndrewGable

Santhosh-Sellavel · 2022-04-29T11:58:43Z

src/styles/getModalStyles.js

-            shouldAddTopSafeAreaPadding = true;
+
+            // Only apply top padding on iOS since only iOS using SafeAreaView and the top insets is not apply
+            shouldAddTopSafeAreaPadding = Platform.OS === 'ios';


please use getPlatform to compare CONST.OS constants to compare platform.

Santhosh-Sellavel · 2022-04-29T12:01:31Z

@mollfpr
Once the requested changes are done, will review this today or by Monday. Thanks

cc: @AndrewGable

mollfpr · 2022-04-29T12:24:44Z

@Santhosh-Sellavel

Updated! I'm using CONST.PLATFORM instead, since the getPlatform() returning those variable. Tested on both devices.

Santhosh-Sellavel · 2022-05-02T18:30:21Z

Reviewing this now

src/styles/getModalStyles.js

Santhosh-Sellavel · 2022-05-02T21:35:13Z

Everything looks good tests well.

Just comment here seems incomplete to me!

cc: @mollfpr @AndrewGable

Co-authored-by: Santhoshkumar Sellavel <85645967+Santhosh-Sellavel@users.noreply.github.com>

AndrewGable · 2022-05-03T02:32:41Z

Sorry I didn't catch this earlier in the proposal but I posted a question in our Slack channel about this PR https://expensify.slack.com/archives/C01GTK53T8Q/p1651544907690039

I thought that the specific platform checks were not allowed, but will discuss with the team and get back to you on this PR.

mollfpr · 2022-05-04T16:38:33Z

src/styles/getModalStyles/getModalStyles.js


-export default (type, windowDimensions, popoverAnchorPosition = {}, containerStyle = {}) => {
+export default ({shouldModalAddTopSafeAreaPadding = {}}) => (type, windowDimensions, popoverAnchorPosition = {}, containerStyle = {}) => {


Here I modified the current function with a new function that accept parameters that can be determined what modal type should apply the top padding.

The previous code has shouldAddTopSafeAreaPadding returning true on CONST.MODAL.MODAL_TYPE.CENTERED, CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE, and CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED. For android we can specified CONST.MODAL.MODAL_TYPE.CENTERED and CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE no to add top padding by returning shouldAddTopSafeAreaPadding with false.

cc @Santhosh-Sellavel @AndrewGable

@mollfpr

I think shouldAddSafeAreaPadding could be a library where computations can happen in platform-specific files.
Could be added inside the getModalStyle folder itself.

Any thoughts @AndrewGable?

@Santhosh-Sellavel Can you outline your suggested fix?

@AndrewGable

Suggestion 1

Could be as simple as the library name shouldAddSafeAreaPadding where index.ios.js returns true and index.js returns false. And call it from the appropriate line (as per the proposed solution).

Suggestion 2

Could be as simple as the library name shouldAddSafeAreaPadding where
index.ios.js
index.android.js
index.js

returns appropriate boolean value based on MODAL_TYPE.

I think suggestion 2 will be good solution.

mollfpr · 2022-05-04T16:39:53Z

src/styles/getModalStyles/getModalStyles.js

@@ -16,7 +16,7 @@ export default (type, windowDimensions, popoverAnchorPosition = {}, containerSty
    let animationOut;
    let hideBackdrop = false;
    let shouldAddBottomSafeAreaPadding = false;
-    let shouldAddTopSafeAreaPadding = false;
+    const shouldAddTopSafeAreaPadding = shouldModalAddTopSafeAreaPadding[type] || false;


This where shouldAddTopSafeAreaPadding will have according to what value we want from specific platform.

mollfpr · 2022-05-04T16:40:37Z

src/styles/getModalStyles/index.js

+import CONST from '../../CONST';
+import getModalStyles from './getModalStyles';
+
+export default getModalStyles({
+    shouldModalAddTopSafeAreaPadding: {
+        [CONST.MODAL.MODAL_TYPE.CENTERED]: true,
+        [CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE]: true,
+        [CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED]: true,
+    },
+});


This are the default value before refactoring.

mollfpr · 2022-05-04T16:41:51Z

src/styles/getModalStyles/index.android.js

+
+export default getModalStyles({
+    shouldModalAddTopSafeAreaPadding: {
+        [CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED]: true,


We only need to set CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED to true since that's the only thing that doesn't no break on android.

Santhosh-Sellavel · 2022-05-04T16:58:30Z

src/styles/getModalStyles/getModalStyles.js


-export default (type, windowDimensions, popoverAnchorPosition = {}, containerStyle = {}) => {
+export default ({shouldModalAddTopSafeAreaPadding = {}}) => (type, windowDimensions, popoverAnchorPosition = {}, containerStyle = {}) => {


@mollfpr

I think shouldAddSafeAreaPadding could be a library where computations can happen in platform-specific files.
Could be added inside the getModalStyle folder itself.

Any thoughts @AndrewGable?

… function

mollfpr · 2022-05-05T02:26:05Z

I just create a function called getShouldAddTopSafeAreaPadding which will be used by android platform and others. I also revert back to the getModalStyles.js file and update to use getShouldAddTopSafeAreaPadding().

cc @Santhosh-Sellavel @AndrewGable

AndrewGable · 2022-05-05T22:22:15Z

@Santhosh-Sellavel - Happy to defer to you here on specific design of the platform specific design 👍

mollfpr · 2022-05-09T05:54:41Z

Hey @Santhosh-Sellavel is my latest commit correct?

Santhosh-Sellavel

getModalStyles folder should stay in the styles folder only. @mollfpr

also, rename the existing getModalStyles.js file to baseGetModalStyles.js.

Santhosh-Sellavel

Sorry for the back and forth @mollfpr,

Just one small suggestion, rename baseGetModalStyles to getBaseModalStyles,

Everything else looks good, and tests well!

@AndrewGable I'll leave it to you for the final review!

Santhosh-Sellavel · 2022-05-13T17:18:15Z

PR Reviewer Checklist

I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- MacOS / Desktop
I verified there are no console errors (if there’s a console error not related to the PR, report it or open an issue for it to be fixed)
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained “why” the code was doing something instead of only explaining “what” the code was doing.
- I verified any copy / text shown in the product was added in all src/languages/* files
- I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named “index.js”. All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- Any functional components have the displayName property
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose and it is broken down into smaller components in order to separate concerns and functions
If a new CSS style is added I verified that:
- A similar style doesn’t already exist
- The style can’t be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.

src/styles/getModalStyles/index.android.js

Santhosh-Sellavel

Asking to update the comments, otherwise looks good, and tests well!

cc: @AndrewGable

src/styles/getModalStyles/index.android.js

Co-authored-by: Santhoshkumar Sellavel <85645967+Santhosh-Sellavel@users.noreply.github.com>

Santhosh-Sellavel

Looks good, and tests well!

@AndrewGable All you!

mollfpr · 2022-05-17T10:33:11Z

@AndrewGable bump 👆

OSBotify · 2022-05-17T19:34:19Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2022-05-18T15:37:36Z

🚀 Deployed to staging by @AndrewGable in version: 1.1.63-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2022-05-18T18:38:10Z

🚀 Deployed to staging by @AndrewGable in version: 1.1.63-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2022-05-19T17:23:15Z

🚀 Deployed to production by @AndrewGable in version: 1.1.63-2 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

s77rt · 2023-03-03T09:07:59Z

This PR is partly responsible for a regression here #15288. The containerHeight is mishandled where it's referenced here before being correctly set onLayout i.e. there is no guarantee that containerHeight will be set then referenced, a race condition is to reference containerHeight before being set.

mollfpr added 3 commits April 28, 2022 00:37

fix not proper image height on native

8dba8e6

remove the exceed space on android when using attachment modal

1917af2

add comment to give some explanation

53cbcf6

mollfpr requested a review from a team as a code owner April 27, 2022 17:59

melvin-bot bot requested review from AndrewGable and Santhosh-Sellavel and removed request for a team April 27, 2022 18:00

mollfpr changed the title ~~Fix 8115~~ Fix image looks cropped In the Preview page Apr 27, 2022

Santhosh-Sellavel suggested changes Apr 29, 2022

View reviewed changes

using getPlatform() instead rn Platform

ac4511e

Santhosh-Sellavel suggested changes May 2, 2022

View reviewed changes

src/styles/getModalStyles.js Outdated Show resolved Hide resolved

Update src/styles/getModalStyles.js

cee6581

Co-authored-by: Santhoshkumar Sellavel <85645967+Santhosh-Sellavel@users.noreply.github.com>

mollfpr added 2 commits May 5, 2022 00:30

refactor getModalStyles func to "shim"

babaa26

fix conflict

cc0b570

mollfpr commented May 4, 2022

View reviewed changes

Santhosh-Sellavel suggested changes May 4, 2022

View reviewed changes

mollfpr added 2 commits May 5, 2022 10:23

function to get shouldAddTopSafeAreaPadding by modal type

bb8a612

revert back the getModalStyles and use getShouldAddTopSafeAreaPadding…

c9952ee

… function

add default value

17e1d3f

Santhosh-Sellavel suggested changes May 12, 2022

View reviewed changes

move to styles folder and rename the base function

ce04075

mollfpr requested a review from Santhosh-Sellavel May 13, 2022 01:19

Santhosh-Sellavel reviewed May 13, 2022

View reviewed changes

src/styles/getModalStyles/index.android.js Show resolved Hide resolved

rename base styles and add comment

28f509e

mollfpr requested a review from Santhosh-Sellavel May 13, 2022 18:15

Santhosh-Sellavel suggested changes May 15, 2022

View reviewed changes

src/styles/getModalStyles/index.android.js Outdated Show resolved Hide resolved

Update src/styles/getModalStyles/index.android.js

8beeb85

Co-authored-by: Santhoshkumar Sellavel <85645967+Santhosh-Sellavel@users.noreply.github.com>

mollfpr requested a review from Santhosh-Sellavel May 16, 2022 01:16

Santhosh-Sellavel approved these changes May 16, 2022

View reviewed changes

AndrewGable approved these changes May 17, 2022

View reviewed changes

AndrewGable merged commit 44326c9 into Expensify:main May 17, 2022

OSBotify mentioned this pull request May 18, 2022

Deploy Checklist: New Expensify 2022-05-18 #9069

Closed

18 tasks

melvin-bot bot mentioned this pull request May 19, 2022

[HOLD for payment 2022-05-26] [$1000] iOS/ Android - Attachment - Image looks cropped In the Preview page #8115

Closed

aswin-s mentioned this pull request Dec 9, 2022

[$2000] Large image doesn't zoom well in Android and gets blurry #12893

Closed

Santhosh-Sellavel mentioned this pull request Jan 30, 2023

adding carousel to attachment modal #9279

Merged

52 tasks

s77rt mentioned this pull request Mar 3, 2023

[HOLD for payment 2023-03-09] [$1000] GIF attachments are either displayed as blank or there is infinite loading on attachment preview #15288

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix image looks cropped In the Preview page #8804

Fix image looks cropped In the Preview page #8804

mollfpr commented Apr 27, 2022 •

edited

Loading

mollfpr commented Apr 29, 2022

Santhosh-Sellavel Apr 29, 2022

Santhosh-Sellavel commented Apr 29, 2022

mollfpr commented Apr 29, 2022

Santhosh-Sellavel commented May 2, 2022

Santhosh-Sellavel commented May 2, 2022

AndrewGable commented May 3, 2022

mollfpr May 4, 2022

mollfpr May 4, 2022

Santhosh-Sellavel May 4, 2022

AndrewGable May 4, 2022

AndrewGable May 4, 2022

Santhosh-Sellavel May 4, 2022 •

edited

Loading

mollfpr May 4, 2022

mollfpr May 4, 2022

mollfpr May 4, 2022

mollfpr May 4, 2022

Santhosh-Sellavel May 4, 2022

mollfpr commented May 5, 2022

AndrewGable commented May 5, 2022

mollfpr commented May 9, 2022

Santhosh-Sellavel left a comment •

edited

Loading

Santhosh-Sellavel left a comment

Santhosh-Sellavel commented May 13, 2022 •

edited

Loading

Santhosh-Sellavel left a comment

Santhosh-Sellavel left a comment

mollfpr commented May 17, 2022

OSBotify commented May 17, 2022

OSBotify commented May 18, 2022

OSBotify commented May 18, 2022

OSBotify commented May 19, 2022

s77rt commented Mar 3, 2023


		export default (type, windowDimensions, popoverAnchorPosition = {}, containerStyle = {}) => {
		export default ({shouldModalAddTopSafeAreaPadding = {}}) => (type, windowDimensions, popoverAnchorPosition = {}, containerStyle = {}) => {

Fix image looks cropped In the Preview page #8804

Fix image looks cropped In the Preview page #8804

Conversation

mollfpr commented Apr 27, 2022 • edited Loading

Details

Fixed Issues

Tests

PR Review Checklist

Contributor (PR Author) Checklist

PR Reviewer Checklist

QA Steps

Screenshots

Web

Mobile Web

Desktop

iOS

Android

mollfpr commented Apr 29, 2022

Choose a reason for hiding this comment

Santhosh-Sellavel commented Apr 29, 2022

mollfpr commented Apr 29, 2022

Santhosh-Sellavel commented May 2, 2022

Santhosh-Sellavel commented May 2, 2022

AndrewGable commented May 3, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Santhosh-Sellavel May 4, 2022 • edited Loading

Choose a reason for hiding this comment

Suggestion 1

Suggestion 2

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mollfpr commented May 5, 2022

AndrewGable commented May 5, 2022

mollfpr commented May 9, 2022

Santhosh-Sellavel left a comment • edited Loading

Choose a reason for hiding this comment

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel commented May 13, 2022 • edited Loading

PR Reviewer Checklist

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

mollfpr commented May 17, 2022

OSBotify commented May 17, 2022

OSBotify commented May 18, 2022

OSBotify commented May 18, 2022

OSBotify commented May 19, 2022

s77rt commented Mar 3, 2023

mollfpr commented Apr 27, 2022 •

edited

Loading

Santhosh-Sellavel May 4, 2022 •

edited

Loading

Santhosh-Sellavel left a comment •

edited

Loading

Santhosh-Sellavel commented May 13, 2022 •

edited

Loading