Merge pull request #49 from LPK98/isira

Enhance weapon display logic and improve styling in components

Author: iSiRaH

app/(screens)/Weapon.tsx

@@ -180,11 +180,18 @@ const Weapon = () => {
                 weapons.map((weapon, index) => (
                   <WeaponCard
                     key={`${String(weapon.id ?? "weapon")}-${index}`}
-                    name={weapon.weaponType ?? "Unknown"}
+                    name={
+                      weapon.weaponType ??
+                      (weapon as AssignedWeapon & {
+                        weapon?: { weaponType?: string };
+                      }).weapon?.weaponType ??
+                      "Unknown"
+                    }
                     status={weapon.status ?? "N/A"}
                     ammoCount={weapon.ammoCount ?? 0}
                     totalAmmo={weapon.totalAmmo ?? 0}
                     dueDate={weapon.dueDate ?? "N/A"}
+                    weapon={weapon}
                   />
                 ))
               )}

app/Translate.tsx

@@ -30,10 +30,6 @@ const LANGUAGE_OPTIONS: LanguageOption[] = [
   { name: "Sinhala", flag: "🇱🇰" },
   { name: "Tamil", flag: "🇱🇰" },
   { name: "English", flag: "🇺🇸" },
-  { name: "Spanish", flag: "🇪🇸" },
-  { name: "French", flag: "🇫🇷" },
-  { name: "German", flag: "🇩🇪" },
-  { name: "Chinese", flag: "🇨🇳" },
 ];
 
 const Translate: React.FC = () => {

app/login.tsx

@@ -242,7 +242,9 @@ export default function LoginScreen() {
         {/* FORGOT PASSWORD */}
         <Pressable
           disabled={loading}
-          onPress={() => console.log("Fogot Password pressed")}
+          onPress={() =>
+            alert("Please contact your administrator to reset your password.")
+          }
         >
           <Text style={styles.forgot}>Forgot Password</Text>
         </Pressable>

src/components/WeaponCard.tsx

@@ -2,13 +2,16 @@ import { Image, Pressable, Text, View, StyleSheet } from "react-native";
 import { useTheme } from "../theme/ThemeProvider";
 import Ionicons from "@expo/vector-icons/build/Ionicons";
 import { ProgressBar } from "react-native-paper";
+import { images } from "../constants/images";
+import { weaponType } from "../types/weaponTypes";
 
 export type WeaponCardProps = {
   name: string;
   status: string;
   ammoCount: number;
   totalAmmo: number;
   dueDate: string;
+  weapon?: weaponType;
 };
 
 const WeaponCard = ({
@@ -17,8 +20,16 @@ const WeaponCard = ({
   ammoCount,
   totalAmmo,
   dueDate,
+  weapon,
 }: WeaponCardProps) => {
   const { colors } = useTheme();
+  const displayName = name?.trim() ? name : "Unknown";
+  const imageUri =
+    weapon?.imageUrl?.trim() ??
+    (
+      weapon as (weaponType & { weapon?: { imageUrl?: string } }) | undefined
+    )?.weapon?.imageUrl?.trim();
+  const imageSource = imageUri ? { uri: imageUri } : images.logo;
   const today = new Date();
   const dueDateObj = new Date(dueDate);
   const isOverdue = dueDateObj < today;
@@ -36,9 +47,10 @@ const WeaponCard = ({
         width: "100%",
       }}
     >
-      <View>
+      <View style={{ backgroundColor: colors.border, padding: 2, borderRadius: 10 }}>
         <Image
-          source={{ uri: "../../assets/images/logo.png" }}
+          source={imageSource}
+          resizeMode="contain"
           style={{ width: 150, height: 150 }}
         />
       </View>
@@ -61,11 +73,11 @@ const WeaponCard = ({
           <Text
             style={{ color: colors.text, fontWeight: "bold", fontSize: 18 }}
           >
-            {name}
+            {displayName}
           </Text>
           <View
             style={{
-              backgroundColor: colors.primaryAccent,
+              backgroundColor: colors.primaryAccent.concat("20"),
               paddingHorizontal: 8,
               paddingVertical: 4,
               borderRadius: 10,

src/components/WeaponRequestCard.tsx

@@ -58,7 +58,7 @@ const WeaponRequestCard = ({
           width: 68,
           height: 68,
           borderRadius: 18,
-          backgroundColor: colors.primaryAccent ?? colors.border,
+          backgroundColor: colors.border,
           alignItems: "center",
           justifyContent: "center",
         }}