From e6627183e1f0552588893851815f43021b4d610d Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Wed, 28 Sep 2022 14:00:40 -0500
Subject: Switch to one default avi

---
 src/view/com/notifications/FeedItem.tsx     |  7 ++-----
 src/view/com/post-thread/PostLikedBy.tsx    |  7 ++-----
 src/view/com/post-thread/PostRepostedBy.tsx |  8 ++------
 src/view/com/post-thread/PostThreadItem.tsx | 12 +++---------
 src/view/com/post/Post.tsx                  |  7 ++-----
 src/view/com/posts/FeedItem.tsx             |  7 ++-----
 src/view/com/profile/ProfileFollowers.tsx   |  7 ++-----
 src/view/com/profile/ProfileFollows.tsx     |  8 ++------
 src/view/com/profile/ProfileHeader.tsx      |  7 ++-----
 src/view/lib/assets.native.ts               |  7 +------
 src/view/lib/assets.ts                      |  7 +------
 src/view/shell/mobile/accounts-menu.tsx     |  4 ++--
 src/view/shell/mobile/index.tsx             |  4 ++--
 13 files changed, 25 insertions(+), 67 deletions(-)

(limited to 'src')

diff --git a/src/view/com/notifications/FeedItem.tsx b/src/view/com/notifications/FeedItem.tsx
index 795c13dfb..1eca3806f 100644
--- a/src/view/com/notifications/FeedItem.tsx
+++ b/src/view/com/notifications/FeedItem.tsx
@@ -6,7 +6,7 @@ import {FontAwesomeIcon, Props} from '@fortawesome/react-native-fontawesome'
 import {NotificationsViewItemModel} from '../../../state/models/notifications-view'
 import {s, colors} from '../../lib/styles'
 import {ago} from '../../lib/strings'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 import {PostText} from '../post/PostText'
 import {Post} from '../post/Post'
 import {Link} from '../util/Link'
