From f5eff8489ca728e401e8ff3672097a9078952b69 Mon Sep 17 00:00:00 2001 From: fprtmjinho Date: Tue, 2 Apr 2024 21:28:01 +0900 Subject: [PATCH] =?UTF-8?q?[simba/#7]=20feat=20:=202=EC=A3=BC=EC=B0=A8=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .idea/.gitignore | 3 + .idea/Android_A.iml | 9 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + UMC_6th/.idea/gradle.xml | 1 + UMC_6th/.idea/misc.xml | 1 - UMC_6th/app/build.gradle.kts | 7 +- UMC_6th/app/src/main/AndroidManifest.xml | 3 + .../java/com/example/umc_6th/AlbumFragment.kt | 58 ++ .../java/com/example/umc_6th/HomeFragment.kt | 33 + .../com/example/umc_6th/LockerFragment.kt | 22 + .../java/com/example/umc_6th/LookFragment.kt | 22 + .../java/com/example/umc_6th/MainActivity.kt | 86 +- .../com/example/umc_6th/SearchFragment.kt | 22 + .../src/main/java/com/example/umc_6th/Song.kt | 6 + .../java/com/example/umc_6th/SongActivity.kt | 53 ++ .../app/src/main/res/drawable/apple_44.png | Bin 0 -> 4823 bytes .../main/res/drawable/btm_color_selector.xml | 5 + .../main/res/drawable/btn_actionbar_close.png | Bin 0 -> 773 bytes .../res/drawable/btn_actionbar_instagram.png | Bin 0 -> 6604 bytes .../src/main/res/drawable/btn_arrow_black.png | Bin 0 -> 2025 bytes .../src/main/res/drawable/btn_arrow_more.png | Bin 0 -> 869 bytes .../main/res/drawable/btn_input_password.png | Bin 0 -> 1931 bytes .../res/drawable/btn_input_password_off.png | Bin 0 -> 2021 bytes .../main/res/drawable/btn_main_arrow_more.png | Bin 0 -> 869 bytes .../src/main/res/drawable/btn_main_mike.png | Bin 0 -> 4547 bytes .../main/res/drawable/btn_main_setting.png | Bin 0 -> 2568 bytes .../src/main/res/drawable/btn_main_ticket.png | Bin 0 -> 4927 bytes .../res/drawable/btn_miniplay_mvpause.png | Bin 0 -> 597 bytes .../main/res/drawable/btn_miniplay_mvplay.png | Bin 0 -> 1085 bytes .../main/res/drawable/btn_miniplay_pause.png | Bin 0 -> 597 bytes .../res/drawable/btn_miniplayer_go_list.png | Bin 0 -> 722 bytes .../main/res/drawable/btn_miniplayer_next.png | Bin 0 -> 1007 bytes .../main/res/drawable/btn_miniplayer_play.png | Bin 0 -> 1296 bytes .../res/drawable/btn_miniplayer_previous.png | Bin 0 -> 1008 bytes .../app/src/main/res/drawable/btn_nugu.png | Bin 0 -> 4547 bytes .../res/drawable/btn_panel_play_large.png | Bin 0 -> 3380 bytes .../main/res/drawable/btn_player_eq_off.png | Bin 0 -> 3099 bytes .../main/res/drawable/btn_player_go_list.png | Bin 0 -> 722 bytes .../src/main/res/drawable/btn_player_more.png | Bin 0 -> 857 bytes .../src/main/res/drawable/btn_player_play.png | Bin 0 -> 1589 bytes .../main/res/drawable/btn_player_related.png | Bin 0 -> 5534 bytes .../main/res/drawable/btn_player_setting.png | Bin 0 -> 1550 bytes .../res/drawable/btn_player_unlike_off.png | Bin 0 -> 2542 bytes .../res/drawable/btn_player_unlike_on.png | Bin 0 -> 2261 bytes .../res/drawable/btn_playlist_select_off.png | Bin 0 -> 724 bytes .../res/drawable/btn_playlist_select_on.png | Bin 0 -> 634 bytes .../main/res/drawable/btn_setting_phone.png | Bin 0 -> 1070 bytes .../main/res/drawable/btn_textbox_close.png | Bin 0 -> 767 bytes .../main/res/drawable/btn_titlebar_close.png | Bin 0 -> 866 bytes .../src/main/res/drawable/btn_toggle_off.png | Bin 0 -> 6878 bytes .../src/main/res/drawable/btn_toggle_on.png | Bin 0 -> 7001 bytes .../button_background_black_color.xml | 10 + .../drawable/button_background_flo_color.xml | 10 + .../drawable/button_background_gray_color.xml | 10 + .../button_background_white_color.xml | 10 + .../res/drawable/discovery_banner_aos.jpg | Bin 0 -> 196530 bytes .../fragment_look_chart_background.xml | 16 + .../fragment_look_chip_off_background.xml | 16 + .../fragment_look_chip_on_background.xml | 16 + .../res/drawable/ic_bottom_home_no_select.png | Bin 0 -> 1592 bytes .../res/drawable/ic_bottom_home_select.png | Bin 0 -> 2105 bytes .../drawable/ic_bottom_locker_no_select.png | Bin 0 -> 2449 bytes .../res/drawable/ic_bottom_locker_select.png | Bin 0 -> 1991 bytes .../res/drawable/ic_bottom_look_no_select.png | Bin 0 -> 6923 bytes .../res/drawable/ic_bottom_look_select.png | Bin 0 -> 3997 bytes .../res/drawable/ic_bottom_my_no_select.png | Bin 0 -> 2449 bytes .../main/res/drawable/ic_bottom_my_select.png | Bin 0 -> 1991 bytes .../drawable/ic_bottom_search_no_select.png | Bin 0 -> 3942 bytes .../res/drawable/ic_bottom_search_select.png | Bin 0 -> 2405 bytes .../res/drawable/ic_browse_arrow_right.png | Bin 0 -> 575 bytes .../app/src/main/res/drawable/ic_flo_logo.png | Bin 0 -> 6765 bytes .../main/res/drawable/ic_main_facebook.png | Bin 0 -> 3758 bytes .../res/drawable/ic_main_facebook_btn.png | Bin 0 -> 3758 bytes .../main/res/drawable/ic_main_instagram.png | Bin 0 -> 12172 bytes .../res/drawable/ic_main_instagram_btn.png | Bin 0 -> 12172 bytes .../src/main/res/drawable/ic_main_twitter.png | Bin 0 -> 8646 bytes .../main/res/drawable/ic_main_twitter_btn.png | Bin 0 -> 8646 bytes .../src/main/res/drawable/ic_main_youtube.png | Bin 0 -> 6756 bytes .../main/res/drawable/ic_main_youtube_btn.png | Bin 0 -> 6756 bytes .../src/main/res/drawable/ic_my_like_off.png | Bin 0 -> 1612 bytes .../src/main/res/drawable/ic_my_like_on.png | Bin 0 -> 1018 bytes .../res/drawable/ico_20_logo_tid_white.png | Bin 0 -> 1676 bytes .../res/drawable/icon_browse_arrow_right.png | Bin 0 -> 575 bytes .../src/main/res/drawable/img_album_exp.png | Bin 0 -> 244187 bytes .../src/main/res/drawable/img_album_exp2.png | Bin 0 -> 7446 bytes .../src/main/res/drawable/img_album_exp3.jpg | Bin 0 -> 147535 bytes .../src/main/res/drawable/img_album_exp4.jpg | Bin 0 -> 134415 bytes .../src/main/res/drawable/img_album_exp5.jpg | Bin 0 -> 310309 bytes .../src/main/res/drawable/img_album_exp6.jpg | Bin 0 -> 152240 bytes .../src/main/res/drawable/img_album_lp.png | Bin 0 -> 24286 bytes .../main/res/drawable/img_default_4_x_1.png | Bin 0 -> 152850 bytes .../res/drawable/img_first_album_default.png | Bin 0 -> 152850 bytes .../res/drawable/img_home_viewpager_exp.png | Bin 0 -> 115895 bytes .../res/drawable/img_home_viewpager_exp2.png | Bin 0 -> 129047 bytes .../src/main/res/drawable/img_jenre_exp_1.png | Bin 0 -> 96716 bytes .../src/main/res/drawable/img_jenre_exp_2.png | Bin 0 -> 44722 bytes .../src/main/res/drawable/img_jenre_exp_3.png | Bin 0 -> 73631 bytes .../src/main/res/drawable/img_potcast_exp.png | Bin 0 -> 124806 bytes .../src/main/res/drawable/img_video_exp.png | Bin 0 -> 320727 bytes .../app/src/main/res/drawable/kakako_44.png | Bin 0 -> 8323 bytes .../res/drawable/main_btm_color_selector.xml | 5 + .../res/drawable/main_btm_home_selector.xml | 5 + .../res/drawable/main_btm_look_selector.xml | 5 + .../res/drawable/main_btm_my_selector.xml | 5 + .../res/drawable/main_btm_search_selector.xml | 5 + .../app/src/main/res/drawable/naver_44.png | Bin 0 -> 7504 bytes .../src/main/res/drawable/nugu_btn_down.png | Bin 0 -> 938 bytes .../main/res/drawable/nugu_btn_pause_32.png | Bin 0 -> 313 bytes .../main/res/drawable/nugu_btn_play_32.png | Bin 0 -> 1253 bytes .../res/drawable/nugu_btn_random_inactive.png | Bin 0 -> 1241 bytes .../res/drawable/nugu_btn_repeat_inactive.png | Bin 0 -> 1284 bytes .../res/drawable/nugu_btn_skip_next_32.png | Bin 0 -> 1139 bytes .../drawable/nugu_btn_skip_previous_32.png | Bin 0 -> 1125 bytes UMC_6th/app/src/main/res/drawable/splash.xml | 8 + .../drawable/textview_background_radius.xml | 15 + ...extview_background_select_color_radius.xml | 13 + .../main/res/drawable/widget_black_play.png | Bin 0 -> 987 bytes .../app/src/main/res/layout/activity_main.xml | 114 ++- .../app/src/main/res/layout/activity_song.xml | 275 ++++++ .../src/main/res/layout/fragment_album.xml | 714 ++++++++++++++++ .../app/src/main/res/layout/fragment_home.xml | 791 ++++++++++++++++++ .../src/main/res/layout/fragment_locker.xml | 14 + .../app/src/main/res/layout/fragment_look.xml | 14 + .../src/main/res/layout/fragment_search.xml | 14 + .../app/src/main/res/layout/item_album.xml | 61 ++ .../app/src/main/res/menu/bottom_nav_menu.xml | 27 + UMC_6th/app/src/main/res/values/colors.xml | 19 + UMC_6th/app/src/main/res/values/strings.xml | 4 +- 131 files changed, 2540 insertions(+), 8 deletions(-) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/Android_A.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml 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/Song.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/apple_44.png create mode 100644 UMC_6th/app/src/main/res/drawable/btm_color_selector.xml create mode 100644 UMC_6th/app/src/main/res/drawable/btn_actionbar_close.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_actionbar_instagram.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_arrow_black.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_arrow_more.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_input_password.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_input_password_off.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_main_arrow_more.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_main_mike.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_main_setting.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_main_ticket.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_miniplay_mvpause.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_miniplay_mvplay.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_miniplay_pause.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_miniplayer_go_list.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_miniplayer_next.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_miniplayer_play.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_miniplayer_previous.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_nugu.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_panel_play_large.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_eq_off.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_go_list.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_more.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_play.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_related.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_setting.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_unlike_off.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_player_unlike_on.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_playlist_select_off.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_playlist_select_on.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_setting_phone.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_textbox_close.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_titlebar_close.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_toggle_off.png create mode 100644 UMC_6th/app/src/main/res/drawable/btn_toggle_on.png create mode 100644 UMC_6th/app/src/main/res/drawable/button_background_black_color.xml create mode 100644 UMC_6th/app/src/main/res/drawable/button_background_flo_color.xml create mode 100644 UMC_6th/app/src/main/res/drawable/button_background_gray_color.xml create mode 100644 UMC_6th/app/src/main/res/drawable/button_background_white_color.xml create mode 100644 UMC_6th/app/src/main/res/drawable/discovery_banner_aos.jpg create mode 100644 UMC_6th/app/src/main/res/drawable/fragment_look_chart_background.xml create mode 100644 UMC_6th/app/src/main/res/drawable/fragment_look_chip_off_background.xml create mode 100644 UMC_6th/app/src/main/res/drawable/fragment_look_chip_on_background.xml create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_home_no_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_home_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_locker_no_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_locker_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_look_no_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_look_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_my_no_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_my_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_search_no_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_bottom_search_select.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_browse_arrow_right.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_flo_logo.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_facebook.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_facebook_btn.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_instagram.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_instagram_btn.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_twitter.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_twitter_btn.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_youtube.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_main_youtube_btn.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_my_like_off.png create mode 100644 UMC_6th/app/src/main/res/drawable/ic_my_like_on.png create mode 100644 UMC_6th/app/src/main/res/drawable/ico_20_logo_tid_white.png create mode 100644 UMC_6th/app/src/main/res/drawable/icon_browse_arrow_right.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_album_exp.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_album_exp2.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_album_exp3.jpg create mode 100644 UMC_6th/app/src/main/res/drawable/img_album_exp4.jpg create mode 100644 UMC_6th/app/src/main/res/drawable/img_album_exp5.jpg create mode 100644 UMC_6th/app/src/main/res/drawable/img_album_exp6.jpg create mode 100644 UMC_6th/app/src/main/res/drawable/img_album_lp.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_default_4_x_1.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_first_album_default.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_home_viewpager_exp2.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_jenre_exp_1.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_jenre_exp_2.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_jenre_exp_3.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_potcast_exp.png create mode 100644 UMC_6th/app/src/main/res/drawable/img_video_exp.png create mode 100644 UMC_6th/app/src/main/res/drawable/kakako_44.png create mode 100644 UMC_6th/app/src/main/res/drawable/main_btm_color_selector.xml create mode 100644 UMC_6th/app/src/main/res/drawable/main_btm_home_selector.xml create mode 100644 UMC_6th/app/src/main/res/drawable/main_btm_look_selector.xml create mode 100644 UMC_6th/app/src/main/res/drawable/main_btm_my_selector.xml create mode 100644 UMC_6th/app/src/main/res/drawable/main_btm_search_selector.xml create mode 100644 UMC_6th/app/src/main/res/drawable/naver_44.png create mode 100644 UMC_6th/app/src/main/res/drawable/nugu_btn_down.png create mode 100644 UMC_6th/app/src/main/res/drawable/nugu_btn_pause_32.png create mode 100644 UMC_6th/app/src/main/res/drawable/nugu_btn_play_32.png create mode 100644 UMC_6th/app/src/main/res/drawable/nugu_btn_random_inactive.png create mode 100644 UMC_6th/app/src/main/res/drawable/nugu_btn_repeat_inactive.png create mode 100644 UMC_6th/app/src/main/res/drawable/nugu_btn_skip_next_32.png create mode 100644 UMC_6th/app/src/main/res/drawable/nugu_btn_skip_previous_32.png create mode 100644 UMC_6th/app/src/main/res/drawable/splash.xml create mode 100644 UMC_6th/app/src/main/res/drawable/textview_background_radius.xml create mode 100644 UMC_6th/app/src/main/res/drawable/textview_background_select_color_radius.xml create mode 100644 UMC_6th/app/src/main/res/drawable/widget_black_play.png 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/layout/item_album.xml create mode 100644 UMC_6th/app/src/main/res/menu/bottom_nav_menu.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store 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/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ 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/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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 @@ +