From b70694f53356236be40193ccf2d2cd9ac2682d9c Mon Sep 17 00:00:00 2001 From: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Tue, 16 Apr 2024 19:12:58 +0900 Subject: [PATCH] =?UTF-8?q?[Nunu/#7]=20feat=202=EC=A3=BC=EC=B0=A8=20?= =?UTF-8?q?=EB=AF=B8=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 18 +- .idea/gradle.xml | 1 + .idea/kotlinc.xml | 2 +- ...__androidx_activity_activity_1_8_2_aar.xml | 13 + ...dx_activity_activity_compose_1_8_2_aar.xml | 13 + ...droidx_activity_activity_ktx_1_8_2_aar.xml | 13 + ..._animation_animation_android_1_5_0_aar.xml | 13 + ...ation_animation_core_android_1_5_0_aar.xml | 13 + ...oundation_foundation_android_1_5_0_aar.xml | 13 + ...on_foundation_layout_android_1_5_0_aar.xml | 13 + ..._compose_material3_material3_1_1_1_aar.xml | 13 + ..._material_icons_core_android_1_5_0_aar.xml | 13 + ...rial_material_ripple_android_1_5_0_aar.xml | 13 + ...pose_runtime_runtime_android_1_5_0_aar.xml | 13 + ...ime_runtime_saveable_android_1_5_0_aar.xml | 13 + ...droidx_compose_ui_ui_android_1_5_0_aar.xml | 16 + ...mpose_ui_ui_geometry_android_1_5_0_aar.xml | 13 + ...mpose_ui_ui_graphics_android_1_5_0_aar.xml | 13 + ...x_compose_ui_ui_test_android_1_5_0_aar.xml | 13 + ...se_ui_ui_test_junit4_android_1_5_0_aar.xml | 13 + ..._compose_ui_ui_test_manifest_1_5_0_aar.xml | 13 + ...x_compose_ui_ui_text_android_1_5_0_aar.xml | 13 + ...ompose_ui_ui_tooling_android_1_5_0_aar.xml | 13 + ...e_ui_ui_tooling_data_android_1_5_0_aar.xml | 13 + ...i_ui_tooling_preview_android_1_5_0_aar.xml | 13 + ...x_compose_ui_ui_unit_android_1_5_0_aar.xml | 13 + ...roidx_lifecycle_lifecycle_common_2_7_0.xml | 12 + ...lifecycle_lifecycle_livedata_2_7_0_aar.xml | 13 + ...ycle_lifecycle_livedata_core_2_7_0_aar.xml | 13 + ..._lifecycle_livedata_core_ktx_2_7_0_aar.xml | 13 + ..._lifecycle_lifecycle_runtime_2_7_0_aar.xml | 13 + ...ecycle_lifecycle_runtime_ktx_2_7_0_aar.xml | 13 + ...ifecycle_lifecycle_viewmodel_2_7_0_aar.xml | 13 + ...ycle_lifecycle_viewmodel_ktx_2_7_0_aar.xml | 13 + ...fecycle_viewmodel_savedstate_2_7_0_aar.xml | 13 + ...dx_savedstate_savedstate_ktx_1_2_1_aar.xml | 13 + ...adle__org_jetbrains_annotations_23_0_0.xml | 14 + ...g_jetbrains_kotlin_kotlin_stdlib_1_9_0.xml | 14 + ...ains_kotlin_kotlin_stdlib_common_1_9_0.xml | 14 + ...brains_kotlin_kotlin_stdlib_jdk7_1_9_0.xml | 14 + ...brains_kotlin_kotlin_stdlib_jdk8_1_9_0.xml | 14 + ...tlinx_kotlinx_coroutines_android_1_7_1.xml | 14 + ...linx_kotlinx_coroutines_core_jvm_1_7_1.xml | 14 + ...linx_kotlinx_coroutines_test_jvm_1_7_1.xml | 14 + .idea/modules.xml | 14 + .idea/modules/UMC_6th.iml | 12 + .idea/modules/lib/UMC_6th.lib.iml | 20 + .../myapplication/UMC_6th.myapplication.iml | 20 + UMC_6th/app/build.gradle.kts | 26 + UMC_6th/app/src/main/AndroidManifest.xml | 9 +- .../java/com/example/umc_6th/AlbumFragment.kt | 30 + .../java/com/example/umc_6th/HomeFragment.kt | 32 + .../com/example/umc_6th/LockerFragment.kt | 21 + .../java/com/example/umc_6th/LookFragment.kt | 21 + .../java/com/example/umc_6th/MainActivity.kt | 77 +- .../com/example/umc_6th/SearchFragment.kt | 21 + .../java/com/example/umc_6th/SongActivity.kt | 32 + .../drawable/button_background_flo_color.xml | 4 +- .../src/main/res/drawable/ic_bottom_home.xml | 4 + .../res/drawable/ic_bottom_home_no_select.png | Bin 1592 -> 1462 bytes .../ic_bottom_home_no_select_resized.png | Bin 0 -> 1023 bytes .../res/drawable/ic_bottom_home_select.png | Bin 2105 -> 2163 bytes .../ic_bottom_home_select_resized.png | Bin 0 -> 1008 bytes .../drawable/ic_bottom_locker_no_select.png | Bin 2449 -> 4644 bytes .../ic_bottom_locker_no_select_resized.png | Bin 0 -> 1577 bytes .../res/drawable/ic_bottom_locker_select.png | Bin 1991 -> 4002 bytes .../ic_bottom_locker_select_resized.png | Bin 0 -> 1351 bytes .../res/drawable/ic_bottom_look_no_select.png | Bin 6923 -> 7597 bytes .../ic_bottom_look_no_select_resized.png | Bin 0 -> 2411 bytes .../res/drawable/ic_bottom_look_select.png | Bin 3997 -> 3763 bytes .../ic_bottom_look_select_resized.png | Bin 0 -> 2443 bytes .../ic_bottom_search_no_select_resized.png | Bin 0 -> 1719 bytes .../ic_bottom_search_select_resized.png | Bin 0 -> 1699 bytes .../res/drawable/main_btm_color_selector.xml | 2 +- .../res/drawable/main_btm_home_selector.xml | 4 +- .../res/drawable/main_btm_locker_selector.xml | 5 + .../res/drawable/main_btm_look_selector.xml | 4 +- .../res/drawable/main_btm_search_selector.xml | 4 +- ...extview_background_select_color_radius.xml | 2 +- .../app/src/main/res/layout/activity_main.xml | 109 ++- .../app/src/main/res/layout/activity_song.xml | 294 +++++++ .../src/main/res/layout/fragment_album.xml | 718 +++++++++++++++++ .../app/src/main/res/layout/fragment_home.xml | 761 ++++++++++++++++++ .../src/main/res/layout/fragment_locker.xml | 6 + .../app/src/main/res/layout/fragment_look.xml | 6 + .../src/main/res/layout/fragment_search.xml | 6 + .../app/src/main/res/menu/menu_bottom_nav.xml | 28 + UMC_6th/app/src/main/res/values/colors.xml | 1 + UMC_6th/app/src/main/res/values/dimens.xml | 6 + UMC_6th/app/src/main/res/values/strings.xml | 1 + UMC_6th/app/src/main/res/values/styles.xml | 10 + UMC_6th/build.gradle.kts | 2 +- 92 files changed, 2854 insertions(+), 22 deletions(-) create mode 100644 .idea/libraries/Gradle__androidx_activity_activity_1_8_2_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_activity_activity_compose_1_8_2_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_activity_activity_ktx_1_8_2_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_animation_animation_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_animation_animation_core_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_foundation_foundation_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_foundation_foundation_layout_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_material3_material3_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_material_material_icons_core_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_material_material_ripple_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_runtime_runtime_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_runtime_runtime_saveable_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_geometry_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_graphics_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_test_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_test_junit4_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_test_manifest_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_text_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_tooling_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_tooling_data_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_tooling_preview_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_compose_ui_ui_unit_android_1_5_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_7_0.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_ktx_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_ktx_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_ktx_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_savedstate_2_7_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_savedstate_savedstate_ktx_1_2_1_aar.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_annotations_23_0_0.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_9_0.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_9_0.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_9_0.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_9_0.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_7_1.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_7_1.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm_1_7_1.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/modules/UMC_6th.iml create mode 100644 .idea/modules/lib/UMC_6th.lib.iml create mode 100644 .idea/modules/myapplication/UMC_6th.myapplication.iml create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/AlbumFragment.kt create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/SearchFragment.kt create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/SongActivity.kt create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_home.xml create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_home_no_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_home_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_locker_no_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_locker_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_look_no_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_look_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_search_no_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_search_select_resized.png create mode 100644 UMC_6th/app/src/main/res/drawable/main_btm_locker_selector.xml create mode 100644 UMC_6th/app/src/main/res/layout/activity_song.xml create mode 100644 UMC_6th/app/src/main/res/layout/fragment_album.xml create mode 100644 UMC_6th/app/src/main/res/layout/fragment_home.xml create mode 100644 UMC_6th/app/src/main/res/layout/fragment_locker.xml create mode 100644 UMC_6th/app/src/main/res/layout/fragment_look.xml create mode 100644 UMC_6th/app/src/main/res/layout/fragment_search.xml create mode 100644 UMC_6th/app/src/main/res/menu/menu_bottom_nav.xml create mode 100644 UMC_6th/app/src/main/res/values/dimens.xml create mode 100644 UMC_6th/app/src/main/res/values/styles.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0c0c338..ea6ebf3 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -2,9 +2,25 @@ - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a599e78..e63676e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ +