From 96cbb52940760894b3c28d678c62903afe3b4647 Mon Sep 17 00:00:00 2001
From: Rickettsia1234 <ej100504@naver.com>
Date: Tue, 14 Jul 2026 23:57:13 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                              |  3 +
 .idea/.name                                   |  1 +
 .idea/AndroidProjectSystem.xml                |  6 ++
 .idea/compiler.xml                            |  6 ++
 .idea/deploymentTargetSelector.xml            | 10 +++
 .idea/gradle.xml                              | 19 +++++
 .idea/markdown.xml                            |  8 ++
 .idea/migrations.xml                          | 10 +++
 .idea/misc.xml                                |  9 ++
 .idea/runConfigurations.xml                   | 17 ++++
 .idea/vcs.xml                                 |  6 ++
 app/build.gradle.kts                          |  2 +
 app/src/main/res/layout/activity_main.xml     | 82 +++++++++++++++++++
 .../main/res/layout/activity_word_edit.xml    | 72 ++++++++++++++++
 app/src/main/res/layout/item_word.xml         | 45 ++++++++++
 app/src/main/res/values/colors.xml            |  4 +
 app/src/main/res/values/strings.xml           | 16 +++-
 gradle/libs.versions.toml                     |  4 +
 18 files changed, 319 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/.name
 create mode 100644 .idea/AndroidProjectSystem.xml
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/gradle.xml
 create mode 100644 .idea/markdown.xml
 create mode 100644 .idea/migrations.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/runConfigurations.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 app/src/main/res/layout/activity_word_edit.xml
 create mode 100644 app/src/main/res/layout/item_word.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..cec0517
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+android_2026_1
\ No newline at end of file
diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 0000000..4a53bee
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..b86273d
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="21" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..639c779
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown.xml b/.idea/markdown.xml
new file mode 100644
index 0000000..c61ea33
--- /dev/null
+++ b/.idea/markdown.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownSettings">
+    <option name="previewPanelProviderInfo">
+      <ProviderInfo name="Compose (experimental)" className="com.intellij.markdown.compose.preview.ComposePanelProvider" />
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..b2c751a
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..16660f1
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cc8ee59..dbebd6c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,7 +37,9 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.recyclerview)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
+    implementation(libs.coil)
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9affce0..4ff191c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,4 +7,86 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="TextView"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toStartOf="@+id/imageView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="TextView"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toStartOf="@+id/imageView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="90dp"
+        android:layout_height="82dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintEnd_toStartOf="@+id/imageButton"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <ImageButton
+        android:id="@+id/imageButton"
+        android:layout_width="34dp"
+        android:layout_height="38dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@android:drawable/ic_menu_delete" />
+
+    <ImageButton
+        android:id="@+id/imageButton2"
+        android:layout_width="32dp"
+        android:layout_height="31dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="16dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageButton"
+        app:srcCompat="@android:drawable/ic_menu_edit" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView"
+        tools:listitem="@layout/support_simple_spinner_dropdown_item" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@android:drawable/ic_input_add" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_word_edit.xml b/app/src/main/res/layout/activity_word_edit.xml
new file mode 100644
index 0000000..ab98b2c
--- /dev/null
+++ b/app/src/main/res/layout/activity_word_edit.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="24dp">
+
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="TextView"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/wordInputLayout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="48dp"
+        app:counterEnabled="true"
+        app:counterMaxLength="30"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView5"
+        android:hint="@string/hint_word" >
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/editTextText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/meaningInputLayout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:counterEnabled="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/wordInputLayout"
+        android:hint="@string/hint_meaning" >
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/editTextText2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="0dp"
+        android:layout_height="56dp"
+        android:layout_marginTop="32dp"
+        android:text="Button"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:cornerRadius="28dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/meaningInputLayout" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_word.xml b/app/src/main/res/layout/item_word.xml
new file mode 100644
index 0000000..aee4709
--- /dev/null
+++ b/app/src/main/res/layout/item_word.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/imageView2"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:text="TextView"
+        android:textSize="18sp"
+        android:textColor="#333333"
+        app:layout_constraintBottom_toTopOf="@+id/textView4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <TextView
+        android:id="@+id/textView4"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:text="TextView"
+        android:textSize="14sp"
+        android:textColor="#666666"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView2"
+        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c8524cd..5256fd6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,4 +2,8 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="purple_main">#673AB7</color>
+    <color name="yellow_accent">#FFC107</color>
+    <color name="green_status">#4CAF50</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4a5053..9696cb7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,17 @@
 <resources>
-    <string name="app_name">android_2026_1</string>
+    <string name="app_name">단어장</string>
+
+    <string name="title_word_add">단어 추가</string>
+    <string name="title_word_edit">단어 수정</string>
+
+    <string name="hint_word">단어</string>
+    <string name="hint_meaning">뜻</string>
+
+    <string name="btn_add">추가</string>
+    <string name="btn_edit">수정</string>
+
+    <string name="desc_word_image">단어 이미지</string>
+    <string name="desc_delete_button">단어 삭제</string>
+    <string name="desc_edit_button">단어 수정</string>
+    <string name="desc_add_floating_button">새 단어 추가</string>
 </resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dd29a05..feea120 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,4 +1,5 @@
 [versions]
+coil = "2.7.0"
 kotlin = "2.3.21"
 activity = "1.13.0"
 agp = "9.0.1"
@@ -9,16 +10,19 @@ junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 appcompat = "1.7.1"
 material = "1.14.0"
