ActivityHeader icons, cleanup

2025-12-23 22:18:36 -05:00 · 2023-02-10 01:24:45 -08:00
parent d2191892e2
commit fec4ac5061
8 changed files with 20 additions and 58 deletions
--- a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
+++ b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
--- a/android/app/src/main/assets/fonts/MaterialIcons.ttf
+++ b/android/app/src/main/assets/fonts/MaterialIcons.ttf
--- a/assets/fonts/inaturalisticons.ttf
+++ b/assets/fonts/inaturalisticons.ttf
--- a/ios/iNaturalistReactNative.xcodeproj/project.pbxproj
+++ b/ios/iNaturalistReactNative.xcodeproj/project.pbxproj
@@ -17,6 +17,9 @@
 		896925E9AF0F4FA497FD25E1 /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E889D9DF17243EC828D2A57 /* inaturalisticons.ttf */; };
 		A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */; };
 		BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */; };
+		930E85993B074F9785F7944C /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEC5CA9028A544DB8E47E273 /* MaterialCommunityIcons.ttf */; };
+		43B44700430B405FA1A54390 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DE2E26ADBABC48C2BCFB836F /* MaterialIcons.ttf */; };
+		6AB5F072CE7142BBAE142049 /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E1D7643E098741EE83EE859A /* inaturalisticons.ttf */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -49,6 +52,9 @@
 		C544256CF572EB52B9E2B9CB /* Pods-iNaturalistReactNative.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative.release.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative/Pods-iNaturalistReactNative.release.xcconfig"; sourceTree = "<group>"; };
 		D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Medium-Pro.otf"; path = "../assets/fonts/Whitney-Medium-Pro.otf"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		BEC5CA9028A544DB8E47E273 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../assets/fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		DE2E26ADBABC48C2BCFB836F /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../assets/fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		E1D7643E098741EE83EE859A /* inaturalisticons.ttf */ = {isa = PBXFileReference; name = "inaturalisticons.ttf"; path = "../assets/fonts/inaturalisticons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
--- a/src/components/INatIcon.js
+++ b/src/components/INatIcon.js
@@ -5,7 +5,7 @@

 import createIconSet from "react-native-vector-icons/lib/create-icon-set";

-export const glyphMap = {
+const glyphMap = {
  "notifications-bell": 57344,
  "hamburger-menu": 57345,
  "plus-sign": 57346,
@@ -19,7 +19,7 @@ export const glyphMap = {
  checkmark: 57354,
  pencil: 57356,
  "ios-people-updated-2": 57357,
-  "cv-sparklylabel": 57358,
+  cv: 57358,
  "close-button-circle": 57349,
  "flash-on-circle": 57360,
  "copyright-circle": 57361,
@@ -28,7 +28,8 @@ export const glyphMap = {
  "status-saved": 57363,
  "upload-arrow": 57359,
  "icn-id2": 57365,
-  "identification-solid": 57366
+  "identification-solid": 57366,
+  flag: 57367
 };

 const iconSet = createIconSet( glyphMap, "inaturalisticons", "inaturalisticons.ttf" );
@@ -39,3 +40,7 @@ export const {
  getImageSource,
  getImageSourceSync
 } = iconSet;
+
+export {
+  glyphMap
+};
--- a/src/components/ObsDetails/ActivityHeader.js
+++ b/src/components/ObsDetails/ActivityHeader.js
@@ -22,6 +22,7 @@ import { Menu } from "react-native-paper";
 import Comment from "realmModels/Comment";
 import { formatIdDate } from "sharedHelpers/dateAndTime";
 import useAuthenticatedMutation from "sharedHooks/useAuthenticatedMutation";
+import colors from "styles/tailwindColors";

 const { useRealm } = RealmContext;

@@ -77,15 +78,15 @@ const ActivityHeader = ( { item, refetchRemoteObservation, toggleRefetch }:Props
    }
  );

-  const ifIcon = () => {
-    if ( item.vision ) return <INatIcon name="pencil" />;
-    if ( flaggedStatus ) return <INatIcon name="pencil" />;
+  const renderIcon = () => {
+    if ( item.vision ) return <INatIcon name="cv" size={22} />;
+    if ( flaggedStatus ) return <INatIcon name="flag" color={colors.warningYellow} size={22} />;
    return null;
  };

  const ifCommentOrID = () => (
    <View className="flex-row items-center space-x-[15px]">
-      {ifIcon()}
+      {renderIcon()}
      {
            flaggedStatus
              ? (
--- a/src/components/ObsDetails/ActivityItem.js
+++ b/src/components/ObsDetails/ActivityItem.js
@@ -1,7 +1,5 @@
 // @flow

-// import { useQueryClient } from "@tanstack/react-query";
-// import { isCurrentUser } from "components/LoginSignUp/AuthenticationService";
 import ActivityHeader from "components/ObsDetails/ActivityHeader";
 import UserText from "components/SharedComponents/UserText";
 import {
@@ -9,7 +7,6 @@ import {
 } from "components/styledComponents";
 import { t } from "i18next";
 import _ from "lodash";
-// import { RealmContext } from "providers/contexts";
 import type { Node } from "react";
 import React from "react";
 import IconMaterial from "react-native-vector-icons/MaterialIcons";
@@ -19,8 +16,6 @@ import { textStyles } from "styles/obsDetails/obsDetails";

 import TaxonImage from "./TaxonImage";

-// const { useRealm } = RealmContext;
-
 type Props = {
  item: Object,
  navToTaxonDetails: Function,
@@ -31,43 +26,9 @@ type Props = {
 const ActivityItem = ( {
  item, navToTaxonDetails, toggleRefetch, refetchRemoteObservation
 }: Props ): Node => {
-  // const [currentUser, setCurrentUser] = useState( null );
-  // const [kebabMenuVisible, setKebabMenuVisible] = useState( false );
-  // const [flagModalVisible, setFlagModalVisible] = useState( false );
-  // const [flaggedStatus, setFlaggedStatus] = useState( false );
  const { taxon } = item;
-  // const { user } = item;
-
-  // const realm = useRealm( );
-  // const queryClient = useQueryClient( );
-  // const itemType = item.category ? "Identification" : "Comment";
-  // const activityItemClassName = flaggedStatus
-  // ? "flex-row border border-borderGray py-1 justify-between bg-flaggedBackground"
-  // : "flex-row border border-borderGray py-1 justify-between";
  const isOnline = useIsConnected( );

-  // useEffect( ( ) => {
-  //   const isActiveUserTheCurrentUser = async ( ) => {
-  //     const current = await isCurrentUser( user?.login );
-  //     setCurrentUser( current );
-  //   };
-  //   isActiveUserTheCurrentUser( );
-
-  //   // show flagged activity item right after flag item modal closes
-  //   if ( item.flags?.length > 0 ) {
-  //     setFlaggedStatus( true );
-  //   }
-  // }, [user, item] );
-
-  // const closeFlagItemModal = () => {
-  //   setFlagModalVisible( false );
-  // };
-
-  // const onItemFlagged = () => {
-  //   setFlaggedStatus( true );
-  //   refetchRemoteObservation();
-  // };
-
  const showNoInternetIcon = accessibilityLabel => (
    <View className="mr-3">
      <IconMaterial
@@ -111,16 +72,6 @@ const ActivityItem = ( {
          <UserText baseStyle={textStyles.activityItemBody} text={item.body} />
        </View>
      )}
-      {/* {!currentUser
-        && (
-        <FlagItemModal
-          id={item.id}
-          showFlagItemModal={flagModalVisible}
-          closeFlagItemModal={closeFlagItemModal}
-          itemType={itemType}
-          onItemFlagged={onItemFlagged}
-        />
-        )} */}
    </View>
  );
 };
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -88,8 +88,7 @@ module.exports = {
      buttonWarningDisabled: WARNING_DISABLED,
      buttonNeutralDisabled: NEUTRAL_DISABLED,
      selectionGreen: "#C1FF00",
-      flaggedBackground: "#fcf8e3",
-      flaggedText: "#8a6d3a"
+      warningYellow: "#E6A939"
    }
  },
  plugins: []