Sz 553

app.config.js

@@ -76,7 +76,7 @@ const expoConfig = {
         backgroundColor: '#ffffff',
       },
       package: 'com.safezone.onestep',
-      versionCode: 7,
+      versionCode: 5,
       softwareKeyboardLayoutMode: 'pan',
     },
     web: {
@@ -125,7 +125,7 @@ const expoConfig = {
       ],
       './plugins/withStaticFrameworks',
     ],
-    runtimeVersion: '1.0.1',
+    runtimeVersion: '1.0.0',
     updates: {
       url: 'https://u.expo.dev/63f6bbd9-1594-44b3-b161-0e0051413ef0',
     },

app/(tabs)/_layout.jsx

@@ -1,4 +1,3 @@
-import TextInputProvider from '@/contexts/textInputContext';
 import '@/locales/index';
 import { Tabs } from 'expo-router';
 import React from 'react';
@@ -19,38 +18,35 @@ const inboxIcon = ({ color, size }) => (
 const TabLayout = () => {
   const { t } = useTranslation();
   return (
-    <TextInputProvider>
-      <Tabs
-        screenOptions={{
-          tabBarHideOnKeyboard: true, // 키보드가 활성화될 때 탭 바 숨기기
-          tabBarStyle: {
-            backgroundColor: 'white',
-            height:
-              Platform.OS === 'ios' ? verticalScale(75) : verticalScale(45),
-          },
-          tabBarLabelStyle: {
-            ...fontStyles.Paragraph.P1.M_100,
-          },
+    <Tabs
+      screenOptions={{
+        tabBarHideOnKeyboard: true, // 키보드가 활성화될 때 탭 바 숨기기
+        tabBarStyle: {
+          backgroundColor: 'white',
+          height: Platform.OS === 'ios' ? verticalScale(75) : verticalScale(45),
+        },
+        tabBarLabelStyle: {
+          ...fontStyles.Paragraph.P1.M_100,
+        },
+      }}
+    >
+      <Tabs.Screen
+        name="index"
+        options={{
+          title: t('views.tabs/_layout.today'),
+          tabBarIcon: todayIcon,
+          headerShown: false,
         }}
-      >
-        <Tabs.Screen
-          name="index"
-          options={{
-            title: t('views.tabs/_layout.today'),
-            tabBarIcon: todayIcon,
-            headerShown: false,
-          }}
-        />
-        <Tabs.Screen
-          name="inboxView"
-          options={{
-            title: t('views.tabs/_layout.inbox'),
-            tabBarIcon: inboxIcon,
-            headerShown: false,
-          }}
-        />
-      </Tabs>
-    </TextInputProvider>
+      />
+      <Tabs.Screen
+        name="inboxView"
+        options={{
+          title: t('views.tabs/_layout.inbox'),
+          tabBarIcon: inboxIcon,
+          headerShown: false,
+        }}
+      />
+    </Tabs>
   );
 };
 

app/(tabs)/index.jsx

@@ -28,6 +28,8 @@ import { scale, verticalScale } from 'react-native-size-matters';
 const TodayView = () => {
   const { i18n } = useTranslation();
   const { userId } = useContext(LoginContext);
+  const [isDragging, setIsDragging] = React.useState(false);
+
   const getLoadingText = () => {
     if (i18n.language === 'ko') {
       return `투두`;
@@ -40,11 +42,18 @@ const TodayView = () => {
     userId: userId,
   });
 
-  const renderCategoriesTodo = ({ item }) => {
+  const renderCategoriesTodo = ({ item, index }) => {
+    const isLastItem = index === categoriesData.length - 1;
+
     return (
-      <View>
-        <CategoryMainItem item={item} isToday={true} />
-        <DailyTodos todosData={todosData} categoryId={item.id} />
+      <View style={isLastItem ? styles.lastCategoryContainer : null}>
+        <CategoryMainItem item={item} />
+        <DailyTodos
+          todosData={todosData}
+          categoryId={item.id}
+          onDragStart={() => setIsDragging(true)}
+          onDragEnd={() => setIsDragging(false)}
+        />
       </View>
     );
   };
@@ -56,14 +65,14 @@ const TodayView = () => {
       <DateProvider>
         <CalendarBottomSheetProvider>
           <AIBottomSheetProvider>
-            <KeyboardAvoidingView
-              style={[styles.container, { paddingBottom: verticalScale(20) }]}
-              behavior={Platform.OS === 'ios' ? 'padding' : null}
-              keyboardVerticalOffset={
-                Platform.OS === 'ios' ? verticalScale(90) : verticalScale(20)
-              }
-            >
-              <SafeAreaView style={styles.container}>
+            <SafeAreaView style={styles.container}>
+              <KeyboardAvoidingView
+                style={[styles.container, { paddingBottom: verticalScale(20) }]}
+                behavior={Platform.OS === 'ios' ? 'padding' : null}
+                keyboardVerticalOffset={
+                  Platform.OS === 'ios' ? verticalScale(90) : verticalScale(90)
+                }
+              >
                 <WeeklyCalendar />
                 <Suspense
                   fallback={
@@ -77,12 +86,13 @@ const TodayView = () => {
                     renderItem={renderCategoriesTodo}
                     keyExtractor={item => item.id}
                     contentContainerStyle={styles.flatList}
+                    scrollEnabled={!isDragging}
                   />
                 </Suspense>
-                <CalendarBottomSheet isTodo={true} item={selectedTodo} />
-                <SubTodoGenerateBottomSheet item={selectedTodo} />
-              </SafeAreaView>
-            </KeyboardAvoidingView>
+              </KeyboardAvoidingView>
+              <CalendarBottomSheet isTodo={true} item={selectedTodo} />
+              <SubTodoGenerateBottomSheet item={selectedTodo} />
+            </SafeAreaView>
           </AIBottomSheetProvider>
         </CalendarBottomSheetProvider>
       </DateProvider>
@@ -104,6 +114,9 @@ const styles = StyleSheet.create({
     paddingHorizontal: scale(20),
     paddingTop: verticalScale(20),
   },
+  lastCategoryContainer: {
+    paddingBottom: verticalScale(90),
+  },
 });
 
 export default TodayView;

app/categoryView/categoryListView.jsx

@@ -44,11 +44,12 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
     justifyContent: 'center',
-    paddingHorizontal: scale(20),
     backgroundColor: 'white',
   },
   list: {
     backgroundColor: 'white',
+    paddingHorizontal: scale(20),
+
     flex: 1,
   },
 });

app/settingsView/settingsAccountView.tsx

@@ -1,5 +1,6 @@
 import '@/locales/index';
 import { IndexPath, Layout, Menu, MenuItem } from '@ui-kitten/components';
+import React from 'react';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SafeAreaView, StyleSheet } from 'react-native';

app/settingsView/settingsView.jsx

@@ -8,7 +8,7 @@ import {
   useTheme,
 } from '@ui-kitten/components';
 import { useRouter } from 'expo-router';
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import ConfirmModal from '@/components/common/molecules/ConfirmModal';
 import { api as Api } from '@/utils/api';
@@ -25,6 +25,7 @@ import {
 } from 'react-native';
 import { heightPercentage, widthPercentage } from '@/utils/responsiveSize';
 import fontStyles from '@/theme/fontStyles';
+import { LoginContext } from '@/contexts/LoginContext';
 const privacyPolicyUrl =
   'https://swm-onestep.github.io/posts/%EA%B0%9C%EC%9D%B8%EC%A0%95%EB%B3%B4%EC%B2%98%EB%A6%AC%EB%B0%A9%EC%B9%A8-copy/';
 const termsOfServiceUrl =
@@ -45,6 +46,7 @@ const renderCurrentStatus = currentStatus => () => (
 );
 
 const SettingsView = () => {
+  const { userName } = useContext(LoginContext);
   const { t } = useTranslation();
   const theme = useTheme();
   const { clear: clearStorage } = useStorage();
@@ -175,7 +177,7 @@ const SettingsView = () => {
           <Text style={fontStyles.Subtitle.S2.M_130}>
             {t('views.settingsView.greeting')}
           </Text>
-          <Text style={fontStyles.Paragraph.P1.R_100}>user</Text>
+          <Text style={fontStyles.Paragraph.P1.R_100}>{userName}</Text>
         </View>
       </View>
       <Layout style={styles.layout} level="1">