+recyclerview = "1.4.0"
 
 [libraries]
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx-activity = { module = "androidx.activity:activity", version.ref = "activity" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
+androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

From 364800cfc0645d78859a5285d9246f8f5e7f40ca Mon Sep 17 00:00:00 2001
From: Rickettsia1234 <ej100504@naver.com>
Date: Fri, 17 Jul 2026 13:50:47 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20=EB=B0=A9=EB=B2=95?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deviceManager.xml                       |  13 ++
 app/build.gradle.kts                          |   1 +
 app/src/main/AndroidManifest.xml              |   8 ++
 .../example/android_2026_1/MainActivity.kt    | 116 ++++++++++++++++++
 .../com/example/android_2026_1/WordAdapter.kt |  37 ++++++
 .../android_2026_1/WordEditActivity.kt        |  75 +++++++++++
 .../com/example/android_2026_1/WordItem.kt    |  12 ++
 app/src/main/res/layout/activity_main.xml     |  10 +-
 .../main/res/layout/activity_word_edit.xml    |  31 +++--
 app/src/main/res/layout/item_word.xml         |  14 +--
 10 files changed, 295 insertions(+), 22 deletions(-)
 create mode 100644 .idea/deviceManager.xml
 create mode 100644 app/src/main/java/com/example/android_2026_1/WordAdapter.kt
 create mode 100644 app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
 create mode 100644 app/src/main/java/com/example/android_2026_1/WordItem.kt

diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
new file mode 100644
index 0000000..91f9558
--- /dev/null
+++ b/.idea/deviceManager.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dbebd6c..3eea16f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.application)
+    id("kotlin-parcelize")
 }
 
 android {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e58d838..515c541 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".WordEditActivity"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 
diff --git a/app/src/main/java/com/example/android_2026_1/MainActivity.kt b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
index ad2a6ca..22cc8d0 100644
--- a/app/src/main/java/com/example/android_2026_1/MainActivity.kt
+++ b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
@@ -1,12 +1,68 @@
 package com.example.android_2026_1
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import coil.load
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 
 class MainActivity : AppCompatActivity() {
+
+    private val wordList = mutableListOf<WordItem>()
+    private var idCount = 0
+    private var selectedItem: WordItem? = null
+
+    private lateinit var adapter: WordAdapter
+    private lateinit var topWord: TextView
+    private lateinit var topMeaning: TextView
+    private lateinit var topImage: ImageView
+
+    private val editLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == RESULT_OK) {
+            val data = result.data
+            val mode = data?.getStringExtra("mode")
+            val word = data?.getStringExtra("word").orEmpty()
+            val meaning = data?.getStringExtra("meaning").orEmpty()
+            val uri = data?.getStringExtra("imageUri")
+
+            when (mode) {
+                "ADD" -> {
+                    val newItem = WordItem(idCount++, word, meaning, uri)
+                    wordList.add(newItem)
+                    adapter.notifyItemInserted(wordList.size - 1)
+                }
+                "EDIT" -> {
+                    val id = data?.getIntExtra("id", -1) ?: -1
+                    val index = wordList.indexOfFirst { it.id == id }
+                    if (index != -1) {
+                        val updated = WordItem(id, word, meaning, uri)
+                        wordList[index] = updated
+                        adapter.notifyItemChanged(index)
+
+                        if (selectedItem?.id == id) {
+                            showPreview(updated)
+                        }
+                    }
+                }
+            }
+
+            if (wordList.isEmpty()) {
+                clearPreview()
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -16,5 +72,65 @@ class MainActivity : AppCompatActivity() {
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
+
+        topWord = findViewById(R.id.textView)
+        topMeaning = findViewById(R.id.textView2)
+        topImage = findViewById(R.id.imageView)
+
+        val btnEdit = findViewById<ImageButton>(R.id.btn_edit)
+        val btnDelete = findViewById<ImageButton>(R.id.btn_delete)
+        val btnAdd = findViewById<FloatingActionButton>(R.id.btn_add)
+        val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
+
+        clearPreview()
+
+        adapter = WordAdapter(wordList) { clickedItem ->
+            showPreview(clickedItem)
+        }
+
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        recyclerView.adapter = adapter
+
+        btnAdd.setOnClickListener {
+            val intent = Intent(this, WordEditActivity::class.java).apply {
+                putExtra("mode", "ADD")
+            }
+            editLauncher.launch(intent)
+        }
+
+        btnEdit.setOnClickListener {
+            selectedItem?.let { item ->
+                val intent = Intent(this, WordEditActivity::class.java).apply {
+                    putExtra("mode", "EDIT")
+                    putExtra("item", item)
+                }
+                editLauncher.launch(intent)
+            }
+        }
+
+        btnDelete.setOnClickListener {
+            selectedItem?.let { item ->
+                val index = wordList.indexOfFirst { it.id == item.id }
+                if (index != -1) {
+                    wordList.removeAt(index)
+                    adapter.notifyItemRemoved(index)
+                    clearPreview()
+                }
+            }
+        }
+    }
+
+    private fun showPreview(item: WordItem) {
+        selectedItem = item
+        topWord.text = item.word
+        topMeaning.text = item.meaning
+        topImage.load(item.imageUri)
+    }
+
+    private fun clearPreview() {
+        topWord.text = ""
+        topMeaning.text = ""
+        topImage.setImageDrawable(null)
+        selectedItem = null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android_2026_1/WordAdapter.kt b/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
new file mode 100644
index 0000000..430d3a4
--- /dev/null
+++ b/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
@@ -0,0 +1,37 @@
+package com.example.android_2026_1
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import coil.load
+
+class WordAdapter(
+    private val items: List<WordItem>,
+    private val onItemClick: (WordItem) -> Unit
+) : RecyclerView.Adapter<WordAdapter.ViewHolder>() {
+
+    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val img: ImageView = view.findViewById(R.id.iv_item_image)
+        val txtWord: TextView = view.findViewById(R.id.tv_item_word)
+        val txtMeaning: TextView = view.findViewById(R.id.tv_item_meaning)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_word, parent, false)
+        return ViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position]
+        holder.txtWord.text = item.word
+        holder.txtMeaning.text = item.meaning
+        holder.img.load(item.imageUri)
+        holder.itemView.setOnClickListener { onItemClick(item) }
+    }
+
+    override fun getItemCount(): Int = items.size
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt b/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
new file mode 100644
index 0000000..b933007
--- /dev/null
+++ b/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
@@ -0,0 +1,75 @@
+package com.example.android_2026_1
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+import android.widget.ImageButton
+import android.widget.TextView
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import coil.load
+import com.google.android.material.textfield.TextInputEditText
+
+class WordEditActivity : AppCompatActivity() {
+
+    private var imageUri: String? = null
+    private lateinit var btnImage: ImageButton
+
+    private val pickLauncher = registerForActivityResult(
+        ActivityResultContracts.GetContent()
+    ) { uri ->
+        uri?.let {
+            imageUri = it.toString()
+            btnImage.load(it)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_word_edit)
+
+        val tvTitle = findViewById<TextView>(R.id.text_title)
+        val btnSubmit = findViewById<Button>(R.id.btn_submit)
+        val etWord = findViewById<TextInputEditText>(R.id.et_word)
+        val etMeaning = findViewById<TextInputEditText>(R.id.et_meaning)
+        btnImage = findViewById(R.id.btn_image)
+
+        val mode = intent.getStringExtra("mode") ?: "ADD"
+        var editId = -1
+
+        val isEdit = mode == "EDIT"
+        tvTitle.text = getString(if (isEdit) R.string.title_word_edit else R.string.title_word_add)
+        btnSubmit.text = getString(if (isEdit) R.string.btn_edit else R.string.btn_add)
+
+        if (isEdit) {
+            intent.getParcelableExtra<WordItem>("item")?.let { item ->
+                editId = item.id
+                etWord.setText(item.word)
+                etMeaning.setText(item.meaning)
+                imageUri = item.imageUri
+                btnImage.load(item.imageUri ?: android.R.drawable.ic_input_add)
+            }
+        } else {
+            imageUri = null
+            btnImage.setImageResource(android.R.drawable.ic_input_add)
+        }
+
+        btnImage.setOnClickListener {
+            pickLauncher.launch("image/*")
+        }
+
+        btnSubmit.setOnClickListener {
+            val resultIntent = Intent().apply {
+                putExtra("mode", mode)
+                putExtra("id", editId)
+                putExtra("word", etWord.text.toString())
+                putExtra("meaning", etMeaning.text.toString())
+                putExtra("imageUri", imageUri)
+            }
+            setResult(RESULT_OK, resultIntent)
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android_2026_1/WordItem.kt b/app/src/main/java/com/example/android_2026_1/WordItem.kt
new file mode 100644
index 0000000..411c707
--- /dev/null
+++ b/app/src/main/java/com/example/android_2026_1/WordItem.kt
@@ -0,0 +1,12 @@
+package com.example.android_2026_1
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class WordItem(
+    val id: Int,
+    val word: String,
+    val meaning: String,
+    val imageUri: String? = null
+) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4ff191c..776d507 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,12 +40,12 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:scaleType="centerCrop"
-        app:layout_constraintEnd_toStartOf="@+id/imageButton"
+        app:layout_constraintEnd_toStartOf="@+id/btn_delete"
         app:layout_constraintTop_toTopOf="parent"
         tools:srcCompat="@tools:sample/avatars" />
 
     <ImageButton
-        android:id="@+id/imageButton"
+        android:id="@+id/btn_delete"
         android:layout_width="34dp"
         android:layout_height="38dp"
         android:layout_marginTop="16dp"
@@ -56,14 +56,14 @@
         app:srcCompat="@android:drawable/ic_menu_delete" />
 
     <ImageButton
-        android:id="@+id/imageButton2"
+        android:id="@+id/btn_edit"
         android:layout_width="32dp"
         android:layout_height="31dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageButton"
+        app:layout_constraintTop_toBottomOf="@+id/btn_delete"
         app:srcCompat="@android:drawable/ic_menu_edit" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -78,7 +78,7 @@
         tools:listitem="@layout/support_simple_spinner_dropdown_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingActionButton"
+        android:id="@+id/btn_add"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/app/src/main/res/layout/activity_word_edit.xml b/app/src/main/res/layout/activity_word_edit.xml
index ab98b2c..0778dbd 100644
--- a/app/src/main/res/layout/activity_word_edit.xml
+++ b/app/src/main/res/layout/activity_word_edit.xml
@@ -6,7 +6,7 @@
     android:padding="24dp">
 
     <TextView
-        android:id="@+id/textView5"
+        android:id="@+id/text_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/wordInputLayout"
+        android:id="@+id/input_word"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -27,18 +27,18 @@
         app:counterMaxLength="30"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView5"
+        app:layout_constraintTop_toBottomOf="@+id/text_title"
         android:hint="@string/hint_word" >
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/editTextText"
+            android:id="@+id/et_word"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/meaningInputLayout"
+        android:id="@+id/input_meaning"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -46,27 +46,38 @@
         app:counterEnabled="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/wordInputLayout"
+        app:layout_constraintTop_toBottomOf="@+id/input_word"
         android:hint="@string/hint_meaning" >
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/editTextText2"
+            android:id="@+id/et_meaning"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button
-        android:id="@+id/button"
+        android:id="@+id/btn_submit"
         android:layout_width="0dp"
         android:layout_height="56dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginTop="152dp"
         android:text="Button"
         android:textSize="16sp"
         android:textStyle="bold"
         app:cornerRadius="28dp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/input_meaning" />
+
+    <ImageButton
+        android:id="@+id/btn_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/btn_submit"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/meaningInputLayout" />
+        app:layout_constraintTop_toBottomOf="@+id/input_meaning"
+        app:srcCompat="@android:drawable/ic_input_add" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_word.xml b/app/src/main/res/layout/item_word.xml
index aee4709..96a9475 100644
--- a/app/src/main/res/layout/item_word.xml
+++ b/app/src/main/res/layout/item_word.xml
@@ -6,7 +6,7 @@
     android:padding="16dp">
 
     <ImageView
-        android:id="@+id/imageView2"
+        android:id="@+id/iv_item_image"
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:scaleType="centerCrop"
@@ -15,21 +15,21 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/textView3"
+        android:id="@+id/tv_item_word"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:text="TextView"
         android:textSize="18sp"
         android:textColor="#333333"
-        app:layout_constraintBottom_toTopOf="@+id/textView4"
+        app:layout_constraintBottom_toTopOf="@+id/tv_item_meaning"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/imageView2"
+        app:layout_constraintStart_toEndOf="@+id/iv_item_image"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
-        android:id="@+id/textView4"
+        android:id="@+id/tv_item_meaning"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
@@ -39,7 +39,7 @@
         android:textColor="#666666"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/imageView2"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+        app:layout_constraintStart_toEndOf="@+id/iv_item_image"
+        app:layout_constraintTop_toBottomOf="@+id/tv_item_word" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e4994fa51642fafb4e33726841051d31be874d44 Mon Sep 17 00:00:00 2001
From: Rickettsia1234 <ej100504@naver.com>
Date: Sat, 18 Jul 2026 17:33:24 +0900
Subject: [PATCH 3/6] =?UTF-8?q?=EB=B7=B0=EB=AA=A8=EB=8D=B8=20=EB=B0=8F=20?=
 =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/android_2026_1/MainActivity.kt    | 85 ++++++++-----------
 .../example/android_2026_1/MainViewModel.kt   | 59 +++++++++++++
 .../com/example/android_2026_1/WordAdapter.kt | 17 +++-
 3 files changed, 108 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/java/com/example/android_2026_1/MainViewModel.kt

diff --git a/app/src/main/java/com/example/android_2026_1/MainActivity.kt b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
index 22cc8d0..ed148e5 100644
--- a/app/src/main/java/com/example/android_2026_1/MainActivity.kt
+++ b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
@@ -7,6 +7,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -17,10 +18,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 
 class MainActivity : AppCompatActivity() {
 
-    private val wordList = mutableListOf<WordItem>()
-    private var idCount = 0
-    private var selectedItem: WordItem? = null
-
+    private val viewModel: MainViewModel by viewModels()
     private lateinit var adapter: WordAdapter
     private lateinit var topWord: TextView
     private lateinit var topMeaning: TextView
@@ -37,29 +35,12 @@ class MainActivity : AppCompatActivity() {
             val uri = data?.getStringExtra("imageUri")
 
             when (mode) {
-                "ADD" -> {
-                    val newItem = WordItem(idCount++, word, meaning, uri)
-                    wordList.add(newItem)
-                    adapter.notifyItemInserted(wordList.size - 1)
-                }
-                "EDIT" -> {
+                MODE_ADD -> viewModel.addWord(word, meaning, uri)
+                MODE_EDIT -> {
                     val id = data?.getIntExtra("id", -1) ?: -1
-                    val index = wordList.indexOfFirst { it.id == id }
-                    if (index != -1) {
-                        val updated = WordItem(id, word, meaning, uri)
-                        wordList[index] = updated
-                        adapter.notifyItemChanged(index)
-
-                        if (selectedItem?.id == id) {
-                            showPreview(updated)
-                        }
-                    }
+                    viewModel.editWord(id, word, meaning, uri)
                 }
             }
-
-            if (wordList.isEmpty()) {
-                clearPreview()
-            }
         }
     }
 
@@ -82,10 +63,8 @@ class MainActivity : AppCompatActivity() {
         val btnAdd = findViewById<FloatingActionButton>(R.id.btn_add)
         val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
 
-        clearPreview()
-
-        adapter = WordAdapter(wordList) { clickedItem ->
-            showPreview(clickedItem)
+        adapter = WordAdapter { clickedItem ->
+            viewModel.selectItem(clickedItem)
         }
 
         recyclerView.layoutManager = LinearLayoutManager(this)
@@ -93,15 +72,15 @@ class MainActivity : AppCompatActivity() {
 
         btnAdd.setOnClickListener {
             val intent = Intent(this, WordEditActivity::class.java).apply {
-                putExtra("mode", "ADD")
+                putExtra("mode", MODE_ADD)
             }
             editLauncher.launch(intent)
         }
 
         btnEdit.setOnClickListener {
-            selectedItem?.let { item ->
+            viewModel.selectedWord.value?.let { item ->
                 val intent = Intent(this, WordEditActivity::class.java).apply {
-                    putExtra("mode", "EDIT")
+                    putExtra("mode", MODE_EDIT)
                     putExtra("item", item)
                 }
                 editLauncher.launch(intent)
@@ -109,28 +88,36 @@ class MainActivity : AppCompatActivity() {
         }
 
         btnDelete.setOnClickListener {
-            selectedItem?.let { item ->
-                val index = wordList.indexOfFirst { it.id == item.id }
-                if (index != -1) {
-                    wordList.removeAt(index)
-                    adapter.notifyItemRemoved(index)
-                    clearPreview()
-                }
-            }
+            viewModel.deleteWord()
+        }
+
+        viewModel.wordList.observe(this) { newList ->
+            adapter.submitList(newList)
+        }
+
+        viewModel.selectedWord.observe(this) { item ->
+            updatePreview(item)
         }
     }
 
-    private fun showPreview(item: WordItem) {
-        selectedItem = item
-        topWord.text = item.word
-        topMeaning.text = item.meaning
-        topImage.load(item.imageUri)
+    private fun updatePreview(item: WordItem?) {
+        if (item != null) {
+            topWord.text = item.word
+            topMeaning.text = item.meaning
+            if (item.imageUri != null) {
+                topImage.load(item.imageUri)
+            } else {
+                topImage.setImageDrawable(null)
+            }
+        } else {
+            topWord.text = ""
+            topMeaning.text = ""
+            topImage.setImageDrawable(null)
+        }
     }
 
-    private fun clearPreview() {
-        topWord.text = ""
-        topMeaning.text = ""
-        topImage.setImageDrawable(null)
-        selectedItem = null
+    companion object {
+        const val MODE_ADD = "ADD"
+        const val MODE_EDIT = "EDIT"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android_2026_1/MainViewModel.kt b/app/src/main/java/com/example/android_2026_1/MainViewModel.kt
new file mode 100644
index 0000000..83dd5f7
--- /dev/null
+++ b/app/src/main/java/com/example/android_2026_1/MainViewModel.kt
@@ -0,0 +1,59 @@
+package com.example.android_2026_1
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class MainViewModel : ViewModel() {
+
+    private val _wordList = MutableLiveData<List<WordItem>>(emptyList())
+    val wordList: LiveData<List<WordItem>> = _wordList
+
+    private val _selectedWord = MutableLiveData<WordItem?>(null)
+    val selectedWord: LiveData<WordItem?> = _selectedWord
+
+    private var nextId = 0
+
+    private fun getCurrentList(): MutableList<WordItem> {
+        return _wordList.value.orEmpty().toMutableList()
+    }
+
+    fun addWord(word: String, meaning: String, uri: String?) {
+        val currentList = getCurrentList()
+        val newItem = WordItem(nextId++, word, meaning, uri)
+        currentList.add(newItem)
+        _wordList.value = currentList
+    }
+
+    fun editWord(id: Int, word: String, meaning: String, uri: String?) {
+        val currentList = getCurrentList()
+        val index = currentList.indexOfFirst { it.id == id }
+        if (index != -1) {
+            val updated = WordItem(id, word, meaning, uri)
+            currentList[index] = updated
+            _wordList.value = currentList
+            if (_selectedWord.value?.id == id) {
+                _selectedWord.value = updated
+            }
+        }
+    }
+
+    fun deleteWord() {
+        val item = _selectedWord.value ?: return
+        val currentList = getCurrentList()
+        val index = currentList.indexOfFirst { it.id == item.id }
+        if (index != -1) {
+            currentList.removeAt(index)
+            _wordList.value = currentList
+            clearSelection()
+        }
+    }
+
+    fun selectItem(item: WordItem) {
+        _selectedWord.value = item
+    }
+
+    fun clearSelection() {
+        _selectedWord.value = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android_2026_1/WordAdapter.kt b/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
index 430d3a4..199f72f 100644
--- a/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
+++ b/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
@@ -5,13 +5,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 
 class WordAdapter(
-    private val items: List<WordItem>,
     private val onItemClick: (WordItem) -> Unit
-) : RecyclerView.Adapter<WordAdapter.ViewHolder>() {
+) : ListAdapter<WordItem, WordAdapter.ViewHolder>(WordDiffCallback) {
 
     class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         val img: ImageView = view.findViewById(R.id.iv_item_image)
@@ -26,12 +27,20 @@ class WordAdapter(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = items[position]
+        val item = getItem(position)
         holder.txtWord.text = item.word
         holder.txtMeaning.text = item.meaning
         holder.img.load(item.imageUri)
         holder.itemView.setOnClickListener { onItemClick(item) }
     }
 
-    override fun getItemCount(): Int = items.size
+    companion object WordDiffCallback : DiffUtil.ItemCallback<WordItem>() {
+        override fun areItemsTheSame(oldItem: WordItem, newItem: WordItem): Boolean {
+            return oldItem.id == newItem.id
+        }
+
+        override fun areContentsTheSame(oldItem: WordItem, newItem: WordItem): Boolean {
+            return oldItem == newItem
+        }
+    }
 }
\ No newline at end of file

From eb5e1e23c058ddbfc0f443ddb5c845d56a63650a Mon Sep 17 00:00:00 2001
From: Rickettsia1234 <ej100504@naver.com>
Date: Sat, 18 Jul 2026 19:22:45 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=B0=94=EC=9D=B8=EB=94=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |   4 +
 .../example/android_2026_1/BindingAdapters.kt |  14 ++
 .../example/android_2026_1/MainActivity.kt    |  60 ++----
 app/src/main/res/layout/activity_main.xml     | 175 ++++++++++--------
 4 files changed, 123 insertions(+), 130 deletions(-)
 create mode 100644 app/src/main/java/com/example/android_2026_1/BindingAdapters.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3eea16f..955758e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -30,6 +30,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
+
+    buildFeatures {
+        dataBinding = true
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/example/android_2026_1/BindingAdapters.kt b/app/src/main/java/com/example/android_2026_1/BindingAdapters.kt
new file mode 100644
index 0000000..1cc09fa
--- /dev/null
+++ b/app/src/main/java/com/example/android_2026_1/BindingAdapters.kt
@@ -0,0 +1,14 @@
+package com.example.android_2026_1
+
+import android.widget.ImageView
+import androidx.databinding.BindingAdapter
+import coil.load
+
+@BindingAdapter("imageUri")
+fun loadImage(imageView: ImageView, uri: String?) {
+    if (uri != null) {
+        imageView.load(uri)
+    } else {
+        imageView.setImageDrawable(null)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android_2026_1/MainActivity.kt b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
index ed148e5..843ae72 100644
--- a/app/src/main/java/com/example/android_2026_1/MainActivity.kt
+++ b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
@@ -2,27 +2,21 @@ package com.example.android_2026_1
 
 import android.content.Intent
 import android.os.Bundle
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.example.android_2026_1.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     private val viewModel: MainViewModel by viewModels()
     private lateinit var adapter: WordAdapter
-    private lateinit var topWord: TextView
-    private lateinit var topMeaning: TextView
-    private lateinit var topImage: ImageView
+    private lateinit var binding: ActivityMainBinding
 
     private val editLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
@@ -47,37 +41,31 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        setContentView(R.layout.activity_main)
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
+        binding.viewModel = viewModel
+        binding.lifecycleOwner = this
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.main) { v, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
 
-        topWord = findViewById(R.id.textView)
-        topMeaning = findViewById(R.id.textView2)
-        topImage = findViewById(R.id.imageView)
-
-        val btnEdit = findViewById<ImageButton>(R.id.btn_edit)
-        val btnDelete = findViewById<ImageButton>(R.id.btn_delete)
-        val btnAdd = findViewById<FloatingActionButton>(R.id.btn_add)
-        val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
-
         adapter = WordAdapter { clickedItem ->
             viewModel.selectItem(clickedItem)
         }
 
-        recyclerView.layoutManager = LinearLayoutManager(this)
-        recyclerView.adapter = adapter
+        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        binding.recyclerView.adapter = adapter
 
-        btnAdd.setOnClickListener {
+        binding.btnAdd.setOnClickListener {
             val intent = Intent(this, WordEditActivity::class.java).apply {
                 putExtra("mode", MODE_ADD)
             }
             editLauncher.launch(intent)
         }
 
-        btnEdit.setOnClickListener {
+        binding.btnEdit.setOnClickListener {
             viewModel.selectedWord.value?.let { item ->
                 val intent = Intent(this, WordEditActivity::class.java).apply {
                     putExtra("mode", MODE_EDIT)
@@ -87,33 +75,9 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        btnDelete.setOnClickListener {
-            viewModel.deleteWord()
-        }
-
         viewModel.wordList.observe(this) { newList ->
             adapter.submitList(newList)
         }
-
-        viewModel.selectedWord.observe(this) { item ->
-            updatePreview(item)
-        }
-    }
-
-    private fun updatePreview(item: WordItem?) {
-        if (item != null) {
-            topWord.text = item.word
-            topMeaning.text = item.meaning
-            if (item.imageUri != null) {
-                topImage.load(item.imageUri)
-            } else {
-                topImage.setImageDrawable(null)
-            }
-        } else {
-            topWord.text = ""
-            topMeaning.text = ""
-            topImage.setImageDrawable(null)
-        }
     }
 
     companion object {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 776d507..da10bb9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,92 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    xmlns:tools="http://tools.android.com/tools">
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="TextView"
-        android:textSize="18sp"
-        app:layout_constraintEnd_toStartOf="@+id/imageView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <data>
+        <variable
+            name="viewModel"
+            type="com.example.android_2026_1.MainViewModel" />
+    </data>
 
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="TextView"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toStartOf="@+id/imageView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".MainActivity">
 
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="90dp"
-        android:layout_height="82dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintEnd_toStartOf="@+id/btn_delete"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars" />
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@{viewModel.selectedWord.word}"
+            android:textSize="18sp"
+            app:layout_constraintEnd_toStartOf="@+id/imageView"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
-        android:id="@+id/btn_delete"
-        android:layout_width="34dp"
-        android:layout_height="38dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@android:drawable/ic_menu_delete" />
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@{viewModel.selectedWord.meaning}"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toStartOf="@+id/imageView"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView" />
 
-    <ImageButton
-        android:id="@+id/btn_edit"
-        android:layout_width="32dp"
-        android:layout_height="31dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="16dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_delete"
-        app:srcCompat="@android:drawable/ic_menu_edit" />
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="90dp"
+            android:layout_height="82dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:scaleType="centerCrop"
+            app:imageUri="@{viewModel.selectedWord.imageUri}"
+            app:layout_constraintEnd_toStartOf="@+id/btn_delete"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:srcCompat="@tools:sample/avatars" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView"
-        tools:listitem="@layout/support_simple_spinner_dropdown_item" />
+        <ImageButton
+            android:id="@+id/btn_delete"
+            android:layout_width="34dp"
+            android:layout_height="38dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:onClick="@{() -> viewModel.deleteWord()}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@android:drawable/ic_menu_delete" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/btn_add"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@android:drawable/ic_input_add" />
+        <ImageButton
+            android:id="@+id/btn_edit"
+            android:layout_width="32dp"
+            android:layout_height="31dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="16dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btn_delete"
+            app:srcCompat="@android:drawable/ic_menu_edit" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView"
+            tools:listitem="@layout/support_simple_spinner_dropdown_item" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btn_add"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:srcCompat="@android:drawable/ic_input_add" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

From 5b7f4b8ad351447f856dd3abbc04028f8f9d42f9 Mon Sep 17 00:00:00 2001
From: Rickettsia1234 <ej100504@naver.com>
Date: Sat, 18 Jul 2026 19:48:51 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EB=8B=A8=EC=96=B4=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=B0=94=EC=9D=B8=EB=94=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android_2026_1/WordEditActivity.kt        |  40 ++---
 .../main/res/layout/activity_word_edit.xml    | 158 ++++++++++--------
 2 files changed, 102 insertions(+), 96 deletions(-)

diff --git a/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt b/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
index b933007..04d8922 100644
--- a/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
+++ b/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
@@ -2,70 +2,62 @@ package com.example.android_2026_1
 
 import android.content.Intent
 import android.os.Bundle
-import android.widget.Button
-import android.widget.ImageButton
-import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import coil.load
-import com.google.android.material.textfield.TextInputEditText
+import com.example.android_2026_1.databinding.ActivityWordEditBinding
 
 class WordEditActivity : AppCompatActivity() {
 
     private var imageUri: String? = null
-    private lateinit var btnImage: ImageButton
+    private lateinit var binding: ActivityWordEditBinding
 
     private val pickLauncher = registerForActivityResult(
         ActivityResultContracts.GetContent()
     ) { uri ->
         uri?.let {
             imageUri = it.toString()
-            btnImage.load(it)
+            binding.btnImage.load(it)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        setContentView(R.layout.activity_word_edit)
-
-        val tvTitle = findViewById<TextView>(R.id.text_title)
-        val btnSubmit = findViewById<Button>(R.id.btn_submit)
-        val etWord = findViewById<TextInputEditText>(R.id.et_word)
-        val etMeaning = findViewById<TextInputEditText>(R.id.et_meaning)
-        btnImage = findViewById(R.id.btn_image)
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_word_edit)
 
         val mode = intent.getStringExtra("mode") ?: "ADD"
         var editId = -1
-
         val isEdit = mode == "EDIT"
-        tvTitle.text = getString(if (isEdit) R.string.title_word_edit else R.string.title_word_add)
-        btnSubmit.text = getString(if (isEdit) R.string.btn_edit else R.string.btn_add)
+
+        binding.isEdit = isEdit
 
         if (isEdit) {
             intent.getParcelableExtra<WordItem>("item")?.let { item ->
                 editId = item.id
-                etWord.setText(item.word)
-                etMeaning.setText(item.meaning)
                 imageUri = item.imageUri
-                btnImage.load(item.imageUri ?: android.R.drawable.ic_input_add)
+                binding.item = item
+                if (item.imageUri == null) {
+                    binding.btnImage.setImageResource(android.R.drawable.ic_input_add)
+                }
             }
         } else {
             imageUri = null
-            btnImage.setImageResource(android.R.drawable.ic_input_add)
+            binding.btnImage.setImageResource(android.R.drawable.ic_input_add)
         }
 
-        btnImage.setOnClickListener {
+        binding.btnImage.setOnClickListener {
             pickLauncher.launch("image/*")
         }
 
-        btnSubmit.setOnClickListener {
+        binding.btnSubmit.setOnClickListener {
             val resultIntent = Intent().apply {
                 putExtra("mode", mode)
                 putExtra("id", editId)
-                putExtra("word", etWord.text.toString())
-                putExtra("meaning", etMeaning.text.toString())
+                putExtra("word", binding.etWord.text.toString())
+                putExtra("meaning", binding.etMeaning.text.toString())
                 putExtra("imageUri", imageUri)
             }
             setResult(RESULT_OK, resultIntent)
diff --git a/app/src/main/res/layout/activity_word_edit.xml b/app/src/main/res/layout/activity_word_edit.xml
index 0778dbd..05b2a51 100644
--- a/app/src/main/res/layout/activity_word_edit.xml
+++ b/app/src/main/res/layout/activity_word_edit.xml
@@ -1,83 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="24dp">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <TextView
-        android:id="@+id/text_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="TextView"
-        android:textSize="28sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <data>
+        <variable
+            name="isEdit"
+            type="Boolean" />
+        <variable
+            name="item"
+            type="com.example.android_2026_1.WordItem" />
+    </data>
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/input_word"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="48dp"
-        app:counterEnabled="true"
-        app:counterMaxLength="30"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_title"
-        android:hint="@string/hint_word" >
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="24dp">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_word"
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/text_title"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:inputType="text" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginTop="32dp"
+            android:text="@{isEdit ? @string/title_word_edit : @string/title_word_add}"
+            android:textSize="28sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/input_meaning"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:counterEnabled="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/input_word"
-        android:hint="@string/hint_meaning" >
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_word"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="48dp"
+            app:counterEnabled="true"
+            app:counterMaxLength="30"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_title"
+            android:hint="@string/hint_word">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_word"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@{item.word}"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_meaning"
-            android:layout_width="match_parent"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_meaning"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:inputType="text" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginTop="16dp"
+            app:counterEnabled="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/input_word"
+            android:hint="@string/hint_meaning">
 
-    <Button
-        android:id="@+id/btn_submit"
-        android:layout_width="0dp"
-        android:layout_height="56dp"
-        android:layout_marginTop="152dp"
-        android:text="Button"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:cornerRadius="28dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/input_meaning" />
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_meaning"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@{item.meaning}"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-    <ImageButton
-        android:id="@+id/btn_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/btn_submit"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/input_meaning"
-        app:srcCompat="@android:drawable/ic_input_add" />
+        <Button
+            android:id="@+id/btn_submit"
+            android:layout_width="0dp"
+            android:layout_height="56dp"
+            android:layout_marginTop="152dp"
+            android:text="@{isEdit ? @string/btn_edit : @string/btn_add}"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:cornerRadius="28dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/input_meaning" />
+
+        <ImageButton
+            android:id="@+id/btn_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:imageUri="@{item.imageUri}"
+            app:layout_constraintBottom_toTopOf="@+id/btn_submit"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/input_meaning" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

From 525861dc315f0e56fb2c09394570422767b4f937 Mon Sep 17 00:00:00 2001
From: Rickettsia1234 <ej100504@naver.com>
Date: Sat, 18 Jul 2026 22:41:19 +0900
Subject: [PATCH 6/6] =?UTF-8?q?kapt=20=EC=84=A4=EC=B9=98=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0=20=EB=B0=8F=20=EB=8B=A8=EC=96=B4?=
 =?UTF-8?q?=20=EA=B0=AF=EC=88=98=20=ED=99=95=EC=9D=B8=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=20=EB=B0=8F=20=EA=B0=81=EC=A2=85=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=93=B1=20=EA=B0=81=EC=A2=85=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  5 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../example/android_2026_1/BindingAdapters.kt | 10 ++-
 .../example/android_2026_1/MainActivity.kt    | 14 +--
 .../com/example/android_2026_1/WordAdapter.kt | 24 ++---
 .../android_2026_1/WordEditActivity.kt        | 23 ++++-
 app/src/main/res/layout/activity_main.xml     |  4 +-
 app/src/main/res/layout/item_word.xml         | 88 +++++++++++--------
 build.gradle.kts                              |  1 -
 gradle/libs.versions.toml                     | 13 +--
 gradle/wrapper/gradle-wrapper.properties      |  6 +-
 11 files changed, 107 insertions(+), 83 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 955758e..b15966f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,16 +1,17 @@
 plugins {
     alias(libs.plugins.android.application)
     id("kotlin-parcelize")
+    alias(libs.plugins.android.legacy.kapt)
 }
 
 android {
     namespace = "com.example.android_2026_1"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.example.android_2026_1"
         minSdk = 26
-        targetSdk = 36
+        targetSdk = 37
         versionCode = 1
         versionName = "1.0"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 515c541..5ac5522 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         </activity>
         <activity
             android:name=".WordEditActivity"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/example/android_2026_1/BindingAdapters.kt b/app/src/main/java/com/example/android_2026_1/BindingAdapters.kt
index 1cc09fa..6c9fd70 100644
--- a/app/src/main/java/com/example/android_2026_1/BindingAdapters.kt
+++ b/app/src/main/java/com/example/android_2026_1/BindingAdapters.kt
@@ -2,13 +2,15 @@ package com.example.android_2026_1
 
 import android.widget.ImageView
 import androidx.databinding.BindingAdapter
+import coil.dispose
 import coil.load
 
 @BindingAdapter("imageUri")
-fun loadImage(imageView: ImageView, uri: String?) {
-    if (uri != null) {
-        imageView.load(uri)
+fun ImageView.setImageUri(uri: String?) {
+    if (uri.isNullOrEmpty()) {
+        dispose()
+        setImageDrawable(null)
     } else {
-        imageView.setImageDrawable(null)
+        load(uri)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android_2026_1/MainActivity.kt b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
index 843ae72..93e2bc6 100644
--- a/app/src/main/java/com/example/android_2026_1/MainActivity.kt
+++ b/app/src/main/java/com/example/android_2026_1/MainActivity.kt
@@ -21,17 +21,17 @@ class MainActivity : AppCompatActivity() {
     private val editLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) { result ->
-        if (result.resultCode == RESULT_OK) {
-            val data = result.data
-            val mode = data?.getStringExtra("mode")
-            val word = data?.getStringExtra("word").orEmpty()
-            val meaning = data?.getStringExtra("meaning").orEmpty()
-            val uri = data?.getStringExtra("imageUri")
+        val data = result.data
+        if (data != null) {
+            val mode = data.getStringExtra("mode")
+            val word = data.getStringExtra("word").orEmpty()
+            val meaning = data.getStringExtra("meaning").orEmpty()
+            val uri = data.getStringExtra("imageUri")
 
             when (mode) {
                 MODE_ADD -> viewModel.addWord(word, meaning, uri)
                 MODE_EDIT -> {
-                    val id = data?.getIntExtra("id", -1) ?: -1
+                    val id = data.getIntExtra("id", -1)
                     viewModel.editWord(id, word, meaning, uri)
                 }
             }
diff --git a/app/src/main/java/com/example/android_2026_1/WordAdapter.kt b/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
index 199f72f..e57ef3a 100644
--- a/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
+++ b/app/src/main/java/com/example/android_2026_1/WordAdapter.kt
@@ -1,37 +1,29 @@
 package com.example.android_2026_1
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import com.example.android_2026_1.databinding.ItemWordBinding
 
 class WordAdapter(
     private val onItemClick: (WordItem) -> Unit
 ) : ListAdapter<WordItem, WordAdapter.ViewHolder>(WordDiffCallback) {
 
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val img: ImageView = view.findViewById(R.id.iv_item_image)
-        val txtWord: TextView = view.findViewById(R.id.tv_item_word)
-        val txtMeaning: TextView = view.findViewById(R.id.tv_item_meaning)
-    }
+    class ViewHolder(val binding: ItemWordBinding) : RecyclerView.ViewHolder(binding.root)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_word, parent, false)
-        return ViewHolder(view)
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val binding = ItemWordBinding.inflate(layoutInflater, parent, false)
+        return ViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = getItem(position)
-        holder.txtWord.text = item.word
-        holder.txtMeaning.text = item.meaning
-        holder.img.load(item.imageUri)
-        holder.itemView.setOnClickListener { onItemClick(item) }
+        holder.binding.item = item
+        holder.binding.root.setOnClickListener { onItemClick(item) }
+        holder.binding.executePendingBindings()
     }
 
     companion object WordDiffCallback : DiffUtil.ItemCallback<WordItem>() {
diff --git a/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt b/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
index 04d8922..13cb6ea 100644
--- a/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
+++ b/app/src/main/java/com/example/android_2026_1/WordEditActivity.kt
@@ -7,6 +7,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import coil.load
+import coil.dispose
 import com.example.android_2026_1.databinding.ActivityWordEditBinding
 
 class WordEditActivity : AppCompatActivity() {
@@ -35,16 +36,25 @@ class WordEditActivity : AppCompatActivity() {
         binding.isEdit = isEdit
 
         if (isEdit) {
-            intent.getParcelableExtra<WordItem>("item")?.let { item ->
+            val item = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+                intent.getParcelableExtra("item", WordItem::class.java)
+            } else {
+                @Suppress("DEPRECATION")
+                intent.getParcelableExtra<WordItem>("item")
+            }
+
+            item?.let { item ->
                 editId = item.id
                 imageUri = item.imageUri
                 binding.item = item
                 if (item.imageUri == null) {
+                    binding.btnImage.dispose()
                     binding.btnImage.setImageResource(android.R.drawable.ic_input_add)
                 }
             }
         } else {
             imageUri = null
+            binding.btnImage.dispose()
             binding.btnImage.setImageResource(android.R.drawable.ic_input_add)
         }
 
@@ -53,11 +63,18 @@ class WordEditActivity : AppCompatActivity() {
         }
 
         binding.btnSubmit.setOnClickListener {
+            val wordText = binding.etWord.text.toString().trim()
+            val meaningText = binding.etMeaning.text.toString().trim()
+
+            if (wordText.isEmpty() || meaningText.isEmpty()) {
+                return@setOnClickListener
+            }
+
             val resultIntent = Intent().apply {
                 putExtra("mode", mode)
                 putExtra("id", editId)
-                putExtra("word", binding.etWord.text.toString())
-                putExtra("meaning", binding.etMeaning.text.toString())
+                putExtra("word", wordText)
+                putExtra("meaning", meaningText)
                 putExtra("imageUri", imageUri)
             }
             setResult(RESULT_OK, resultIntent)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index da10bb9..e2d43a5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://tools.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
         <variable
@@ -48,7 +48,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:scaleType="centerCrop"
-            app:imageUri="@{viewModel.selectedWord.imageUri}"
+            app:imageUri="@{viewModel.selectedWord != null ? viewModel.selectedWord.imageUri : null}"
             app:layout_constraintEnd_toStartOf="@+id/btn_delete"
             app:layout_constraintTop_toTopOf="parent"
             tools:srcCompat="@tools:sample/avatars" />
diff --git a/app/src/main/res/layout/item_word.xml b/app/src/main/res/layout/item_word.xml
index 96a9475..b78bf44 100644
--- a/app/src/main/res/layout/item_word.xml
+++ b/app/src/main/res/layout/item_word.xml
@@ -1,45 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <ImageView
-        android:id="@+id/iv_item_image"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <data>
+        <variable
+            name="item"
+            type="com.example.android_2026_1.WordItem" />
+    </data>
 
-    <TextView
-        android:id="@+id/tv_item_word"
-        android:layout_width="0dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:text="TextView"
-        android:textSize="18sp"
-        android:textColor="#333333"
-        app:layout_constraintBottom_toTopOf="@+id/tv_item_meaning"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/iv_item_image"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed" />
+        android:padding="16dp">
 
-    <TextView
-        android:id="@+id/tv_item_meaning"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
-        android:text="TextView"
-        android:textSize="14sp"
-        android:textColor="#666666"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/iv_item_image"
-        app:layout_constraintTop_toBottomOf="@+id/tv_item_word" />
+        <ImageView
+            android:id="@+id/iv_item_image"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:scaleType="centerCrop"
+            app:imageUri="@{item != null ? item.imageUri : null}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_item_word"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:text="@{item != null ? item.word : ``}"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toTopOf="@+id/tv_item_meaning"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_item_image"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <TextView
+            android:id="@+id/tv_item_meaning"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:text="@{item != null ? item.meaning : ``}"
+            android:textColor="#666666"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_item_image"
+            app:layout_constraintTop_toBottomOf="@+id/tv_item_word" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 922f551..06e4514 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index feea120..7126ec5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,11 @@
 [versions]
+agp = "9.1.1"
+databindingCompiler = "9.3.0"
+kotlin = "2.4.10"
 coil = "2.7.0"
-kotlin = "2.3.21"
 activity = "1.13.0"
-agp = "9.0.1"
 constraintlayout = "2.2.1"
-coreKtx = "1.18.0"
+coreKtx = "1.19.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
@@ -16,6 +17,7 @@ recyclerview = "1.4.0"
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx-activity = { module = "androidx.activity:activity", version.ref = "activity" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-databinding-compiler = { module = "androidx.databinding:databinding-compiler", version.ref = "databindingCompiler" }
 coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
@@ -25,5 +27,6 @@ material = { module = "com.google.android.material:material", version.ref = "mat
 androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
\ No newline at end of file
+android-application = { id="com.android.application", version.ref="agp" }
+kotlin-android = { id="org.jetbrains.kotlin.android", version.ref="kotlin" }
+android-legacy-kapt = { id = "com.android.legacy-kapt", version.ref = "agp" }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 986dfe1..36bee10 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
-#Fri May 15 03:28:10 KST 2026
+#Sat Jul 18 21:35:54 KST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME