From 8e0a5ccc91b16eb77ec7999e5845f2d5a0982cb2 Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 28 Jul 2023 15:01:48 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=20=EB=A9=94=EC=9D=B8=20-=20UI,=20Api=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/vividnext/sodalive/di/AppDI.kt | 2 + .../sodalive/mypage/MyPageFragment.kt | 124 +++++++ .../sodalive/mypage/MyPageResponse.kt | 19 + .../sodalive/mypage/MyPageViewModel.kt | 59 ++++ .../kr/co/vividnext/sodalive/user/UserApi.kt | 8 + .../vividnext/sodalive/user/UserRepository.kt | 7 + .../res/drawable-xxhdpi/ic_blog_circle.png | Bin 0 -> 8020 bytes .../main/res/drawable-xxhdpi/ic_coin_w.png | Bin 0 -> 1276 bytes .../main/res/drawable-xxhdpi/ic_forward.png | Bin 0 -> 223 bytes .../res/drawable-xxhdpi/ic_headphones.png | Bin 0 -> 756 bytes .../drawable-xxhdpi/ic_instagram_circle.png | Bin 0 -> 8335 bytes .../res/drawable-xxhdpi/ic_myinfo_edit.png | Bin 0 -> 332 bytes .../main/res/drawable-xxhdpi/ic_settings.png | Bin 0 -> 976 bytes .../res/drawable-xxhdpi/ic_website_circle.png | Bin 0 -> 7895 bytes .../res/drawable-xxhdpi/ic_youtube_circle.png | Bin 0 -> 6485 bytes .../drawable/bg_round_corner_16_7_fdca2f.xml | 8 + .../bg_round_corner_6_7_352953_9970ff.xml | 8 + .../drawable/bg_round_corner_6_7_664aab.xml | 8 + app/src/main/res/layout/fragment_my.xml | 332 +++++++++++++++++- app/src/main/res/values/colors.xml | 3 + 20 files changed, 572 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt create mode 100644 app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt create mode 100644 app/src/main/res/drawable-xxhdpi/ic_blog_circle.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_coin_w.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_forward.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_headphones.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_instagram_circle.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_myinfo_edit.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_website_circle.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_youtube_circle.png create mode 100644 app/src/main/res/drawable/bg_round_corner_16_7_fdca2f.xml create mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_352953_9970ff.xml create mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_664aab.xml diff --git a/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt b/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt index 7b70ef8..0593086 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt @@ -10,6 +10,7 @@ import kr.co.vividnext.sodalive.live.LiveViewModel import kr.co.vividnext.sodalive.live.recommend.LiveRecommendApi import kr.co.vividnext.sodalive.live.recommend.LiveRecommendRepository import kr.co.vividnext.sodalive.main.MainViewModel +import kr.co.vividnext.sodalive.mypage.MyPageViewModel import kr.co.vividnext.sodalive.network.TokenAuthenticator import kr.co.vividnext.sodalive.settings.event.EventApi import kr.co.vividnext.sodalive.settings.event.EventRepository @@ -77,6 +78,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) { viewModel { FindPasswordViewModel(get()) } viewModel { MainViewModel(get()) } viewModel { LiveViewModel(get(), get(), get()) } + viewModel { MyPageViewModel(get()) } } private val repositoryModule = module { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt index 595ba44..9737c68 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt @@ -1,7 +1,131 @@ package kr.co.vividnext.sodalive.mypage +import android.annotation.SuppressLint +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.view.View +import android.webkit.URLUtil +import android.widget.Toast +import coil.load +import coil.transform.CircleCropTransformation +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseFragment +import kr.co.vividnext.sodalive.common.LoadingDialog +import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.databinding.FragmentMyBinding +import kr.co.vividnext.sodalive.extensions.moneyFormat +import kr.co.vividnext.sodalive.settings.notification.MemberRole +import org.koin.android.ext.android.inject class MyPageFragment : BaseFragment(FragmentMyBinding::inflate) { + + private val viewModel: MyPageViewModel by inject() + + private lateinit var loadingDialog: LoadingDialog + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + loadingDialog = LoadingDialog(requireActivity(), layoutInflater) + + setupView() + bindData() + } + + override fun onStart() { + super.onStart() + viewModel.getUserInfo() + } + + private fun setupView() { + binding.ivSettings.setOnClickListener {} + + binding.ivEdit.setOnClickListener {} + + binding.tvTotalCoin.setOnClickListener {} + + binding.tvChargeCoin.setOnClickListener {} + + binding.llReservationSuda.setOnClickListener {} + + binding.rlServiceCenter.setOnClickListener {} + + binding.tvAuth.setOnClickListener {} + + if (SharedPreferenceManager.role == MemberRole.CREATOR.name) { + binding.tvMyChannel.visibility = View.VISIBLE + binding.tvMyChannel.setOnClickListener {} + } else { + binding.tvMyChannel.visibility = View.GONE + } + } + + @SuppressLint("SetTextI18n") + private fun bindData() { + viewModel.toastLiveData.observe(viewLifecycleOwner) { + it?.let { Toast.makeText(requireContext(), it, Toast.LENGTH_LONG).show() } + } + + viewModel.isLoading.observe(viewLifecycleOwner) { + if (it) { + loadingDialog.show(screenWidth) + } else { + loadingDialog.dismiss() + } + } + + viewModel.myPageLiveData.observe(viewLifecycleOwner) { + if (it.isAuth) { + binding.tvAuth.visibility = View.GONE + } else { + binding.tvAuth.visibility = View.VISIBLE + } + + binding.ivProfile.load(it.profileUrl) { + crossfade(true) + placeholder(R.drawable.bg_placeholder) + transformations(CircleCropTransformation()) + } + binding.tvNickname.text = it.nickname + + if (it.websiteUrl.isNullOrBlank() || !URLUtil.isValidUrl(it.websiteUrl)) { + binding.ivWebsite.visibility = View.GONE + } else { + binding.ivWebsite.visibility = View.VISIBLE + binding.ivWebsite.setOnClickListener { _ -> + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.websiteUrl))) + } + } + + if (it.blogUrl.isNullOrBlank() || !URLUtil.isValidUrl(it.blogUrl)) { + binding.ivBlog.visibility = View.GONE + } else { + binding.ivBlog.visibility = View.VISIBLE + binding.ivBlog.setOnClickListener { _ -> + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.blogUrl))) + } + } + + if (it.instagramUrl.isNullOrBlank() || !URLUtil.isValidUrl(it.instagramUrl)) { + binding.ivInstagram.visibility = View.GONE + } else { + binding.ivInstagram.visibility = View.VISIBLE + binding.ivInstagram.setOnClickListener { _ -> + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.instagramUrl))) + } + } + + if (it.youtubeUrl.isNullOrBlank() || !URLUtil.isValidUrl(it.youtubeUrl)) { + binding.ivYoutube.visibility = View.GONE + } else { + binding.ivYoutube.visibility = View.VISIBLE + binding.ivYoutube.setOnClickListener { _ -> + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.youtubeUrl))) + } + } + + binding.tvTotalCoin.text = "${(it.chargeCoin + it.rewardCoin).moneyFormat()} 캔" + binding.tvReservationSuda.text = "${it.sudaReservationCount}" + } + } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt new file mode 100644 index 0000000..a502b7f --- /dev/null +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt @@ -0,0 +1,19 @@ +package kr.co.vividnext.sodalive.mypage + +import com.google.gson.annotations.SerializedName + +data class MyPageResponse( + @SerializedName("nickname") val nickname: String, + @SerializedName("profileUrl") val profileUrl: String, + @SerializedName("chargeCoin") val chargeCoin: Int, + @SerializedName("rewardCoin") val rewardCoin: Int, + @SerializedName("youtubeUrl") val youtubeUrl: String?, + @SerializedName("instagramUrl") val instagramUrl: String?, + @SerializedName("websiteUrl") val websiteUrl: String?, + @SerializedName("blogUrl") val blogUrl: String?, + @SerializedName("sudaReservationCount") val sudaReservationCount: Int, + @SerializedName("counselingReservationCount") val counselingReservationCount: Int, + @SerializedName("likeCount") val likeCount: Int, + @SerializedName("reviewCount") val reviewCount: Int, + @SerializedName("isAuth") val isAuth: Boolean, +) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt new file mode 100644 index 0000000..2714089 --- /dev/null +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt @@ -0,0 +1,59 @@ +package kr.co.vividnext.sodalive.mypage + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import com.orhanobut.logger.Logger +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.schedulers.Schedulers +import kr.co.vividnext.sodalive.base.BaseViewModel +import kr.co.vividnext.sodalive.common.SharedPreferenceManager +import kr.co.vividnext.sodalive.user.UserRepository + +class MyPageViewModel( + private val userRepository: UserRepository +): BaseViewModel() { + private val _toastLiveData = MutableLiveData() + val toastLiveData: LiveData + get() = _toastLiveData + + private var _isLoading = MutableLiveData(false) + val isLoading: LiveData + get() = _isLoading + + private val _myPageLiveData = MutableLiveData() + val myPageLiveData: LiveData + get() = _myPageLiveData + + fun getUserInfo() { + if (!_isLoading.value!!) { + _isLoading.value = true + } + + compositeDisposable.add( + userRepository.getMyPage("Bearer ${SharedPreferenceManager.token}") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + { + if (it.success && it.data != null) { + _myPageLiveData.postValue(it.data!!) + } else { + if (it.message != null) { + _toastLiveData.postValue(it.message) + } else { + _toastLiveData.postValue( + "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." + ) + } + } + _isLoading.value = false + }, + { + _isLoading.value = false + it.message?.let { message -> Logger.e(message) } + _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + } + ) + ) + } +} diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/UserApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/UserApi.kt index 7e59ec3..931eea1 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/user/UserApi.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/user/UserApi.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.user import io.reactivex.rxjava3.core.Single import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.main.PushTokenUpdateRequest +import kr.co.vividnext.sodalive.mypage.MyPageResponse import kr.co.vividnext.sodalive.settings.notification.GetMemberInfoResponse import kr.co.vividnext.sodalive.settings.notification.UpdateNotificationSettingRequest import kr.co.vividnext.sodalive.user.find_password.ForgotPasswordRequest @@ -17,6 +18,7 @@ import retrofit2.http.Multipart import retrofit2.http.POST import retrofit2.http.PUT import retrofit2.http.Part +import retrofit2.http.Query interface UserApi { @POST("/member/login") @@ -48,4 +50,10 @@ interface UserApi { @Body request: PushTokenUpdateRequest, @Header("Authorization") authHeader: String ): Single> + + @GET("/member/mypage") + fun getMyPage( + @Query("container") container: String = "aos", + @Header("Authorization") authHeader: String + ): Single> } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/UserRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/UserRepository.kt index 1c34592..1948cc7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/user/UserRepository.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/user/UserRepository.kt @@ -1,6 +1,9 @@ package kr.co.vividnext.sodalive.user +import io.reactivex.rxjava3.core.Single +import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.main.PushTokenUpdateRequest +import kr.co.vividnext.sodalive.mypage.MyPageResponse import kr.co.vividnext.sodalive.settings.notification.UpdateNotificationSettingRequest import kr.co.vividnext.sodalive.user.find_password.ForgotPasswordRequest import kr.co.vividnext.sodalive.user.login.LoginRequest @@ -28,4 +31,8 @@ class UserRepository(private val userApi: UserApi) { ) = userApi.updatePushToken(request, authHeader = token) fun getMemberInfo(token: String) = userApi.getMemberInfo(authHeader = token) + + fun getMyPage(token: String): Single> { + return userApi.getMyPage(authHeader = token) + } } diff --git a/app/src/main/res/drawable-xxhdpi/ic_blog_circle.png b/app/src/main/res/drawable-xxhdpi/ic_blog_circle.png new file mode 100644 index 0000000000000000000000000000000000000000..d6f9ab5be8a51dc0d5fe04939193702ff25133f4 GIT binary patch literal 8020 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 Hl+XkK1nhP= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_instagram_circle.png b/app/src/main/res/drawable-xxhdpi/ic_instagram_circle.png new file mode 100644 index 0000000000000000000000000000000000000000..07ba4735a77f976eaf7c4f722a670cd235a2ef0f GIT binary patch literal 8335 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 Z_iuaqRi`32Cwc$?002ovPDHLkV1joS_H_UN literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_myinfo_edit.png b/app/src/main/res/drawable-xxhdpi/ic_myinfo_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..133480bcba61dad0791d07cbea4dc848c8e5baca GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKx3?xrnI^qbVSkfJRf%L|H?mvmFKt5w}kh>GZ zx^prwfgI@opAc8~0-yglfY@JIKAz<{y~m9Xw^0V0heYv%S}ex_A~=?zu(xYo`g6x!PHE zKc4wCEITN6@!hsW)jh|(b|jwRU2pKdaC@#m`NAz7#~(19f8Fpr_4c+li#NL+W6t@< z*wi$*&o?{rRlZ(WUsKF~V``JG@ShV8{w?dtt3UPP?U9~>Qy(5y`Ucl+vut*Mueq(> zZ^Mr46XHL&TE6Yt++Vsbflu*#z`D4T!tMSwx1@{N<&W>&?Y&g;IM5pmp00i_>zopr E0HRlx0ssI2 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..a31d5ae38a90170d0fb5410532ea2abe7edf0819 GIT binary patch literal 976 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2H;>5jgR3=A9lx&I`x0{M)^LGDfr z>(0r%1akZWd_r8^3w-`l4|FX39tAX6vLwham?6dYi{RZ22aP(}Uoc7i4X$)qdM!44 zrpjqQkr!1A3{1a0T^vI^jxP<5T(nw&C)ClwK_vbA{)_4hB-*m7U8xl z&UI@!woLb*LDiPke;QpGXd zE#Xg9eLt*Rc&PD1%Cs}Bn@YcRao)+fTW~05dENZ8mmWQPedoNDi%9lag|87_sfC%! z!tp;ubH8$3J*M@#+2ok6O7yj}PrKKY9AB1Exs_#Ad`tLq&6)fUrhhQpq1AYqSE{hR zy!m9JGke2(dlfOuwnMSC8<)OwN)&1rdF}Cl`KE)Oxlw`0%hR{_l6!kwGmtGBJy;5mO_&SR5rvpD=G@RHw#JY}4*slo8Q`JsIUp$pCD-@h$v@x8oC_2gVH z*`*d5Y`=Qv`MB0h?^XYJ0 zFXvyLa4tk^^~4h!RBz`l`P+NBs{ZwjHM$yHt;Vhsws!@l^+(?8_#QSf#Y>0J;?os_ z&MR4L%I%?{6{qJb%>s4pab*US-h93`g~^!Ri`-kJPN5=9=%ZiNW`+B zwUmrg(+c`n>{Hxh+&l&g2 zKD^%&zUBY%=VxP&h2FB-TQ3tkFZPGL-OGagiXr;^Yj4^sN>ns1dpx-Ym{%A)UHx3v IIVCg!0F_wlNB{r; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_website_circle.png b/app/src/main/res/drawable-xxhdpi/ic_website_circle.png new file mode 100644 index 0000000000000000000000000000000000000000..6490fbb55a35a59268635a40760930d7914c46ab GIT binary patch literal 7895 zcmV;|9w_07P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91c%TCS1ONa40RR91cmMzZ00`n$?f?KDK}keGRCodHodrK7=+!MX?JagxqIp@s0^Zw_3XXc%9Z4qVE<>%+yCQqJh6Zxl4 zpRUb)n{wsKH6%N=Uw^GsrAn2i=gyt$2_S8W>w~X_S6Kvt zu#2z*;six;g&prG%9RJYc6fd8Gk#58US2wtXX%k6M>f{2TUYUU(33}KdFNU<%Mp9S z4L6j#=%S0tA)z$@qaPq$N7$J#(GH-Pd>(&-xF3nz$n`pW7T0@oa&j_=&m%nc{PWLC zQVY1zqemx2MMYI1G69LLPK9a3brPX8K?|O!7|ne&wB+I!lj%zU{q6DN#}8MpUOmTZU|R;@!Gi}!qk3atUK1EO66Otp zx#eN#S(tbdzl1pX4*>M1fTQU_g2RUoPb^=)d@3{!gtp#%QkgIYn$B?jG2#4*6)S%A z{rBIWUASYC9*GR0b8`2OoSe7K6a06yQ<9*3{r_T+e#ysi$5D zW}&Q_Hd^dHD*Eu4n3yK;VgnlN3GP3mGijJagF&~fGy!)IZIgYN8aos}m;0*pir=MB zBPh&A0nf0EB)EL}@^3qJ>hu--sE;dm9xv1kwWdsLP$V8ea1N7YhT^F_eIsz~~Gc$8*pvTPtm0*E;!37t{Ry-3m z)E{tHQ$xoC?i^FNR)#V`n$x>=>$VAAHD&~H1!3ESgoG_jW*peEWlO+1odE+_;HIRc z^ajwGNN!ue{fwG9oL=(RWr**lk_yPXd-m+PnGRPHlH3E3J65Y!ZF`+Mb@m1dY}x*f9Xo2$A_2jW$+HiVoIzW? zch#y@ew%0g2AHv23`E@qxNksY1+Jevdi3a+7hZVbSQ+GZNJs|Alc?s;m~7DysvkuB z51MdaYHI4H^z?MUCN2ExWGz^*pxl}@Yp#T-_aI6$KF=`(nivu;{Z29+J9g}2@N*rug zMW1^80p>@ohZ;ww-RLcU0TC0)_*~JX!!iDFKr>E^M5e;yCE_(af0X+~Z`1TjMa#BK zX7^I7Mxi!Vqe8}`nzwqJY50B5IIwc%%3m2L?*!Pk@VqZ}g{&@Jx~#*j>G1@G#}Z6i zU_&KqtUHBTrBxRXKl$X7D?KAM{FbjA5RcK4kHPbw0C@`jQg2kXM*s`l@#Dw0lEji( z4)-r%e$?PR>`dSQ6Eq(pP@1$kO*sCmB?*iZl(6HC487(Q55&=GN;6MxsOknJFmhk0g zo_Qv-q(s8;=5k=xtXUbf!Bg>SHYaHVK}i%83$SL1n7ZnN8qn&DedzpGN=hIc9~usz zQQxG~wFZouu~BcJG;VQ}6dU=?H{V2IUw#B| &$y}uOqaWLc7uU}u4CZRh`L~ZgZ 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_youtube_circle.png b/app/src/main/res/drawable-xxhdpi/ic_youtube_circle.png new file mode 100644 index 0000000000000000000000000000000000000000..80b476411183a1cd0f0b4f053304c4c94cbf6108 GIT binary patch literal 6485 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_round_corner_16_7_fdca2f.xml b/app/src/main/res/drawable/bg_round_corner_16_7_fdca2f.xml new file mode 100644 index 0000000..a073482 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_16_7_fdca2f.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_352953_9970ff.xml b/app/src/main/res/drawable/bg_round_corner_6_7_352953_9970ff.xml new file mode 100644 index 0000000..85da0f0 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_6_7_352953_9970ff.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_664aab.xml b/app/src/main/res/drawable/bg_round_corner_6_7_664aab.xml new file mode 100644 index 0000000..8e4b4fa --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_6_7_664aab.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index 70a9204..94c8821 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/app/src/main/res/layout/fragment_my.xml @@ -1,16 +1,336 @@ + android:layout_height="match_parent" + android:background="@color/black"> - + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/rl_toolbar"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3ae1c1e..16423fe 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,6 +21,9 @@ #533D89 #643BC8 #881609 + #fdca2f + #352953 + #664aab #B3909090 #88909090