From 3bad5c5e5521fb0a7118bddb9baea9464b625f72 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 21 Aug 2024 21:49:42 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20-=20=EC=9A=B0=EC=B8=A1=20=EC=B5=9C=EC=83=81?= =?UTF-8?q?=EB=8B=A8=EC=97=90=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=B3=B4?= =?UTF-8?q?=EA=B4=80=ED=95=A8,=20=EC=95=8C=EB=9E=8C=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EC=B6=94=EA=B0=80=20-=20=EB=B0=B0=EB=84=88?= =?UTF-8?q?=EC=99=80=20=EC=B6=94=EC=B2=9C=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/AudioContentMainFragment.kt | 19 +++++ .../order/AudioContentOrderListActivity.kt | 2 +- .../res/drawable-xxhdpi/ic_alarm_clock.png | Bin 1033 -> 1273 bytes .../res/drawable-xxhdpi/ic_content_keep.png | Bin 0 -> 824 bytes .../layout/fragment_audio_content_main.xml | 68 ++++++++++++------ app/src/main/res/layout/fragment_my.xml | 2 +- 6 files changed, 67 insertions(+), 24 deletions(-) create mode 100755 app/src/main/res/drawable-xxhdpi/ic_content_keep.png diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt index 9c49853..5020e1e 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt @@ -41,6 +41,7 @@ import kr.co.vividnext.sodalive.databinding.FragmentAudioContentMainBinding import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity import kr.co.vividnext.sodalive.explorer.profile.series.UserProfileSeriesListAdapter import kr.co.vividnext.sodalive.extensions.dpToPx +import kr.co.vividnext.sodalive.mypage.alarm.AlarmListActivity import kr.co.vividnext.sodalive.settings.event.EventDetailActivity import kr.co.vividnext.sodalive.settings.notification.MemberRole import org.koin.android.ext.android.inject @@ -121,6 +122,24 @@ class AudioContentMainFragment : BaseFragment( } ) } + + binding.ivContentKeep.setOnClickListener { + startActivity( + Intent( + requireContext(), + AudioContentOrderListActivity::class.java + ) + ) + } + + binding.ivAlarm.setOnClickListener { + startActivity( + Intent( + requireActivity(), + AlarmListActivity::class.java + ) + ) + } } private fun setupRecommendSeries() { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt index 1d7f482..4796b26 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt @@ -34,7 +34,7 @@ class AudioContentOrderListActivity : BaseActivityA&iiBL{Q4GJ0x0000DNk~Le0000;0000;2nGNE09Ea?N0A{ke*}(6 zL_t(|0qvV#auY`o#=o9bfaHNlC&=am!EY%!Rgqt8-~~8=?Gq$Ef#nl~oPclw#FK;b zU{OJ?yrG-`-9R|0q@d8wFug`)%U)?$J+rHIF~0|^^lzs9xu<7(x(x&Zfj}S-2m}Iw zfOiN&zCRqtQ4~FaF&zWyX`Sr-e|4`lLJhcR8;JTzlI%)tQxL!gD5Z{51HdYqhp9m| zAyVqu)HZ&!&yU$=2v}O6sW{g4;+Z#$iBTW!TzVc$MOsRrx#BPeebfa*{ft*dA{CB7 z3&jCOiPjs^bcSCc4{9HcZ7?=JLx?u|*UPWnxP`}XgrN4%Y;(hXi5Yvf-~bsu9naF=XuX982+=Qa z#7Q8#6n4aMrwZ&+;}i!DI0-})ZKLLxD3ZrAI0%$(rBp%+;T!8kyvss}SRh3Z2j;4I z|0Q-HL@W@I`VrRzf2E=a5F!$&bDX+tb-9)+#)xed2{d_kjl?;lSy@$s(RJS1=b#$V zcMu>=HDZ*Eff>zvk3cb&WsnE)HQh*!+480>plx6a5_51ugR)Ml4W6p>QL?sv)DFLWo$P=!UII`rOURgU?KT z2oVd!_r@l-)YsJiH|ggZr(=9vTmvA?Sm_ z-IjCd`g}ak*h*&CxHKL(z~a2}(6BH&W(llBB%}9ye|pZ8QUqeswqK>5R8YGg8PbnV zHe2F+YZ0a0D01LVdjhp~-fHK;G4G52^;%itq;sGG(%wa&YfGH&%?^BW*XVHrW)=T_ zRf#}T(mqC8m?ffZTf6Qo^IdM!(~5dG|I<(Vk6M+bH5$?E{+`=853Z}j>WSZxd z2O9BDEv@X$WupJ)+rTPC2?PRxKp+qZ1OkDQ`3OIPA3gbtDa8N)002ovPDHLkV1o3C BO$Gn} delta 997 zcmVOL zL_t(|0qvUIanvvn$NvgE!0?g|P@aGcGlU8_IyfreQb9rm(N#cFL5>QN4mc`EcuIIP z6_7W0A!64b8OP^4ODoy&4EoL7Bxj$r+VyI+S{Xq05oJTN%p=}_7((`e*^eh4uF}K0~!W}vzqJ)k0l?I0B-}-l-G@08pE-N zrfi`R9{c=wgYwL>qwR!TbxJ0G4pzWooBGFhU0|23R(}uTy>x!!ae9cTabN z5tbeOI2eGkEEG#r(P1;Ve>}qxB+B37gaaGepPUQRHPfL!)_GSa;#8R7fS1pCUkW2G ztFNR;J*)KN79Y&6I)@NZD$H<%rJ!Ws&*e&z!`>j}5l*XkAVF*Z6zjZ1@Xg8<)pE@h z&M2QyvLz&BGZb^34`T}lQZJBtfWepu@B*0u6y9NMkQYFJWIH^;f3RC$H^>Xhv3cR| z0g954kz$p9J|dX{Z!l7nU~CctXp9$c5Ado8m1xA~FXaJ`*QCU&m7`5~FNG2VM8~{V zoWJj^y?q!4ElaR zi6JA%YkBd=T*}|;kXMDt;x<5VER=!?c{3#_6`t>^;|HAzfAj#3UZ^1XK?frhbg*%O zVUNc0s83IRhCt$MhJN2WlIovG$}>?spn^Psmq$@`))_iQqN6bJK}eIR24E;loR!53 zjhNW{{h|GkbHFyD*8|8k7x^h|tl(HEKF1&I#8#e(?g4db?+WojiuP(;kM T@x4cG00000NkvXXu0mjfOM1ez diff --git a/app/src/main/res/drawable-xxhdpi/ic_content_keep.png b/app/src/main/res/drawable-xxhdpi/ic_content_keep.png new file mode 100755 index 0000000000000000000000000000000000000000..3990aeab4f09213b36cbab70eac72b8e33679f87 GIT binary patch literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&di3`}P|T^vIy7~jru%)9I$;_$!cw(b#g4?l<9 z&YB%5jJ{;<}G;1drMd#??SAGj?fa7B=`Oa(n}fybRPYm>8QI(Yk9rQ?M~aj z`NBu#R6kArf9A(|d1j6#1rDdkzzu5W+q&6SKH$~Nnjyc^DKemd)r)tTzP#*CQ~wi} zA1;z&IasZb<x<0|Dm@~(>G35F$MUeb!5!+>^$$w^SnX+Ik%_5MKQZIw!{n)7 z>n%BrY&vbdDoirlmp?FES9>Au&cVC)4H(XQnw+_>ni(;5Vn~x5lTwExi(!WXo8S?J zCJ7gTW{xBQM;;VGE?p17c@q!SI{aaXUNobrIUM zX+Bdse%Cnj&d0mL@wXq|sVRAV_~;FtjWYRJf(s?eC&coZ{mh+Qvi|7FooCm`@}(`4 zm7J(1Y~McT<}QWX=imH0bZg60ouB!xib=-rH{6cvxLMb>qFmN0yHL0+?do=UhA)cj z+te~{tuj$m&U10(J7I&(*(=q$wuwkgeW$^yf97+@)#E~YLz+BZU;IC5-I>=%yBb?0 zV7^nV-E}yHIkY9+yTNhR9lv=wi+C*Ll-n6*tF5f#oHt49NY1V+>#Q1%FA>_}vU2ji z>5INuMm|zIp?CU7!gi0w=Q}tT{rIZB_Os^{aZYtdmmjL{cHG^XUar`5+=BBG%X4kN zP?48`e?Om3jz4_1GWh+$&y=*hrQL`-TPTXEbvP7)yUsHn-#2=1h@EApRHB8 zXmdi0=f)~7|92|OvpsAAw@g~Z@xAkfj8{*kPthu_$lq5*rqw(D5!$5{pr*d|)WpgA o&e{3g`V%eA;wZqf@XjCBKOIliwQsg`0~0!fr>mdKI;Vst04E?`r2qf` literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/fragment_audio_content_main.xml b/app/src/main/res/layout/fragment_audio_content_main.xml index 37afb49..a09f37d 100644 --- a/app/src/main/res/layout/fragment_audio_content_main.xml +++ b/app/src/main/res/layout/fragment_audio_content_main.xml @@ -15,16 +15,54 @@ android:layout_height="match_parent" android:orientation="vertical"> - + android:layout_marginBottom="26.7dp"> + + + + + + + + + + + @@ -77,20 +115,6 @@ - - - -