diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index dc9557a..c24b81f 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.bin and b/.gradle/5.4.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 10e733e..86d1c1b 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.lock and b/.gradle/5.4.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index 3b99e2b..1ffed2f 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.bin and b/.gradle/5.4.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index f93f4df..7c2d187 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.lock and b/.gradle/5.4.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index e10f17f..ff862be 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 02304f1..2eca377 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 86de061..e774179 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 88ea3aa..45b5654 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/app/app.iml b/app/app.iml
index 0cd2a81..c7e6a31 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -25,13 +25,13 @@
       </configuration>
     </facet>
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
+      <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false" pureKotlinSourceFolders="C:\Users\User\Desktop\TokDDak\TokDDak-Android\app\src\debug\kotlin;C:\Users\User\Desktop\TokDDak\TokDDak-Android\app\src\debug\java;C:\Users\User\Desktop\TokDDak\TokDDak-Android\app\src\release\kotlin;C:\Users\User\Desktop\TokDDak\TokDDak-Android\app\src\release\java;C:\Users\User\Desktop\TokDDak\TokDDak-Android\app\src\debugAndroidTest\kotlin;C:\Users\User\Desktop\TokDDak\TokDDak-Android\app\src\debugUnitTest\kotlin;C:\Users\User\Desktop\TokDDak\TokDDak-Android\app\src\releaseUnitTest\kotlin">
         <compilerSettings>
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.50/bec16087637a7cafe54894e73d38037977cb30d2/kotlin-android-extensions-runtime-1.3.50.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/8ae9e26c5c8c9a000acc0ed16b5d86cd/core-ktx-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/b8b9456e6bc27c34a841ca249fcef984/material-1.2.0-alpha03/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/0c59e42970579c9c36ddd604ba39521e/appcompat-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/192956975d878377950c234ac6ab45b1/viewpager2-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/c07a3c405e82a9d1ec3b60f35396be86/recyclerview-selection-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/9be57793dd66ecf9203d97bf793a950a/legacy-support-v4-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/be72a025bdbaab80103bf76d0a95b5e6/glide-4.10.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/dde3a500be3f9e82cad45fe9d0d4710f/fragment-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/1e690e96e239b5322a70849840aaf8d6/appcompat-resources-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/9eca2d67ba16850252a0e8f7032d79d7/legacy-support-core-ui-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/b67b53361488a275cff23d941d562e4f/drawerlayout-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/481a559874259d7afc9fb94b67c74794/media-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/d6017a93f1c1bb53cc27a8296dc329c2/legacy-support-core-utils-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/a1d60b2b2df6267a940945b10906ac8d/recyclerview-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/1b8548de1f3872e080f4a0af5c4afdc6/coordinatorlayout-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/5c7d1548f86301583f7dc097090efce1/transition-1.2.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/0d1e24dd755d137670cc772a0e1e427c/vectordrawable-animated-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/1a82c7742c5a4526143884783b39ae1f/vectordrawable-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/017eb3dbde765a50e2c453e2c1be3254/viewpager-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/569463a400f4655cb66ccd8c77ac9d23/loader-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/7e76384a25d516b81e48b47e66093da8/activity-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/bcd92837f1e4f7bca7af96ff7c5158e2/slidingpanelayout-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/61e754f822341b92c876bd827e7fad39/customview-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/6f7a8e742381393a69b51decff3607f4/swiperefreshlayout-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/9a49a9f7c083e8251cd54c67bb5e46b0/asynclayoutinflater-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/5b454e4f1a30a31f78d2352c725b41cb/core-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/01c6ea285deb1d2d201d8ad7093d5952/cursoradapter-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/6710647f0ff0155eef164b5f5f319455/versionedparcelable-1.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/a92e45ec4fa68c7c4f494a840fe60d30/cardview-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/1f4e46d7d430906a34b29924153a73b5/lifecycle-runtime-2.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/595537921263202967bb153ba3f055a2/gifdecoder-4.10.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/104fc67b94a2303581dcd43c6c820bd8/lifecycle-viewmodel-2.1.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/6f95def34ed016769d2b866dcb94d0a0/documentfile-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/dc5b11592a4d4071dcf05c11aca9d515/localbroadcastmanager-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/2b86797c9f03b1904e4e1ea1f74f5bf2/print-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/ac491061dad848fba0053ec19d2c98fc/interpolator-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/257d20d372b194265b3c3e0ac0c8c32c/savedstate-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/117237b384d1d41655b445f8ab3449a2/lifecycle-livedata-2.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/0061becc098e44b855ca034fb1802bc0/lifecycle-livedata-core-2.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/a3bfb016d41c70cb77a4f9afd84ecb49/core-runtime-2.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/4865d0bb420eeb38e1193023e7c09d7a/constraintlayout-1.1.3/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/5bbd8891ce4907264d3c87264e73f85f/annotation-experimental-1.0.0/jars/classes.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.10.0/64b5e97b9b10c47b62577d2b25f1e1fe9dcd1f56/disklrucache-4.10.0.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.10.0/bbe80fe87e3a3a08c995557f3b8e66f479bf9363/annotations-4.10.0.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit-mock/2.6.2/e0499f53c64c4222d7f16d72f48e019965f54509/retrofit-mock-2.6.2.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.6.2/c212ba1ef76db28d96768c74991343e4794b639f/converter-gson-2.6.2.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.6.2/b51e9cf3b25a2f4116612d368d1aeba671fe1533/retrofit-2.6.2.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.12.0/b36f4a04584c0fb0d9af2d3401cdff8dacb1ea54/okhttp-3.12.0.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.15.0/bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8/okio-1.15.0.jar;C:/Users/SunnnI/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.6/9180733b7df8542621dc12e21e87557e8c99b8cb/gson-2.8.6.jar;C:/Users/SunnnI/.gradle/caches/transforms-2/files-2.1/57256ad6da45fdf2d0f2b0adc9d70e2a/circleimageview-3.0.1/jars/classes.jar;C:/Users/SunnnI/AppData/Local/Android/Sdk/platforms/android-29/android.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.50/bec16087637a7cafe54894e73d38037977cb30d2/kotlin-android-extensions-runtime-1.3.50.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/8ae9e26c5c8c9a000acc0ed16b5d86cd/core-ktx-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/b8b9456e6bc27c34a841ca249fcef984/material-1.2.0-alpha03/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/0c59e42970579c9c36ddd604ba39521e/appcompat-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/192956975d878377950c234ac6ab45b1/viewpager2-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/c07a3c405e82a9d1ec3b60f35396be86/recyclerview-selection-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/9be57793dd66ecf9203d97bf793a950a/legacy-support-v4-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/be72a025bdbaab80103bf76d0a95b5e6/glide-4.10.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/dde3a500be3f9e82cad45fe9d0d4710f/fragment-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/1e690e96e239b5322a70849840aaf8d6/appcompat-resources-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/9eca2d67ba16850252a0e8f7032d79d7/legacy-support-core-ui-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/b67b53361488a275cff23d941d562e4f/drawerlayout-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/481a559874259d7afc9fb94b67c74794/media-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/d6017a93f1c1bb53cc27a8296dc329c2/legacy-support-core-utils-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/a1d60b2b2df6267a940945b10906ac8d/recyclerview-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/1b8548de1f3872e080f4a0af5c4afdc6/coordinatorlayout-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/5c7d1548f86301583f7dc097090efce1/transition-1.2.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/0d1e24dd755d137670cc772a0e1e427c/vectordrawable-animated-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/1a82c7742c5a4526143884783b39ae1f/vectordrawable-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/017eb3dbde765a50e2c453e2c1be3254/viewpager-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/569463a400f4655cb66ccd8c77ac9d23/loader-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/7e76384a25d516b81e48b47e66093da8/activity-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/bcd92837f1e4f7bca7af96ff7c5158e2/slidingpanelayout-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/61e754f822341b92c876bd827e7fad39/customview-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/6f7a8e742381393a69b51decff3607f4/swiperefreshlayout-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/9a49a9f7c083e8251cd54c67bb5e46b0/asynclayoutinflater-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/5b454e4f1a30a31f78d2352c725b41cb/core-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/01c6ea285deb1d2d201d8ad7093d5952/cursoradapter-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/6710647f0ff0155eef164b5f5f319455/versionedparcelable-1.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/a92e45ec4fa68c7c4f494a840fe60d30/cardview-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/1f4e46d7d430906a34b29924153a73b5/lifecycle-runtime-2.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/595537921263202967bb153ba3f055a2/gifdecoder-4.10.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/104fc67b94a2303581dcd43c6c820bd8/lifecycle-viewmodel-2.1.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/6f95def34ed016769d2b866dcb94d0a0/documentfile-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/dc5b11592a4d4071dcf05c11aca9d515/localbroadcastmanager-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/2b86797c9f03b1904e4e1ea1f74f5bf2/print-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/ac491061dad848fba0053ec19d2c98fc/interpolator-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/257d20d372b194265b3c3e0ac0c8c32c/savedstate-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/117237b384d1d41655b445f8ab3449a2/lifecycle-livedata-2.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/0061becc098e44b855ca034fb1802bc0/lifecycle-livedata-core-2.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/a3bfb016d41c70cb77a4f9afd84ecb49/core-runtime-2.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/4865d0bb420eeb38e1193023e7c09d7a/constraintlayout-1.1.3/jars/classes.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/5bbd8891ce4907264d3c87264e73f85f/annotation-experimental-1.0.0/jars/classes.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.10.0/64b5e97b9b10c47b62577d2b25f1e1fe9dcd1f56/disklrucache-4.10.0.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.10.0/bbe80fe87e3a3a08c995557f3b8e66f479bf9363/annotations-4.10.0.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit-mock/2.6.2/e0499f53c64c4222d7f16d72f48e019965f54509/retrofit-mock-2.6.2.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.6.2/c212ba1ef76db28d96768c74991343e4794b639f/converter-gson-2.6.2.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.6.2/b51e9cf3b25a2f4116612d368d1aeba671fe1533/retrofit-2.6.2.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.12.0/b36f4a04584c0fb0d9af2d3401cdff8dacb1ea54/okhttp-3.12.0.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.15.0/bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8/okio-1.15.0.jar;C:/Users/User/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.6/9180733b7df8542621dc12e21e87557e8c99b8cb/gson-2.8.6.jar;C:/Users/User/.gradle/caches/transforms-2/files-2.1/57256ad6da45fdf2d0f2b0adc9d70e2a/circleimageview-3.0.1/jars/classes.jar;C:/Users/User/AppData/Local/Android/Sdk/platforms/android-29/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
diff --git a/app/src/main/java/com/sopt/tokddak/api/PlanningServiceImpl.kt b/app/src/main/java/com/sopt/tokddak/api/PlanningServiceImpl.kt
index 3e8d802..8987eb7 100644
--- a/app/src/main/java/com/sopt/tokddak/api/PlanningServiceImpl.kt
+++ b/app/src/main/java/com/sopt/tokddak/api/PlanningServiceImpl.kt
@@ -4,7 +4,7 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 object PlanningServiceImpl {
-    private const val BASE_URL = "http://13.125.42.117:3000/"
+    private const val BASE_URL = "http://tokddak.ap-northeast-2.elasticbeanstalk.com/"
 
     private val retrofit: Retrofit = Retrofit.Builder()
         .baseUrl(BASE_URL)
diff --git a/app/src/main/java/com/sopt/tokddak/api/Service.kt b/app/src/main/java/com/sopt/tokddak/api/Service.kt
index fe53a01..f1d129c 100644
--- a/app/src/main/java/com/sopt/tokddak/api/Service.kt
+++ b/app/src/main/java/com/sopt/tokddak/api/Service.kt
@@ -1,7 +1,7 @@
 package com.sopt.tokddak.api
 
-import com.sopt.tokddak.feature.history.HistoryServerItem
 import com.sopt.tokddak.feature.expense.PostExpense
+import com.sopt.tokddak.feature.history.HistoryServerItem
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -17,4 +17,5 @@ interface Service {
         @Body body:PostExpense
     ) : Call<Unit>
 
+    //@POST("/trips/{CityId}")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/tokddak/feature/bottom/BottomSheetDialog.kt b/app/src/main/java/com/sopt/tokddak/feature/bottom/BottomSheetDialog.kt
index 4fb334e..0d12640 100644
--- a/app/src/main/java/com/sopt/tokddak/feature/bottom/BottomSheetDialog.kt
+++ b/app/src/main/java/com/sopt/tokddak/feature/bottom/BottomSheetDialog.kt
@@ -154,7 +154,6 @@ class BottomSheetDialog : BottomSheetDialogFragment(), View.OnClickListener {
                 }
                 Log.v("Bottm", contents)
                 (activity as DayActivity).getContents(contents)
-                //Toast.makeText(context, contents, Toast.LENGTH_SHORT).show()
             }
         }
 
