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 @@ @style/Theme.UMC_6th - - - @style/Theme.UMC_6th - - @style/Theme.UMC_6th @@ -136,16 +131,11 @@ @@ -253,29 +243,29 @@ - @@ -953,6 +958,7 @@ - \ 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