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.

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

[FIX] ServerDropdown flashing bigger server icon #2775

Merged
merged 4 commits into from
Jan 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed android/app/src/main/res/drawable-hdpi/logo.png
Binary file not shown.
Binary file removed android/app/src/main/res/drawable-mdpi/logo.png
Binary file not shown.
Binary file removed android/app/src/main/res/drawable-xhdpi/logo.png
Binary file not shown.
Binary file removed android/app/src/main/res/drawable-xxhdpi/logo.png
Binary file not shown.
Binary file removed android/app/src/main/res/drawable-xxxhdpi/logo.png
Binary file not shown.
4 changes: 2 additions & 2 deletions app/presentation/ServerItem/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ const ServerItem = React.memo(({
uri: item.iconURL,
priority: FastImage.priority.high
}}
defaultSource={{ uri: 'logo' }}
defaultSource={require('../../static/images/logo.png')}
style={styles.serverIcon}
onError={() => console.log('err_loading_server_icon')}
/>
)
: (
<FastImage
source={{ uri: 'logo' }}
source={require('../../static/images/logo.png')}
style={styles.serverIcon}
/>
)
Expand Down
Binary file modified app/static/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/views/OnboardingView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class OnboardingView extends React.Component {
return (
<FormContainer theme={theme} testID='onboarding-view'>
<FormContainerInner>
<Image style={styles.onboarding} source={{ uri: 'logo' }} fadeDuration={0} />
<Image style={styles.onboarding} source={require('../../static/images/logo.png')} fadeDuration={0} />
<Text style={[styles.title, { color: themes[theme].titleText }]}>{I18n.t('Onboarding_title')}</Text>
<Text style={[styles.subtitle, { color: themes[theme].controlText }]}>{I18n.t('Onboarding_subtitle')}</Text>
<Text style={[styles.description, { color: themes[theme].auxiliaryText }]}>{I18n.t('Onboarding_description')}</Text>
Expand Down
4 changes: 2 additions & 2 deletions app/views/OnboardingView/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export default StyleSheet.create({
marginBottom: verticalScale(50),
maxHeight: verticalScale(150),
resizeMode: 'contain',
width: 80,
height: 70
width: 100,
height: 100
},
title: {
...sharedStyles.textBold,
Expand Down
4 changes: 2 additions & 2 deletions app/views/RoomsListView/ServerDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,14 @@ class ServerDropdown extends Component {
? (
<Image
source={{ uri: item.iconURL }}
defaultSource={{ uri: 'logo' }}
defaultSource={require('../../static/images/logo.png')}
style={styles.serverIcon}
onError={() => console.warn('error loading serverIcon')}
/>
)
: (
<Image
source={{ uri: 'logo' }}
source={require('../../static/images/logo.png')}
style={styles.serverIcon}
/>
)
Expand Down
23 changes: 0 additions & 23 deletions ios/RocketChatRN/Images.xcassets/logo.imageset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.