From 8e7a479a3283b8193118f5d50e3f0d47d5818302 Mon Sep 17 00:00:00 2001 From: leeleess Date: Sat, 13 Jul 2019 04:42:05 +0900 Subject: [PATCH 1/8] Add heart animation & more-func --- app/build.gradle | 9 +- app/src/main/AndroidManifest.xml | 32 ++-- .../song2/wave/Data/model/SearchArtistData.kt | 5 + .../com/song2/wave/LikeAnimationActivity.kt | 53 ++++++ .../Search/Adapter/SearchArtistViewAdapter.kt | 40 ++++ .../Main/Search/SearchCoverArtistFragment.kt | 40 ++++ .../Main/Search/SearchOriginArtistFragment.kt | 71 +++++++ .../wave/UI/MainPlayer/MainPlayerActivity.kt | 38 +++- app/src/main/res/drawable-v24/artist_menu.png | Bin 0 -> 57785 bytes app/src/main/res/drawable-v24/bt_close.png | Bin 0 -> 256 bytes app/src/main/res/drawable-v24/btn_mypage.png | Bin 0 -> 430 bytes app/src/main/res/drawable-v24/btn_plus.png | Bin 0 -> 194 bytes .../res/drawable-v24/btn_threedot_like.png | Bin 0 -> 495 bytes .../res/drawable-v24/btn_threedot_share.png | Bin 0 -> 339 bytes .../main/res/drawable-v24/library_artist.png | Bin 0 -> 39429 bytes .../main/res/drawable-v24/playlist_atrist.png | Bin 0 -> 27293 bytes app/src/main/res/drawable/btn_report.png | Bin 0 -> 381 bytes .../res/drawable/img_border_more_info.xml | 10 + .../main/res/layout/activity_chart_more.xml | 157 +++++++++++++++ .../main/res/layout/activity_library_more.xml | 178 ++++++++++++++++++ .../res/layout/activity_like_animation.xml | 26 +++ .../main/res/layout/activity_main_player.xml | 23 ++- .../res/layout/activity_playlist_more.xml | 108 +++++++++++ .../layout/fragment_search_cover_artist.xml | 13 ++ .../layout/fragment_search_origin_artist.xml | 11 ++ .../res/layout/item_search_origin_artist.xml | 36 ++++ app/src/main/res/raw/try_11.mp4 | Bin 0 -> 1091903 bytes .../main/res/raw/wave_heart_animation.json | 1 + 28 files changed, 823 insertions(+), 28 deletions(-) create mode 100644 app/src/main/java/com/song2/wave/Data/model/SearchArtistData.kt create mode 100644 app/src/main/java/com/song2/wave/LikeAnimationActivity.kt create mode 100644 app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SearchArtistViewAdapter.kt create mode 100644 app/src/main/java/com/song2/wave/UI/Main/Search/SearchCoverArtistFragment.kt create mode 100644 app/src/main/java/com/song2/wave/UI/Main/Search/SearchOriginArtistFragment.kt create mode 100644 app/src/main/res/drawable-v24/artist_menu.png create mode 100644 app/src/main/res/drawable-v24/bt_close.png create mode 100644 app/src/main/res/drawable-v24/btn_mypage.png create mode 100644 app/src/main/res/drawable-v24/btn_plus.png create mode 100644 app/src/main/res/drawable-v24/btn_threedot_like.png create mode 100644 app/src/main/res/drawable-v24/btn_threedot_share.png create mode 100644 app/src/main/res/drawable-v24/library_artist.png create mode 100644 app/src/main/res/drawable-v24/playlist_atrist.png create mode 100644 app/src/main/res/drawable/btn_report.png create mode 100644 app/src/main/res/drawable/img_border_more_info.xml create mode 100644 app/src/main/res/layout/activity_chart_more.xml create mode 100644 app/src/main/res/layout/activity_library_more.xml create mode 100644 app/src/main/res/layout/activity_like_animation.xml create mode 100644 app/src/main/res/layout/activity_playlist_more.xml create mode 100644 app/src/main/res/layout/fragment_search_cover_artist.xml create mode 100644 app/src/main/res/layout/fragment_search_origin_artist.xml create mode 100644 app/src/main/res/layout/item_search_origin_artist.xml create mode 100644 app/src/main/res/raw/try_11.mp4 create mode 100644 app/src/main/res/raw/wave_heart_animation.json diff --git a/app/build.gradle b/app/build.gradle index e46b29d..854c72c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,9 +38,7 @@ dependencies { implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.android.support:design:27.1.1' implementation "org.jetbrains.anko:anko:0.10.5" - // implementation 'org.jetbrains.anko:anko:0.10.4' - - + // implementation 'org.jetbrains.anko:anko:0.10.4' // Circle ImageView is adapted implementation 'de.hdodenhof:circleimageview:3.0.0' @@ -48,6 +46,9 @@ dependencies { // 카카오 로그인 sdk를 사용하기 위해 필요. implementation group: 'com.kakao.sdk', name: 'usermgmt', version: '1.17.0' + //애니메이션 + implementation 'com.airbnb.android:lottie:2.6.0-beta19' + // Glide is adapted implementation 'com.github.bumptech.glide:glide:4.9.0' implementation 'com.squareup.picasso:picasso:2.5.2' @@ -57,4 +58,4 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-core:2.9.7' implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.0' implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.7' -} \ No newline at end of file +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6614832..b8c33d1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,6 +18,8 @@ android:supportsRtl="true" android:theme="@style/Theme.AppCompat.NoActionBar" android:usesCleartextTraffic="true"> + + @@ -29,16 +31,18 @@ - + + - + @@ -48,26 +52,15 @@ - - - - - - + - - - - - - - - - - + (R.id.video) + val path = "android.resource://" + packageName + "/" + R.raw.try_11 + videoView?.setVideoURI(Uri.parse(path)) + //val button = findViewById