Make all avatars square with rounded corners

Fixes #205
zulip · Jan 15, 2017 · 9dc8f09 · 9dc8f09
1 parent 12fa5ff
commit 9dc8f09
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/common/ImageAvatar.js b/src/common/ImageAvatar.js
@@ -5,11 +5,11 @@ import {
 
 import { Touchable } from './';
 
-export default({ avatarUrl, size, onPress }) => {
+export default({ avatarUrl, size, isCircular, onPress }) => {
   const style = {
     height: size,
     width: size,
-    borderRadius: size / 2,
+    borderRadius: isCircular ? size / 2 : size / 8,
   };
 
   return (

diff --git a/src/common/TextAvatar.js b/src/common/TextAvatar.js
@@ -17,13 +17,13 @@ export const colorHashFromName = (name: string) => {
 export const initialsFromName = (name: string) =>
   name.match(/\S+\s*/g).map(x => x[0].toUpperCase()).join('');
 
-export default ({ name, size, onPress }) => {
+export default ({ name, size, isCircular, onPress }) => {
   const frameStyle = {
     justifyContent: 'center',
     alignItems: 'center',
     height: size,
     width: size,
-    borderRadius: size / 2,
+    borderRadius: isCircular ? size / 2 : size / 8,
     backgroundColor: colorHashFromName(name),
   };
   const textStyle = {

diff --git a/src/message/MessageLoading.js b/src/message/MessageLoading.js
@@ -15,7 +15,7 @@ const styles = StyleSheet.create({
   },
   avatar: {
     backgroundColor: '#ddd',
-    borderRadius: 16,
+    borderRadius: 32 / 8,
     width: 32,
     height: 32,
   },

diff --git a/src/message/Subheader.js b/src/message/Subheader.js
@@ -11,7 +11,7 @@ import Timestamp from './Timestamp';
 const styles = StyleSheet.create({
   subheader: {
     flex: 1,
-    flexBasis: 25,
+    flexBasis: 20,
     flexDirection: 'row',
     justifyContent: 'space-between',
   },