From 9a32a29762f8f25deb791e6578e1876acb979d60 Mon Sep 17 00:00:00 2001
From: leesumin0526 <leesumin0526@gmail.com>
Date: Mon, 24 Jun 2024 22:53:01 +0900
Subject: [PATCH] =?UTF-8?q?[maro/#43]=20feat=20::=209=EC=A3=BC=EC=B0=A8=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 78 ++++++++++---------
 .../com/example/umc_6th/LockerFragment.kt     |  1 +
 .../java/com/example/umc_6th/LoginActivity.kt |  1 +
 .../java/com/example/umc_6th/LookFragment.kt  | 26 +------
 4 files changed, 45 insertions(+), 61 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d523961..e4b6d6d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -105,11 +105,6 @@
           <theme>@style/Theme.UMC_6th</theme>
         </config>
       </layout>
-      <layout url="file://$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/item.xml">
-        <config>
-          <theme>@style/Theme.UMC_6th</theme>
-        </config>
-      </layout>
       <layout url="file://$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/item_album.xml">
         <config>
           <theme>@style/Theme.UMC_6th</theme>
@@ -136,16 +131,11 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2a0892f6-22ae-44d0-9c68-5f47b708a220" name="Changes" comment="[maro/#38] feat :: 8주차 구현 완료">
+    <list default="true" id="2a0892f6-22ae-44d0-9c68-5f47b708a220" name="Changes" comment="[maro/#43] feat :: 9주차 구현 완료">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/User.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/User.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_look.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_look.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -187,8 +177,8 @@
         <option value="resourceFile" />
         <option value="Kotlin Data Class" />
         <option value="Kotlin Interface" />
-        <option value="Kotlin Class" />
         <option value="layoutResourceFile" />
+        <option value="Kotlin Class" />
       </list>
     </option>
   </component>
@@ -253,29 +243,29 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "maro/#43",
-    "ignore.virus.scanning.warn.message": "true",
-    "last_opened_file_path": "C:/android/MARO_HW1/UMC_6th/app/src/main/java/com/example/umc_6th",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.17",
-    "project.structure.side.proportion": "0.2",
-    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
+  <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;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;maro/#43&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/android/MARO_HW1/UMC_6th/app/src/main/java/com/example/umc_6th&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.2&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;
   },
-  "keyToStringList": {
-    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
-      "HgIgnore",
-      "GitIgnore"
+  &quot;keyToStringList&quot;: {
+    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
+      &quot;HgIgnore&quot;,
+      &quot;GitIgnore&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\android\MARO_HW1\UMC_6th\app\src\main\java\com\example\umc_6th" />
@@ -903,7 +893,23 @@
       <option name="project" value="LOCAL" />
       <updated>1717579963617</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="[maro/#43] feat :: 9주차 구현 완료">
+      <option name="closed" value="true" />
+      <created>1718708628738</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1718708628738</updated>
+    </task>
+    <task id="LOCAL-00035" summary="[maro/#43] feat :: 9주차 구현 완료">
+      <option name="closed" value="true" />
+      <created>1718708640991</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1718708640991</updated>
+    </task>
+    <option name="localTasksCounter" value="36" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -928,7 +934,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="[maro/#7] feat : 2주차 구현" />
     <MESSAGE value="[maro/#7] fix : binding 버그 수정" />
     <MESSAGE value="[maro/#13] feat : ViewPager Banner" />
     <MESSAGE value="[maro/#13] feat : ViewPager Background" />
@@ -953,6 +958,7 @@
     <MESSAGE value="[maro/#38] feat :: 좋아요 표시 유저 구분" />
     <MESSAGE value="[maro/#38] feat :: 저장 앨범 탭, 둘러보기 페이지 제작" />
     <MESSAGE value="[maro/#38] feat :: 8주차 구현 완료" />
-    <option name="LAST_COMMIT_MESSAGE" value="[maro/#38] feat :: 8주차 구현 완료" />
+    <MESSAGE value="[maro/#43] feat :: 9주차 구현 완료" />
+    <option name="LAST_COMMIT_MESSAGE" value="[maro/#43] feat :: 9주차 구현 완료" />
   </component>
 </project>
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt
index e77715d..17767e3 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import com.chrome.umcflo.LoginActivity
 import com.example.umc_6th.databinding.FragmentLockerBinding
 import com.google.android.material.tabs.TabLayoutMediator
 
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt
index d3944fb..485741a 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt
@@ -1,4 +1,5 @@
 package com.chrome.umcflo
+import com.example.umc_6th.Result
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt
index 28042b9..917d036 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt
@@ -16,31 +16,7 @@ class LookFragment : Fragment(), LookView {
 
     lateinit var binding: FragmentLookBinding
     private lateinit var songDB: SongDatabase
-
-    private lateinit var chartBtn : Button
-    private lateinit var videoBtn : Button
-    private lateinit var genreBtn : Button
-    private lateinit var situationBtn : Button
-    private lateinit var audioBtn : Button
-    private lateinit var atmosphereBtn : Button
-
-    private lateinit var buttonList: List<Button>
-
-    private lateinit var chartTv : TextView
-    private lateinit var videoTv : TextView
-    private lateinit var genreTv : TextView
-    private lateinit var situationTv : TextView
-    private lateinit var audioTv : TextView
-    private lateinit var atmosphereTv : TextView
-
-    private lateinit var textList: List<TextView>
-
-    lateinit var scrollView : ScrollView
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
+    private lateinit var floCharAdapter: SongRVAdapter
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?