From 2c7884b9ff49b8a8d676c31f5a299a20ce125c23 Mon Sep 17 00:00:00 2001
From: Mekan1206 <myradow207@gmail.com>
Date: Sat, 20 Sep 2025 14:24:33 +0500
Subject: [PATCH] Refactor HomeScreen activity state and update UI labels

- Changed state management for next day's activity to use 'dayLabel' instead of 'dateStr'.
- Updated logic to determine the day label for next day's activity.
- Modified badge text in HomeScreen to reflect the new label and improved localization for today's activity.
---
 app/(tabs)/home.tsx     | 13 +++++++++----
 app/(tabs)/programs.tsx |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/(tabs)/home.tsx b/app/(tabs)/home.tsx
index 0424a25..c79ddc0 100644
--- a/app/(tabs)/home.tsx
+++ b/app/(tabs)/home.tsx
@@ -14,7 +14,7 @@ import { getPrograms, ProgramActivity } from '@/utils/programs';
 export default function HomeScreen() {
   const insets = useSafeAreaInsets();
   const [todaysActivity, setTodaysActivity] = useState<ProgramActivity | null>(null);
-  const [nextDayActivity, setNextDayActivity] = useState<(ProgramActivity & { dateStr: string }) | null>(null);
+  const [nextDayActivity, setNextDayActivity] = useState<(ProgramActivity & { dayLabel: string }) | null>(null);
 
   useEffect(() => {
     const fetchAndSetActivities = async () => {
@@ -54,8 +54,13 @@ export default function HomeScreen() {
           return loopDate > todayDate;
         });
 
+        const tomorrow = new Date(now);
+        tomorrow.setDate(tomorrow.getDate() + 1);
+        const tomorrowStr = formatDate(tomorrow);
+
         if (nextDateStr && activities[nextDateStr].length > 0) {
-          setNextDayActivity({ ...activities[nextDateStr][0], dateStr: nextDateStr });
+          const dayLabel = nextDateStr === tomorrowStr ? 'Ertir' : nextDateStr;
+          setNextDayActivity({ ...activities[nextDateStr][0], dayLabel });
         }
       } catch (error) {
         console.error('Failed to load activities for home screen:', error);
@@ -98,7 +103,7 @@ export default function HomeScreen() {
         <View style={styles.innerContainer}>
           {todaysActivity && (
             <FeatureCard
-              badgeText={`Today, ${todaysActivity.time || 'All Day'}`}
+              badgeText={`Şu gün, ${todaysActivity.time}`}
               title={todaysActivity.title}
               description={todaysActivity.description}
               image={require('@/assets/images/aisha.jpg')}
@@ -107,7 +112,7 @@ export default function HomeScreen() {
 
           {nextDayActivity && (
             <FeatureCard
-              badgeText={`${nextDayActivity.dateStr}, ${nextDayActivity.time || 'All Day'}`}
+              badgeText={`${nextDayActivity.dayLabel}, ${nextDayActivity.time}`}
               title={nextDayActivity.title}
               description={nextDayActivity.description}
               image={require('@/assets/images/aisha.jpg')}
diff --git a/app/(tabs)/programs.tsx b/app/(tabs)/programs.tsx
index 841651d..a5d7e7d 100644
--- a/app/(tabs)/programs.tsx
+++ b/app/(tabs)/programs.tsx
@@ -79,12 +79,12 @@ export default function Programs() {
   return (
     <View style={[styles.container, { backgroundColor: Colors[colorScheme].background, paddingTop: insets.top }]}>
       <View style={styles.header}>
-        <Text style={[styles.title, { color: Colors[colorScheme].text }]}>Umrah Pilgrimage</Text>
+        <Text style={[styles.title, { color: Colors[colorScheme].text }]}>Respisaniýa</Text>
       </View>
 
       {isStale && (
         <View style={styles.warningContainer}>
-          <Text style={styles.warningText}>Failed to fetch latest data. Showing cached activities.</Text>
+          <Text style={styles.warningText}>Soňky maglumatlary almak başartmady. Saklanan çäreler görkezilýär.</Text>
         </View>
       )}