From 8ae9f0fe85a5522a334e598f2f628d9b59a73d27 Mon Sep 17 00:00:00 2001
From: soohyun <soohyun6879@naver.com>
Date: Fri, 27 Nov 2020 23:03:53 +0900
Subject: [PATCH 1/2] init: new branch

---
 .../ui/SplashActivity.java                    |  2 +-
 .../ui/main/MainActivity.java                 | 11 ++++--
 .../res/drawable/ic_check_box_black_24dp.xml  |  9 +++++
 .../res/drawable/ic_menu_book_black_24dp.xml  | 18 ++++++++++
 .../drawable/ic_military_tech_black_24dp.xml  |  9 +++++
 .../res/drawable/ic_person_black_24dp.xml     |  9 +++++
 app/src/main/res/layout/activity_main.xml     | 23 +++++++++----
 app/src/main/res/layout/fragment_changepw.xml | 17 +++++++---
 app/src/main/res/layout/fragment_profile.xml  | 20 +++++------
 app/src/main/res/menu/bottom_menu.xml         | 34 +++++++++++++++++++
 app/src/main/res/menu/bottomnavigation.xml    |  4 ---
 app/src/main/res/navigation/nav_user.xml      | 14 ++++----
 12 files changed, 134 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_check_box_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_menu_book_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_military_tech_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_person_black_24dp.xml
 create mode 100644 app/src/main/res/menu/bottom_menu.xml
 delete mode 100644 app/src/main/res/menu/bottomnavigation.xml

diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java b/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java
index 2af459c..ccb4e0e 100644
--- a/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java
+++ b/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java
@@ -27,7 +27,7 @@ void startSplash() {
             @Override
             public void run() {
                 //
-                Intent intent = new Intent(getApplicationContext(),UserActivity.class);
+                Intent intent = new Intent(getApplicationContext(),MainActivity.class);
                 startActivity(intent);
                 finish();
             }
diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/main/MainActivity.java b/app/src/main/java/com/example/wordmemorizationgame/ui/main/MainActivity.java
index d026ceb..eb85cb3 100644
--- a/app/src/main/java/com/example/wordmemorizationgame/ui/main/MainActivity.java
+++ b/app/src/main/java/com/example/wordmemorizationgame/ui/main/MainActivity.java
@@ -1,19 +1,24 @@
 package com.example.wordmemorizationgame.ui.main;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.navigation.fragment.NavHostFragment;
+import androidx.navigation.ui.NavigationUI;
 
 import android.os.Bundle;
 
 import com.example.wordmemorizationgame.R;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        // MainActivity
-        // develop
-        // branch
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navi);
+        NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.navHost_main);
+        NavigationUI.setupWithNavController(bottomNavigationView,navHostFragment.getNavController());
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check_box_black_24dp.xml b/app/src/main/res/drawable/ic_check_box_black_24dp.xml
new file mode 100644
index 0000000..90257bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_box_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_book_black_24dp.xml b/app/src/main/res/drawable/ic_menu_book_black_24dp.xml
new file mode 100644
index 0000000..11a8db8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_book_black_24dp.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,5c-1.11,-0.35 -2.33,-0.5 -3.5,-0.5c-1.95,0 -4.05,0.4 -5.5,1.5c-1.45,-1.1 -3.55,-1.5 -5.5,-1.5S2.45,4.9 1,6v14.65c0,0.25 0.25,0.5 0.5,0.5c0.1,0 0.15,-0.05 0.25,-0.05C3.1,20.45 5.05,20 6.5,20c1.95,0 4.05,0.4 5.5,1.5c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.65,0 3.35,0.3 4.75,1.05c0.1,0.05 0.15,0.05 0.25,0.05c0.25,0 0.5,-0.25 0.5,-0.5V6C22.4,5.55 21.75,5.25 21,5zM21,18.5c-1.1,-0.35 -2.3,-0.5 -3.5,-0.5c-1.7,0 -4.15,0.65 -5.5,1.5V8c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.2,0 2.4,0.15 3.5,0.5V18.5z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M17.5,10.5c0.88,0 1.73,0.09 2.5,0.26V9.24C19.21,9.09 18.36,9 17.5,9c-1.7,0 -3.24,0.29 -4.5,0.83v1.66C14.13,10.85 15.7,10.5 17.5,10.5z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M13,12.49v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26V11.9c-0.79,-0.15 -1.64,-0.24 -2.5,-0.24C15.8,11.66 14.26,11.96 13,12.49z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M17.5,14.33c-1.7,0 -3.24,0.29 -4.5,0.83v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26v-1.52C19.21,14.41 18.36,14.33 17.5,14.33z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_military_tech_black_24dp.xml b/app/src/main/res/drawable/ic_military_tech_black_24dp.xml
new file mode 100644
index 0000000..872d496
--- /dev/null
+++ b/app/src/main/res/drawable/ic_military_tech_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,10.43V2H7v8.43c0,0.35 0.18,0.68 0.49,0.86l4.18,2.51l-0.99,2.34l-3.41,0.29l2.59,2.24L9.07,22L12,20.23L14.93,22l-0.78,-3.33l2.59,-2.24l-3.41,-0.29l-0.99,-2.34l4.18,-2.51C16.82,11.11 17,10.79 17,10.43zM13,12.23l-1,0.6l-1,-0.6V3h2V12.23z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml
new file mode 100644
index 0000000..5634154
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 70aebdf..2ee0224 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,12 +7,21 @@
     tools:context=".ui.main.MainActivity">
 
     <fragment
