diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/Android_A.iml b/.idea/Android_A.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/Android_A.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..d0ae007
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..58490e4
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..fdf8d99
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..08bdde3
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..87a20fc
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..265f9fc
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/.idea/vcs.xml b/.idea/vcs.xml
similarity index 69%
rename from UMC_6th/.idea/vcs.xml
rename to .idea/vcs.xml
index 6c0b863..35eb1dd 100644
--- a/UMC_6th/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/UMC_6th/.idea/.gitignore b/UMC_6th/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/UMC_6th/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/UMC_6th/.idea/.name b/UMC_6th/.idea/.name
new file mode 100644
index 0000000..b3405b3
--- /dev/null
+++ b/UMC_6th/.idea/.name
@@ -0,0 +1 @@
+My Application
\ No newline at end of file
diff --git a/UMC_6th/.idea/deploymentTargetDropDown.xml b/UMC_6th/.idea/deploymentTargetDropDown.xml
index 0c0c338..07e8bfc 100644
--- a/UMC_6th/.idea/deploymentTargetDropDown.xml
+++ b/UMC_6th/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/UMC_6th/.idea/gradle.xml b/UMC_6th/.idea/gradle.xml
index 32522c1..0897082 100644
--- a/UMC_6th/.idea/gradle.xml
+++ b/UMC_6th/.idea/gradle.xml
@@ -1,5 +1,6 @@
+
diff --git a/UMC_6th/.idea/kotlinc.xml b/UMC_6th/.idea/kotlinc.xml
index 8d81632..fdf8d99 100644
--- a/UMC_6th/.idea/kotlinc.xml
+++ b/UMC_6th/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/UMC_6th/app/build.gradle.kts b/UMC_6th/app/build.gradle.kts
index f793280..4751c27 100644
--- a/UMC_6th/app/build.gradle.kts
+++ b/UMC_6th/app/build.gradle.kts
@@ -1,14 +1,19 @@
plugins {
- id("com.android.application")
- id("org.jetbrains.kotlin.android")
+ alias(libs.plugins.androidApplication)
+ alias(libs.plugins.jetbrainsKotlinAndroid)
}
android {
- namespace = "com.example.umc_6th"
+ namespace = "com.example.myfirstapp"
compileSdk = 34
+
+ buildFeatures {
+ viewBinding = true
+ }
+
defaultConfig {
- applicationId = "com.example.umc_6th"
+ applicationId = "com.example.myfirstapp"
minSdk = 24
targetSdk = 34
versionCode = 1
@@ -37,11 +42,13 @@ android {
dependencies {
- implementation("androidx.core:core-ktx:1.10.1")
- implementation("androidx.appcompat:appcompat:1.6.1")
- implementation("com.google.android.material:material:1.11.0")
- implementation("androidx.constraintlayout:constraintlayout:2.1.4")
- testImplementation("junit:junit:4.13.2")
- androidTestImplementation("androidx.test.ext:junit:1.1.5")
- androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+ implementation(libs.androidx.core.ktx)
+ implementation(libs.androidx.appcompat)
+ implementation(libs.material)
+ implementation(libs.androidx.activity)
+ implementation(libs.androidx.constraintlayout)
+ implementation ("androidx.fragment:fragment-ktx:1.6.2")
+ testImplementation(libs.junit)
+ androidTestImplementation(libs.androidx.junit)
+ androidTestImplementation(libs.androidx.espresso.core)
}
\ No newline at end of file
diff --git a/UMC_6th/app/src/androidTest/java/com/example/umc_6th/ExampleInstrumentedTest.kt b/UMC_6th/app/src/androidTest/java/com/example/myfirstapp/ExampleInstrumentedTest.kt
similarity index 84%
rename from UMC_6th/app/src/androidTest/java/com/example/umc_6th/ExampleInstrumentedTest.kt
rename to UMC_6th/app/src/androidTest/java/com/example/myfirstapp/ExampleInstrumentedTest.kt
index 60fd33d..56af7c1 100644
--- a/UMC_6th/app/src/androidTest/java/com/example/umc_6th/ExampleInstrumentedTest.kt
+++ b/UMC_6th/app/src/androidTest/java/com/example/myfirstapp/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.myfirstapp
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("com.example.umc_6th", appContext.packageName)
+ assertEquals("com.example.myfirstapp", appContext.packageName)
}
}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/AndroidManifest.xml b/UMC_6th/app/src/main/AndroidManifest.xml
index 3e1ab00..fb79b9a 100644
--- a/UMC_6th/app/src/main/AndroidManifest.xml
+++ b/UMC_6th/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/Theme.UMC_6th"
+ android:theme="@style/Theme.MyApplication"
tools:targetApi="31">
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/AlbumFragment.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/AlbumFragment.kt
new file mode 100644
index 0000000..4b98f5a
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/AlbumFragment.kt
@@ -0,0 +1,50 @@
+package com.example.myfirstapp
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import com.example.myfirstapp.databinding.FragmentAlbumBinding
+
+class AlbumFragment : Fragment() {
+
+ lateinit var binding : FragmentAlbumBinding
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ binding = FragmentAlbumBinding.inflate(inflater,container,false)
+
+ //HomeFragment를 AlbumFragment로 전환할때 전달된 데이터 받는 곳(bundle을 이용해 전달 가능)
+ binding.albumTitleTv.text = arguments?.getString("title")
+ binding.albumSingerTv.text = arguments?.getString("singer")
+
+ binding.albumBackIv.setOnClickListener{
+ (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_container,HomeFragment()).commitAllowingStateLoss()
+ }
+ binding.albumSongLalacCl.setOnClickListener{
+ Toast.makeText(activity,"LILAC",Toast.LENGTH_SHORT).show()
+ }
+ binding.albumSongFluCl.setOnClickListener{
+ Toast.makeText(activity,"FLU",Toast.LENGTH_SHORT).show()
+ }
+ binding.albumSongCoinCl.setOnClickListener{
+ Toast.makeText(activity,"Coin",Toast.LENGTH_SHORT).show()
+ }
+ binding.albumSongSpringhelloCl.setOnClickListener{
+ Toast.makeText(activity,"봄 안녕 봄",Toast.LENGTH_SHORT).show()
+ }
+ binding.albumSongCelebrityCl.setOnClickListener{
+ Toast.makeText(activity,"Celebrity",Toast.LENGTH_SHORT).show()
+ }
+ binding.albumSongSingCl.setOnClickListener{
+ Toast.makeText(activity,"돌림노래 (Feat.DEAN)",Toast.LENGTH_SHORT).show()
+ }
+
+ return binding.root
+ }
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/HomeFragment.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/HomeFragment.kt
new file mode 100644
index 0000000..a2a41bf
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/HomeFragment.kt
@@ -0,0 +1,34 @@
+package com.example.myfirstapp
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.example.myfirstapp.databinding.FragmentHomeBinding
+
+class HomeFragment : Fragment() {
+
+ lateinit var binding: FragmentHomeBinding
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+
+ binding = FragmentHomeBinding.inflate(inflater, container, false)
+ binding.homeTodayAlbum1Iv.setOnClickListener {
+ //HomeFragment를 AlbumFragment로 전환할때 데이터도 이동(bundle을 이용해 전달 가능)
+ val bundle = Bundle()
+ bundle.putString("title", binding.homeTodayAlbumTitleTv.text.toString())
+ bundle.putString("singer", binding.homeTodaySingerTv.text.toString())
+
+ val albumFragment = AlbumFragment()
+ albumFragment.arguments = bundle
+
+ (context as MainActivity).supportFragmentManager.beginTransaction()
+ .replace(R.id.main_container, albumFragment).commitAllowingStateLoss()
+ }
+ return binding.root
+ }
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/LockerFragment.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/LockerFragment.kt
new file mode 100644
index 0000000..278ac71
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/LockerFragment.kt
@@ -0,0 +1,19 @@
+package com.example.myfirstapp
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class LockerFragment : Fragment() {
+ // 여기에 Fragment의 구현 내용을 작성합니다.
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ // 여기에서 Fragment의 레이아웃을 인플레이트합니다.
+ return inflater.inflate(R.layout.fragment_locker, container, false)
+ }
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/LookFragment.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/LookFragment.kt
new file mode 100644
index 0000000..694be3e
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/LookFragment.kt
@@ -0,0 +1,19 @@
+package com.example.myfirstapp
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class LookFragment : Fragment() {
+ // 여기에 Fragment의 구현 내용을 작성합니다.
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ // 여기에서 Fragment의 레이아웃을 인플레이트합니다.
+ return inflater.inflate(R.layout.fragment_look, container, false)
+ }
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/MainActivity.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/MainActivity.kt
new file mode 100644
index 0000000..42efede
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/MainActivity.kt
@@ -0,0 +1,100 @@
+package com.example.myfirstapp
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.example.myfirstapp.databinding.ActivityMainBinding
+
+class MainActivity : AppCompatActivity() {
+
+ lateinit var binding : ActivityMainBinding
+ lateinit var activityResultLauncher: ActivityResultLauncher
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ binding = ActivityMainBinding.inflate(layoutInflater)
+ setContentView(binding.root)
+
+ setBottomNavigationView()
+
+ //MainActivity에서 SongActivity로 데이터 값 넘기기 위한 변수명 지정
+ val song = Song(binding.mainPlayTitleTv.text.toString(), binding.mainPlaySingerTv.text.toString())
+
+ //SongActivity에서 Mainactivity로 데이터 넘긴거 받고 가수명과 노래 제목 toast로 출력
+ activityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+ if (result.resultCode == RESULT_OK) {
+ val data = result.data
+ if (data != null) {
+ val message = data.getStringExtra("message")
+ Log.d("message", message!!)
+ Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+ }
+ }
+ }
+ //MainActivity에서 SongActivity로 데이터 값 넘기는 코드
+ binding.mainPlayCl.setOnClickListener {
+ val intent = Intent(this, SongActivity::class.java)
+ intent.putExtra("title", song.title)
+ intent.putExtra("singer",song.singer)
+ activityResultLauncher.launch(intent)
+ }
+
+
+
+ Log.d("Song",song.title + song.singer)
+
+ if (savedInstanceState == null) {
+ binding.mainBottomNavigation.selectedItemId = R.id.fragment_home
+ }
+ }
+
+ fun setBottomNavigationView() {
+
+ supportFragmentManager.beginTransaction().replace(R.id.main_container, HomeFragment()).commitAllowingStateLoss()
+ binding.mainBottomNavigation.setOnItemSelectedListener { item ->
+ when (item.itemId) {
+ R.id.homeFragment -> {
+ supportFragmentManager.beginTransaction().replace(
+ R.id.main_container,
+ HomeFragment()
+ ).commit()
+ true
+ }
+
+ R.id.lookFragment -> {
+ supportFragmentManager.beginTransaction().replace(
+ R.id.main_container,
+ LookFragment()
+ ).commit()
+ true
+ }
+
+ R.id.searchFragment -> {
+ supportFragmentManager.beginTransaction().replace(
+ R.id.main_container,
+ SearchFragment()
+ ).commit()
+ true
+ }
+
+ R.id.lockerFragment -> {
+ supportFragmentManager.beginTransaction().replace(
+ R.id.main_container,
+ LockerFragment()
+ ).commit()
+ true
+ }
+
+ else -> false
+ }
+ }
+ }
+ }
+
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/SearchFragment.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/SearchFragment.kt
new file mode 100644
index 0000000..815c5bd
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/SearchFragment.kt
@@ -0,0 +1,20 @@
+package com.example.myfirstapp
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class SearchFragment : Fragment() {
+ // 여기에 Fragment의 구현 내용을 작성합니다.
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ // 여기에서 Fragment의 레이아웃을 인플레이트합니다.
+ return inflater.inflate(R.layout.fragment_search, container, false)
+ }
+
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/Song.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/Song.kt
new file mode 100644
index 0000000..c00f378
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/Song.kt
@@ -0,0 +1,6 @@
+package com.example.myfirstapp
+
+data class Song(
+ val title : String = "",
+ val singer : String = ""
+)
diff --git a/UMC_6th/app/src/main/java/com/example/myfirstapp/SongActivity.kt b/UMC_6th/app/src/main/java/com/example/myfirstapp/SongActivity.kt
new file mode 100644
index 0000000..13d3f52
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/myfirstapp/SongActivity.kt
@@ -0,0 +1,69 @@
+package com.example.myfirstapp
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.example.myfirstapp.databinding.ActivityMainBinding
+import com.example.myfirstapp.databinding.ActivitySongBinding
+
+class SongActivity : AppCompatActivity() {
+
+ lateinit var binding: ActivitySongBinding
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ binding = ActivitySongBinding.inflate(layoutInflater)
+ setContentView(binding.root)
+
+ var title : String? = null
+ var singer : String? = null
+
+ //MainActivity에서 SongActivity로 넘긴 데이터 값 받는 곳
+ if(intent.hasExtra("title") && intent.hasExtra("singer")){
+ title = intent.getStringExtra("title")
+ singer = intent.getStringExtra("singer")
+ binding.songMusicTitleTv.text = title
+ binding.songMusicSingerTv.text = singer
+ }
+
+ //SongActivity에서 Mainactivity로 데이터 넘기는 곳
+ //songDownIb를 누르면 intent가 넘어감
+ binding.songDownIb.setOnClickListener {
+ val intent = Intent(this, MainActivity::class.java)
+ intent.putExtra("message", title + " _ " + singer)
+ setResult(RESULT_OK, intent)
+ finish()
+ }
+
+ binding.songMiniplayerPlayIv.setOnClickListener{
+ setPlayerStatus(false)
+ }
+ binding.songMiniplayerPauseIv.setOnClickListener{
+ setPlayerStatus(true)
+ }
+ if(intent.hasExtra("title")&&intent.hasExtra("singer")){
+ binding.songMusicTitleTv.text = intent.getStringExtra("title")
+ binding.songMusicSingerTv.text = intent.getStringExtra("singer")
+ }
+ }
+
+ override fun onBackPressed() {
+ val intent = Intent(this, MainActivity::class.java)
+ intent.putExtra("message", "뒤로가기 버튼 클릭")
+ setResult(RESULT_OK, intent)
+ finish()
+ }
+
+ fun setPlayerStatus(isPlaying : Boolean){
+ if(isPlaying){ //재생중
+ binding.songMiniplayerPlayIv.visibility = View.VISIBLE
+ binding.songMiniplayerPauseIv.visibility = View.GONE
+ }
+ else{ //일시정지
+ binding.songMiniplayerPlayIv.visibility = View.GONE
+ binding.songMiniplayerPauseIv.visibility = View.VISIBLE
+ }
+ }
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt
deleted file mode 100644
index 1b8d109..0000000
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.umc_6th
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_main)
- }
-}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/apple_44.png b/UMC_6th/app/src/main/res/drawable/apple_44.png
new file mode 100644
index 0000000..f365d20
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/apple_44.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btm_color_selector.xml b/UMC_6th/app/src/main/res/drawable/btm_color_selector.xml
new file mode 100644
index 0000000..3ecf8a7
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/btm_color_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/btn_actionbar_close.png b/UMC_6th/app/src/main/res/drawable/btn_actionbar_close.png
new file mode 100644
index 0000000..b6cc3cc
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_actionbar_close.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_actionbar_instagram.png b/UMC_6th/app/src/main/res/drawable/btn_actionbar_instagram.png
new file mode 100644
index 0000000..90bc027
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_actionbar_instagram.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_arrow_black.png b/UMC_6th/app/src/main/res/drawable/btn_arrow_black.png
new file mode 100644
index 0000000..cc38ca8
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_arrow_black.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_arrow_more.png b/UMC_6th/app/src/main/res/drawable/btn_arrow_more.png
new file mode 100644
index 0000000..59e410c
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_arrow_more.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_input_password.png b/UMC_6th/app/src/main/res/drawable/btn_input_password.png
new file mode 100644
index 0000000..8c2eb18
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_input_password.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_input_password_off.png b/UMC_6th/app/src/main/res/drawable/btn_input_password_off.png
new file mode 100644
index 0000000..8234f53
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_input_password_off.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_main_arrow_more.png b/UMC_6th/app/src/main/res/drawable/btn_main_arrow_more.png
new file mode 100644
index 0000000..59e410c
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_main_arrow_more.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_main_mike.png b/UMC_6th/app/src/main/res/drawable/btn_main_mike.png
new file mode 100644
index 0000000..9bddec6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_main_mike.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_main_setting.png b/UMC_6th/app/src/main/res/drawable/btn_main_setting.png
new file mode 100644
index 0000000..7a8d5d6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_main_setting.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_main_ticket.png b/UMC_6th/app/src/main/res/drawable/btn_main_ticket.png
new file mode 100644
index 0000000..52b6d64
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_main_ticket.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_miniplay_mvpause.png b/UMC_6th/app/src/main/res/drawable/btn_miniplay_mvpause.png
new file mode 100644
index 0000000..470e046
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_miniplay_mvpause.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_miniplay_mvplay.png b/UMC_6th/app/src/main/res/drawable/btn_miniplay_mvplay.png
new file mode 100644
index 0000000..d118677
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_miniplay_mvplay.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_miniplay_pause.png b/UMC_6th/app/src/main/res/drawable/btn_miniplay_pause.png
new file mode 100644
index 0000000..470e046
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_miniplay_pause.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_miniplayer_go_list.png b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_go_list.png
new file mode 100644
index 0000000..1b2d977
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_go_list.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_miniplayer_next.png b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_next.png
new file mode 100644
index 0000000..3aedba3
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_next.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_miniplayer_play.png b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_play.png
new file mode 100644
index 0000000..f619072
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_play.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_miniplayer_previous.png b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_previous.png
new file mode 100644
index 0000000..d0bf1f6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_miniplayer_previous.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_nugu.png b/UMC_6th/app/src/main/res/drawable/btn_nugu.png
new file mode 100644
index 0000000..9bddec6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_nugu.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_panel_play_large.png b/UMC_6th/app/src/main/res/drawable/btn_panel_play_large.png
new file mode 100644
index 0000000..4ac7103
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_panel_play_large.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_eq_off.png b/UMC_6th/app/src/main/res/drawable/btn_player_eq_off.png
new file mode 100644
index 0000000..f23d9c6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_eq_off.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_go_list.png b/UMC_6th/app/src/main/res/drawable/btn_player_go_list.png
new file mode 100644
index 0000000..1b2d977
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_go_list.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_more.png b/UMC_6th/app/src/main/res/drawable/btn_player_more.png
new file mode 100644
index 0000000..a8ad9e6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_more.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_play.png b/UMC_6th/app/src/main/res/drawable/btn_player_play.png
new file mode 100644
index 0000000..f6c3201
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_play.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_related.png b/UMC_6th/app/src/main/res/drawable/btn_player_related.png
new file mode 100644
index 0000000..9026fe5
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_related.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_setting.png b/UMC_6th/app/src/main/res/drawable/btn_player_setting.png
new file mode 100644
index 0000000..0df8f69
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_setting.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_unlike_off.png b/UMC_6th/app/src/main/res/drawable/btn_player_unlike_off.png
new file mode 100644
index 0000000..b539504
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_unlike_off.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_player_unlike_on.png b/UMC_6th/app/src/main/res/drawable/btn_player_unlike_on.png
new file mode 100644
index 0000000..45a43ca
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_player_unlike_on.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_playlist_select_off.png b/UMC_6th/app/src/main/res/drawable/btn_playlist_select_off.png
new file mode 100644
index 0000000..62ef45c
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_playlist_select_off.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_playlist_select_on.png b/UMC_6th/app/src/main/res/drawable/btn_playlist_select_on.png
new file mode 100644
index 0000000..2d3b6af
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_playlist_select_on.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_setting_phone.png b/UMC_6th/app/src/main/res/drawable/btn_setting_phone.png
new file mode 100644
index 0000000..d6de4c6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_setting_phone.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_textbox_close.png b/UMC_6th/app/src/main/res/drawable/btn_textbox_close.png
new file mode 100644
index 0000000..10f1f63
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_textbox_close.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_titlebar_close.png b/UMC_6th/app/src/main/res/drawable/btn_titlebar_close.png
new file mode 100644
index 0000000..6615def
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_titlebar_close.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_toggle_off.png b/UMC_6th/app/src/main/res/drawable/btn_toggle_off.png
new file mode 100644
index 0000000..983360d
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_toggle_off.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/btn_toggle_on.png b/UMC_6th/app/src/main/res/drawable/btn_toggle_on.png
new file mode 100644
index 0000000..fb609f4
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/btn_toggle_on.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/button_background_black_color.xml b/UMC_6th/app/src/main/res/drawable/button_background_black_color.xml
new file mode 100644
index 0000000..a4afe1d
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/button_background_black_color.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/button_background_flo_color.xml b/UMC_6th/app/src/main/res/drawable/button_background_flo_color.xml
new file mode 100644
index 0000000..046ded6
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/button_background_flo_color.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/button_background_gray_color.xml b/UMC_6th/app/src/main/res/drawable/button_background_gray_color.xml
new file mode 100644
index 0000000..3406c73
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/button_background_gray_color.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/button_background_white_color.xml b/UMC_6th/app/src/main/res/drawable/button_background_white_color.xml
new file mode 100644
index 0000000..679a1fd
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/button_background_white_color.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/discovery_banner_aos.jpg b/UMC_6th/app/src/main/res/drawable/discovery_banner_aos.jpg
new file mode 100644
index 0000000..c905515
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/discovery_banner_aos.jpg differ
diff --git a/UMC_6th/app/src/main/res/drawable/fragment_look_chart_background.xml b/UMC_6th/app/src/main/res/drawable/fragment_look_chart_background.xml
new file mode 100644
index 0000000..aae5110
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/fragment_look_chart_background.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/fragment_look_chip_off_background.xml b/UMC_6th/app/src/main/res/drawable/fragment_look_chip_off_background.xml
new file mode 100644
index 0000000..283cbe9
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/fragment_look_chip_off_background.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/fragment_look_chip_on_background.xml b/UMC_6th/app/src/main/res/drawable/fragment_look_chip_on_background.xml
new file mode 100644
index 0000000..e77b352
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/fragment_look_chip_on_background.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_home_no_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_home_no_select.png
new file mode 100644
index 0000000..53a611a
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_home_no_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_home_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_home_select.png
new file mode 100644
index 0000000..787c7b4
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_home_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_locker_no_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_locker_no_select.png
new file mode 100644
index 0000000..bfe7ac0
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_locker_no_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_locker_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_locker_select.png
new file mode 100644
index 0000000..a88aa30
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_locker_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_look_no_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_look_no_select.png
new file mode 100644
index 0000000..73177d8
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_look_no_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_look_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_look_select.png
new file mode 100644
index 0000000..cad00b8
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_look_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_my_no_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_my_no_select.png
new file mode 100644
index 0000000..a67dec3
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_my_no_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_my_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_my_select.png
new file mode 100644
index 0000000..042489f
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_my_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_search_no_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_search_no_select.png
new file mode 100644
index 0000000..a77b8c5
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_search_no_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_bottom_search_select.png b/UMC_6th/app/src/main/res/drawable/ic_bottom_search_select.png
new file mode 100644
index 0000000..d5c8a72
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_bottom_search_select.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_browse_arrow_right.png b/UMC_6th/app/src/main/res/drawable/ic_browse_arrow_right.png
new file mode 100644
index 0000000..71b588b
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_browse_arrow_right.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_flo_logo.png b/UMC_6th/app/src/main/res/drawable/ic_flo_logo.png
new file mode 100644
index 0000000..643224d
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_flo_logo.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_facebook.png b/UMC_6th/app/src/main/res/drawable/ic_main_facebook.png
new file mode 100644
index 0000000..83e9732
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_facebook.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_facebook_btn.png b/UMC_6th/app/src/main/res/drawable/ic_main_facebook_btn.png
new file mode 100644
index 0000000..83e9732
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_facebook_btn.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_instagram.png b/UMC_6th/app/src/main/res/drawable/ic_main_instagram.png
new file mode 100644
index 0000000..398ce61
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_instagram.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_instagram_btn.png b/UMC_6th/app/src/main/res/drawable/ic_main_instagram_btn.png
new file mode 100644
index 0000000..398ce61
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_instagram_btn.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_twitter.png b/UMC_6th/app/src/main/res/drawable/ic_main_twitter.png
new file mode 100644
index 0000000..6ddc68e
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_twitter.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_twitter_btn.png b/UMC_6th/app/src/main/res/drawable/ic_main_twitter_btn.png
new file mode 100644
index 0000000..6ddc68e
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_twitter_btn.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_youtube.png b/UMC_6th/app/src/main/res/drawable/ic_main_youtube.png
new file mode 100644
index 0000000..0c4ec93
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_youtube.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_main_youtube_btn.png b/UMC_6th/app/src/main/res/drawable/ic_main_youtube_btn.png
new file mode 100644
index 0000000..0c4ec93
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_main_youtube_btn.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_my_like_off.png b/UMC_6th/app/src/main/res/drawable/ic_my_like_off.png
new file mode 100644
index 0000000..c06e139
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_my_like_off.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ic_my_like_on.png b/UMC_6th/app/src/main/res/drawable/ic_my_like_on.png
new file mode 100644
index 0000000..22577c0
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ic_my_like_on.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/ico_20_logo_tid_white.png b/UMC_6th/app/src/main/res/drawable/ico_20_logo_tid_white.png
new file mode 100644
index 0000000..c6f4d4f
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/ico_20_logo_tid_white.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/icon_browse_arrow_right.png b/UMC_6th/app/src/main/res/drawable/icon_browse_arrow_right.png
new file mode 100644
index 0000000..71b588b
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/icon_browse_arrow_right.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_album_exp.png b/UMC_6th/app/src/main/res/drawable/img_album_exp.png
new file mode 100644
index 0000000..6e3f38a
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_album_exp.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_album_exp2.png b/UMC_6th/app/src/main/res/drawable/img_album_exp2.png
new file mode 100644
index 0000000..28ea3ee
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_album_exp2.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_album_exp3.jpg b/UMC_6th/app/src/main/res/drawable/img_album_exp3.jpg
new file mode 100644
index 0000000..6641600
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_album_exp3.jpg differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_album_exp4.jpg b/UMC_6th/app/src/main/res/drawable/img_album_exp4.jpg
new file mode 100644
index 0000000..aecebb6
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_album_exp4.jpg differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_album_exp5.jpg b/UMC_6th/app/src/main/res/drawable/img_album_exp5.jpg
new file mode 100644
index 0000000..6a8d870
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_album_exp5.jpg differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_album_exp6.jpg b/UMC_6th/app/src/main/res/drawable/img_album_exp6.jpg
new file mode 100644
index 0000000..48202f2
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_album_exp6.jpg differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_album_lp.png b/UMC_6th/app/src/main/res/drawable/img_album_lp.png
new file mode 100644
index 0000000..29fb1b4
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_album_lp.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_default_4_x_1.png b/UMC_6th/app/src/main/res/drawable/img_default_4_x_1.png
new file mode 100644
index 0000000..926d34f
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_default_4_x_1.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_first_album_default.png b/UMC_6th/app/src/main/res/drawable/img_first_album_default.png
new file mode 100644
index 0000000..926d34f
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_first_album_default.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp.png b/UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp.png
new file mode 100644
index 0000000..da78032
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp2.png b/UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp2.png
new file mode 100644
index 0000000..50fa4be
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp2.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_jenre_exp_1.png b/UMC_6th/app/src/main/res/drawable/img_jenre_exp_1.png
new file mode 100644
index 0000000..0d43e8e
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_jenre_exp_1.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_jenre_exp_2.png b/UMC_6th/app/src/main/res/drawable/img_jenre_exp_2.png
new file mode 100644
index 0000000..f03efb2
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_jenre_exp_2.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_jenre_exp_3.png b/UMC_6th/app/src/main/res/drawable/img_jenre_exp_3.png
new file mode 100644
index 0000000..51de684
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_jenre_exp_3.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_potcast_exp.png b/UMC_6th/app/src/main/res/drawable/img_potcast_exp.png
new file mode 100644
index 0000000..50a46e0
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_potcast_exp.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/img_video_exp.png b/UMC_6th/app/src/main/res/drawable/img_video_exp.png
new file mode 100644
index 0000000..7f6b05f
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/img_video_exp.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/kakako_44.png b/UMC_6th/app/src/main/res/drawable/kakako_44.png
new file mode 100644
index 0000000..243298e
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/kakako_44.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/main_btm_color_selector.xml b/UMC_6th/app/src/main/res/drawable/main_btm_color_selector.xml
new file mode 100644
index 0000000..3ecf8a7
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/main_btm_color_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/main_btm_home_selector.xml b/UMC_6th/app/src/main/res/drawable/main_btm_home_selector.xml
new file mode 100644
index 0000000..b018478
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/main_btm_home_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/main_btm_look_selector.xml b/UMC_6th/app/src/main/res/drawable/main_btm_look_selector.xml
new file mode 100644
index 0000000..89ced75
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/main_btm_look_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/main_btm_my_selector.xml b/UMC_6th/app/src/main/res/drawable/main_btm_my_selector.xml
new file mode 100644
index 0000000..d6739bf
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/main_btm_my_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/main_btm_search_selector.xml b/UMC_6th/app/src/main/res/drawable/main_btm_search_selector.xml
new file mode 100644
index 0000000..e6e823f
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/main_btm_search_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/naver_44.png b/UMC_6th/app/src/main/res/drawable/naver_44.png
new file mode 100644
index 0000000..d984487
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/naver_44.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/nugu_btn_down.png b/UMC_6th/app/src/main/res/drawable/nugu_btn_down.png
new file mode 100644
index 0000000..03a04c5
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/nugu_btn_down.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/nugu_btn_pause_32.png b/UMC_6th/app/src/main/res/drawable/nugu_btn_pause_32.png
new file mode 100644
index 0000000..9388aa3
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/nugu_btn_pause_32.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/nugu_btn_play_32.png b/UMC_6th/app/src/main/res/drawable/nugu_btn_play_32.png
new file mode 100644
index 0000000..b781e4c
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/nugu_btn_play_32.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/nugu_btn_random_inactive.png b/UMC_6th/app/src/main/res/drawable/nugu_btn_random_inactive.png
new file mode 100644
index 0000000..fe4f880
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/nugu_btn_random_inactive.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/nugu_btn_repeat_inactive.png b/UMC_6th/app/src/main/res/drawable/nugu_btn_repeat_inactive.png
new file mode 100644
index 0000000..1e4044d
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/nugu_btn_repeat_inactive.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/nugu_btn_skip_next_32.png b/UMC_6th/app/src/main/res/drawable/nugu_btn_skip_next_32.png
new file mode 100644
index 0000000..fc02f28
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/nugu_btn_skip_next_32.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/nugu_btn_skip_previous_32.png b/UMC_6th/app/src/main/res/drawable/nugu_btn_skip_previous_32.png
new file mode 100644
index 0000000..03ec854
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/nugu_btn_skip_previous_32.png differ
diff --git a/UMC_6th/app/src/main/res/drawable/splash.xml b/UMC_6th/app/src/main/res/drawable/splash.xml
new file mode 100644
index 0000000..9beb18a
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/splash.xml
@@ -0,0 +1,8 @@
+
+
+
+ -
+
+
+
+
diff --git a/UMC_6th/app/src/main/res/drawable/textview_background_radius.xml b/UMC_6th/app/src/main/res/drawable/textview_background_radius.xml
new file mode 100644
index 0000000..d250c1e
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/textview_background_radius.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/textview_background_select_color_radius.xml b/UMC_6th/app/src/main/res/drawable/textview_background_select_color_radius.xml
new file mode 100644
index 0000000..8aaca4c
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/textview_background_select_color_radius.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/widget_black_play.png b/UMC_6th/app/src/main/res/drawable/widget_black_play.png
new file mode 100644
index 0000000..0ec2700
Binary files /dev/null and b/UMC_6th/app/src/main/res/drawable/widget_black_play.png differ
diff --git a/UMC_6th/app/src/main/res/layout/activity_main.xml b/UMC_6th/app/src/main/res/layout/activity_main.xml
index 17eab17..efa2bb2 100644
--- a/UMC_6th/app/src/main/res/layout/activity_main.xml
+++ b/UMC_6th/app/src/main/res/layout/activity_main.xml
@@ -6,13 +6,107 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:menu="@menu/my_navigaton_items" />
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/activity_song.xml b/UMC_6th/app/src/main/res/layout/activity_song.xml
new file mode 100644
index 0000000..1d0dfcb
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/activity_song.xml
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/fragment_album.xml b/UMC_6th/app/src/main/res/layout/fragment_album.xml
new file mode 100644
index 0000000..b0d3029
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/fragment_album.xml
@@ -0,0 +1,667 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/fragment_home.xml b/UMC_6th/app/src/main/res/layout/fragment_home.xml
new file mode 100644
index 0000000..921add8
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/fragment_home.xml
@@ -0,0 +1,811 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/fragment_locker.xml b/UMC_6th/app/src/main/res/layout/fragment_locker.xml
new file mode 100644
index 0000000..b8d9345
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/fragment_locker.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/fragment_look.xml b/UMC_6th/app/src/main/res/layout/fragment_look.xml
new file mode 100644
index 0000000..120be76
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/fragment_look.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/fragment_search.xml b/UMC_6th/app/src/main/res/layout/fragment_search.xml
new file mode 100644
index 0000000..66b433c
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/fragment_search.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/menu/my_navigaton_items.xml b/UMC_6th/app/src/main/res/menu/my_navigaton_items.xml
new file mode 100644
index 0000000..5609141
--- /dev/null
+++ b/UMC_6th/app/src/main/res/menu/my_navigaton_items.xml
@@ -0,0 +1,25 @@
+
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/values-night/themes.xml b/UMC_6th/app/src/main/res/values-night/themes.xml
index 729c965..d25b0f2 100644
--- a/UMC_6th/app/src/main/res/values-night/themes.xml
+++ b/UMC_6th/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-
diff --git a/UMC_6th/app/src/main/res/values/colors.xml b/UMC_6th/app/src/main/res/values/colors.xml
index c8524cd..d60b4b8 100644
--- a/UMC_6th/app/src/main/res/values/colors.xml
+++ b/UMC_6th/app/src/main/res/values/colors.xml
@@ -1,5 +1,25 @@
+ #3f3fff
+
+ #FFBB86FC
+ #FF6200EE
+ #FF3700B3
+ #FF03DAC5
+ #FF018786
#FF000000
#FFFFFFFF
+
+ #9cbee2
+ #062342
+ #424242
+ #6bb2ff
+
+ #00ff0000
+ #3f3fff
+ #a8a8a8
+ #3f3fff
+ #a8a8a8
+
+ #F11818
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/values/strings.xml b/UMC_6th/app/src/main/res/values/strings.xml
index fddcd68..3de1a39 100644
--- a/UMC_6th/app/src/main/res/values/strings.xml
+++ b/UMC_6th/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
- UMC_6th
+ My Application
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/values/themes.xml b/UMC_6th/app/src/main/res/values/themes.xml
index e28d846..d66ac09 100644
--- a/UMC_6th/app/src/main/res/values/themes.xml
+++ b/UMC_6th/app/src/main/res/values/themes.xml
@@ -1,9 +1,9 @@
-
-
+
\ No newline at end of file
diff --git a/UMC_6th/app/src/test/java/com/example/umc_6th/ExampleUnitTest.kt b/UMC_6th/app/src/test/java/com/example/myfirstapp/ExampleUnitTest.kt
similarity index 91%
rename from UMC_6th/app/src/test/java/com/example/umc_6th/ExampleUnitTest.kt
rename to UMC_6th/app/src/test/java/com/example/myfirstapp/ExampleUnitTest.kt
index 75df93d..9d172ff 100644
--- a/UMC_6th/app/src/test/java/com/example/umc_6th/ExampleUnitTest.kt
+++ b/UMC_6th/app/src/test/java/com/example/myfirstapp/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.myfirstapp
import org.junit.Test
diff --git a/UMC_6th/build.gradle.kts b/UMC_6th/build.gradle.kts
index 53f4a67..a0985ef 100644
--- a/UMC_6th/build.gradle.kts
+++ b/UMC_6th/build.gradle.kts
@@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id("com.android.application") version "8.2.2" apply false
- id("org.jetbrains.kotlin.android") version "1.9.22" apply false
+ alias(libs.plugins.androidApplication) apply false
+ alias(libs.plugins.jetbrainsKotlinAndroid) apply false
}
\ No newline at end of file
diff --git a/UMC_6th/gradle.properties b/UMC_6th/gradle.properties
index 3c5031e..20e2a01 100644
--- a/UMC_6th/gradle.properties
+++ b/UMC_6th/gradle.properties
@@ -8,8 +8,8 @@
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
diff --git a/UMC_6th/gradle/libs.versions.toml b/UMC_6th/gradle/libs.versions.toml
new file mode 100644
index 0000000..aa53726
--- /dev/null
+++ b/UMC_6th/gradle/libs.versions.toml
@@ -0,0 +1,26 @@
+[versions]
+agp = "8.3.0"
+kotlin = "1.9.0"
+coreKtx = "1.12.0"
+junit = "4.13.2"
+junitVersion = "1.1.5"
+espressoCore = "3.5.1"
+appcompat = "1.6.1"
+material = "1.10.0"
+activity = "1.8.0"
+constraintlayout = "2.1.4"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+
+[plugins]
+androidApplication = { id = "com.android.application", version.ref = "agp" }
+jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
diff --git a/UMC_6th/gradle/wrapper/gradle-wrapper.properties b/UMC_6th/gradle/wrapper/gradle-wrapper.properties
index cd00df2..fa70c04 100644
--- a/UMC_6th/gradle/wrapper/gradle-wrapper.properties
+++ b/UMC_6th/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 02 21:04:08 KST 2024
+#Mon Apr 08 01:53:20 KST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/UMC_6th/settings.gradle.kts b/UMC_6th/settings.gradle.kts
index c68b8ae..5dc0189 100644
--- a/UMC_6th/settings.gradle.kts
+++ b/UMC_6th/settings.gradle.kts
@@ -1,6 +1,12 @@
pluginManagement {
repositories {
- google()
+ google {
+ content {
+ includeGroupByRegex("com\\.android.*")
+ includeGroupByRegex("com\\.google.*")
+ includeGroupByRegex("androidx.*")
+ }
+ }
mavenCentral()
gradlePluginPortal()
}
@@ -13,6 +19,5 @@ dependencyResolutionManagement {
}
}
-rootProject.name = "UMC_6th"
+rootProject.name = "My Application"
include(":app")
-
\ No newline at end of file