diff --git a/app/src/main/java/com/sopt/tokddak/feature/day/DayActivity.kt b/app/src/main/java/com/sopt/tokddak/feature/day/DayActivity.kt
index 086b9fc..38dc15d 100644
--- a/app/src/main/java/com/sopt/tokddak/feature/day/DayActivity.kt
+++ b/app/src/main/java/com/sopt/tokddak/feature/day/DayActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.util.Log
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL
@@ -14,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.sopt.tokddak.R
 import com.sopt.tokddak.feature.bottom.BottomSheetDialog
 import com.sopt.tokddak.feature.main.MainActivity
+import com.sopt.tokddak.feature.main.OnTripFragment
 import kotlinx.android.synthetic.main.activity_day.*
 
 
@@ -33,14 +35,15 @@ class DayActivity : AppCompatActivity() {
 
     private var currentDay = 0
 
+    private lateinit var ctnPerfect : ConstraintLayout
+
     private lateinit var layoutManager : LinearLayoutManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_day)
+        ctnPerfect = findViewById(R.id.ctn_perfect)
         init()
-
-
         outer()
 
         img_bar = findViewById(R.id.img_bar)
@@ -54,6 +57,12 @@ class DayActivity : AppCompatActivity() {
             startActivity(intent)
             finish()
         }