-        android:id="@+id/fragment3"
-        android:name="com.example.wordmemorizationgame.auth.LoginFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:id="@+id/navHost_main"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/nav_user" />
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navi"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:itemBackground="@android:color/white"
+        app:itemIconTint="#000000"
+        app:itemTextColor="#000000"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:menu="@menu/bottom_menu"
+        tools:layout_editor_absoluteX="16dp" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_changepw.xml b/app/src/main/res/layout/fragment_changepw.xml
index 707d60c..4bf32bd 100644
--- a/app/src/main/res/layout/fragment_changepw.xml
+++ b/app/src/main/res/layout/fragment_changepw.xml
@@ -2,6 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_marginStart="10dp"
+    android:layout_marginEnd="10dp"
     android:orientation="vertical">
 
     <TextView
@@ -13,7 +15,7 @@
         android:text="비밀번호 변경"
         android:textAlignment="center"
         android:textColor="#010101"
-        android:textSize="30sp"
+        android:textSize="20sp"
         android:textStyle="bold" />
 
     <EditText
@@ -21,20 +23,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="이전 비밀번호"
-        android:textSize="24sp" />
+        android:textSize="18sp" />
 
     <EditText
         android:id="@+id/new_pw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="새 비밀번호"
-        android:textSize="24sp"/>
+        android:textSize="18sp"/>
 
     <EditText
         android:id="@+id/identify_pw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="새 비밀번호 확인"
-        android:textSize="24sp"/>
+        android:textSize="18sp"/>
+
+    <Button
+        android:id="@+id/btn_finish"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="확인"
+        android:textSize="18sp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 1618ecf..bacd18c 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -14,7 +14,7 @@
         android:text="내 정보"
         android:textAlignment="center"
         android:textColor="#010101"
-        android:textSize="30sp"
+        android:textSize="20sp"
         android:textStyle="bold" />
 
     <RelativeLayout
@@ -23,30 +23,30 @@
 
         <ImageView
             android:id="@+id/iv_image"
-            android:layout_width="150dp"
-            android:layout_height="150dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:background="@drawable/profile"
-            android:layout_marginLeft="10dp"/>
+            android:layout_marginLeft="15dp"/>
 
         <TextView
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="이름"
-            android:textSize="24sp"
+            android:textSize="20sp"
             android:textColor="#010101"
