Merged with master

src/components/markdownEditor/view/markdownEditorView.js

@@ -58,6 +58,23 @@ export default class MarkdownEditorView extends Component {
     }
   }
 
+  componentDidUpdate(prevProps, prevState) {
+    const { text } = this.state;
+    const { isFormValid, handleIsFormValid } = this.props;
+
+    if (prevState.text !== text && !isFormValid) {
+      const nextText = text.replace(prevState.text, '');
+
+      if (nextText && nextText.length > 0) {
+        this._changeText(text);
+
+        if (handleIsFormValid) {
+          handleIsFormValid(text);
+        }
+      }
+    }
+  }
+
   // Component functions
   _changeText = (input) => {
     const {
@@ -147,7 +164,7 @@ export default class MarkdownEditorView extends Component {
           iconType="FontAwesome"
           name="image"
         />
-        {/* <View style={styles.clearButtonWrapper}>
+        <View style={styles.clearButtonWrapper}>
           <IconButton
             onPress={() => this.ClearActionSheet.show()}
             size={20}
@@ -155,7 +172,7 @@ export default class MarkdownEditorView extends Component {
             iconType="FontAwesome"
             name="trash"
           />
-        </View> */}
+        </View>
         {/* TODO: After alpha */}
         {/* <DropdownButton
           style={styles.dropdownStyle}

src/components/modal/view/modalStyles.js

@@ -38,6 +38,5 @@ export default EStyleSheet.create({
   },
   safeArea: {
     backgroundColor: '$primaryBackgroundColor',
-    flex: 1,
   },
 });

src/components/posts/view/postsView.js

@@ -93,17 +93,12 @@ class PostsView extends Component {
     let newPosts = [];
 
     this.setState({ isLoading: true });
-    if ((!filter && tag) || filter === 'feed' || filter === 'blog' || getFor === 'blog') {
+    if (tag || filter === 'feed' || filter === 'blog' || getFor === 'blog') {
       options = {
         tag,
         limit: 3,
       };
-    } else if (filter == 'reblogs') {
+    } else if (filter === 'reblogs') {
-      options = {
-        tag,
-        limit: 3,
-      };
-    } else if (tag) {
       options = {
         tag,
         limit: 3,

src/components/searchInput/view/searchInputStyles.js

@@ -2,6 +2,7 @@ import EStyleSheet from 'react-native-extended-stylesheet';
 
 export default EStyleSheet.create({
   inputWrapper: {
+    marginTop: 20,
     backgroundColor: '$primaryLightBackground',
     flexDirection: 'row',
     height: 44,
@@ -10,9 +11,6 @@ export default EStyleSheet.create({
     justifyContent: 'center',
     marginHorizontal: 16,
   },
-  safeArea: {
-    marginTop: 20,
-  },
   icon: {
     alignSelf: 'center',
     color: '$iconColor',

src/components/searchInput/view/searchInputView.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, SafeAreaView } from 'react-native';
+import { SafeAreaView } from 'react-native';
 
 // Components
 import { Icon } from '../../icon';
@@ -11,31 +11,36 @@ import styles from './searchInputStyles';
 
 /* Props
  * ------------------------------------------------
- *   @prop { type }    name                - Description....
+ *   @prop { func }    onChangeText            - The function will trigger when input on change
+ *   @prop { func }    handleOnModalClose      - Handle on click method for close button
+ *   @prop { string }  placeholder             - Placeholder for input
+ *   @prop { bool }    editable                - Editable value for input. Default value is true.
  */
 const SearchInputView = ({
-  onChangeText, handleOnModalClose, placeholder, editable = true, autoFocus = true,
+  onChangeText,
+  handleOnModalClose,
+  placeholder,
+  editable = true,
+  autoFocus = true,
 }) => (
-  <SafeAreaView style={styles.safeArea}>
+  <SafeAreaView style={styles.inputWrapper}>
-    <View style={styles.inputWrapper}>
+    <Icon style={styles.icon} iconType="FontAwesome" name="search" size={15} />
-      <Icon style={styles.icon} iconType="FontAwesome" name="search" size={15} />
+    <TextInput
-      <TextInput
+      style={styles.input}
-        style={styles.input}
+      onChangeText={text => onChangeText(text)}
-        onChangeText={text => onChangeText(text)}
+      placeholder={placeholder}
-        placeholder={placeholder}
+      placeholderTextColor="#c1c5c7"
-        placeholderTextColor="#c1c5c7"
+      autoCapitalize="none"
-        autoCapitalize="none"
+      autoFocus={autoFocus}
-        autoFocus={autoFocus}
+      editable={editable}
-        editable={editable}
+    />
-      />
+    <IconButton
-      <IconButton
+      iconStyle={styles.closeIcon}
-        iconStyle={styles.closeIcon}
+      iconType="Ionicons"
-        iconType="Ionicons"
+      style={styles.closeIconButton}
-        style={styles.closeIconButton}
+      name="ios-close-circle-outline"
-        name="ios-close-circle-outline"
+      onPress={() => handleOnModalClose()}
-        onPress={() => handleOnModalClose()}
+    />
-      />
-    </View>
   </SafeAreaView>
 );
 

src/components/searchModal/view/searchModalStyles.js

@@ -53,6 +53,12 @@ export default EStyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
   },
+  searchItemImageWrapper: {
+    flex: 1,
+  },
+  searchItemTextWrapper: {
+    flex: 7,
+  },
   searchItemImage: {
     width: 40,
     height: 40,

src/components/searchModal/view/searchModalView.js

@@ -59,7 +59,7 @@ class SearchModalView extends PureComponent {
               renderItem={({ item }) => (
                 <TouchableHighlight onPress={() => handleOnPressListItem(searchResults.type, item)}>
                   <View style={styles.searhItems}>
-                    <View style={{ flex: 1 }}>
+                    <View style={styles.searchItemImageWrapper}>
                       {item.image && (
                         <FastImage
                           source={{
@@ -69,7 +69,7 @@ class SearchModalView extends PureComponent {
                         />
                       )}
                     </View>
-                    <View style={{ flex: 7 }}>
+                    <View style={styles.searchItemTextWrapper}>
                       {item.text && <Text style={styles.searchItemText}>{item.text}</Text>}
                     </View>
                   </View>

src/config/locales/fa-IR.json

@@ -201,9 +201,9 @@
     "no_existing_post": "پستی موجود نیست"
   },
   "comment_filter": {
-    "trending": "trending",
+    "trending": "پرطرفدار",
-    "reputation": "reputation",
+    "reputation": "شهرت",
-    "votes": "votes",
+    "votes": "رأی‌ ها",
-    "age": "age"
+    "age": "سن"
   }
 }

src/config/locales/id-ID.json

@@ -79,7 +79,7 @@
     "cancel": "batal",
     "login": "MASUK",
     "steemconnect_description": "Jika Anda tidak ingin menyimpan sandi Anda dienkripsi dan disimpan pada perangkat Anda, Anda dapat menggunakan Steemconnect.",
-    "steemconnect_fee_description": "Steemconnect may charge some fees from your reward transactions"
+    "steemconnect_fee_description": "Steemconnect dapat membebankan beberapa biaya dari transaksi hadiah Anda"
   },
   "home": {
     "feed": "Umpan",
@@ -201,9 +201,9 @@
     "no_existing_post": "Tidak ada post yang ada"
   },
   "comment_filter": {
-    "trending": "trending",
+    "trending": "Trending",
-    "reputation": "reputation",
+    "reputation": "reputasi",
-    "votes": "votes",
+    "votes": "berikan suara",
-    "age": "age"
+    "age": "usia"
   }
 }

src/config/locales/index.js

@@ -6,6 +6,9 @@ export default {
   'it-IT': require('./it-IT.json'),
   'ru-RU': require('./ru-RU.json'),
   'tr-TR': require('./tr-TR.json'),
+  'ko-KR': require('./ko-KR.json'),
+  'lt-LT': require('./lt-LT.json'),
+  'pt-PT': require('./pt-PT.json'),
 };
 
 export const locales = [
@@ -16,4 +19,7 @@ export const locales = [
   { id: 'iT-IT', name: 'Italian' },
   { id: 'ru-RU', name: 'Русский' },
   { id: 'tr-TR', name: 'Türkçe' },
+  { id: 'ko-KR', name: 'Korean' },
+  { id: 'lt-LT', name: 'Lithuanian' },
+  { id: 'pt-PT', name: 'Porteguese' },
 ];

src/config/locales/tr-TR.json

@@ -79,7 +79,7 @@
     "cancel": "geç",
     "login": "GİRİŞ",
     "steemconnect_description": "Eğer kullanıçı bilgilerini şifreli olarak tutulmasını istemiyorsanız Steemconnect ilede giriş yapabilirsiniz.",
-    "steemconnect_fee_description": "Steemconnect may charge some fees from your reward transactions"
+    "steemconnect_fee_description": "Not: Steemconnect ödül işlemlerinde bazı ücretler alabilir"
   },
   "home": {
     "feed": "Akış",
@@ -115,8 +115,8 @@
     "reply_placeholder": "Yukarıdaki yazi hakkinda nasil bir cevap yazmak istersin?",
     "publish": "Yayınla",
     "reply": "Cevapla",
-    "open_galery": "Open Galery",
+    "open_galery": "Gariyi Aç",
-    "capture_photo": "Capture a photo"
+    "capture_photo": "Bir fotoğraf yakala"
   },
   "pincode": {
     "enter_text": "Açmak için pin kodunu giriniz",
@@ -137,8 +137,8 @@
     "warning": "Uyarı",
     "invalid_pincode": "Geçersiz pin gözden geçirip yeniden deneyin.",
     "remove_alert": "Kaldırmak istediğine emin misin ?",
-    "clear_alert": "Are you sure you want to clear?",
+    "clear_alert": "Silmek istediğinizden emin misiniz?",
-    "clear": "Clear",
+    "clear": "Temizle",
     "cancel": "Vazgeç",
     "delete": "Temizle",
     "copied": "Kopyalandı",
@@ -166,7 +166,7 @@
     "empty_list": "Burada hiçbir şey yok",
     "deleted": "Yer işareti kaldırıldı",
     "search": "Yer imlerinde ara",
-    "added": "Added to bookmarks",
+    "added": "Yer imlerine eklendi",
     "add": "Yerimlerine ekle"
   },
   "favorites": {
@@ -198,12 +198,12 @@
   },
   "deep_link": {
     "no_existing_user": "Kullanici Bulunamadi",
-    "no_existing_post": "Boyle bir icerik yok"
+    "no_existing_post": "Kullanici Bulunamadi"
   },
   "comment_filter": {
-    "trending": "trending",
+    "trending": "öne çıkanlar",
-    "reputation": "reputation",
+    "reputation": "itibar",
-    "votes": "votes",
+    "votes": "oylar",
-    "age": "age"
+    "age": "yaş"
   }
 }

src/constants/options/language.js

@@ -1,3 +1,23 @@
-export default ['Deutsche', 'English', 'Hungarian', 'Indonesian', 'Russian', 'Turkish'];
+export default [
+  'Deutsche',
+  'English',
+  'Hungarian',
+  'Indonesian',
+  'Korean',
+  'Lithuanian',
+  'Porteguese',
+  'Russian',
+  'Turkish',
+];
 
-export const VALUE = ['de-DE', 'en-US', 'hu-HU', 'id-ID', 'ru-RU', 'tr-TR'];
+export const VALUE = [
+  'de-DE',
+  'en-US',
+  'hu-HU',
+  'id-ID',
+  'ko-KR',
+  'lt-LT',
+  'pt-PT',
+  'ru-RU',
+  'tr-TR',
+];

src/screens/application/container/applicationContainer.js

@@ -10,7 +10,7 @@ import { NavigationActions } from 'react-navigation';
 import { bindActionCreators } from 'redux';
 import Push from 'appcenter-push';
 
-// Constants
+// Languages
 import en from 'react-intl/locale-data/en';
 import id from 'react-intl/locale-data/id';
 import ru from 'react-intl/locale-data/ru';
@@ -18,7 +18,11 @@ import de from 'react-intl/locale-data/de';
 import it from 'react-intl/locale-data/it';
 import hu from 'react-intl/locale-data/hu';
 import tr from 'react-intl/locale-data/tr';
+import ko from 'react-intl/locale-data/ko';
+import lt from 'react-intl/locale-data/lt';
+import pt from 'react-intl/locale-data/pt';
 
+// Constants
 import AUTH_TYPE from '../../../constants/authType';
 
 // Services
@@ -67,7 +71,7 @@ import {
 import ApplicationScreen from '../screen/applicationScreen';
 import { Launch } from '../..';
 
-addLocaleData([...en, ...ru, ...de, ...id, ...it, ...hu, ...tr]);
+addLocaleData([...en, ...ru, ...de, ...id, ...it, ...hu, ...tr, ...ko, ...pt, ...lt]);
 
 class ApplicationContainer extends Component {
   constructor() {

src/screens/bookmarks/screen/bookmarksScreen.js

@@ -50,7 +50,7 @@ class BookmarksScreen extends Component {
           index={index}
           isClickable
           text={text}
-          username={item.author}
+          username={isFavorites ? item.account : item.author}
         />
       );
     }

src/screens/editor/screen/editorScreen.js

@@ -39,7 +39,7 @@ class EditorScreen extends Component {
 
   // Component Life Cycles
   componentWillReceiveProps = (nextProps) => {
-    const { draftPost } = this.props;
+    const { draftPost, isUploading } = this.props;
 
     if (nextProps.draftPost && draftPost !== nextProps.draftPost) {
       this.setState({
@@ -48,6 +48,10 @@ class EditorScreen extends Component {
         },
       });
     }
+
+    if (isUploading !== nextProps) {
+      this._handleFormUpdate();
+    }
   };
 
   // Component Functions
@@ -107,7 +111,7 @@ class EditorScreen extends Component {
     }
   };
 
-  _handleIsFormValid = () => {
+  _handleIsFormValid = (bodyText) => {
     const { fields } = this.state;
     const { isReply } = this.props;
     let _isFormValid;
@@ -118,9 +122,8 @@ class EditorScreen extends Component {
       _isFormValid = fields
         && fields.title
         && fields.title.length > 0
-        && fields.body
+        && ((fields.body && fields.body.length > 0 && fields.tags.length > 0)
-        && fields.body.length > 0
+          || (bodyText && bodyText.length > 0));
-        && fields.tags.length > 0;
     }
 
     this.setState({ isFormValid: _isFormValid });
@@ -215,6 +218,9 @@ class EditorScreen extends Component {
             componentID="body"
             draftBody={fields && fields.body}
             handleOnTextChange={this._setWordsCount}
+            handleFormUpdate={this._handleFormUpdate}
+            handleIsFormValid={this._handleIsFormValid}
+            isFormValid={isFormValid}
             handleOpenImagePicker={handleOnImagePicker}
             intl={intl}
             uploadedImage={uploadedImage}

src/screens/profile/container/profileContainer.js

@@ -56,7 +56,7 @@ class ProfileContainer extends Component {
       return;
     }
 
-    if (selectedUser && selectedUser.username) {
+    if (selectedUser && selectedUser.username && selectedUser.username !== currentAccount.name) {
       this._loadProfile(selectedUser.username);
 
       if (selectedUser.username) {

src/screens/searchResult/screen/searchResultScreen.js

@@ -1,4 +1,4 @@
-import React, { PureComponent, Fragment } from 'react';
+import React, { PureComponent } from 'react';
 import { View } from 'react-native';
 import ScrollableTabView from '@esteemapp/react-native-scrollable-tab-view';
 import { injectIntl } from 'react-intl';
@@ -22,35 +22,33 @@ class SearchResultScreen extends PureComponent {
     const { intl, tag, navigationGoBack } = this.props;
 
     return (
-      <Fragment>
+      <View style={styles.container}>
-        <View style={styles.container}>
+        <SearchInput
-          <SearchInput
+          onChangeText={() => {}}
-            onChangeText={text => console.log('text :', text)}
+          handleOnModalClose={navigationGoBack}
-            handleOnModalClose={navigationGoBack}
+          placeholder={`#${tag}`}
-            placeholder={`#${tag}`}
+          editable={false}
-            editable={false}
+        />
-            autoFocus={false}
+        <ScrollableTabView
-          />
+          style={globalStyles.tabView}
-          <ScrollableTabView
+          renderTabBar={() => (
-            style={globalStyles.tabView}
+            <TabBar
-            renderTabBar={() => (
+              style={styles.tabbar}
-              <TabBar
+              tabUnderlineDefaultWidth={80}
-                style={styles.tabbar}
+              tabUnderlineScaleX={2}
-                tabUnderlineDefaultWidth={80}
+              tabBarPosition="overlayTop"
-                tabUnderlineScaleX={2}
+            />
-                tabBarPosition="overlayTop"
+          )}
-              />
+        >
-            )}
+          <View
+            tabLabel={intl.formatMessage({
+              id: 'search.posts',
+            })}
+            style={styles.tabbarItem}
           >
-            <View
+            <Posts pageType="posts" tag={tag} />
-              tabLabel={intl.formatMessage({
+          </View>
-                id: 'search.posts',
+          {/* <View
-              })}
-              style={styles.tabbarItem}
-            >
-              <Posts pageType="posts" tag={tag} />
-            </View>
-            {/* <View
               tabLabel={intl.formatMessage({
                 id: 'search.comments',
               })}
@@ -63,9 +61,8 @@ class SearchResultScreen extends PureComponent {
                 pageType="posts"
               />
             </Fragment> */}
-          </ScrollableTabView>
+        </ScrollableTabView>
-        </View>
+      </View>
-      </Fragment>
     );
   }
 }