Merge pull request #1233 from esteemapp/bugfix/markdown-darktheme

created themeContainer fixed markdown placeholder issue

src/components/basicUIElements/view/placeHolder/listItemPlaceHolderView.js

@@ -1,19 +1,25 @@
 import React from 'react';
-import { connect } from 'react-redux';
 import { View } from 'react-native';
 import Placeholder from 'rn-placeholder';
 
+import { ThemeContainer } from '../../../../containers';
+
 import styles from './listItemPlaceHolderStyles';
 
-const ListItemPlaceHolderView = ({ isDarkTheme }) => {
-  const color = isDarkTheme ? '#2e3d51' : '#f5f5f5';
-
+const ListItemPlaceHolderView = () => {
   return (
+    <ThemeContainer>
+      {({ isDarkTheme }) => (
         <View style={styles.container}>
-      <Placeholder.Media size={30} hasRadius animate="fade" color={color} />
+          <Placeholder.Media
+            size={30}
+            hasRadius
+            animate="fade"
+            color={isDarkTheme ? '#2e3d51' : '#f5f5f5'}
+          />
           <View style={styles.paragraphWrapper}>
             <Placeholder.Paragraph
-          color={color}
+              color={isDarkTheme ? '#2e3d51' : '#f5f5f5'}
               lineNumber={2}
               textSize={12}
               lineSpacing={8}
@@ -24,11 +30,9 @@ const ListItemPlaceHolderView = ({ isDarkTheme }) => {
             />
           </View>
         </View>
+      )}
+    </ThemeContainer>
   );
 };
 
-const mapStateToProps = state => ({
-  isDarkTheme: state.application.isDarkTheme,
-});
-
-export default connect(mapStateToProps)(ListItemPlaceHolderView);
+export default ListItemPlaceHolderView;

src/components/basicUIElements/view/placeHolder/listPlaceHolderView.js

@@ -1,6 +1,5 @@
 /* eslint-disable radix */
 import React, { Fragment } from 'react';
-import { connect } from 'react-redux';
 import { Dimensions } from 'react-native';
 import times from 'lodash/times';
 
@@ -18,9 +17,4 @@ const ListPlaceHolderView = () => {
 
   return <Fragment>{listElements}</Fragment>;
 };
-
-const mapStateToProps = state => ({
-  isDarkTheme: state.application.isDarkTheme,
-});
-
-export default connect(mapStateToProps)(ListPlaceHolderView);
+export default ListPlaceHolderView;

src/components/markdownEditor/view/markdownEditorView.js

@@ -13,6 +13,8 @@ import { PostBody } from '../../postElements';
 import { StickyBar } from '../../basicUIElements';
 import { TextInput } from '../../textInput';
 
+import { ThemeContainer } from '../../../containers';
+
 // Styles
 import styles from './markdownEditorStyles';
 
@@ -201,6 +203,8 @@ export default class MarkdownEditorView extends Component {
         behavior={Platform.OS === 'ios' ? 'padding' : null}
       >
         {!isPreviewActive ? (
+          <ThemeContainer>
+            {({ isDarkTheme }) => (
               <TextInput
                 multiline
                 onChangeText={this._changeText}
@@ -208,7 +212,7 @@ export default class MarkdownEditorView extends Component {
                 placeholder={intl.formatMessage({
                   id: isReply ? 'editor.reply_placeholder' : 'editor.default_placeholder',
                 })}
-            placeholderTextColor="#c1c5c7"
+                placeholderTextColor={isDarkTheme ? '#526d91' : '#c1c5c7'}
                 selection={selection}
                 selectionColor="#357ce6"
                 style={styles.textWrapper}
@@ -217,6 +221,8 @@ export default class MarkdownEditorView extends Component {
                 innerRef={this.inputRef}
                 editable={!isLoading}
               />
+            )}
+          </ThemeContainer>
         ) : (
           this._renderPreview()
         )}

src/containers/index.js

@@ -6,6 +6,7 @@ import ProfileEditContainer from './profileEditContainer';
 import RedeemContainer from './redeemContainer';
 import SpinGameContainer from './spinGameContainer';
 import TransferContainer from './transferContainer';
+import ThemeContainer from './themeContainer';
 
 export {
   DarkThemeContainer,
@@ -16,4 +17,5 @@ export {
   RedeemContainer,
   SpinGameContainer,
   TransferContainer,
+  ThemeContainer,
 };

src/containers/redeemContainer.js

@@ -140,7 +140,6 @@ class RedeemContainer extends Component {
 
 const mapStateToProps = state => ({
   username: state.account.currentAccount.name,
-  isDarkTheme: state.application.isDarkTheme,
   activeBottomTab: state.ui.activeBottomTab,
   isConnected: state.application.isConnected,
   accounts: state.account.otherAccounts,

src/containers/themeContainer.js

@@ -0,0 +1,18 @@
+/* eslint-disable no-unused-vars */
+import React from 'react';
+import { connect } from 'react-redux';
+
+const ThemeContainer = ({ children, isDarkTheme }) => {
+  return (
+    children &&
+    children({
+      isDarkTheme,
+    })
+  );
+};
+
+const mapStateToProps = state => ({
+  isDarkTheme: state.application.isDarkTheme,
+});
+
+export default connect(mapStateToProps)(ThemeContainer);

src/screens/notification/container/notificationContainer.js

@@ -151,13 +151,12 @@ class NotificationContainer extends Component {
 
   render() {
     const { isLoggedIn } = this.props;
-    const { notifications, isNotificationRefreshing, isDarkTheme } = this.state;
+    const { notifications, isNotificationRefreshing } = this.state;
 
     return (
       <NotificationScreen
         getActivities={this._getAvtivities}
         notifications={notifications}
-        isDarkTheme={isDarkTheme}
         navigateToNotificationRoute={this._navigateToNotificationRoute}
         readAllNotification={this._readAllNotification}
         handleLoginPress={this._handleOnPressLogin}
@@ -171,7 +170,6 @@ class NotificationContainer extends Component {
 
 const mapStateToProps = state => ({
   isLoggedIn: state.application.isLoggedIn,
-  isDarkTheme: state.application.isDarkTheme,
   isConnected: state.application.isConnected,
 
   username: state.account.currentAccount.name,