-            android:layout_marginLeft="190dp"
-            android:layout_marginTop="30dp"/>
+            android:layout_marginLeft="150dp"
+            android:layout_marginTop="10dp"/>
 
         <TextView
             android:id="@+id/tv_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="아이디"
-            android:textSize="24sp"
+            android:textSize="20sp"
             android:textColor="#010101"
-            android:layout_marginLeft="190dp"
-            android:layout_marginTop="80dp"/>
+            android:layout_marginLeft="150dp"
+            android:layout_marginTop="60dp"/>
 
    </RelativeLayout>
 
diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml
new file mode 100644
index 0000000..a5443df
--- /dev/null
+++ b/app/src/main/res/menu/bottom_menu.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/test1Fragment"
+        android:icon="@drawable/ic_search_black_24dp"
+        android:title="검색"
+        android:enabled="true"/>
+
+    <item
+        android:id="@+id/test2Fragment"
+        android:icon="@drawable/ic_military_tech_black_24dp"
+        android:title="랭킹"
+        android:enabled="true"/>
+
+    <item
+        android:id="@+id/test3Fragment"
+        android:icon="@drawable/ic_check_box_black_24dp"
+        android:title="퀴즈"
+        android:enabled="true"/>
+
+    <item
+        android:id="@+id/test4Fragment"
+        android:icon="@drawable/ic_menu_book_black_24dp"
+        android:title="단어장"
+        android:enabled="true"/>
+
+    <item
+        android:id="@+id/profileFragment"
+        android:icon="@drawable/ic_person_black_24dp"
+        android:title="내 정보"
+        android:enabled="true"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottomnavigation.xml b/app/src/main/res/menu/bottomnavigation.xml
deleted file mode 100644
index fe187c0..0000000
--- a/app/src/main/res/menu/bottomnavigation.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_user.xml b/app/src/main/res/navigation/nav_user.xml
index d749450..ec949f4 100644
--- a/app/src/main/res/navigation/nav_user.xml
+++ b/app/src/main/res/navigation/nav_user.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/nav_user"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_user"
     app:startDestination="@id/profileFragment">
 
     <fragment
         android:id="@+id/profileFragment"
         android:name="com.example.wordmemorizationgame.ui.user.ProfileFragment"
-        android:label="ProfileFragment" >
+        android:label="fragment_profile"
+        tools:layout="@layout/fragment_profile">
         <action
             android:id="@+id/action_profileFragment_to_changepwFragment"
             app:destination="@id/changepwFragment" />
@@ -14,9 +17,6 @@
     <fragment
         android:id="@+id/changepwFragment"
         android:name="com.example.wordmemorizationgame.ui.user.ChangepwFragment"
-        android:label="ChangepwFragment" >
-        <action
-            android:id="@+id/action_changepwFragment_to_profileFragment"
-            app:destination="@id/profileFragment" />
-    </fragment>
+        android:label="fragment_changepw"
+        tools:layout="@layout/fragment_changepw"/>
 </navigation>
\ No newline at end of file

From d5fe3072ea46338776a046a4b6ee8af72f26f40a Mon Sep 17 00:00:00 2001
From: soohyun <soohyun6879@naver.com>
Date: Fri, 18 Dec 2020 18:25:15 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Add:=20Word=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=EB=B2=A0=EC=9D=B4=EC=8A=A4,=20MyvocaFragment,=20=ED=95=98?=
 =?UTF-8?q?=EB=8B=A8=EB=B0=94=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  5 ++
 .../wordmemorizationgame/database/Word.java   | 17 ++++
 .../database/WordDao.java                     | 26 ++++++
 .../database/WordDatabase.java                | 22 +++++
 .../ui/voca/MyvocaAdapter.java                | 57 +++++++++++++
 .../ui/voca/MyvocaFragment.java               | 80 +++++++++++++++++++
 .../ui/voca/MyvocaItem.java                   | 22 +++++
 app/src/main/res/layout/activity_main.xml     |  2 +-
 app/src/main/res/layout/activity_user.xml     |  2 +-
 app/src/main/res/layout/fragment_myvoca.xml   | 29 +++++++
 app/src/main/res/layout/myvoca_item.xml       | 28 +++++++
 app/src/main/res/menu/bottom_menu.xml         | 20 +----
 .../navigation/{nav_user.xml => nav_main.xml} |  7 +-
 13 files changed, 295 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/com/example/wordmemorizationgame/database/Word.java
 create mode 100644 app/src/main/java/com/example/wordmemorizationgame/database/WordDao.java
 create mode 100644 app/src/main/java/com/example/wordmemorizationgame/database/WordDatabase.java
 create mode 100644 app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaAdapter.java
 create mode 100644 app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaFragment.java
 create mode 100644 app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaItem.java
 create mode 100644 app/src/main/res/layout/fragment_myvoca.xml
 create mode 100644 app/src/main/res/layout/myvoca_item.xml
 rename app/src/main/res/navigation/{nav_user.xml => nav_main.xml} (76%)

