From 47deea650e517583ccfe843472d9e1140f8fdefc Mon Sep 17 00:00:00 2001 From: Miguel Alatzar Date: Wed, 9 Dec 2020 22:16:29 -0700 Subject: [PATCH] [MM-31177] Use png over Compass icon for logo (#5008) * Use png over Compass icon for logo * Update splash screen pngs * Revert "Update splash screen pngs" This reverts commit c79c3c1364af93925a96d9420d4799ee87646b62. * Update logo --- app/screens/client_upgrade/client_upgrade.js | 10 ++--- .../forgot_password.test.js.snap | 36 ++++++++++++------ .../forgot_password/forgot_password.js | 9 ++--- app/screens/login/login.js | 9 ++--- app/screens/login_options/login_options.js | 8 ++-- app/screens/mfa/mfa.js | 9 ++--- app/screens/select_server/select_server.js | 9 ++--- app/styles/index.js | 3 -- assets/base/images/logo.png | Bin 0 -> 6616 bytes 9 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 assets/base/images/logo.png diff --git a/app/screens/client_upgrade/client_upgrade.js b/app/screens/client_upgrade/client_upgrade.js index 166788f52..0a8b1b056 100644 --- a/app/screens/client_upgrade/client_upgrade.js +++ b/app/screens/client_upgrade/client_upgrade.js @@ -6,6 +6,7 @@ import {Navigation} from 'react-native-navigation'; import PropTypes from 'prop-types'; import { Alert, + Image, Linking, ScrollView, TouchableOpacity, @@ -15,13 +16,11 @@ import {intlShape} from 'react-intl'; import {SafeAreaView} from 'react-native-safe-area-context'; import {popTopScreen, dismissModal} from '@actions/navigation'; -import CompassIcon from '@components/compass_icon'; import FormattedText from '@components/formatted_text'; import StatusBar from '@components/status_bar'; import {UpgradeTypes} from '@constants'; import {checkUpgradeType, isUpgradeAvailable} from '@utils/client_upgrade'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import {GlobalStyles} from 'app/styles'; export default class ClientUpgrade extends PureComponent { static propTypes = { @@ -269,10 +268,9 @@ export default class ClientUpgrade extends PureComponent { style={styles.scrollView} contentContainerStyle={styles.scrollViewContent} > - {this.renderMessageContent()} diff --git a/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap b/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap index 692d923d8..68817c409 100644 --- a/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap +++ b/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap @@ -24,12 +24,16 @@ exports[`ForgotPassword match snapshot after success of sendPasswordResetEmail 1 } } > - @@ -110,12 +114,16 @@ exports[`ForgotPassword should match snapshot 1`] = ` } } > - @@ -224,12 +232,16 @@ exports[`ForgotPassword snapshot for error on failure of email regex 1`] = ` } } > - diff --git a/app/screens/forgot_password/forgot_password.js b/app/screens/forgot_password/forgot_password.js index 57819033a..251eb880e 100644 --- a/app/screens/forgot_password/forgot_password.js +++ b/app/screens/forgot_password/forgot_password.js @@ -7,6 +7,7 @@ import Button from 'react-native-button'; import {intlShape} from 'react-intl'; import { + Image, StyleSheet, Text, TextInput, @@ -15,7 +16,6 @@ import { } from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; -import CompassIcon from '@components/compass_icon'; import ErrorText from '@components/error_text'; import FormattedText from '@components/formatted_text'; import StatusBar from '@components/status_bar'; @@ -158,10 +158,9 @@ export default class ForgotPassword extends PureComponent { onPress={this.blur} > - {displayError} {passwordFormView} diff --git a/app/screens/login/login.js b/app/screens/login/login.js index cba786010..7c26c0150 100644 --- a/app/screens/login/login.js +++ b/app/screens/login/login.js @@ -7,6 +7,7 @@ import {intlShape} from 'react-intl'; import { ActivityIndicator, Dimensions, + Image, InteractionManager, Keyboard, StyleSheet, @@ -20,7 +21,6 @@ import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scrollview'; import {SafeAreaView} from 'react-native-safe-area-context'; import {resetToChannel, goToScreen} from '@actions/navigation'; -import CompassIcon from '@components/compass_icon'; import ErrorText from '@components/error_text'; import FormattedText from '@components/formatted_text'; import StatusBar from '@components/status_bar'; @@ -381,10 +381,9 @@ export default class Login extends PureComponent { keyboardShouldPersistTaps='handled' enableOnAndroid={true} > - diff --git a/app/screens/login_options/login_options.js b/app/screens/login_options/login_options.js index 301613116..3eb56e154 100644 --- a/app/screens/login_options/login_options.js +++ b/app/screens/login_options/login_options.js @@ -17,7 +17,6 @@ import {SafeAreaView} from 'react-native-safe-area-context'; import {goToScreen} from '@actions/navigation'; import LocalConfig from '@assets/config'; import gitlab from '@assets/images/gitlab.png'; -import CompassIcon from '@components/compass_icon'; import FormattedText from '@components/formatted_text'; import StatusBar from '@components/status_bar'; import {ViewTypes} from '@constants'; @@ -260,10 +259,9 @@ export default class LoginOptions extends PureComponent { ref={this.scrollRef} > - {this.props.config.SiteName} diff --git a/app/screens/mfa/mfa.js b/app/screens/mfa/mfa.js index 1250ac704..7060c2a8e 100644 --- a/app/screens/mfa/mfa.js +++ b/app/screens/mfa/mfa.js @@ -5,6 +5,7 @@ import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; import { ActivityIndicator, + Image, Keyboard, KeyboardAvoidingView, Platform, @@ -15,7 +16,6 @@ import { import Button from 'react-native-button'; import {SafeAreaView} from 'react-native-safe-area-context'; -import CompassIcon from '@components/compass_icon'; import ErrorText from '@components/error_text'; import FormattedText from '@components/formatted_text'; import StatusBar from '@components/status_bar'; @@ -146,10 +146,9 @@ export default class Mfa extends PureComponent { - - diff --git a/app/styles/index.js b/app/styles/index.js index 185c087c6..cb06b567e 100644 --- a/app/styles/index.js +++ b/app/styles/index.js @@ -109,7 +109,4 @@ export const GlobalStyles = StyleSheet.create({ borderRadius: 3, color: '#3d3c40', }, - logo: { - color: '#2389D7', - }, }); diff --git a/assets/base/images/logo.png b/assets/base/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5906b6391fa33ebd84ed6889cee8939ca941f757 GIT binary patch literal 6616 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 W8;{2Ygpx-90000