+
+        ctnPerfect.setOnClickListener {
+            val intent = Intent(this, OnTripFragment::class.java)
+            startActivity(intent)
+            finish()
+        }
     }
 
     fun init(){
@@ -67,7 +76,6 @@ class DayActivity : AppCompatActivity() {
         dayContents.add(arrayListOf("카페", "노잼", "간편식"))
         dayContents.add(arrayListOf("일반호텔"))
 
-
     }
 
     private fun outer() {
diff --git a/app/src/main/java/com/sopt/tokddak/feature/day/DayAdapter.kt b/app/src/main/java/com/sopt/tokddak/feature/day/DayAdapter.kt
index 8c6e65b..005dc08 100644
--- a/app/src/main/java/com/sopt/tokddak/feature/day/DayAdapter.kt
+++ b/app/src/main/java/com/sopt/tokddak/feature/day/DayAdapter.kt
@@ -10,11 +10,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.tokddak.R
 import com.sopt.tokddak.feature.inner.InnerAdapter
-import com.sopt.tokddak.feature.inner.InnerData
 
 class DayAdapter(private val context : Context, var dayContents : ArrayList<ArrayList<String>>) : RecyclerView.Adapter<DayAdapter.DayViewHolder>(){
 
-    private val innerData = InnerData()
+    //private val innerData = InnerData()
     var data = listOf<DayItem>()
     lateinit var innerAdapter : InnerAdapter
 
@@ -36,39 +35,15 @@ class DayAdapter(private val context : Context, var dayContents : ArrayList<Arra
         val txt_dayNo : TextView = view.findViewById(R.id.txt_dayNo)
         val rv_inner : RecyclerView = view.findViewById(R.id.rv_inner)
 
-//        fun bind(data : DayItem){
-//            txt_dayNo.text = data.day
-//
-//            innerAdapter = InnerAdapter(context)
-//            rv_inner.adapter = innerAdapter
-//            rv_inner.layoutManager = LinearLayoutManager(context, HORIZONTAL, false)
-//            rv_inner.setHasFixedSize(true)
-//
-//            //val holder = rv_inner.findViewHolderForAdapterPosition(position) as InnerAdapter.InnerViewHolder
-//
-//            innerAdapter.data = innerData.getInner()
-//            innerAdapter.notifyDataSetChanged()
-//        }
-
         fun bind(dayContents : ArrayList<String>){
             innerAdapter = InnerAdapter(context, dayContents)
             rv_inner.adapter = innerAdapter
             rv_inner.layoutManager = LinearLayoutManager(context)
             rv_inner.setHasFixedSize(true)
-
-            //val holder = rv_inner.findViewHolderForAdapterPosition(position) as InnerAdapter.InnerViewHolder
-//
-//            innerAdapter.data = innerData.getInner()
-//            innerAdapter.notifyDataSetChanged()
         }
     }
 
     fun updateDay(){
         innerAdapter.notifyDataChange()
     }
-
-//    fun updateDay(idx : Int, dayContents : ArrayList<String>){
-//        Log.v("YGYG", innerAdapter.dayContents.toString())
-//        innerAdapter.notifyDataSetChanged()
-//    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/tokddak/feature/expense/ExpenseActivity.kt b/app/src/main/java/com/sopt/tokddak/feature/expense/ExpenseActivity.kt
index 60fd855..36863c1 100644
--- a/app/src/main/java/com/sopt/tokddak/feature/expense/ExpenseActivity.kt
+++ b/app/src/main/java/com/sopt/tokddak/feature/expense/ExpenseActivity.kt
@@ -35,10 +35,9 @@ class ExpenseActivity : AppCompatActivity() {
 
         btn_checked.setOnClickListener {
             val cost = tv_extense_input.text.toString().toIntOrNull()
-            val detail = tv_detail_input.toString()
+            val detail = tv_detail_input.text.toString()
             Log.v("YGYG", "In2")
 
-
             if (cost == null) {
                 //TODO: 코스트 입력하라고 토스트 띄우고
                 Toast.makeText(this, "금액을 입력하세요.", Toast.LENGTH_SHORT).show()
@@ -49,18 +48,14 @@ class ExpenseActivity : AppCompatActivity() {
 
                 sendData(cost, typeInt, detail)
             }
-        }
 
-        btn_back_black.setOnClickListener {
             finish()
         }
 
-        btn_checked.setOnClickListener {
-            // 통신 함수
+        btn_back_black.setOnClickListener {
             finish()
         }
 
-
     }
 
     private fun sendData(cost: Int, category: Int, content: String) {
@@ -75,29 +70,12 @@ class ExpenseActivity : AppCompatActivity() {
 
             override fun onResponse(call: Call<Unit>, response: Response<Unit>) {
                 if (response.isSuccessful) {
-                    Toast.makeText(this@ExpenseActivity, "성공", Toast.LENGTH_SHORT).show()
+                    //Toast.makeText(this@ExpenseActivity, "성공", Toast.LENGTH_SHORT).show()
                 } else {
                     Log.v("YGYG", response.errorBody().toString())
-
                 }
             }
-
         })
-
-//        setExpense.setExpense().enqueue(object : Callback<ExpenseServerItem>{
-//            override fun onFailure(call: Call<ExpenseServerItem>, t: Throwable) {
-//                Log.e("서버 보내기 오류", "t = $t")
-//            }
-//
-//            override fun onResponse(
-//                call: Call<ExpenseServerItem>,
-//                response: Response<ExpenseServerItem>
-//            ) {
-//                if(response.isSuccessful){
-//                    val sendData = response.body()!!
-//                }
-//            }
-//        })
     }
 
     private fun checking() {
@@ -118,8 +96,7 @@ class ExpenseActivity : AppCompatActivity() {
 
     private fun setCheckButtonState() {
         btn_checked.isEnabled =
-            type.isNotEmpty() &&
-                    tv_extense_input.text.isNotEmpty()
+            type.isNotEmpty() && tv_extense_input.text.isNotEmpty()
 
         Log.v("YGYG", tv_extense_input.text.isNotEmpty().toString())
     }
diff --git a/app/src/main/java/com/sopt/tokddak/feature/history/HistoryActivity.kt b/app/src/main/java/com/sopt/tokddak/feature/history/HistoryActivity.kt
index 331c7fd..9eb8e21 100644
--- a/app/src/main/java/com/sopt/tokddak/feature/history/HistoryActivity.kt
+++ b/app/src/main/java/com/sopt/tokddak/feature/history/HistoryActivity.kt
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.tokddak.R
+import com.sopt.tokddak.common.toDecimalFormat
 import kotlinx.android.synthetic.main.activity_expense_history.*
 import retrofit2.Call
 import retrofit2.Callback
@@ -28,29 +29,27 @@ class HistoryActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_expense_history)
-        init()
+
+        history_rv_outer = findViewById(R.id.history_rv_outer)
+        init(history_rv_outer)
 
         img_back.setOnClickListener {
             finish()
         }
     }
 
-    private fun init(){
+    private fun init(view : RecyclerView){
 
         txt_total_price = findViewById(R.id.txt_total_price)
-        var total = txt_total_price.text.toString().toInt()
-
 
         divider = DividerItemDecoration(this, 1)
         divider.setDrawable(resources.getDrawable(R.drawable.rv_divider))
 
-        history_rv_outer = findViewById(R.id.history_rv_outer)
-
         historyAdapter = HistoryAdapter(this)
 
-        history_rv_outer.adapter = historyAdapter
-        history_rv_outer.layoutManager = LinearLayoutManager(this, VERTICAL, false)
-        history_rv_outer.addItemDecoration(divider)
+        view.adapter = historyAdapter
+        view.layoutManager = LinearLayoutManager(this, VERTICAL, false)
+        view.addItemDecoration(divider)
 
         getHistory.getHistory(1).enqueue(object : Callback<HistoryServerItem>{
             override fun onFailure(call: Call<HistoryServerItem>, t: Throwable) {
@@ -67,6 +66,10 @@ class HistoryActivity : AppCompatActivity() {
 
                     historyAdapter.data = historyIn
                     historyAdapter.notifyDataSetChanged()
+                    var total = 0
+                    historyIn.forEach { total += it.price }
+                    txt_total_price.text = total.toDecimalFormat()
+
                 }
             }
         })
diff --git a/app/src/main/java/com/sopt/tokddak/feature/history/HistoryAdapter.kt b/app/src/main/java/com/sopt/tokddak/feature/history/HistoryAdapter.kt
index 2eaaca6..52563ab 100644
--- a/app/src/main/java/com/sopt/tokddak/feature/history/HistoryAdapter.kt
+++ b/app/src/main/java/com/sopt/tokddak/feature/history/HistoryAdapter.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.tokddak.R
+import com.sopt.tokddak.common.toDecimalFormat
 
 class HistoryAdapter(private val context: Context) : RecyclerView.Adapter<HistoryAdapter.HistoryViewHolder>(){
 
@@ -32,9 +33,17 @@ class HistoryAdapter(private val context: Context) : RecyclerView.Adapter<Histor
         val txt_price : TextView = view.findViewById(R.id.txt_price)
 
         fun bind(historyItem: HistoryServerInItem){
-            txt_category.text = historyItem.category.toString()
+
+            when(historyItem.category.toString()){
+                "1" -> txt_category.text = "숙박"
+                "2" -> txt_category.text = "식사"
+                "3" -> txt_category.text = "간식/주류"
+                "4" -> txt_category.text = "교통"
+                "5" -> txt_category.text = "쇼핑"
+                "6" -> txt_category.text = "액티비티"
+            }
             txt_detail.text = historyItem.detail
-            txt_price.text = historyItem.price.toString()
+            txt_price.text = historyItem.price.toDecimalFormat()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/tokddak/feature/inner/InnerAdapter.kt b/app/src/main/java/com/sopt/tokddak/feature/inner/InnerAdapter.kt
index eeb8211..917514a 100644
--- a/app/src/main/java/com/sopt/tokddak/feature/inner/InnerAdapter.kt
+++ b/app/src/main/java/com/sopt/tokddak/feature/inner/InnerAdapter.kt
@@ -14,7 +14,6 @@ class InnerAdapter (private val context : Context, var dayContents : ArrayList<S
 
     var data = listOf<InnerItem>()
 
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InnerViewHolder {
         val view = LayoutInflater.from(context).inflate(R.layout.rv_item_inner,parent,false)
         return InnerViewHolder(view)
@@ -26,14 +25,22 @@ class InnerAdapter (private val context : Context, var dayContents : ArrayList<S
         return holder.bind(dayContents[position])
     }
 
-    inner class InnerViewHolder (view : View) : RecyclerView.ViewHolder(view){//, BottomAdapter.BottomListener
-    val ctn_inner : View = view.findViewById(R.id.ctn_inner)
+    inner class InnerViewHolder (view : View) : RecyclerView.ViewHolder(view), View.OnLongClickListener{//, BottomAdapter.BottomListener
+        val ctn_inner : View = view.findViewById(R.id.ctn_inner)
         val txt_category : TextView = view.findViewById(R.id.txt_category)
         val img_category : ImageView = view.findViewById(R.id.img_category)
 
 
         fun bind(innerItem : String){
             txt_category.text = innerItem
+            ctn_inner.setOnLongClickListener(this)
+        }
+
+        override fun onLongClick(view : View): Boolean {
+            val position = adapterPosition
+            dayContents.removeAt(position)
+            notifyItemRemoved(position)
+            return true
         }
     }
 
diff --git a/app/src/main/res/layout/activity_day.xml b/app/src/main/res/layout/activity_day.xml
index bb2f79a..1333ef5 100644
--- a/app/src/main/res/layout/activity_day.xml
+++ b/app/src/main/res/layout/activity_day.xml
@@ -38,7 +38,14 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.0"
             app:srcCompat="@drawable/navi_btn_back_w" />
-
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/ctn_perfect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
         <TextView
             android:id="@+id/txt_perfect"
             android:layout_width="wrap_content"
@@ -53,7 +60,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
@@ -85,10 +92,10 @@
         android:id="@+id/txt_total_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:textColor="#ffffff"
-        android:text="000,000"
+        android:text="0"
         android:textSize="24sp"
         app:layout_constraintTop_toBottomOf="@+id/txt_explain"
         app:layout_constraintStart_toEndOf="@+id/txt_won" />
diff --git a/app/src/main/res/layout/activity_expense.xml b/app/src/main/res/layout/activity_expense.xml
index b0064ea..26c57c3 100644
--- a/app/src/main/res/layout/activity_expense.xml
+++ b/app/src/main/res/layout/activity_expense.xml
@@ -43,7 +43,7 @@
                 android:id="@+id/btn_stay"
                 android:layout_width="100dp"
                 android:layout_height="48dp"
-                android:layout_marginTop="64dp"
+                android:layout_marginTop="58dp"
                 android:background="@drawable/selector_blue_white_background"
                 android:tag="숙박"
                 android:text="숙박"
@@ -57,7 +57,7 @@
                 android:id="@+id/btn_food"
                 android:layout_width="100dp"
                 android:layout_height="48dp"
-                android:layout_marginTop="64dp"
+                android:layout_marginTop="58dp"
                 android:background="@drawable/selector_blue_white_background"
                 android:tag="식사"
                 android:text="식사"
@@ -71,7 +71,7 @@
                 android:id="@+id/btn_snacks"
                 android:layout_width="100dp"
                 android:layout_height="48dp"
-                android:layout_marginTop="64dp"
+                android:layout_marginTop="58dp"
                 android:background="@drawable/selector_blue_white_background"
                 android:tag="간식/주류"
                 android:text="간식/주류"
@@ -158,7 +158,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="6dp"
                 android:layout_marginBottom="12dp"
-                android:text="원"
+                android:text="EUR"
                 android:textColor="#151617"
                 android:textSize="20sp"
                 app:layout_constraintBottom_toBottomOf="@id/tv_extense_input"
@@ -188,20 +188,25 @@
                 android:paddingBottom="12dp"
                 android:textSize="20sp"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/txt_detail" />
+                app:layout_constraintTop_toBottomOf="@id/txt_detail"
+                app:layout_constraintVertical_bias="0.024" />
 
             <Button
-                android:text="확인"
-                android:textSize="16sp"
                 android:id="@+id/btn_checked"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
-                android:textColor="#ffffff"
                 android:background="@drawable/selector_btn_ok_change"
+                android:text="확인"
+                android:textColor="#ffffff"
+                android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_detail_input"
+                app:layout_constraintVertical_bias="1.0" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/rv_item_history.xml b/app/src/main/res/layout/rv_item_history.xml
index 74c3381..b65c7a1 100644
--- a/app/src/main/res/layout/rv_item_history.xml
+++ b/app/src/main/res/layout/rv_item_history.xml
@@ -14,7 +14,8 @@
         android:layout_marginTop="16dp"
         android:layout_marginStart="24dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/txt_detail"/>
     <TextView
         android:id="@+id/txt_detail"
         android:layout_width="wrap_content"
diff --git a/local.properties b/local.properties
index cea393c..c58e542 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Dec 25 13:35:31 KST 2019
-sdk.dir=C\:\\Users\\SunnnI\\AppData\\Local\\Android\\Sdk
+#Sat Jan 04 02:30:50 KST 2020
+sdk.dir=C\:\\Users\\User\\AppData\\Local\\Android\\Sdk