diff --git a/app/build.gradle b/app/build.gradle
index ea5a53c..eedc0bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,11 @@ dependencies {
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
 
+    def room_version = "2.2.5"
+
+    implementation "androidx.room:room-runtime:$room_version"
+    annotationProcessor "androidx.room:room-compiler:$room_version"
+
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
diff --git a/app/src/main/java/com/example/wordmemorizationgame/database/Word.java b/app/src/main/java/com/example/wordmemorizationgame/database/Word.java
new file mode 100644
index 0000000..cf8637b
--- /dev/null
+++ b/app/src/main/java/com/example/wordmemorizationgame/database/Word.java
@@ -0,0 +1,17 @@
+package com.example.wordmemorizationgame.database;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
+@Entity
+public class Word {
+    @PrimaryKey(autoGenerate = true)
+    public int id;
+
+    @ColumnInfo(name = "word_english")
+    public String word_english;
+
+    @ColumnInfo(name = "word_korean")
+    public String word_korean;
+}
diff --git a/app/src/main/java/com/example/wordmemorizationgame/database/WordDao.java b/app/src/main/java/com/example/wordmemorizationgame/database/WordDao.java
new file mode 100644
index 0000000..3f05d12
--- /dev/null
+++ b/app/src/main/java/com/example/wordmemorizationgame/database/WordDao.java
@@ -0,0 +1,26 @@
+package com.example.wordmemorizationgame.database;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
+
+import java.util.List;
+
+@Dao
+public interface WordDao {
+    @Query("SELECT * FROM word")
+    List<Word> getAll();
+
+    @Query("SELECT word_english FROM word")
+    List<String> getWord_englishAll();
+
+    @Query("SELECT word_korean FROM word")
+    List<String> getWord_koreanAll();
+
+    @Insert
+    void insertAll(Word... words);
+
+    @Delete
+    void delete(Word word);
+}
diff --git a/app/src/main/java/com/example/wordmemorizationgame/database/WordDatabase.java b/app/src/main/java/com/example/wordmemorizationgame/database/WordDatabase.java
new file mode 100644
index 0000000..4c7eb75
--- /dev/null
+++ b/app/src/main/java/com/example/wordmemorizationgame/database/WordDatabase.java
@@ -0,0 +1,22 @@
+package com.example.wordmemorizationgame.database;
+
+import android.content.Context;
+
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+
+import com.example.wordmemorizationgame.ui.voca.MyvocaFragment;
+
+@Database(entities = {Word.class}, version = 1)
+public abstract class WordDatabase extends RoomDatabase {
+    private static WordDatabase INSTANCE;
+    public abstract WordDao wordDao();
+
+    public static WordDatabase getAppDatabase(Context context){
+        if(INSTANCE == null){
+            INSTANCE = Room.databaseBuilder(context, WordDatabase.class , "word-db").allowMainThreadQueries().build();
+        }
+        return  INSTANCE;
+    }
+}
diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaAdapter.java b/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaAdapter.java
new file mode 100644
index 0000000..a883eb1
--- /dev/null
+++ b/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaAdapter.java
@@ -0,0 +1,57 @@
+package com.example.wordmemorizationgame.ui.voca;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.wordmemorizationgame.R;
+
+import java.util.ArrayList;
+
+public class MyvocaAdapter extends RecyclerView.Adapter<MyvocaAdapter.ViewHolder> {
+    private ArrayList<MyvocaItem> mData = null;
+
+    MyvocaAdapter(ArrayList<MyvocaItem> list) {
+        mData = list;
+    }
+
+    @Override
+    public MyvocaAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        Context context = parent.getContext() ;
+        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        View view = inflater.inflate(R.layout.myvoca_item, parent, false);
+        MyvocaAdapter.ViewHolder vh = new MyvocaAdapter.ViewHolder(view);
+
+        return vh;
+    }
+
+    @Override
+    public void onBindViewHolder(MyvocaAdapter.ViewHolder holder, int position) {
+        MyvocaItem item = mData.get(position);
+
+        holder.word_english.setText(item.getWord_english());
+        holder.word_korean.setText(item.getWord_korean());
+    }
+
+    @Override
+    public int getItemCount() {
+        return mData.size();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        TextView word_english;
+        TextView word_korean;
+
+        ViewHolder(View itemView) {
+            super(itemView) ;
+
+            word_english = itemView.findViewById(R.id.word_english);
+            word_korean = itemView.findViewById(R.id.word_korean);
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaFragment.java b/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaFragment.java
new file mode 100644
index 0000000..eca1411
--- /dev/null
+++ b/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaFragment.java
@@ -0,0 +1,80 @@
+package com.example.wordmemorizationgame.ui.voca;
+
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.example.wordmemorizationgame.R;
+import com.example.wordmemorizationgame.database.Word;
+import com.example.wordmemorizationgame.database.WordDatabase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyvocaFragment extends Fragment {
+
+    public MyvocaFragment() {
+        // Required empty public constructor
+    }
+
+    RecyclerView mRecyclerView = null;
+    MyvocaAdapter mAdapter = null;
+    ArrayList<MyvocaItem> mList = new ArrayList<MyvocaItem>();
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        LinearLayout layout = (LinearLayout)inflater.inflate(R.layout.fragment_myvoca, container, false);
+        mRecyclerView = (RecyclerView)layout.findViewById(R.id.recycler);
+        WordDatabase wordDatabase = WordDatabase.getAppDatabase(getContext());
+
+        mAdapter = new MyvocaAdapter(mList);
+        mRecyclerView.setAdapter(mAdapter);
+
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+        List<String> word_english_list = wordDatabase.wordDao().getWord_englishAll();
+        List<String> word_korean_list = wordDatabase.wordDao().getWord_koreanAll();
+
+        String[] word_english_array = word_english_list.toArray(new String[word_english_list.size()]);
+        String[] word_korean_array = word_korean_list.toArray(new String[word_korean_list.size()]);
+
+        for(int i=0; i<word_english_array.length; i++){
+            addItem(word_english_array[i], word_korean_array[i]);
+        }
+
+        //테스트
+        /*
+        Word new_word = new Word();
+        new_word.word_english = "peach";
+        new_word.word_korean = "복숭아";
+        wordDatabase.wordDao().insertAll(new_word);
+
+        addItem("apple", "사과");
+        addItem("orange", "오렌지");
+        addItem("banana", "바나나");
+         */
+
+        mAdapter.notifyDataSetChanged();
+
+        return layout;
+    }
+
+    public void addItem(String word_english, String word_korean) { //String word_english, String word_korean
+        MyvocaItem item = new MyvocaItem();
+
+        item.setWord_english(word_english);
+        item.setWord_korean(word_korean);
+
+        mList.add(item);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaItem.java b/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaItem.java
new file mode 100644
index 0000000..36e01a8
--- /dev/null
+++ b/app/src/main/java/com/example/wordmemorizationgame/ui/voca/MyvocaItem.java
@@ -0,0 +1,22 @@
+package com.example.wordmemorizationgame.ui.voca;
+
+import android.graphics.drawable.Drawable;
+
+public class MyvocaItem {
+    private String word_english ;
+    private String word_korean ;
+
+    public void setWord_english(String word_english) {
+        this.word_english = word_english;
+    }
+    public void setWord_korean(String word_korean) {
+        this.word_korean = word_korean;
+    }
+
+    public String getWord_english() {
+        return word_english;
+    }
+    public String getWord_korean() {
+        return word_korean;
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2ee0224..431f994 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_user" />
+        app:navGraph="@navigation/nav_main" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navi"
diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml
index 5b558c0..d8240b2 100644
--- a/app/src/main/res/layout/activity_user.xml
+++ b/app/src/main/res/layout/activity_user.xml
@@ -15,5 +15,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/nav_user" />
+        app:navGraph="@navigation/nav_main" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_myvoca.xml b/app/src/main/res/layout/fragment_myvoca.xml
new file mode 100644
index 0000000..9450270
--- /dev/null
+++ b/app/src/main/res/layout/fragment_myvoca.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        android:text="내 단어장"
+        android:textAlignment="center"
+        android:textColor="#010101"
+        android:textSize="24sp"
+        android:textStyle="bold" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/recycler"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/myvoca_item.xml b/app/src/main/res/layout/myvoca_item.xml
new file mode 100644
index 0000000..01acdee
--- /dev/null
+++ b/app/src/main/res/layout/myvoca_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    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:layout_marginStart="20dp"
+    android:layout_marginEnd="20dp"
+    android:layout_marginTop="5dp"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/word_english"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24sp"
+        android:textColor="#000000" />
+
+    <TextView
+        android:id="@+id/word_korean"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="24sp"
+        android:textColor="#000000" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml
index a5443df..31d203c 100644
--- a/app/src/main/res/menu/bottom_menu.xml
+++ b/app/src/main/res/menu/bottom_menu.xml
@@ -8,27 +8,9 @@
         android:enabled="true"/>
 
     <item
-        android:id="@+id/test2Fragment"
-        android:icon="@drawable/ic_military_tech_black_24dp"
-        android:title="랭킹"
-        android:enabled="true"/>
-
-    <item
-        android:id="@+id/test3Fragment"
-        android:icon="@drawable/ic_check_box_black_24dp"
-        android:title="퀴즈"
-        android:enabled="true"/>
-
-    <item
-        android:id="@+id/test4Fragment"
+        android:id="@+id/myvocaFragment"
         android:icon="@drawable/ic_menu_book_black_24dp"
         android:title="단어장"
         android:enabled="true"/>
 
-    <item
-        android:id="@+id/profileFragment"
-        android:icon="@drawable/ic_person_black_24dp"
-        android:title="내 정보"
-        android:enabled="true"/>
-
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_user.xml b/app/src/main/res/navigation/nav_main.xml
similarity index 76%
rename from app/src/main/res/navigation/nav_user.xml
rename to app/src/main/res/navigation/nav_main.xml
index ec949f4..d103c0b 100644
--- a/app/src/main/res/navigation/nav_user.xml
+++ b/app/src/main/res/navigation/nav_main.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_user"
-    app:startDestination="@id/profileFragment">
+    app:startDestination="@id/myvocaFragment">
 
     <fragment
         android:id="@+id/profileFragment"
@@ -19,4 +19,9 @@
         android:name="com.example.wordmemorizationgame.ui.user.ChangepwFragment"
         android:label="fragment_changepw"
         tools:layout="@layout/fragment_changepw"/>
+    <fragment
+        android:id="@+id/myvocaFragment"
+        android:name="com.example.wordmemorizationgame.ui.voca.MyvocaFragment"
+        android:label="fragment_myvoca"
+        tools:layout="@layout/fragment_myvoca"/>
 </navigation>
\ No newline at end of file