Merge branch 'develop'

DSM-DMS · Dec 13, 2021 · f7325dc · f7325dc
2 parents 17a7dcc + 01d5a73
commit f7325dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/java/com/dms/pmsandroid/feature/meal/adapter/MealAdapter.kt b/app/src/main/java/com/dms/pmsandroid/feature/meal/adapter/MealAdapter.kt
@@ -73,4 +73,9 @@ class MealAdapter(
         meals.putAll(mealList)
         notifyDataSetChanged()
     }
+
+    fun updateMeal(startPosition: Int, endPosition: Int, mealList: HashMap<Int, MealItem>) {
+        meals.putAll(mealList)
+        notifyItemRangeChanged(startPosition, endPosition)
+    }
 }
diff --git a/app/src/main/res/layout/activity_introduce_club.xml b/app/src/main/res/layout/activity_introduce_club.xml
@@ -62,7 +62,7 @@
             android:layout_marginTop="20dp"
             android:layout_marginStart="30dp"
             android:fontFamily="@font/nanumsquareregular"
-            android:text="@string/children_club"
+            android:text="@string/developer_club"
             android:textColor="@color/gray_300"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/title_tv" />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="intro_developer">개발자 소개</string>
     <string name="intro_club">동아리 소개</string>
     <string name="children_club">자녀의 동아리</string>
+    <string name="developer_club">PMS 개발 동아리</string>
     <string name="intro_main_dms">대마고의 자랑거리를 소개합니다</string>
     <string name="save_login_info">로그인정보 저장</string>
     <string name="school_notify">학교소식</string>