Skip to content

FEATURE 191-mypage 주문차트 api연결 #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ddubii wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FEATURE 191-mypage 주문차트 api연결 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/ConsumerMyPageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ class ConsumerMyPageFragment : BaseFragment<FragmentConsumerMyPageBinding>
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)
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/codepatissier/keki/src/main/consumer/mypage/model/MyPageResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_consumer_my_page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<TextView
android:id="@+id/tv_order_waiting_number"
Expand Down