@plusscommunities/pluss-circles-app 8.0.4 → 8.0.6-beta.0

package/src/components/notifications/GroupMessage.js

@@ -1,114 +1,122 @@
-import React, { Component } from 'react';
-import { Text, View, TouchableOpacity, StyleSheet } from 'react-native';
-import { connect } from 'react-redux';
-import _ from 'lodash';
-import { ProfilePic } from '../common';
-import { TEXT_DARK, TEXT_LIGHT, getFirstName } from '../../js';
-import { updateNavRead, clearGroupCounter } from '../../actions';
-import NavigationService from '../../js/NavigationService';
-import { values } from '../../values.config';
+import React, { Component } from "react";
+import { Text, View, TouchableOpacity, StyleSheet } from "react-native";
+import { connect } from "react-redux";
+import _ from "lodash";
+import { ProfilePic } from "../common";
+import { TEXT_DARK, TEXT_LIGHT, getFirstName } from "../../js";
+import { updateNavRead, clearGroupCounter } from "../../actions";
+import NavigationService from "../../js/NavigationService";
+import { values } from "../../values.config";
 
 class GroupMessage extends Component {
-  onPressChat = message => {
-    // if (message.isPrivate) {
-    //   // TODO: No need to handle?
-    //   NavigationService.navigate('profile', {
-    //     user: {
-    //       ...message.PrivateChatUser,
-    //       key: message.PrivateChatUser ? message.PrivateChatUser.userId : '',
-    //       id: message.PrivateChatUser ? message.PrivateChatUser.userId : '',
-    //     },
-    //   });
-    // } else {
-    this.props.updateNavRead({ openedNotifs: true });
-    this.props.clearGroupCounter(message.Id, this.props.user.uid);
-    NavigationService.navigate(values.screenCircleChat, { chat: message });
-    // }
-  };
+	onPressChat = (message) => {
+		// if (message.isPrivate) {
+		//   // TODO: No need to handle?
+		//   NavigationService.navigate('profile', {
+		//     user: {
+		//       ...message.PrivateChatUser,
+		//       key: message.PrivateChatUser ? message.PrivateChatUser.userId : '',
+		//       id: message.PrivateChatUser ? message.PrivateChatUser.userId : '',
+		//     },
+		//   });
+		// } else {
+		this.props.updateNavRead({ openedNotifs: true });
+		this.props.clearGroupCounter(message.Id, this.props.user.uid);
+		NavigationService.navigate(values.screenCircleChat, { chat: message });
+		// }
+	};
 
-  getChatImage = chat => {
-    if (!_.isEmpty(chat.Thumbnail)) {
-      return chat.Thumbnail;
-    }
-    if (!_.isEmpty(chat.Image)) {
-      return chat.Image;
-    }
-    if (chat.IsPrivate) {
-      const otherUser = _.find(chat.Audience || [], u => {
-        return u.userId !== this.props.user.Id;
-      });
-      if (otherUser) {
-        return otherUser.profilePic;
-      }
-    }
-    return null;
-  };
+	getChatImage = (chat) => {
+		if (!_.isEmpty(chat.Thumbnail)) {
+			return chat.Thumbnail;
+		}
+		if (!_.isEmpty(chat.Image)) {
+			return chat.Image;
+		}
+		if (chat.IsPrivate) {
+			const otherUser = _.find(chat.Audience || [], (u) => {
+				return u.userId !== this.props.user.Id;
+			});
+			if (otherUser) {
+				return otherUser.profilePic;
+			}
+		}
+		return null;
+	};
 
-  render() {
-    const { message, index } = this.props;
+	render() {
+		const { message, index } = this.props;
 
-    const chatImage = this.getChatImage(message);
-    return (
-      <View key={index} style={styles.notifWrapper}>
-        <TouchableOpacity activeOpacity={0.9} onPress={() => this.onPressChat(message)}>
-          <View style={styles.notifInner}>
-            <View
-              style={{
-                marginRight: 16,
-              }}
-            >
-              <ProfilePic Diameter={40} ProfilePic={chatImage} />
-            </View>
-            <View style={{ flex: 1 }}>
-              <Text style={styles.notifInner_title}>
-                {message.Title
-                  ? `New message in ${message.Title}`
-                  : `Message from ${message?.lastMessage?.user?.name ? message.lastMessage.user.name : ''}`}
-              </Text>
-              <Text style={styles.notifInner_text}>
-                {message.isPrivate
-                  ? `${message.lastMessage?.text || ''}`.substring(0, 150)
-                  : `${getFirstName(message.lastMessage?.user?.name || 'Someone')} posted: ${message.lastMessage?.text || ''}`.substring(0, 100)}
-              </Text>
-            </View>
-          </View>
-        </TouchableOpacity>
-      </View>
-    );
-  }
+		const chatImage = this.getChatImage(message);
+		return (
+			<View key={index} style={styles.notifWrapper}>
+				<TouchableOpacity
+					activeOpacity={0.9}
+					onPress={() => this.onPressChat(message)}
+				>
+					<View style={styles.notifInner}>
+						<View
+							style={{
+								marginRight: 16,
+							}}
+						>
+							<ProfilePic Diameter={40} ProfilePic={chatImage} />
+						</View>
+						<View style={{ flex: 1 }}>
+							<Text style={styles.notifInner_title}>
+								{message.Title
+									? `New message in ${message.Title}`
+									: `Message from ${message?.lastMessage?.user?.name ? message.lastMessage.user.name : ""}`}
+							</Text>
+							<Text style={styles.notifInner_text}>
+								{message.isPrivate
+									? `${message.lastMessage?.text || ""}`.substring(0, 150)
+									: `${getFirstName(message.lastMessage?.user?.name || "Someone")} posted: ${message.lastMessage?.text || ""}`.substring(
+											0,
+											100,
+										)}
+							</Text>
+						</View>
+					</View>
+				</TouchableOpacity>
+			</View>
+		);
+	}
 }
 
 const styles = StyleSheet.create({
-  notifWrapper: {
-    width: '100%',
-    padding: 16,
-    paddingBottom: 0,
-    backgroundColor: '#fff',
-  },
-  notifInner: {
-    paddingBottom: 16,
-    flexDirection: 'row',
-    borderBottomWidth: 1,
-    borderBottomColor: 'rgb(235, 239, 242)',
-  },
-  notifInner_title: {
-    fontSize: 14,
-    fontFamily: 'sf-semibold',
-    color: TEXT_DARK,
-  },
-  notifInner_text: {
-    marginTop: 4,
-    fontSize: 12,
-    lineHeight: 14,
-    fontFamily: 'sf-regular',
-    color: TEXT_LIGHT,
-  },
+	notifWrapper: {
+		width: "100%",
+		padding: 16,
+		paddingBottom: 0,
+		backgroundColor: "#fff",
+	},
+	notifInner: {
+		paddingBottom: 16,
+		flexDirection: "row",
+		borderBottomWidth: 1,
+		borderBottomColor: "rgb(235, 239, 242)",
+	},
+	notifInner_title: {
+		fontSize: 14,
+		fontFamily: "sf-semibold",
+		color: TEXT_DARK,
+	},
+	notifInner_text: {
+		marginTop: 4,
+		fontSize: 12,
+		lineHeight: 14,
+		fontFamily: "sf-regular",
+		color: TEXT_LIGHT,
+	},
 });
 
