[FIX] ServerDropdown flashing bigger server icon (#2775)
* [FIX] ServerDropdown flashing bigger server icon * Remove unused logo and update image path where needed * Minor tweak Co-authored-by: Diego Mello <diegolmello@gmail.com>
Before Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 11 KiB |
|
@ -27,14 +27,14 @@ const ServerItem = React.memo(({
|
||||||
uri: item.iconURL,
|
uri: item.iconURL,
|
||||||
priority: FastImage.priority.high
|
priority: FastImage.priority.high
|
||||||
}}
|
}}
|
||||||
defaultSource={{ uri: 'logo' }}
|
defaultSource={require('../../static/images/logo.png')}
|
||||||
style={styles.serverIcon}
|
style={styles.serverIcon}
|
||||||
onError={() => console.log('err_loading_server_icon')}
|
onError={() => console.log('err_loading_server_icon')}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
: (
|
: (
|
||||||
<FastImage
|
<FastImage
|
||||||
source={{ uri: 'logo' }}
|
source={require('../../static/images/logo.png')}
|
||||||
style={styles.serverIcon}
|
style={styles.serverIcon}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 42 KiB |
|
@ -89,7 +89,7 @@ class OnboardingView extends React.Component {
|
||||||
return (
|
return (
|
||||||
<FormContainer theme={theme} testID='onboarding-view'>
|
<FormContainer theme={theme} testID='onboarding-view'>
|
||||||
<FormContainerInner>
|
<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.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.subtitle, { color: themes[theme].controlText }]}>{I18n.t('Onboarding_subtitle')}</Text>
|
||||||
<Text style={[styles.description, { color: themes[theme].auxiliaryText }]}>{I18n.t('Onboarding_description')}</Text>
|
<Text style={[styles.description, { color: themes[theme].auxiliaryText }]}>{I18n.t('Onboarding_description')}</Text>
|
||||||
|
|
|
@ -11,8 +11,8 @@ export default StyleSheet.create({
|
||||||
marginBottom: verticalScale(50),
|
marginBottom: verticalScale(50),
|
||||||
maxHeight: verticalScale(150),
|
maxHeight: verticalScale(150),
|
||||||
resizeMode: 'contain',
|
resizeMode: 'contain',
|
||||||
width: 80,
|
width: 100,
|
||||||
height: 70
|
height: 100
|
||||||
},
|
},
|
||||||
title: {
|
title: {
|
||||||
...sharedStyles.textBold,
|
...sharedStyles.textBold,
|
||||||
|
|
|
@ -220,14 +220,14 @@ class ServerDropdown extends Component {
|
||||||
? (
|
? (
|
||||||
<Image
|
<Image
|
||||||
source={{ uri: item.iconURL }}
|
source={{ uri: item.iconURL }}
|
||||||
defaultSource={{ uri: 'logo' }}
|
defaultSource={require('../../static/images/logo.png')}
|
||||||
style={styles.serverIcon}
|
style={styles.serverIcon}
|
||||||
onError={() => console.warn('error loading serverIcon')}
|
onError={() => console.warn('error loading serverIcon')}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
: (
|
: (
|
||||||
<Image
|
<Image
|
||||||
source={{ uri: 'logo' }}
|
source={require('../../static/images/logo.png')}
|
||||||
style={styles.serverIcon}
|
style={styles.serverIcon}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"filename" : "icon.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"filename" : "icon@2x.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"filename" : "icon@3x.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "3x"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 7.8 KiB |