diff --git a/.gradle/config.properties b/.gradle/config.properties
new file mode 100644
index 0000000..76e9d26
--- /dev/null
+++ b/.gradle/config.properties
@@ -0,0 +1,2 @@
+#Tue Nov 26 00:44:34 KST 2024
+java.home=C\:\\Program Files\\Android\\Android Studio1\\jbr
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..99b49d3
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+assignment02
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..8958210
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidLayouts">
+    <shared>
+      <config />
+    </shared>
+    <layouts>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_addword.xml">
+        <config>
+          <theme>@style/Theme.Assignment02</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
+        <config>
+          <theme>@style/Theme.Assignment02</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_word.xml">
+        <config>
+          <theme>@style/Theme.Assignment02</theme>
+        </config>
+      </layout>
+    </layouts>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="66610982-134f-47c4-a8b4-c3cdf03dc3f9" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/assignment02/ui/addword/AddWordActivity.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/assignment02/MainActivity.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/assignment02/TextFragment.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/bottom_menu.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_text.xml" beforeDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ClangdSettings">
+    <option name="formatViaClangd" value="false" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\상상\.android\avd\Medium_Phone_API_33.avd]" />
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <task path="$PROJECT_DIR$/app">
+          <activation />
+        </task>
+        <projects_view>
+          <tree_state>
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="assignment02" type="f1a62948:ProjectNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="assignment02" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="assignment02" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="assignment02" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="other" type="c8890929:TasksNode$1" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+        <option value="layoutResourceFile" />
+        <option value="Kotlin Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="2okHCiQbUQEHdzpGipW9Nn9xt3D" />
+  <component name="ProjectViewState">
+    <option name="autoscrollToSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
+    &quot;last_directory_selection&quot;: &quot;C:/Users/Public/assignment02/app/src/main/java&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/Public/assignment02&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.20431472&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.Mappings&quot;
+  }
+}</component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\Public\assignment02\app\src\main\res\layout" />
+    </key>
+    <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="" />
+    </key>
+  </component>
+  <component name="RunManager">
+    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+      <module name="assignment02.app.main" />
+      <option name="DEPLOY" value="true" />
+      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+      <option name="DEPLOY_AS_INSTANT" value="false" />
+      <option name="ARTIFACT_NAME" value="" />
+      <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ALL_USERS" value="false" />
+      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+      <option name="CLEAR_APP_STORAGE" value="false" />
+      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+      <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
+      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <option name="DEBUGGER_TYPE" value="Auto" />
+      <Auto>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Auto>
+      <Hybrid>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Hybrid>
+      <Java>
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Java>
+      <Native>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Native>
+      <Profilers>
+        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+      </Profilers>
+      <option name="DEEP_LINK" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+      <method v="2">
+        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="66610982-134f-47c4-a8b4-c3cdf03dc3f9" name="Changes" comment="" />
+      <created>1731406527910</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1731406527910</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 166076e..6856133 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace = "com.example.assignment02"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.example.assignment02"
@@ -36,11 +36,15 @@ android {
 }
 
 dependencies {
-    implementation("androidx.activity:activity-ktx:1.7.0")
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("com.google.code.gson:gson:2.8.8")
+    implementation("androidx.viewpager2:viewpager2:1.0.0")
+    implementation("androidx.fragment:fragment-ktx:1.3.5")
+    implementation("com.google.android.material:material:1.10.0")
+    implementation("androidx.core:core-ktx:1.15.0")
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.android.material:material:1.12.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
+    implementation("androidx.recyclerview:recyclerview:1.4.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c9ef4a9..57c5bc4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -13,15 +17,19 @@
         android:theme="@style/Theme.Assignment02"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".RandomActivity" />
+
+        <activity android:name=".ui.addword.AddWordActivity" />
+        <activity android:name=".data.model.Word" />
+        <activity android:name=".data.repository.WordDatabase" />
+        <activity android:name=".ui.main.MainAdapter" />
+        <activity android:name=".viewmodel.MainViewModel" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/assignment02/MainActivity.kt b/app/src/main/java/com/example/assignment02/MainActivity.kt
deleted file mode 100644
index acbfa04..0000000
--- a/app/src/main/java/com/example/assignment02/MainActivity.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.example.assignment02
-
-import android.app.Activity
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.widget.TextView
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        val number_text: TextView = findViewById(R.id.number_text)
-        val count_btn: TextView = findViewById(R.id.count_btn)
-        val toast_btn: TextView = findViewById(R.id.toast_btn)
-        val random_btn: TextView = findViewById(R.id.random_btn)
-        val intent = Intent(this, RandomActivity::class.java)
-
-        val resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                number_text.text = result.data?.getIntExtra("random_number", 0).toString()
-                Toast.makeText(this, "OK", Toast.LENGTH_SHORT).show()
-            }
-            else {
-                Toast.makeText(this, "오류", Toast.LENGTH_SHORT).show()
-            }
-        }
-
-        count_btn.setOnClickListener {
-            number_text.text = (number_text.text.toString().toInt()+1).toString()
-        }
-        toast_btn.setOnClickListener {
-            Toast.makeText(this, "숫자 : "+number_text.text, Toast.LENGTH_LONG).show()
-        }
-        random_btn.setOnClickListener {
-            intent.putExtra("number", number_text.text.toString().toInt())
-            resultLauncher.launch(intent)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/assignment02/RandomActivity.kt b/app/src/main/java/com/example/assignment02/RandomActivity.kt
deleted file mode 100644
index 22307a7..0000000
--- a/app/src/main/java/com/example/assignment02/RandomActivity.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.assignment02
-
-import android.content.Intent
-import android.os.Bundle
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import kotlin.random.Random
-
-class RandomActivity : AppCompatActivity()  {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_random)
-        val number_text: TextView = findViewById(R.id.number_text)
-        val number = intent.getIntExtra("number", 1)
-        val resultIntent = Intent()
-
-        if (number > 0){
-            val random_number = Random.nextInt(0, number)  // 0부터 99까지의 랜덤 값
-            number_text.text = random_number.toString()
-            resultIntent.putExtra("random_number", random_number)
-            setResult(RESULT_OK, resultIntent)
-        } else {
-            number_text.text = number.toString()
-            resultIntent.putExtra("random_number", number)
-            setResult(RESULT_OK, resultIntent)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/assignment02/data/model/Word.kt b/app/src/main/java/com/example/assignment02/data/model/Word.kt
new file mode 100644
index 0000000..f85f36e
--- /dev/null
+++ b/app/src/main/java/com/example/assignment02/data/model/Word.kt
@@ -0,0 +1,6 @@
+package com.example.assignment02.data.model
+
+data class Word(
+    val word: String,
+    val definition: String
+)
diff --git a/app/src/main/java/com/example/assignment02/data/repository/WordDatabase.kt b/app/src/main/java/com/example/assignment02/data/repository/WordDatabase.kt
new file mode 100644
index 0000000..e876c67
--- /dev/null
+++ b/app/src/main/java/com/example/assignment02/data/repository/WordDatabase.kt
@@ -0,0 +1,23 @@
+package com.example.assignment02.data.repository
+
+import android.content.Context
+import com.example.assignment02.data.model.Word
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+class WordDatabase(context: Context) {
+
+    private val sharedPreferences = context.getSharedPreferences("word_db", Context.MODE_PRIVATE)
+    private val gson = Gson()
+
+    fun saveWords(wordList: List<Word>) {
+        val json = gson.toJson(wordList)
+        sharedPreferences.edit().putString("word_list", json).apply()
+    }
+
+    fun getWords(): List<Word> {
+        val json = sharedPreferences.getString("word_list", "[]") ?: "[]"
+        val type = object : TypeToken<List<Word>>() {}.type
+        return gson.fromJson(json, type)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/assignment02/ui/addword/AddWordActivity.kt b/app/src/main/java/com/example/assignment02/ui/addword/AddWordActivity.kt
new file mode 100644
index 0000000..6b50b43
--- /dev/null
+++ b/app/src/main/java/com/example/assignment02/ui/addword/AddWordActivity.kt
@@ -0,0 +1,43 @@
+package com.example.assignment02.ui.addword
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
+import com.example.assignment02.R
+
+class AddWordActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_addword)
+
+        val wordText = findViewById<EditText>(R.id.wordText)
+        val definitionText = findViewById<EditText>(R.id.definitionText)
+        val button = findViewById<Button>(R.id.button)
+
+        val mode = intent.getStringExtra("mode") ?: "add"
+        if (mode == "edit") {
+            val word = intent.getStringExtra("word") ?: ""
+            val definition = intent.getStringExtra("definition") ?: ""
+            wordText.setText(word)
+            definitionText.setText(definition)
+        }
+
+        button.setOnClickListener {
+            val word = wordText.text.toString().trim()
+            val definition = definitionText.text.toString().trim()
+
+            if (word.isNotEmpty() && definition.isNotEmpty()) {
+                val resultIntent = Intent().apply {
+                    putExtra("word", word)
+                    putExtra("definition", definition)
+                }
+                setResult(Activity.RESULT_OK, resultIntent)
+                finish()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/assignment02/ui/main/MainActivity.kt b/app/src/main/java/com/example/assignment02/ui/main/MainActivity.kt
new file mode 100644
index 0000000..3fab62e
--- /dev/null
+++ b/app/src/main/java/com/example/assignment02/ui/main/MainActivity.kt
@@ -0,0 +1,107 @@
+package com.example.assignment02.ui.main
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.ImageButton
+import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.example.assignment02.R
+import com.example.assignment02.data.model.Word
+import com.example.assignment02.ui.addword.AddWordActivity
+import com.example.assignment02.viewmodel.MainViewModel
+
+class MainActivity : AppCompatActivity() {
+
+    private lateinit var recyclerView: RecyclerView
+    private lateinit var addWordButton: ImageButton
+    private lateinit var editButton: ImageButton
+    private lateinit var deleteButton: ImageButton
+    private lateinit var wordViewModel: MainViewModel
+    private lateinit var selectedWordText: TextView
+    private lateinit var selectedDefinitionText: TextView
+    private lateinit var adapter: MainAdapter
+
+    private var selectedWord: Word? = null
+
+    private val wordLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == RESULT_OK) {
+            val data = result.data
+            val word = data?.getStringExtra("word") ?: return@registerForActivityResult
+            val definition = data.getStringExtra("definition") ?: return@registerForActivityResult
+            val newWord = Word(word, definition)
+
+            val mode = data.getStringExtra("mode")
+
+            if (mode == "edit") {
+                wordViewModel.removeWord(selectedWord!!)
+            }
+            wordViewModel.addWord(newWord)
+
+            wordViewModel.removeWord(selectedWord!!)
+            adapter.submitList(wordViewModel.getWords())
+            selectedWordText.text = newWord.word
+            selectedDefinitionText.text = newWord.definition
+            editButton.visibility = View.VISIBLE
+            deleteButton.visibility = View.VISIBLE
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        recyclerView = findViewById(R.id.recyclerView)
+        addWordButton = findViewById(R.id.addButton)
+        editButton = findViewById(R.id.editButton)
+        deleteButton = findViewById(R.id.deleteButton)
+        selectedWordText = findViewById(R.id.selectedWordText)
+        selectedDefinitionText = findViewById(R.id.selectedDefinitionText)
+
+        wordViewModel = MainViewModel(application)
+
+        adapter = MainAdapter { word ->
+            selectedWord = word
+            selectedWordText.text = word.word
+            selectedDefinitionText.text = word.definition
+            editButton.visibility = View.VISIBLE
+            deleteButton.visibility = View.VISIBLE
+        }
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        recyclerView.adapter = adapter
+
+        addWordButton.setOnClickListener {
+            val intent = Intent(this, AddWordActivity::class.java).apply {
+                putExtra("mode", "add")
+            }
+            wordLauncher.launch(intent)
+        }
+
+        editButton.setOnClickListener {
+            selectedWord?.let {
+                val intent = Intent(this, AddWordActivity::class.java).apply {
+                    putExtra("mode", "edit")
+                    putExtra("word", it.word)
+                    putExtra("definition", it.definition)
+                }
+                wordLauncher.launch(intent)
+            }
+        }
+        deleteButton.setOnClickListener {
+            if(selectedWord != null) {
+                Log.d("Test", selectedWord!!.word + " : " + selectedWord!!.definition)
+                wordViewModel.removeWord(selectedWord!!)
+                adapter.submitList(wordViewModel.getWords())
+                selectedWordText.text = ""
+                selectedDefinitionText.text = ""
+                editButton.visibility = View.GONE
+                deleteButton.visibility = View.GONE
+            }
+        }
+        adapter.submitList(wordViewModel.getWords())
+    }
+}
diff --git a/app/src/main/java/com/example/assignment02/ui/main/MainAdapter.kt b/app/src/main/java/com/example/assignment02/ui/main/MainAdapter.kt
new file mode 100644
index 0000000..dc3e3b9
--- /dev/null
+++ b/app/src/main/java/com/example/assignment02/ui/main/MainAdapter.kt
@@ -0,0 +1,46 @@
+package com.example.assignment02.ui.main
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.example.assignment02.R
+import com.example.assignment02.data.model.Word
+
+class MainAdapter(private val onItemClick: (Word) -> Unit) : RecyclerView.Adapter<MainAdapter.WordViewHolder>() {
+
+    private var wordList = listOf<Word>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WordViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_word, parent, false)
+        return WordViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: WordViewHolder, position: Int) {
+        val word = wordList[position]
+        holder.bind(word)
+        holder.itemView.setOnClickListener {
+            onItemClick(word)
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return wordList.size
+    }
+
+    fun submitList(list: List<Word>) {
+        wordList = list
+        notifyDataSetChanged()
+    }
+
+    class WordViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val wordText: TextView = itemView.findViewById(R.id.wordText)
+        private val definitionText: TextView = itemView.findViewById(R.id.definitionText)
+
+        fun bind(word: Word) {
+            wordText.text = word.word
+            definitionText.text = word.definition
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/assignment02/viewmodel/MainViewModel.kt b/app/src/main/java/com/example/assignment02/viewmodel/MainViewModel.kt
new file mode 100644
index 0000000..16832b2
--- /dev/null
+++ b/app/src/main/java/com/example/assignment02/viewmodel/MainViewModel.kt
@@ -0,0 +1,40 @@
+package com.example.assignment02.viewmodel
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.example.assignment02.data.repository.WordDatabase
+import com.example.assignment02.data.model.Word
+
+class MainViewModel(application: Application) : AndroidViewModel(application) {
+
+    private val wordDatabase: WordDatabase = WordDatabase(application)
+    private var wordList: List<Word> = emptyList()
+
+    fun addWord(word: Word) {
+        val updatedList = wordList.toMutableList()
+        updatedList.add(word)
+        wordDatabase.saveWords(updatedList)
+        wordList = updatedList
+    }
+
+    init {
+        loadWords()
+    }
+
+    fun loadWords() {
+        wordList = wordDatabase.getWords()
+    }
+
+    fun getWords(): List<Word> {
+        return wordList
+    }
+
+    fun removeWord(word: Word) {
+        val updatedList = wordList.toMutableList()
+        updatedList.remove(word)
+        wordDatabase.saveWords(updatedList)
+        wordList = updatedList
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/add.png b/app/src/main/res/drawable/add.png
new file mode 100644
index 0000000..bc589b9
Binary files /dev/null and b/app/src/main/res/drawable/add.png differ
diff --git a/app/src/main/res/drawable/del.png b/app/src/main/res/drawable/del.png
new file mode 100644
index 0000000..4a28194
Binary files /dev/null and b/app/src/main/res/drawable/del.png differ
diff --git a/app/src/main/res/drawable/edit.png b/app/src/main/res/drawable/edit.png
new file mode 100644
index 0000000..c8f473a
Binary files /dev/null and b/app/src/main/res/drawable/edit.png differ
diff --git a/app/src/main/res/layout/activity_addword.xml b/app/src/main/res/layout/activity_addword.xml
new file mode 100644
index 0000000..08b4d3c
--- /dev/null
+++ b/app/src/main/res/layout/activity_addword.xml
@@ -0,0 +1,39 @@
+<?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:layout_margin="30dp">
+
+    <EditText
+        android:id="@+id/wordText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:hint="단어"
+        android:padding="16dp"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/definitionText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:hint="설명"
+        android:padding="16dp"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/wordText" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="확인"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/definitionText" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0fb246d..bfcef9b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,49 +4,90 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="30dp"
-    tools:context=".MainActivity">
+    android:background="#BEEBFF"
+    tools:context=".ui.main.MainActivity">
 
-    <TextView
-        android:id="@+id/number_text"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/selectLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="0"
-        android:textSize="48sp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/selectedWordText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="12dp"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <ImageButton
+            android:id="@+id/editButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:background="@android:color/transparent"
+            android:padding="12dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/edit"
+            android:visibility="gone" />
 
-    <Button
-        android:id="@+id/count_btn"
-        android:layout_width="wrap_content"
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/selectedDefinitionLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Count"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/number_text"
-        app:layout_constraintVertical_bias="0.5" />
+        app:layout_constraintTop_toBottomOf="@id/selectLayout">
 
-    <Button
-        android:id="@+id/toast_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Toast"
+        <TextView
+            android:id="@+id/selectedDefinitionText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:layout_marginBottom="3dp"
+            android:layout_weight="1"
+            android:padding="12dp"
+            android:textSize="16sp" />
+
+        <ImageButton
+            android:id="@+id/deleteButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:background="@android:color/transparent"
+            android:padding="12dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/del"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#FFFFFF"
+        android:backgroundTint="#FFFFFF"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/number_text"
-        app:layout_constraintVertical_bias="0.5" />
+        app:layout_constraintTop_toBottomOf="@id/selectedDefinitionLayout" />
 
-    <Button
-        android:id="@+id/random_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Random"
+    <ImageButton
+        android:id="@+id/addButton"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="32dp"
+        android:background="@android:color/transparent"
+        android:scaleType="fitCenter"
+        android:src="@drawable/add"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/number_text"
-        app:layout_constraintVertical_bias="0.5" />
+        app:layout_constraintEnd_toEndOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_random.xml b/app/src/main/res/layout/activity_random.xml
deleted file mode 100644
index 3f6e6ae..0000000
--- a/app/src/main/res/layout/activity_random.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="30dp"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:id="@+id/number_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="0"
-        android:textSize="48sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</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..abbc65d
--- /dev/null
+++ b/app/src/main/res/layout/item_word.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <TextView
+        android:id="@+id/wordText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:textStyle="bold"/>
+
+    <TextView
+        android:id="@+id/definitionText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"/>
+</LinearLayout>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 731cd98..b849030 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Nov 12 19:15:37 KST 2024
+#Tue Nov 26 00:44:39 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip