Fixed pr comment requirements

This commit is contained in:
Mustafa Buyukcelebi 2019-02-27 23:47:10 +03:00
parent cfad357871
commit dda2c365b5
6 changed files with 61 additions and 63 deletions

View File

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

View File

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

View File

@ -11,13 +11,15 @@ import styles from './searchInputStyles';
/* Props /* 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 = ({ const SearchInputView = ({
onChangeText, handleOnModalClose, placeholder, editable = true, onChangeText, handleOnModalClose, placeholder, editable = 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}
@ -35,7 +37,6 @@ const SearchInputView = ({
name="ios-close-circle-outline" name="ios-close-circle-outline"
onPress={() => handleOnModalClose()} onPress={() => handleOnModalClose()}
/> />
</View>
</SafeAreaView> </SafeAreaView>
); );

View File

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

View File

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

View File

@ -22,10 +22,9 @@ class SearchResultScreen extends PureComponent {
const { intl, tag, navigationGoBack } = this.props; const { intl, tag, navigationGoBack } = this.props;
return ( return (
<Fragment>
<View style={styles.container}> <View style={styles.container}>
<SearchInput <SearchInput
onChangeText={text => console.log('text :', text)} onChangeText={() => {}}
handleOnModalClose={navigationGoBack} handleOnModalClose={navigationGoBack}
placeholder={tag} placeholder={tag}
editable={false} editable={false}
@ -64,7 +63,6 @@ class SearchResultScreen extends PureComponent {
</Fragment> */} </Fragment> */}
</ScrollableTabView> </ScrollableTabView>
</View> </View>
</Fragment>
); );
} }
} }