From 8d715f419b8a497a9d55791581e7f10969d14458 Mon Sep 17 00:00:00 2001 From: ddubii Date: Tue, 27 Jun 2023 20:54:25 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20mypage=20=EC=A3=BC=EB=AC=B8=EC=B0=A8?= =?UTF-8?q?=ED=8A=B8=20api=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keki/src/main/consumer/mypage/ConsumerMyPageFragment.kt | 4 ++++ .../keki/src/main/consumer/mypage/model/MyPageResult.kt | 5 ++++- app/src/main/res/layout/fragment_consumer_my_page.xml | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/ConsumerMyPageFragment.kt b/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/ConsumerMyPageFragment.kt index 792f62c4..5b4ab79e 100644 --- a/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/ConsumerMyPageFragment.kt +++ b/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/ConsumerMyPageFragment.kt @@ -68,6 +68,10 @@ class ConsumerMyPageFragment : BaseFragment val nim = getString(R.string.my_page_tv_nickname) binding.tvNickName.text = response.result.nickname + nim + binding.tvOrderWaitingNumber.text = response.result.orderWaiting.toString() + binding.tvOrderInNumber.text = response.result.progressing.toString() + binding.tvPickupWaitingNumber.text = response.result.pickupWaiting.toString() + if(response.result.profileImg != null){ // 이미지 가져오기 var storageRef = fbStorage?.reference?.child(response.result.profileImg) diff --git a/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/model/MyPageResult.kt b/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/model/MyPageResult.kt index d91af9f7..289a8e42 100644 --- a/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/model/MyPageResult.kt +++ b/app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/model/MyPageResult.kt @@ -2,5 +2,8 @@ package com.codepatissier.keki.src.main.consumer.mypage.model class MyPageResult ( val nickname : String, - val profileImg : String + val profileImg : String, + val orderWaiting: Int, + val progressing: Int, + val pickupWaiting: Int ) \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_consumer_my_page.xml b/app/src/main/res/layout/fragment_consumer_my_page.xml index c6d9de97..156a9347 100644 --- a/app/src/main/res/layout/fragment_consumer_my_page.xml +++ b/app/src/main/res/layout/fragment_consumer_my_page.xml @@ -140,11 +140,11 @@ android:layout_gravity="left|bottom" android:layout_marginLeft="@dimen/my_page_order_chart_bg_nemo1_tv_marginLeft" android:layout_marginBottom="@dimen/my_page_order_chart_bg_nemo_tv_marginBottom" - android:textColor="@color/black" android:fontFamily="@font/notosanskr_regular" android:includeFontPadding="false" - android:textSize="@dimen/my_page_order_chart_bg_nemo_tv_text_size" - android:text="@string/my_page_tv_order_waiting" /> + android:text="@string/my_page_tv_order_waiting" + android:textColor="@color/black" + android:textSize="@dimen/my_page_order_chart_bg_nemo_tv_text_size" />