Merge branch 'develop' into fix.rooms-list-request

RocketChat · Jan 13, 2021 · 663cd8d · 663cd8d
2 parents ede1d27 + 3b4f457
commit 663cd8d
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 33 deletions.
diff --git a/android/app/src/main/res/drawable-hdpi/logo.png b/android/app/src/main/res/drawable-hdpi/logo.png
diff --git a/android/app/src/main/res/drawable-mdpi/logo.png b/android/app/src/main/res/drawable-mdpi/logo.png
diff --git a/android/app/src/main/res/drawable-xhdpi/logo.png b/android/app/src/main/res/drawable-xhdpi/logo.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/logo.png b/android/app/src/main/res/drawable-xxhdpi/logo.png
diff --git a/android/app/src/main/res/drawable-xxxhdpi/logo.png b/android/app/src/main/res/drawable-xxxhdpi/logo.png
diff --git a/app/presentation/RoomItem/Touchable.js b/app/presentation/RoomItem/Touchable.js
@@ -48,7 +48,7 @@ class Touchable extends React.Component {
 			rowState: 0 // 0: closed, 1: right opened, -1: left opened
 		};
 		this._onGestureEvent = Animated.event(
-			[{ nativeEvent: { translationX: this.dragX } }]
+			[{ nativeEvent: { translationX: this.dragX } }], { useNativeDriver: true }
 		);
 		this._value = 0;
 	}

diff --git a/app/presentation/ServerItem/index.js b/app/presentation/ServerItem/index.js
@@ -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}
 					/>
 				)

diff --git a/app/static/images/logo.png b/app/static/images/logo.png
diff --git a/app/views/NewServerView/ServerInput/Item.js b/app/views/NewServerView/ServerInput/Item.js
@@ -34,8 +34,8 @@ const Item = ({
 }) => (
 	<Touch style={styles.container} onPress={() => onPress(item.url)} theme={theme} testID={`server-history-${ item.url }`}>
 		<View style={styles.content}>
-			<Text style={[styles.server, { color: themes[theme].bodyText }]}>{item.url}</Text>
-			<Text style={[styles.username, { color: themes[theme].auxiliaryText }]}>{item.username}</Text>
+			<Text numberOfLines={1} style={[styles.server, { color: themes[theme].bodyText }]}>{item.url}</Text>
+			<Text numberOfLines={1} style={[styles.username, { color: themes[theme].auxiliaryText }]}>{item.username}</Text>
 		</View>
 		<BorderlessButton onPress={() => onDelete(item)} testID={`server-history-delete-${ item.url }`}>
 			<CustomIcon name='delete' size={24} color={themes[theme].auxiliaryText} />

diff --git a/app/views/OnboardingView/index.js b/app/views/OnboardingView/index.js
@@ -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>

diff --git a/app/views/OnboardingView/styles.js b/app/views/OnboardingView/styles.js
@@ -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,

diff --git a/app/views/RoomsListView/ServerDropdown.js b/app/views/RoomsListView/ServerDropdown.js
@@ -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}
 							/>
 						)

diff --git a/ios/RocketChatRN/Images.xcassets/logo.imageset/Contents.json b/ios/RocketChatRN/Images.xcassets/logo.imageset/Contents.json
diff --git a/ios/RocketChatRN/Images.xcassets/logo.imageset/icon.png b/ios/RocketChatRN/Images.xcassets/logo.imageset/icon.png
diff --git a/ios/RocketChatRN/Images.xcassets/logo.imageset/icon@2x.png b/ios/RocketChatRN/Images.xcassets/logo.imageset/icon@2x.png
diff --git a/ios/RocketChatRN/Images.xcassets/logo.imageset/icon@3x.png b/ios/RocketChatRN/Images.xcassets/logo.imageset/icon@3x.png