@@ -62,10 +62,7 @@ export const FeedItem = observer(function FeedItem({
     <Link style={styles.outer} href={itemHref} title={itemTitle}>
       <View style={styles.layout}>
         <Link style={styles.layoutAvi} href={authorHref} title={authorTitle}>
-          <Image
-            style={styles.avi}
-            source={AVIS[item.author.name] || AVIS['alice.test']}
-          />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </Link>
         <View style={styles.layoutContent}>
           <View style={styles.meta}>
diff --git a/src/view/com/post-thread/PostLikedBy.tsx b/src/view/com/post-thread/PostLikedBy.tsx
index bfaa52137..fbeb52eea 100644
--- a/src/view/com/post-thread/PostLikedBy.tsx
+++ b/src/view/com/post-thread/PostLikedBy.tsx
@@ -16,7 +16,7 @@ import {
 import {Link} from '../util/Link'
 import {useStores} from '../../../state'
 import {s, colors} from '../../lib/styles'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 
 export const PostLikedBy = observer(function PostLikedBy({uri}: {uri: string}) {
   const store = useStores()
@@ -78,10 +78,7 @@ const LikedByItem = ({item}: {item: LikedByViewItemModel}) => {
     <Link style={styles.outer} href={`/profile/${item.name}`} title={item.name}>
       <View style={styles.layout}>
         <View style={styles.layoutAvi}>
-          <Image
-            style={styles.avi}
-            source={AVIS[item.name] || AVIS['alice.test']}
-          />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </View>
         <View style={styles.layoutContent}>
           <Text style={[s.f15, s.bold]}>{item.displayName}</Text>
diff --git a/src/view/com/post-thread/PostRepostedBy.tsx b/src/view/com/post-thread/PostRepostedBy.tsx
index 1da76da54..6ffe3a2c4 100644
--- a/src/view/com/post-thread/PostRepostedBy.tsx
+++ b/src/view/com/post-thread/PostRepostedBy.tsx
@@ -6,7 +6,6 @@ import {
   Image,
   StyleSheet,
   Text,
-  TouchableOpacity,
   View,
 } from 'react-native'
 import {
@@ -16,7 +15,7 @@ import {
 import {Link} from '../util/Link'
 import {useStores} from '../../../state'
 import {s, colors} from '../../lib/styles'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 
 export const PostRepostedBy = observer(function PostRepostedBy({
   uri,
@@ -84,10 +83,7 @@ const RepostedByItem = ({item}: {item: RepostedByViewItemModel}) => {
     <Link style={styles.outer} href={`/profile/${item.name}`} title={item.name}>
       <View style={styles.layout}>
         <View style={styles.layoutAvi}>
-          <Image
-            style={styles.avi}
-            source={AVIS[item.name] || AVIS['alice.test']}
-          />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </View>
         <View style={styles.layoutContent}>
           <Text style={[s.f15, s.bold]}>{item.displayName}</Text>
diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx
index ebc81d887..8a2034cc6 100644
--- a/src/view/com/post-thread/PostThreadItem.tsx
+++ b/src/view/com/post-thread/PostThreadItem.tsx
@@ -10,7 +10,7 @@ import {Link} from '../util/Link'
 import {PostDropdownBtn} from '../util/DropdownBtn'
 import {s, colors} from '../../lib/styles'
 import {ago, pluralize} from '../../lib/strings'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 import {useStores} from '../../../state'
 
 export const PostThreadItem = observer(function PostThreadItem({
@@ -105,10 +105,7 @@ export const PostThreadItem = observer(function PostThreadItem({
       <View style={styles.outer}>
         <View style={styles.layout}>
           <Link style={styles.layoutAvi} href={authorHref} title={authorTitle}>
-            <Image
-              style={styles.avi}
-              source={AVIS[item.author.name] || AVIS['alice.test']}
-            />
+            <Image style={styles.avi} source={DEF_AVATER} />
           </Link>
           <View style={styles.layoutContent}>
             <View style={[styles.meta, s.mt5]}>
@@ -190,10 +187,7 @@ export const PostThreadItem = observer(function PostThreadItem({
       <Link style={styles.outer} href={itemHref} title={itemTitle}>
         <View style={styles.layout}>
           <Link style={styles.layoutAvi} href={authorHref} title={authorTitle}>
-            <Image
-              style={styles.avi}
-              source={AVIS[item.author.name] || AVIS['alice.test']}
-            />
+            <Image style={styles.avi} source={DEF_AVATER} />
           </Link>
           <View style={styles.layoutContent}>
             <View style={styles.meta}>
diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx
index 2a9cb71fc..cdf938d22 100644
--- a/src/view/com/post/Post.tsx
+++ b/src/view/com/post/Post.tsx
@@ -17,7 +17,7 @@ import {Link} from '../util/Link'
 import {useStores} from '../../../state'
 import {s, colors} from '../../lib/styles'
 import {ago} from '../../lib/strings'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 
 export const Post = observer(function Post({uri}: {uri: string}) {
   const store = useStores()
@@ -82,10 +82,7 @@ export const Post = observer(function Post({uri}: {uri: string}) {
     <Link style={styles.outer} href={itemHref} title={itemTitle}>
       <View style={styles.layout}>
         <Link style={styles.layoutAvi} href={authorHref} title={authorTitle}>
-          <Image
-            style={styles.avi}
-            source={AVIS[item.author.name] || AVIS['alice.test']}
-          />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </Link>
         <View style={styles.layoutContent}>
           <View style={styles.meta}>
diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx
index 31554839f..684b261a8 100644
--- a/src/view/com/posts/FeedItem.tsx
+++ b/src/view/com/posts/FeedItem.tsx
@@ -10,7 +10,7 @@ import {Link} from '../util/Link'
 import {PostDropdownBtn} from '../util/DropdownBtn'
 import {s, colors} from '../../lib/styles'
 import {ago} from '../../lib/strings'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 import {useStores} from '../../../state'
 
 export const FeedItem = observer(function FeedItem({
@@ -59,10 +59,7 @@ export const FeedItem = observer(function FeedItem({
           style={styles.layoutAvi}
           href={authorHref}
           title={item.author.name}>
-          <Image
-            style={styles.avi}
-            source={AVIS[item.author.name] || AVIS['alice.test']}
-          />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </Link>
         <View style={styles.layoutContent}>
           <View style={styles.meta}>
diff --git a/src/view/com/profile/ProfileFollowers.tsx b/src/view/com/profile/ProfileFollowers.tsx
index e6ad30d7f..24f28f645 100644
--- a/src/view/com/profile/ProfileFollowers.tsx
+++ b/src/view/com/profile/ProfileFollowers.tsx
@@ -15,7 +15,7 @@ import {
 import {Link} from '../util/Link'
 import {useStores} from '../../../state'
 import {s, colors} from '../../lib/styles'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 
 export const ProfileFollowers = observer(function ProfileFollowers({
   name,
@@ -81,10 +81,7 @@ const User = ({item}: {item: FollowerItem}) => {
     <Link style={styles.outer} href={`/profile/${item.name}`} title={item.name}>
       <View style={styles.layout}>
         <View style={styles.layoutAvi}>
-          <Image
-            style={styles.avi}
-            source={AVIS[item.name] || AVIS['alice.test']}
-          />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </View>
         <View style={styles.layoutContent}>
           <Text style={[s.f15, s.bold]}>{item.displayName}</Text>
diff --git a/src/view/com/profile/ProfileFollows.tsx b/src/view/com/profile/ProfileFollows.tsx
index 83ada4b77..719765edf 100644
--- a/src/view/com/profile/ProfileFollows.tsx
+++ b/src/view/com/profile/ProfileFollows.tsx
@@ -6,7 +6,6 @@ import {
   Image,
   StyleSheet,
   Text,
-  TouchableOpacity,
   View,
 } from 'react-native'
 import {
@@ -16,7 +15,7 @@ import {
 import {useStores} from '../../../state'
 import {Link} from '../util/Link'
 import {s, colors} from '../../lib/styles'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 
 export const ProfileFollows = observer(function ProfileFollows({
   name,
@@ -82,10 +81,7 @@ const User = ({item}: {item: FollowItem}) => {
     <Link style={styles.outer} href={`/profile/${item.name}`} title={item.name}>
       <View style={styles.layout}>
         <View style={styles.layoutAvi}>
-          <Image
-            style={styles.avi}
-            source={AVIS[item.name] || AVIS['alice.test']}
-          />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </View>
         <View style={styles.layoutContent}>
           <Text style={[s.f15, s.bold]}>{item.displayName}</Text>
diff --git a/src/view/com/profile/ProfileHeader.tsx b/src/view/com/profile/ProfileHeader.tsx
index 8b30e0f92..fab26bd57 100644
--- a/src/view/com/profile/ProfileHeader.tsx
+++ b/src/view/com/profile/ProfileHeader.tsx
@@ -15,7 +15,7 @@ import {useStores} from '../../../state'
 import {EditProfileModel} from '../../../state/models/shell'
 import {pluralize} from '../../lib/strings'
 import {s, gradients, colors} from '../../lib/styles'
-import {AVIS, BANNER} from '../../lib/assets'
+import {DEF_AVATER, BANNER} from '../../lib/assets'
 import Toast from '../util/Toast'
 import {Link} from '../util/Link'
 
@@ -81,10 +81,7 @@ export const ProfileHeader = observer(function ProfileHeader({
   return (
     <View style={styles.outer}>
       <Image style={styles.banner} source={BANNER} />
-      <Image
-        style={styles.avi}
-        source={AVIS[view.name] || AVIS['alice.test']}
-      />
+      <Image style={styles.avi} source={DEF_AVATER} />
       <View style={styles.content}>
         <View style={[styles.displayNameLine]}>
           <Text style={styles.displayName}>{view.displayName}</Text>
diff --git a/src/view/lib/assets.native.ts b/src/view/lib/assets.native.ts
index e0e027ad7..23d959534 100644
--- a/src/view/lib/assets.native.ts
+++ b/src/view/lib/assets.native.ts
@@ -1,9 +1,4 @@
 import {ImageSourcePropType} from 'react-native'
 
-export const AVIS: Record<string, ImageSourcePropType> = {
-  'alice.test': require('../../../public/img/alice.jpg'),
-  'bob.test': require('../../../public/img/bob.jpg'),
-  'carol.test': require('../../../public/img/carla.jpg'),
-}
-
+export const DEF_AVATER: ImageSourcePropType = require('../../../public/img/default-avatar.jpg')
 export const BANNER: ImageSourcePropType = require('../../../public/img/banner.jpg')
diff --git a/src/view/lib/assets.ts b/src/view/lib/assets.ts
index 957348eca..cbbfe791f 100644
--- a/src/view/lib/assets.ts
+++ b/src/view/lib/assets.ts
@@ -1,9 +1,4 @@
 import {ImageSourcePropType} from 'react-native'
 
-export const AVIS: Record<string, ImageSourcePropType> = {
-  'alice.test': {uri: '/img/alice.jpg'},
-  'bob.test': {uri: '/img/bob.jpg'},
-  'carol.test': {uri: '/img/carla.jpg'},
-}
-
+export const DEF_AVATER: ImageSourcePropType = {uri: '/img/default-avatar.jpg'}
 export const BANNER: ImageSourcePropType = {uri: '/img/banner.jpg'}
diff --git a/src/view/shell/mobile/accounts-menu.tsx b/src/view/shell/mobile/accounts-menu.tsx
index b4b538603..ec0e6bf40 100644
--- a/src/view/shell/mobile/accounts-menu.tsx
+++ b/src/view/shell/mobile/accounts-menu.tsx
@@ -9,7 +9,7 @@ import {
 } from 'react-native'
 import RootSiblings from 'react-native-root-siblings'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 import {s, colors} from '../../lib/styles'
 
 export function createAccountsMenu({
@@ -34,7 +34,7 @@ export function createAccountsMenu({
           <TouchableOpacity
             style={[styles.menuItem]}
             onPress={() => onPressItem(0)}>
-            <Image style={styles.avi} source={AVIS['alice.test']} />
+            <Image style={styles.avi} source={DEF_AVATER} />
             <Text style={[styles.label, s.bold]}>Alice</Text>
           </TouchableOpacity>
           <TouchableOpacity
diff --git a/src/view/shell/mobile/index.tsx b/src/view/shell/mobile/index.tsx
index d289b126d..25ee30e34 100644
--- a/src/view/shell/mobile/index.tsx
+++ b/src/view/shell/mobile/index.tsx
@@ -33,7 +33,7 @@ import {createBackMenu, createForwardMenu} from './history-menu'
 import {createAccountsMenu} from './accounts-menu'
 import {createLocationMenu} from './location-menu'
 import {s, colors} from '../../lib/styles'
-import {AVIS} from '../../lib/assets'
+import {DEF_AVATER} from '../../lib/assets'
 
 const locationIconNeedsNudgeUp = (icon: IconProp) => icon === 'house'
 const SWIPE_GESTURE_DIST_TRIGGER = 0.5
@@ -186,7 +186,7 @@ export const MobileShell: React.FC = observer(() => {
     <View style={styles.outerContainer}>
       <View style={styles.topBar}>
         <TouchableOpacity onPress={onPressAvi}>
-          <Image style={styles.avi} source={AVIS['alice.test']} />
+          <Image style={styles.avi} source={DEF_AVATER} />
         </TouchableOpacity>
         <Location
           icon={screenRenderDesc.icon}
-- 
cgit 1.4.1