-const mapStateToProps = state => {
-  return {
-    user: state.user,
-  };
+const mapStateToProps = (state) => {
+	return {
+		user: state.user,
+	};
 };
 
-export default connect(mapStateToProps, { updateNavRead, clearGroupCounter })(GroupMessage);
+export default connect(mapStateToProps, { updateNavRead, clearGroupCounter })(
+	GroupMessage,
+);

package/src/components/takeover/TakeoverBackground.js

@@ -1,26 +1,32 @@
-import React, { PureComponent } from 'react';
-import { View } from 'react-native';
+import React, { PureComponent } from "react";
+import { View } from "react-native";
 
 class TakeoverBackground extends PureComponent {
-  render() {
-    return (
-      <View style={[styles.container, this.props.style, this.props.colour && { backgroundColor: this.props.colour }]}>
-        {this.props.children}
-      </View>
-    );
-  }
+	render() {
+		return (
+			<View
+				style={[
+					styles.container,
+					this.props.style,
+					this.props.colour && { backgroundColor: this.props.colour },
+				]}
+			>
+				{this.props.children}
+			</View>
+		);
+	}
 }
 
 const styles = {
-  container: {
-    flex: 1,
-    position: 'relative',
-    backgroundColor: '#fff',
-  },
-  image: {
-    flex: 1,
-    position: 'relative',
-  },
+	container: {
+		flex: 1,
+		position: "relative",
+		backgroundColor: "#fff",
+	},
+	image: {
+		flex: 1,
+		position: "relative",
+	},
 };
 
 export default TakeoverBackground;

package/src/config/index.js

@@ -1,9 +1,9 @@
-import { Config } from '../core.config';
-import { values } from '../values.config';
+import { Config } from "../core.config";
+import { values } from "../values.config";
 
 export const CONST_STRINGS = {
-  EMPTY_GROUPS: values.textEmptyGroups,
-  EMPTY_PEOPLE: values.textEmptyPeople,
+	EMPTY_GROUPS: values.textEmptyGroups,
+	EMPTY_PEOPLE: values.textEmptyPeople,
 };
 export const getTinyChatDefault = () => Config.env.tinyChatDefault;
 export const getNewEventDefaults = () => Config.env.newEventDefaults;

package/src/core.config.js

@@ -1,5 +1,29 @@
 // import * as PlussCore from '../../pluss-core/src';
-import * as PlussCore from '@plusscommunities/pluss-core-app';
+import * as PlussCore from "@plusscommunities/pluss-core-app";
 
-const { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours } = PlussCore;
-export { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours };
+const {
+	Apis,
+	Fonts,
+	Actions,
+	ActionTypes,
+	Config,
+	Components,
+	Styles,
+	Session,
+	Helper,
+	Constants,
+	Colours,
+} = PlussCore;
+export {
+	Apis,
+	Fonts,
+	Actions,
+	ActionTypes,
+	Config,
+	Components,
+	Styles,
+	Session,
+	Helper,
+	Constants,
+	Colours,
+};