@momo-kits/avatar 0.0.7 → 0.0.12

package/Avatar.js

@@ -2,7 +2,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import {
-    View, StyleSheet, TouchableOpacity, Dimensions
+    View, StyleSheet, TouchableOpacity, Dimensions, Platform
 } from 'react-native';
 import { get, isEqual } from 'lodash';
 import {
@@ -317,7 +317,7 @@ const shortName = (width) => ({
 export default class Avatar extends Component {
     constructor(props) {
         super(props);
-        this.color = this.getAvatarColor();
+        this.color = this.getAvatarColor(props.name);
         this.state = {
             hideSource: false,
             ownUpdate: false,
@@ -333,7 +333,7 @@ export default class Avatar extends Component {
             this.subscription = Dimensions.addEventListener(
                 'change',
                 ({ window }) => {
-                    if(window?.height > 0 && window?.width > 0) {
+                    if(window?.height > 0 && window?.width > 0 && Platform.OS === 'android') {
                         this.setState({ dimensions: window });
                     }
                 }
@@ -518,14 +518,13 @@ export default class Avatar extends Component {
         );
     }
 
-    getAvatarColor() {
-        const { source } = this.props;
-        const number = Math.abs(this.hashUrl(source));
-        if (number && !isNaN(Number(number))) {
-            const colorIndex = Number(number) % COLORS.length;
-            return COLORS[colorIndex];
-        }
-        return '#d5d6d6';
+    getAvatarColor(name) {
+        const shortName = this.getContactShortName(name)
+        if (!shortName) return "#d5d6d6"
+        const firstLetter = shortName[0].charCodeAt(0)
+        let colorIndex = Number(firstLetter) % 26
+        if (colorIndex > 19) colorIndex = 25 - colorIndex
+        return COLORS[colorIndex]
     }
 
     onPress = () => {

package/Avatar.web.js

@@ -293,6 +293,7 @@ const shortName = (width) => ({
 export default class Avatar extends Component {
     constructor(props) {
         super(props);
+        this.color = this.getAvatarColor(props.name);
         this.state = {
             hideSource: false,
             ownUpdate: false,
@@ -440,6 +441,16 @@ export default class Avatar extends Component {
         };
     }
 
+    getAvatarColor(name) {
+        const shortName = this.getContactShortName(name)
+        if (!shortName) return "#d5d6d6"
+        const firstLetter = shortName[0].charCodeAt(0)
+        let colorIndex = Number(firstLetter) % 26
+        if (colorIndex > 19) colorIndex = 25 - colorIndex
+        return COLORS[colorIndex]
+    }
+
+
     onLoadSourceError = () => {
         this.setState({ hideSource: true, ownUpdate: true });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/avatar",
-  "version": "0.0.7",
+  "version": "0.0.12",
   "private": false,
   "main": "index.js",
   "dependencies": {},