From bcdc7a345c9835e1122f91c97bfc2096a08c8703 Mon Sep 17 00:00:00 2001
From: Chris <chrischuckgithub@gmail.com>
Date: Mon, 20 Feb 2023 10:02:11 -0600
Subject: [PATCH] Add ability to select obs preview image (#491)

* Add ability to select obs preview image

* Use Inat icon

* lint

* Make icon smaller

* Change icon dimensions

* Add border radius to theme

* Add ability to select obs preview image

* Use Inat icon

* lint

* Make icon smaller

* Remove empty lines

* Update UiLibrary.js

* Update UiLibrary.js

---------

Co-authored-by: Johannes Klein <johannes.t.klein@gmail.com>
---
 src/components/Observations/ObsGridItem.js    |  3 +-
 src/components/Observations/ObsListItem.js    |  6 ++-
 .../Observations/ObsPreviewImage/index.js     | 50 +++++++++++++++----
 tailwind.config.js                            |  3 +-
 4 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/components/Observations/ObsGridItem.js b/src/components/Observations/ObsGridItem.js
index 73ebe15a3..860c8f35d 100644
--- a/src/components/Observations/ObsGridItem.js
+++ b/src/components/Observations/ObsGridItem.js
@@ -41,7 +41,8 @@ const ObsGridItem = ( {
         source={imageSource}
         height="h-[172px]"
         width="w-full"
-        observation={observation}
+        obsPhotosCount={observation?.observationPhotos?.length ?? 0}
+        hasSound={!!observation?.observationSounds?.length}
         isMultiplePhotosTop
       >
         <View className="absolute bottom-0 flex p-2 w-full">
diff --git a/src/components/Observations/ObsListItem.js b/src/components/Observations/ObsListItem.js
index 6fcdec3ee..ec120d4a9 100644
--- a/src/components/Observations/ObsListItem.js
+++ b/src/components/Observations/ObsListItem.js
@@ -25,11 +25,13 @@ const ObsListItem = ( { observation }: Props ): Node => {
     >
       <ObsPreviewImage
         source={{ uri: Photo.displayLocalOrRemoteSquarePhoto( photo ) }}
-        observation={observation}
+        obsPhotosCount={observation?.observationPhotos?.length ?? 0}
+        hasSound={!!observation?.observationSounds?.length}
         opaque={needsSync}
         disableGradient
+        hasSmallBorderRadius
       />
-      <View className="pr-[25px] flex-1">
+      <View className="pr-[25px] flex-1 ml-[10px]">
         <DisplayTaxonName
           taxon={observation?.taxon}
           scientificNameFirst={observation?.user?.prefers_scientific_name_first}
diff --git a/src/components/Observations/ObsPreviewImage/index.js b/src/components/Observations/ObsPreviewImage/index.js
index 2c9fd281f..b07be18ab 100644
--- a/src/components/Observations/ObsPreviewImage/index.js
+++ b/src/components/Observations/ObsPreviewImage/index.js
@@ -1,5 +1,6 @@
 // @flow
 import classNames from "classnames";
+import INatIcon from "components/INatIcon";
 import { View } from "components/styledComponents";
 import type { Node } from "react";
 import React from "react";
@@ -14,37 +15,45 @@ type SOURCE = {
 
 type Props = {
   source: SOURCE,
-  observation?: Object,
+  children?: Node,
+  obsPhotosCount?: number,
+  selectable?: boolean,
+  selected?: boolean,
+  hasSound?: boolean,
   opaque?: boolean,
   width?: string,
   height?: string,
   isMultiplePhotosTop?: boolean,
-  children?: Node,
   disableGradient?: boolean,
+  hasSmallBorderRadius?: boolean
 };
 
 const ObsPreviewImage = ( {
   source,
-  observation,
+  children,
+  hasSound = false,
+  obsPhotosCount = 0,
+  selectable = false,
+  selected = false,
   height = "h-[62px]",
   width = "w-[62px]",
   opaque = false,
   isMultiplePhotosTop = false,
-  children,
-  disableGradient = false
+  disableGradient = false,
+  hasSmallBorderRadius = false
 }: Props ): Node => {
   const theme = useTheme( );
-  const obsPhotosCount = observation?.observationPhotos?.length ?? 0;
   const hasMultiplePhotos = obsPhotosCount > 1;
-  const hasSound = !!observation?.observationSounds?.length;
   const filterIconName = obsPhotosCount > 9 ? "filter-9-plus" : `filter-${obsPhotosCount || 2}`;
+  const borderRadius = hasSmallBorderRadius ? "rounded-lg" : "rounded-2xl";
 
   return (
     <View
       className={classNames(
-        "relative rounded-lg mr-[10px] overflow-hidden",
+        "relative overflow-hidden",
         height,
-        width
+        width,
+        borderRadius
       )}
     >
       <Background
@@ -52,6 +61,29 @@ const ObsPreviewImage = ( {
         opaque={opaque}
         disableGradient={disableGradient}
       />
+      {selectable && (
+        <View
+          className={
+            classNames(
+              "flex items-center justify-center",
+              "border-2 border-white rounded-full",
+              "absolute m-2.5 right-0",
+              "w-[24px] h-[24px]",
+              {
+                "bg-white": selected
+              }
+            )
+          }
+        >
+          {selected && (
+            <INatIcon
+              name="checkmark"
+              color={theme.colors.primary}
+              size={12}
+            />
+          )}
+        </View>
+      )}
       {hasMultiplePhotos && (
         <View
           className={classNames( "absolute right-0", {
diff --git a/tailwind.config.js b/tailwind.config.js
index 618b353b6..e5fd39633 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -84,7 +84,8 @@ module.exports = {
       borderRadius: {
         // tried using rem value here, but it wouldn't load on iOS or Android
         DEFAULT: "7px",
-        lg: "8px"
+        lg: "8px",
+        "2xl": "15px"
       }
     },
     colors: {