diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20__8_09__Changes_1.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20__8_09__Changes_1.xml deleted file mode 100644 index 22d0758..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20__8_09__Changes_1.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20__8_10__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20__8_10__Changes_.xml deleted file mode 100644 index 23a2159..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20__8_10__Changes_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20_\354\230\244\355\233\204_8_09_[Changes]1/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20_\354\230\244\355\233\204_8_09_[Changes]1/shelved.patch" deleted file mode 100644 index a8e9477..0000000 --- "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-04-20_\354\230\244\355\233\204_8_09_[Changes]1/shelved.patch" +++ /dev/null @@ -1,95 +0,0 @@ -Index: UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>package com.example.umc_6th\r\n\r\nimport android.os.Bundle\r\nimport androidx.fragment.app.Fragment\r\nimport android.view.LayoutInflater\r\nimport android.view.View\r\nimport android.view.ViewGroup\r\nimport androidx.core.os.bundleOf\r\nimport androidx.fragment.app.setFragmentResult\r\nimport com.example.umc_6th.databinding.FragmentHomeBinding\r\n\r\nclass HomeFragment : Fragment() {\r\n\r\n lateinit var binding : FragmentHomeBinding\r\n\r\n override fun onCreate(savedInstanceState: Bundle?) {\r\n super.onCreate(savedInstanceState)\r\n }\r\n\r\n override fun onCreateView(\r\n inflater: LayoutInflater, container: ViewGroup?,\r\n savedInstanceState: Bundle?\r\n ): View? {\r\n binding = FragmentHomeBinding.inflate(inflater, container, false)\r\n\r\n binding.homeAlbumImgIv1.setOnClickListener {\r\n setFragmentResult(\"TitleInfo\", bundleOf(\"title\" to binding.titleLilac.text.toString()))\r\n setFragmentResult(\"SingerInfo\", bundleOf(\"singer\" to binding.singerIu.text.toString()))\r\n\r\n (context as MainActivity)\r\n .supportFragmentManager.beginTransaction()\r\n .replace(R.id.main_frm, AlbumFragment()).commitAllowingStateLoss()\r\n }\r\n return binding.root\r\n }\r\n} -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt ---- a/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt -+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt -@@ -32,5 +32,7 @@ - .replace(R.id.main_frm, AlbumFragment()).commitAllowingStateLoss() - } - return binding.root -+ -+ - } - } -\ No newline at end of file -Index: UMC_6th/app/src/main/res/layout/fragment_home.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\r\n\r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/UMC_6th/app/src/main/res/layout/fragment_home.xml b/UMC_6th/app/src/main/res/layout/fragment_home.xml ---- a/UMC_6th/app/src/main/res/layout/fragment_home.xml -+++ b/UMC_6th/app/src/main/res/layout/fragment_home.xml -@@ -11,15 +11,15 @@ - android:layout_width="match_parent" - android:layout_height="wrap_content"> - -- -+ app:layout_constraintTop_toTopOf="parent"/> - - - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - package com.example.umc_6th\r\n\r\nimport android.os.Bundle\r\nimport androidx.fragment.app.Fragment\r\nimport android.view.LayoutInflater\r\nimport android.view.View\r\nimport android.view.ViewGroup\r\nimport androidx.core.os.bundleOf\r\nimport androidx.fragment.app.setFragmentResult\r\nimport androidx.viewpager2.widget.ViewPager2\r\nimport com.example.umc_6th.databinding.FragmentHomeBinding\r\n\r\nclass HomeFragment : Fragment() {\r\n\r\n lateinit var binding : FragmentHomeBinding\r\n\r\n\r\n override fun onCreate(savedInstanceState: Bundle?) {\r\n super.onCreate(savedInstanceState)\r\n }\r\n\r\n override fun onCreateView(\r\n inflater: LayoutInflater, container: ViewGroup?,\r\n savedInstanceState: Bundle?\r\n ): View? {\r\n binding = FragmentHomeBinding.inflate(inflater, container, false)\r\n\r\n binding.homeAlbumImgIv1.setOnClickListener {\r\n setFragmentResult(\"TitleInfo\", bundleOf(\"title\" to binding.titleLilac.text.toString()))\r\n setFragmentResult(\"SingerInfo\", bundleOf(\"singer\" to binding.singerIu.text.toString()))\r\n\r\n (context as MainActivity)\r\n .supportFragmentManager.beginTransaction()\r\n .replace(R.id.main_frm, AlbumFragment()).commitAllowingStateLoss()\r\n }\r\n\r\n val bannerAdapter = BannerVPAdapter(this)\r\n bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp))\r\n bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp2))\r\n binding.homeBannerVp.adapter = bannerAdapter\r\n binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL\r\n\r\n return binding.root\r\n }\r\n} -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt ---- a/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt (revision b1026ff4cff5c29159da84eb52592a6e3142581b) -+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt (date 1713611347065) -@@ -41,5 +41,7 @@ - binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL - - return binding.root -+ -+ - } - } -\ No newline at end of file -Index: UMC_6th/app/src/main/res/layout/fragment_home.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\r\n\r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/UMC_6th/app/src/main/res/layout/fragment_home.xml b/UMC_6th/app/src/main/res/layout/fragment_home.xml ---- a/UMC_6th/app/src/main/res/layout/fragment_home.xml (revision b1026ff4cff5c29159da84eb52592a6e3142581b) -+++ b/UMC_6th/app/src/main/res/layout/fragment_home.xml (date 1713611347073) -@@ -11,15 +11,15 @@ - android:layout_width="match_parent" - android:layout_height="wrap_content"> - -- -+ app:layout_constraintTop_toTopOf="parent"/> - - - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - -+ app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/> - - @style/Theme.UMC_6th + + + @style/Theme.UMC_6th + + @style/Theme.UMC_6th @@ -91,9 +96,17 @@