Merge pull request GetStream#254 from BetterSocial/feat/credder

Feat/credder
kevinnath1007 · Jun 7, 2022 · 67d454c · 67d454c
2 parents 407870c + 64770ca
commit 67d454c
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 19 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         applicationId "org.bettersocial"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 62
-        versionName "1.28.1"
+        versionCode 67
+        versionName "1.28.7"
     }
     splits {
         abi {

diff --git a/src/components/Card/Card.js b/src/components/Card/Card.js
@@ -115,7 +115,7 @@ Card.propTypes = {
 const styles = StyleSheet.create({
   credderRating: {
     // height: 24,
-    height: 15,
+    height: 16,
     alignSelf: 'center',
   },
   link: {

diff --git a/src/components/CredderRating/FeedCredderRating.js b/src/components/CredderRating/FeedCredderRating.js
@@ -26,7 +26,7 @@ const FeedCredderRating = ({ containerStyle = {}, iconSize = 14, scoreSize = 16,
 
     return <View style={{ ...styles.credderRatingContainer, ...containerStyle }}>
         {__renderCredderRatingIcon()}
-        <Text style={styles.credderRating(scoreSize)}>{__renderCredderRatingScore()}</Text>
+        <Text style={styles.credderRating(scoreSize, score)}>{__renderCredderRatingScore()}</Text>
     </View >
 }
 
@@ -36,14 +36,18 @@ const styles = StyleSheet.create({
     credderIcon: {
         alignSelf: "center",
     },
-    credderRating: (fontSize) => {
+    credderRating: (fontSize, score) => {
         return {
             fontSize,
-            fontFamily: fonts.inter[500],
-            color: COLORS.black,
+            fontFamily: fonts.inter[400],
+            color: COLORS.gray4,
             alignSelf: 'center',
-            textAlign: 'center',
+            // textAlign: 'center',
             marginLeft: 4,
+            lineHeight: 15,
+            // marginTop: 0,
+            marginTop: (!score || score < 0) ? -1.2 : 0,
+            // backgroundColor: 'red',
         }
     },
     credderRatingContainer: {

diff --git a/src/components/Search/SearchModal.js b/src/components/Search/SearchModal.js
@@ -1,18 +1,17 @@
 import * as React from 'react';
+import Modal from 'react-native-modal';
 import {
-  View,
-  Text,
-  StyleSheet,
   Dimensions,
+  StyleSheet,
+  Text,
   TouchableNativeFeedback,
+  View,
 } from 'react-native';
 
-import Modal from 'react-native-modal';
-
+import AutoFocusTextArea from '../TextArea/AutoFocusTextArea';
 import CrossIcon from '../../../assets/icons/cross.svg';
 import StringConstant from '../../utils/string/StringConstant';
 import { displayFormattedSearchLocations } from '../../utils/string/StringUtils';
-import AutoFocusTextArea from '../TextArea/AutoFocusTextArea';
 
 const width = Dimensions.get('screen').width;
 
@@ -55,6 +54,8 @@ const SearchModal = (props) => {
                 value={props.value}
                 placeholder={props.placeholder ? props.placeholder : ''}
                 placeholderTextColor="#BDBDBD"
+                multiline={false}
+                returnKeyType="search"
               />
             </View>
             {props.isLoading ? <Text>Please wait...</Text> : null}

diff --git a/src/navigations/root-stack.js b/src/navigations/root-stack.js
@@ -69,7 +69,7 @@ const RootStact = () => {
       await client?.disconnectUser();
     };
   }, []);
-  console.log('kurama',profileState)
+  // console.log('kurama',profileState)
   return (
     <View
       style={{

diff --git a/src/screens/DiscoveryScreen/elements/Search.js b/src/screens/DiscoveryScreen/elements/Search.js
@@ -157,6 +157,7 @@ const DiscoverySearch = ({onPress, showBackButton = false, onContainerClicked =
             onFocus={() => __handleFocus(true)}
             onBlur={() => __handleFocus(false)}
             multiline={false}
+            returnKeyType="search"
             placeholder={StringConstant.discoverySearchBarPlaceholder}
             placeholderTextColor={COLORS.gray1}
             style={styles.input} />

diff --git a/src/screens/NewsScreen/Header.js b/src/screens/NewsScreen/Header.js
@@ -51,7 +51,7 @@ const Header = ({ image, domain, time, item }) => {
               {new Date(time).toLocaleDateString()}
             </Text>
             <View style={styles.point} />
-            <FeedCredderRating containerStyle={{ height: 15, alignSelf: 'center' }} 
+            <FeedCredderRating containerStyle={{ height: 16, alignSelf: 'center' }} 
               score={item?.domain?.credderScore} scoreSize={12}
               iconSize={16} />
           </View>

diff --git a/src/screens/WebView/HelpCenter.js b/src/screens/WebView/HelpCenter.js
@@ -22,7 +22,7 @@ const HelpCenter = () => {
       <Header title="Help Center" onPress={() => navigator.goBack()}  />
       </SafeAreaView>
       <WebView
-        androidHardwareAccelerationDisabled={true}
+        androidHardwareAccelerationDisabled={false}
         source={{ uri: 'https://bettersocial.org/help' }}
         showsVerticalScrollIndicator={false}
         startInLoadingState={true}

diff --git a/src/screens/WebView/PrivacyPolicies.js b/src/screens/WebView/PrivacyPolicies.js
@@ -22,7 +22,7 @@ const PrivacyPolicies = () => {
       <Header title="Privacy Policies" onPress={() => navigator.goBack()}  />
       </SafeAreaView>
       <WebView
-        androidHardwareAccelerationDisabled={true}
+        androidHardwareAccelerationDisabled={false}
         source={{ uri: 'https://bettersocial.org/privacy' }}
         showsVerticalScrollIndicator={false}
         startInLoadingState={true}

diff --git a/src/screens/WhotoFollow/elements/ItemUser.js b/src/screens/WhotoFollow/elements/ItemUser.js
@@ -49,7 +49,7 @@ const ItemUser = ({photo, username, bio, followed, onPress, userid}) => {
         />
         <View style={styles.containerTextCard}>
           <Text style={styles.textFullName}>{username}</Text>
-          <Text style={styles.textUsername} numberOfLines={1}>{bio ? bio + bio + bio + bio + bio + bio + bio + bio : ''}</Text>
+          <Text style={styles.textUsername} numberOfLines={1}>{bio ? bio : ''}</Text>
         </View>
       </View>
       <View style={styles.containerButton}>

diff --git a/src/utils/theme/index.js b/src/utils/theme/index.js
@@ -20,6 +20,7 @@ export const COLORS = {
   gray: '#6A6A6A',
   gray1: '#C4C4C4',
   gray6: '#F2F2F2',
+  gray4: '#4A4A4A',
   greyseries: '#333333',
   holytosca: '#00ADB5',
   holyTosca: '#00ADB5',