From 31b34c9b02700fd3ad49a5b402d31c5c5a5735ee Mon Sep 17 00:00:00 2001 From: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:35:44 +0900 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 5ebb9304cb537d09ce2261aee6a21994ef63a647 Author: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Mon Apr 8 16:10:03 2024 +0900 [add/#2] 리소스 파일 추가 및 초기 세팅 수정 commit 399d551a6e9ed13169cfd45b5030aeadab816b74 Author: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Mon Apr 8 11:46:00 2024 +0900 [add/#2] 파일 추가 및 수정 commit 21ca71c09ba4c3cd949a6c71d961d614dc03b4a8 Author: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Sat Apr 6 20:28:24 2024 +0900 [fix/#2] 초기 세팅 중 --- .idea/.name | 1 + .idea/appInsightsSettings.xml | 26 ++ .idea/codeStyles/Project.xml | 123 +++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 6 + .idea/deploymentTargetDropDown.xml | 10 + .idea/gradle.xml | 20 ++ .idea/kotlinc.xml | 6 + .idea/misc.xml | 10 + .idea/vcs.xml | 6 + .idea/workspace.xml | 251 ++++++++++++++++++ UMC_6th/.gitignore | 6 + UMC_6th/app/build.gradle.kts | 3 +- .../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 UMC_6th/settings.gradle.kts | 9 +- lib/build.gradle.kts | 8 + .../main/java/com/example/lib/MyClass.java | 4 + 118 files changed, 646 insertions(+), 2 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/appInsightsSettings.xml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml 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 lib/build.gradle.kts create mode 100644 lib/src/main/java/com/example/lib/MyClass.java diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..5e47c7a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +UMC_6th \ No newline at end of file diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..371f2e2 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a599e78 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..8d81632 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6885eed --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + +<<<<<<< Updated upstream + +======= + +>>>>>>> Stashed changes + + + \ 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/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..2b5cc0c --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,251 @@ + + + + + + + + + + @style/Theme.UMC_6th + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +