klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

라이브 예약 현황, 예약 취소 추가

This commit is contained in:
klaus 2023-08-02 23:56:45 +09:00
parent c5896529e1
commit 7dbbd8d490
44 changed files with 1117 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -55,6 +55,8 @@
<activity android:name=".settings.event.EventActivity" />
<activity android:name=".settings.event.EventDetailActivity" />
<activity android:name=".settings.notification.NotificationSettingsActivity" />
<activity android:name=".live.reservation_status.LiveReservationStatusActivity" />
<activity android:name=".live.reservation_status.LiveReservationCancelActivity" />
<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"

2
app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt
View File

@ -14,6 +14,7 @@ import kr.co.vividnext.sodalive.live.LiveRepository
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.live.reservation_status.LiveReservationStatusViewModel
import kr.co.vividnext.sodalive.live.room.LiveRoomViewModel
import kr.co.vividnext.sodalive.live.room.create.LiveRoomCreateViewModel
import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailViewModel
@ -144,6 +145,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
viewModel { NotificationSettingsViewModel(get()) }
viewModel { SettingsViewModel(get()) }
viewModel { TextMessageDetailViewModel(get()) }
viewModel { LiveReservationStatusViewModel(get()) }
}
private val repositoryModule = module {

2
app/src/main/java/kr/co/vividnext/sodalive/explorer/ExplorerSectionAdapter.kt
View File

@ -24,7 +24,7 @@ class ExplorerSectionAdapter(
binding.ivProfile.load(item.profileImageUrl) {
transformations(CircleCropTransformation())
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
crossfade(true)
}

2
app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt
View File

@ -536,7 +536,7 @@ class UserProfileActivity : BaseActivity<ActivityUserProfileBinding>(
layoutUserProfile.ivProfile.load(creator.profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}

2
app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileLiveAdapter.kt
View File

@ -28,7 +28,7 @@ class UserProfileLiveAdapter(
fun bind(item: LiveRoomResponse) {
binding.ivCover.load(item.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
}

2
app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileSimilarCreatorAdapter.kt
View File

@ -20,7 +20,7 @@ class UserProfileSimilarCreatorAdapter(
fun bind(item: SimilarCreatorResponse) {
binding.ivProfile.load(item.profileImage) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}

2
app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/cheers/UserProfileCheersAdapter.kt
View File

@ -35,7 +35,7 @@ class UserProfileCheersAdapter(
binding.ivProfile.load(cheers.profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(16.7f.dpToPx()))
}
binding.tvContent.text = cheers.content

2
app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/donation/UserProfileDonationAdapter.kt
View File

@ -22,7 +22,7 @@ class UserProfileDonationAdapter : RecyclerView.Adapter<UserProfileDonationAdapt
binding.ivProfile.load(item.profileImage) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}

2
app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/follow/UserFollowerListAdapter.kt
View File

@ -24,7 +24,7 @@ class UserFollowerListAdapter(
binding.tvNickname.text = item.nickname
binding.ivProfile.load(item.profileImage) {
transformations(CircleCropTransformation())
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
crossfade(true)
}

22
app/src/main/java/kr/co/vividnext/sodalive/live/LiveApi.kt
View File

@ -5,6 +5,8 @@ import io.reactivex.rxjava3.core.Single
import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.live.reservation.MakeLiveReservationRequest
import kr.co.vividnext.sodalive.live.reservation.MakeLiveReservationResponse
import kr.co.vividnext.sodalive.live.reservation_status.CancelLiveReservationRequest
import kr.co.vividnext.sodalive.live.reservation_status.GetLiveReservationResponse
import kr.co.vividnext.sodalive.live.room.CancelLiveRequest
import kr.co.vividnext.sodalive.live.room.EnterOrQuitLiveRoomRequest
import kr.co.vividnext.sodalive.live.room.LiveRoomStatus
@ -188,4 +190,24 @@ interface LiveApi {
fun recentVisitRoomUsers(
@Header("Authorization") authHeader: String
): Single<ApiResponse<List<GetRoomDetailUser>>>
@GET("/live/reservation")
fun getReservations(
@Query("timezone") timezone: String,
@Query("isActive") active: Boolean,
@Header("Authorization") authHeader: String
): Single<ApiResponse<List<GetLiveReservationResponse>>>
@GET("/live/reservation/{id}")
fun getReservation(
@Path("id") id: Long,
@Query("timezone") timezone: String,
@Header("Authorization") authHeader: String
): Single<ApiResponse<GetLiveReservationResponse>>
@PUT("/live/reservation/cancel")
fun cancelReservation(
@Body request: CancelLiveReservationRequest,
@Header("Authorization") authHeader: String
): Single<ApiResponse<Any>>
}

20
app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt
View File

@ -4,6 +4,7 @@ import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.core.Single
import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.live.reservation.MakeLiveReservationRequest
import kr.co.vividnext.sodalive.live.reservation_status.CancelLiveReservationRequest
import kr.co.vividnext.sodalive.live.room.CancelLiveRequest
import kr.co.vividnext.sodalive.live.room.EnterOrQuitLiveRoomRequest
import kr.co.vividnext.sodalive.live.room.LiveRoomStatus
@ -210,4 +211,23 @@ class LiveRepository(
) = api.donationStatus(roomId, authHeader = token)
fun recentVisitRoomUsers(token: String) = api.recentVisitRoomUsers(authHeader = token)
fun getReservations(
active: Boolean,
token: String
) = api.getReservations(TimeZone.getDefault().id, active, authHeader = token)
fun getReservation(
reservationId: Long,
token: String
) = api.getReservation(
id = reservationId,
timezone = TimeZone.getDefault().id,
authHeader = token
)
fun cancelReservation(
request: CancelLiveReservationRequest,
token: String
) = api.cancelReservation(request, authHeader = token)
}

2
app/src/main/java/kr/co/vividnext/sodalive/live/now/LiveNowAdapter.kt
View File

@ -25,7 +25,7 @@ class LiveNowAdapter(
fun bind(item: GetRoomListResponse) {
binding.ivCover.load(item.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
}
binding.tvManager.text = item.managerNickname

2
app/src/main/java/kr/co/vividnext/sodalive/live/recommend/RecommendLiveAdapter.kt
View File

@ -28,7 +28,7 @@ class RecommendLiveAdapter(
ivRecommendLive.load(data.imageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(5.3f.dpToPx()))
}
ivRecommendLive.layoutParams = layoutParams

2
app/src/main/java/kr/co/vividnext/sodalive/live/recommend_channel/LiveRecommendChannelAdapter.kt
View File

@ -54,7 +54,7 @@ class LiveRecommendChannelAdapter(
fun bind(item: GetRecommendChannelResponse) {
binding.ivRecommendChannel.load(item.profileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(30f.dpToPx()))
}
binding.tvRecommendChannelNickname.text = item.nickname

4
app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt
View File

@ -76,7 +76,7 @@ class LiveReservationAdapter(
fun bind(item: GetRoomListResponse) {
binding.ivCover.load(item.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
}
binding.tvDate.text = item.beginDateTime
@ -122,7 +122,7 @@ class LiveReservationAdapter(
}
binding.ivCover.load(item.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(4f.dpToPx()))
}
binding.tvDate.text = item.beginDateTime

11
app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/CancelLiveReservationRequest.kt Normal file
View File

@ -0,0 +1,11 @@
package kr.co.vividnext.sodalive.live.reservation_status
import com.google.gson.annotations.SerializedName
data class CancelLiveReservationRequest(
@SerializedName("reservationId")
val reservationId: Long,
@SerializedName("reason")
val reason: String
)

17
app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/GetLiveReservationResponse.kt Normal file
View File

@ -0,0 +1,17 @@
package kr.co.vividnext.sodalive.live.reservation_status
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class GetLiveReservationResponse(
@SerializedName("reservationId") val reservationId: Long,
@SerializedName("roomId") val roomId: Long,
@SerializedName("title") val title: String,
@SerializedName("coverImageUrl") val coverImageUrl: String,
@SerializedName("price") val price: Int,
@SerializedName("masterNickname") val masterNickname: String,
@SerializedName("beginDateTime") val beginDateTime: String,
@SerializedName("cancelable") val cancelable: Boolean,
) : Parcelable

162
app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationCancelActivity.kt Normal file
View File

@ -0,0 +1,162 @@
package kr.co.vividnext.sodalive.live.reservation_status
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.view.View
import android.widget.Toast
import androidx.activity.OnBackPressedCallback
import coil.load
import coil.transform.RoundedCornersTransformation
import com.jakewharton.rxbinding4.widget.textChanges
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.databinding.ActivityLiveReservationCancelBinding
import kr.co.vividnext.sodalive.extensions.dpToPx
import kr.co.vividnext.sodalive.main.MainActivity
import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity
import org.koin.android.ext.android.inject
class LiveReservationCancelActivity : BaseActivity<ActivityLiveReservationCancelBinding>(
ActivityLiveReservationCancelBinding::inflate
) {
private val viewModel: LiveReservationStatusViewModel by inject()
private lateinit var loadingDialog: LoadingDialog
private var reservationId: Long = 0
private val onBackPressedCallback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
setResult(RESULT_OK)
}
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
reservationId = intent.getLongExtra("reservation_id", 0)
if (reservationId <= 0) {
Toast.makeText(applicationContext, "잘못된 예약정보 입니다.", Toast.LENGTH_LONG).show()
finish()
return
}
viewModel.isLoading.observe(this) {
if (it) {
loadingDialog.show(screenWidth, "")
} else {
loadingDialog.dismiss()
}
}
viewModel.toastLiveData.observe(this) {
it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
}
compositeDisposable.add(
binding.etReasonEtc.textChanges().skip(1)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe {
if (binding.tvReason5.isSelected) {
viewModel.reason = it.toString()
}
}
)
viewModel.reservationId = reservationId
viewModel.getReservation { setReservation(it) }
}
@SuppressLint("SetTextI18n")
override fun setupView() {
loadingDialog = LoadingDialog(this, layoutInflater)
binding.toolbar.tvBack.text = "예약취소"
binding.toolbar.tvBack.setOnClickListener { finish() }
binding.tvReason1.setOnClickListener {
checkboxSelectedFalse()
binding.tvReason1.isSelected = true
viewModel.reason = binding.tvReason1.text.toString()
}
binding.tvReason2.setOnClickListener {
checkboxSelectedFalse()
binding.tvReason2.isSelected = true
viewModel.reason = binding.tvReason2.text.toString()
}
binding.tvReason3.setOnClickListener {
checkboxSelectedFalse()
binding.tvReason3.isSelected = true
viewModel.reason = binding.tvReason3.text.toString()
}
binding.tvReason4.setOnClickListener {
checkboxSelectedFalse()
binding.tvReason4.isSelected = true
viewModel.reason = binding.tvReason4.text.toString()
}
binding.tvReason5.setOnClickListener {
checkboxSelectedFalse()
binding.tvReason5.isSelected = true
viewModel.reason = binding.etReasonEtc.text.toString()
}
binding.tvOtherSudaReservation.setOnClickListener {
finishAffinity()
startActivity(Intent(applicationContext, MainActivity::class.java))
}
binding.tvCheckCoinStatus.setOnClickListener {
startActivity(Intent(applicationContext, CanStatusActivity::class.java))
}
binding.tvCancel.setOnClickListener {
viewModel.cancelReservation {
if (binding.tvPrice.text == "무료") {
binding.tvCancelComplete.visibility = View.GONE
} else {
binding.tvCancelComplete.visibility = View.VISIBLE
binding.tvCancelComplete.text = "결제한 ${binding.tvPrice.text}이 \n환불처리 되었습니다."
}
binding.llCancelComplete.visibility = View.VISIBLE
binding.llCancelConfirm.visibility = View.GONE
binding.toolbar.tvBack.text = "예약취소 확인"
}
}
}
private fun checkboxSelectedFalse() {
binding.tvReason1.isSelected = false
binding.tvReason2.isSelected = false
binding.tvReason3.isSelected = false
binding.tvReason4.isSelected = false
binding.tvReason5.isSelected = false
}
@SuppressLint("SetTextI18n")
private fun setReservation(response: GetLiveReservationResponse) {
binding.tvDate.text = response.beginDateTime
binding.tvNickname.text = response.masterNickname
binding.tvTitle.text = response.title
binding.ivProfile.load(response.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
}
if (response.price > 0) {
binding.tvCheckCoinStatus.visibility = View.VISIBLE
binding.tvPrice.text = "${response.price}코인"
} else {
binding.tvCheckCoinStatus.visibility = View.GONE
binding.tvPrice.text = "무료"
}
}
}

124
app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusActivity.kt Normal file
View File

@ -0,0 +1,124 @@
package kr.co.vividnext.sodalive.live.reservation_status
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
import android.graphics.Rect
import android.os.Bundle
import android.view.View
import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.databinding.ActivityLiveReservationStatusBinding
import kr.co.vividnext.sodalive.extensions.dpToPx
import org.koin.android.ext.android.inject
class LiveReservationStatusActivity : BaseActivity<ActivityLiveReservationStatusBinding>(
ActivityLiveReservationStatusBinding::inflate
) {
private val viewModel: LiveReservationStatusViewModel by inject()
private lateinit var loadingDialog: LoadingDialog
private lateinit var adapter: LiveReservationStatusAdapter
private lateinit var cancelActivityResultLauncher: ActivityResultLauncher<Intent>
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
cancelActivityResultLauncher = registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) {
if (it.resultCode == Activity.RESULT_OK) {
adapter.items.clear()
viewModel.getLiveReservationStatus(isActive = true)
}
}
bindData()
viewModel.getLiveReservationStatus(isActive = true)
}
override fun setupView() {
binding.toolbar.tvBack.text = "라이브 예약 현황"
binding.toolbar.tvBack.setOnClickListener { finish() }
loadingDialog = LoadingDialog(this, layoutInflater)
val recyclerView = binding.recyclerView
adapter = LiveReservationStatusAdapter {
val intent = Intent(applicationContext, LiveReservationCancelActivity::class.java)
intent.putExtra("reservation_id", it.reservationId)
cancelActivityResultLauncher.launch(intent)
}
recyclerView.layoutManager = LinearLayoutManager(
applicationContext,
LinearLayoutManager.VERTICAL,
false
)
recyclerView.addItemDecoration(object : RecyclerView.ItemDecoration() {
override fun getItemOffsets(
outRect: Rect,
view: View,
parent: RecyclerView,
state: RecyclerView.State
) {
super.getItemOffsets(outRect, view, parent, state)
outRect.left = 13.3f.dpToPx().toInt()
outRect.right = 13.3f.dpToPx().toInt()
when (parent.getChildAdapterPosition(view)) {
0 -> {
outRect.top = 13.3f.dpToPx().toInt()
outRect.bottom = 6.7f.dpToPx().toInt()
}
adapter.itemCount - 1 -> {
outRect.top = 6.7f.dpToPx().toInt()
outRect.bottom = 13.3f.dpToPx().toInt()
}
else -> {
outRect.top = 6.7f.dpToPx().toInt()
outRect.bottom = 6.7f.dpToPx().toInt()
}
}
}
})
recyclerView.adapter = adapter
}
@SuppressLint("NotifyDataSetChanged")
private fun bindData() {
viewModel.liveReservationStatusLiveData.observe(this) {
if (adapter.items.size > 0 || it.isNotEmpty()) {
adapter.items.addAll(it)
adapter.notifyDataSetChanged()
binding.recyclerView.visibility = View.VISIBLE
binding.tvNoItems.visibility = View.GONE
} else {
binding.recyclerView.visibility = View.GONE
binding.tvNoItems.visibility = View.VISIBLE
}
}
viewModel.toastLiveData.observe(this) {
it?.let { Toast.makeText(this, it, Toast.LENGTH_LONG).show() }
}
viewModel.isLoading.observe(this) {
if (it) {
loadingDialog.show(screenWidth)
} else {
loadingDialog.dismiss()
}
}
}
}

64
app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusAdapter.kt Normal file
View File

@ -0,0 +1,64 @@
package kr.co.vividnext.sodalive.live.reservation_status
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import coil.load
import coil.transform.RoundedCornersTransformation
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.databinding.ItemLiveReservationStatusBinding
import kr.co.vividnext.sodalive.extensions.dpToPx
class LiveReservationStatusAdapter(
private val onClickCancel: (GetLiveReservationResponse) -> Unit
) : RecyclerView.Adapter<LiveReservationStatusAdapter.ViewHolder>() {
val items = mutableListOf<GetLiveReservationResponse>()
inner class ViewHolder(
private val binding: ItemLiveReservationStatusBinding,
) : RecyclerView.ViewHolder(binding.root) {
fun bind(item: GetLiveReservationResponse) {
binding.tvDate.text = item.beginDateTime
binding.tvNickname.text = item.masterNickname
binding.tvTitle.text = item.title
binding.ivProfile.load(item.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(4.7f.dpToPx()))
}
binding.tvPrice.text = if (item.price > 0) {
"${item.price}코인"
} else {
"무료"
}
if (item.cancelable) {
binding.tvCancel.setOnClickListener { onClickCancel(item) }
binding.tvCancel.visibility = View.VISIBLE
} else {
binding.tvCancel.visibility = View.GONE
binding.tvNonCancellable.visibility = View.VISIBLE
}
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return ViewHolder(
ItemLiveReservationStatusBinding.inflate(
LayoutInflater.from(parent.context),
parent,
false
)
)
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.bind(items[position])
}
override fun getItemCount() = items.count()
}

135
app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusViewModel.kt Normal file
View File

@ -0,0 +1,135 @@
package kr.co.vividnext.sodalive.live.reservation_status
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.live.LiveRepository
class LiveReservationStatusViewModel(
private val repository: LiveRepository
) : BaseViewModel() {
private val _liveReservationStatusLiveData = MutableLiveData<List<GetLiveReservationResponse>>()
val liveReservationStatusLiveData: LiveData<List<GetLiveReservationResponse>>
get() = _liveReservationStatusLiveData
private val _toastLiveData = MutableLiveData<String?>()
val toastLiveData: LiveData<String?>
get() = _toastLiveData
private var _isLoading = MutableLiveData(false)
val isLoading: LiveData<Boolean>
get() = _isLoading
var reservationId: Long = 0
var reason: String = ""
fun getLiveReservationStatus(isActive: Boolean) {
if (!_isLoading.value!!) {
_isLoading.value = true
compositeDisposable.add(
repository.getReservations(isActive, "Bearer ${SharedPreferenceManager.token}")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{
if (it.success && it.data != null) {
_liveReservationStatusLiveData.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("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
}
)
)
}
}
fun getReservation(onSuccess: (GetLiveReservationResponse) -> Unit) {
if (!_isLoading.value!!) {
_isLoading.value = true
compositeDisposable.add(
repository.getReservation(reservationId, "Bearer ${SharedPreferenceManager.token}")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{
if (it.success && it.data != null) {
onSuccess(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("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
}
)
)
}
}
fun cancelReservation(onSuccess: () -> Unit) {
if (!_isLoading.value!!) {
if (reason.isBlank()) {
_toastLiveData.postValue("취소이유를 선택해주세요.")
return
}
_isLoading.value = true
compositeDisposable.add(
repository.cancelReservation(
CancelLiveReservationRequest(reservationId, reason),
"Bearer ${SharedPreferenceManager.token}"
).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{
if (it.success) {
_toastLiveData.postValue("라이브 예약이 취소되었습니다.")
onSuccess()
} 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("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
}
)
)
}
}
}

6
app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
View File

@ -562,7 +562,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
binding.tvTitle.text = response.title
binding.ivCover.load(response.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
}
isAvailableDonation = response.isAvailableDonation
@ -625,7 +625,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
if (newCoverImageUri != null) {
binding.ivCover.load(newCoverImageUri) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
}
}
@ -679,7 +679,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
binding.tvCreatorNickname.text = response.managerNickname
binding.ivCreatorProfile.load(response.managerProfileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}

4
app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt
View File

@ -160,7 +160,7 @@ data class LiveRoomNormalChat(
val itemBinding = binding as ItemLiveRoomChatBinding
itemBinding.ivProfile.load(profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
}
@ -278,7 +278,7 @@ data class LiveRoomDonationChat(
itemBinding.ivProfile.load(profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
}
itemBinding.tvChat.text = spChat

4
app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt
View File

@ -105,7 +105,7 @@ class LiveRoomCreateActivity : BaseActivity<ActivityLiveRoomCreateBinding>(
binding.ivCover.background = null
binding.ivCover.load(fileUri) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
}
viewModel.coverImageUri = fileUri
@ -282,7 +282,7 @@ class LiveRoomCreateActivity : BaseActivity<ActivityLiveRoomCreateBinding>(
binding.ivCover.background = null
binding.ivCover.load(it.coverImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
}
}

2
app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailAdapter.kt
View File

@ -22,7 +22,7 @@ class LiveRoomDetailAdapter(
binding.tvNickname.text = item.nickname
binding.ivProfile.load(item.profileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
}
binding.root.setOnClickListener { onClick(item) }

4
app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt
View File

@ -236,7 +236,7 @@ class LiveRoomDetailFragment(
binding.tvManagerIntroduce.text = manager.introduce
binding.ivManagerProfile.load(manager.profileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}
@ -308,7 +308,7 @@ class LiveRoomDetailFragment(
val itemView = ItemLiveDetailUserSummaryBinding.inflate(layoutInflater)
itemView.ivProfile.load(user.profileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(16.7f.dpToPx()))
}

2
app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt
View File

@ -83,7 +83,7 @@ class LiveRoomDonationDialog(
dialogView.ivProfile.load(SharedPreferenceManager.profileImage) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}

2
app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingAdapter.kt
View File

@ -45,7 +45,7 @@ class LiveRoomDonationRankingAdapter :
binding.ivProfile.load(item.profileImage) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}

6
app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileItem.kt
View File

@ -118,7 +118,7 @@ data class LiveRoomProfileItemMaster(
itemBinding.tvNickname.text = nickname
itemBinding.ivProfile.load(profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}
if (id != SharedPreferenceManager.userId) {
@ -137,7 +137,7 @@ data class LiveRoomProfileItemManager(
itemBinding.tvNickname.text = nickname
itemBinding.ivProfile.load(profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}
if (id != SharedPreferenceManager.userId) {
@ -159,7 +159,7 @@ data class LiveRoomProfileItemUser(
itemBinding.tvNickname.text = nickname
itemBinding.ivProfile.load(profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}

2
app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileListAdapter.kt
View File

@ -19,7 +19,7 @@ class LiveRoomProfileListAdapter : RecyclerView.Adapter<LiveRoomProfileListAdapt
fun bind(item: LiveRoomMember) {
binding.ivProfile.load(item.profileImage) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.3f.dpToPx()))
if (activeSpeakers.contains(item.id.toInt())) {

2
app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomUserProfileDialog.kt
View File

@ -78,7 +78,7 @@ class LiveRoomUserProfileDialog(
userProfileLiveData.observe(activity) { userProfile ->
dialogView.ivProfile.load(userProfile.profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(8.dpToPx()))
}

2
app/src/main/java/kr/co/vividnext/sodalive/live/room/tag/LiveTagAdapter.kt
View File

@ -36,7 +36,7 @@ class LiveTagAdapter(
binding.ivTag.load(item.image) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(30f.dpToPx()))
}
binding.tvTag.text = item.tag

4
app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt
View File

@ -49,7 +49,7 @@ class LiveRoomInfoEditDialog(
this.coverImageUri = coverImageUri
dialogView.ivCover.load(coverImageUri) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
}
}
@ -58,7 +58,7 @@ class LiveRoomInfoEditDialog(
this.coverImageUrl = coverImageUrl
dialogView.ivCover.load(coverImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
}
}

2
app/src/main/java/kr/co/vividnext/sodalive/message/SelectMessageRecipientAdapter.kt
View File

@ -20,7 +20,7 @@ class SelectMessageRecipientAdapter(
fun bind(item: GetRoomDetailUser) {
binding.ivProfile.load(item.profileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
}

4
app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageAdapter.kt
View File

@ -23,7 +23,7 @@ class TextMessageAdapter(
if (SharedPreferenceManager.nickname == item.recipientNickname) {
binding.ivProfile.load(item.senderProfileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
}
@ -31,7 +31,7 @@ class TextMessageAdapter(
} else {
binding.ivProfile.load(item.recipientProfileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
}

4
app/src/main/java/kr/co/vividnext/sodalive/message/text/TextMessageDetailActivity.kt
View File

@ -114,7 +114,7 @@ class TextMessageDetailActivity : BaseActivity<ActivityTextMessageDetailBinding>
if (SharedPreferenceManager.nickname == messageItem?.recipientNickname) {
binding.ivProfile.load(messageItem?.senderProfileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
}
@ -122,7 +122,7 @@ class TextMessageDetailActivity : BaseActivity<ActivityTextMessageDetailBinding>
} else {
binding.ivProfile.load(messageItem?.recipientProfileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(13.3f.dpToPx()))
}

4
app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageAdapter.kt
View File

@ -57,7 +57,7 @@ class VoiceMessageAdapter(
if (SharedPreferenceManager.nickname == item.recipientNickname) {
binding.ivProfile.load(item.senderProfileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
}
@ -65,7 +65,7 @@ class VoiceMessageAdapter(
} else {
binding.ivProfile.load(item.recipientProfileImageUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
}

2
app/src/main/java/kr/co/vividnext/sodalive/message/voice/VoiceMessageWriteFragment.kt
View File

@ -103,7 +103,7 @@ class VoiceMessageWriteFragment(
private fun setReceiver(userId: Long, nickname: String, profileUrl: String) {
binding.ivProfile.load(profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(RoundedCornersTransformation(23.4f.dpToPx()))
}
binding.tvNickname.text = nickname

12
app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt
View File

@ -23,6 +23,7 @@ import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity
import kr.co.vividnext.sodalive.live.reservation_status.LiveReservationStatusActivity
import kr.co.vividnext.sodalive.settings.SettingsActivity
import kr.co.vividnext.sodalive.settings.notification.MemberRole
import org.koin.android.ext.android.inject
@ -76,7 +77,14 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
)
}
binding.llReservationSuda.setOnClickListener {}
binding.llReservationLive.setOnClickListener {
startActivity(
Intent(
requireActivity(),
LiveReservationStatusActivity::class.java
)
)
}
binding.rlServiceCenter.setOnClickListener {}
@ -133,7 +141,7 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
binding.ivProfile.load(it.profileUrl) {
crossfade(true)
placeholder(R.drawable.bg_placeholder)
placeholder(R.drawable.ic_logo)
transformations(CircleCropTransformation())
}
binding.tvNickname.text = it.nickname

8
app/src/main/res/drawable/bg_round_corner_6_7_transparent_9970ff.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent" />
<corners android:radius="6.7dp" />
<stroke
android:width="1dp"
android:color="@color/color_9970ff" />
</shape>

346
app/src/main/res/layout/activity_live_reservation_cancel.xml Normal file
View File

@ -0,0 +1,346 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
<include
android:id="@+id/toolbar"
layout="@layout/detail_toolbar" />
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:layout_marginTop="20dp">
<ImageView
android:id="@+id/iv_profile"
android:layout_width="80dp"
android:layout_height="116.7dp"
android:adjustViewBounds="true"
android:contentDescription="@null" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="20dp"
android:layout_marginEnd="16.3dp"
android:layout_toEndOf="@+id/iv_profile"
android:orientation="vertical">
<TextView
android:id="@+id/tv_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_ffd300"
android:textSize="9.3sp"
tools:ignore="SmallSp"
tools:text="2021.06.20 SUN 10p.m" />
<TextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_bbbbbb"
android:textSize="11.3sp"
tools:text="사냥꾼1004" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4.3dp"
android:ellipsize="end"
android:fontFamily="@font/gmarket_sans_medium"
android:lineSpacingExtra="4.7sp"
android:maxLines="2"
android:textColor="@color/color_e2e2e2"
android:textSize="15.3sp"
tools:text="여자들이 좋아하는 남자 스타일은?" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_7fe2e2e2"
android:textSize="12sp"
tools:text="300코인" />
<TextView
android:id="@+id/tv_non_cancellable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="15.3dp"
android:fontFamily="sans-serif-light"
android:text="예약 취소 불가"
android:textColor="@color/color_777777"
android:textSize="10.7sp"
android:visibility="gone"
tools:ignore="RelativeOverlap,SmallSp" />
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@+id/iv_profile"
android:layout_marginTop="13.3dp"
android:background="@color/color_88909090" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_cancel_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:layout_marginTop="33.3dp"
android:fontFamily="@font/gmarket_sans_bold"
android:text="예약을 취소하시겠습니까?"
android:textColor="@color/color_a285eb"
android:textSize="20sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:letterSpacing="0"
android:text="예약취소 이유를 선택해주세요. 서비스 개선에 중요한 자료로 활용하겠습니다."
android:textColor="@color/color_eeeeee"
android:textSize="13.3sp" />
<TextView
android:id="@+id/tv_reason_1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="23.3dp"
android:layout_marginTop="13.3dp"
android:button="@null"
android:drawablePadding="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:text="중요한 개인일정이 생겨서"
android:textColor="@color/color_eeeeee"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_radio_button_select" />
<TextView
android:id="@+id/tv_reason_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="23.3dp"
android:layout_marginTop="10dp"
android:button="@null"
android:drawablePadding="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:text="다른 라이브에 참여하고 싶어서"
android:textColor="@color/color_eeeeee"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_radio_button_select" />
<TextView
android:id="@+id/tv_reason_3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="23.3dp"
android:layout_marginTop="10dp"
android:button="@null"
android:drawablePadding="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:text="라이브 참여자 중 불편한 사람이 있어서"
android:textColor="@color/color_eeeeee"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_radio_button_select" />
<TextView
android:id="@+id/tv_reason_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="23.3dp"
android:layout_marginTop="10dp"
android:button="@null"
android:drawablePadding="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:text="참여비용이 부담되서"
android:textColor="@color/color_eeeeee"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_radio_button_select" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="23.3dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_reason_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@null"
android:drawablePadding="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:text="기타"
android:textColor="@color/color_eeeeee"
android:textSize="13.3sp"
app:drawableStartCompat="@drawable/ic_radio_button_select" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="23.3dp"
android:orientation="vertical">
<EditText
android:id="@+id/et_reason_etc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:button="@null"
android:fontFamily="@font/gmarket_sans_light"
android:hint="입력해 주세요"
android:importantForAutofill="no"
android:inputType="textWebEditText"
android:textColor="@color/color_eeeeee"
android:textColorHint="@color/color_555555"
android:textCursorDrawable="@drawable/edit_text_cursor"
android:textSize="13.3sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="7.3dp"
android:background="@color/color_88909090" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="6.7dp"
android:layout_marginTop="20dp"
android:background="@color/color_232323" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="23.3dp"
android:layout_marginTop="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:text="취소요청시, 차감했던 코인은 환불처리 됩니다. 라이브 참여인원 제한에 따라 재예약이 불가할 수 있습니다."
android:textColor="@color/color_ff5c49" />
<TextView
android:id="@+id/tv_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:layout_marginTop="90dp"
android:layout_marginBottom="13.3dp"
android:background="@drawable/bg_round_corner_6_7_9970ff"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingVertical="16dp"
android:text="예약취소"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_cancel_complete"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:layout_marginTop="33.3dp"
android:fontFamily="@font/gmarket_sans_bold"
android:text="예약취소가 완료되었습니다."
android:textColor="@color/color_a285eb"
android:textSize="20sp" />
<TextView
android:id="@+id/tv_cancel_complete"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:layout_marginTop="20dp"
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_eeeeee"
android:textSize="20sp"
tools:text="결제한 500코인이\n환불처리 되었습니다." />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
android:layout_marginTop="60dp"
android:layout_marginBottom="10dp">
<TextView
android:id="@+id/tv_other_suda_reservation"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="13.3dp"
android:layout_weight="1"
android:background="@drawable/bg_round_corner_10_339970ff_9970ff"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingVertical="16dp"
android:text="다른 라이브 예약하기"
android:textColor="@color/color_9970ff"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_coin_status"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/bg_round_corner_10_9970ff"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingVertical="16dp"
android:text="코인내역 확인하기"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

34
app/src/main/res/layout/activity_live_reservation_status.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar"
layout="@layout/detail_toolbar" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
<TextView
android:id="@+id/tv_no_items"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="@font/gmarket_sans_medium"
android:text="예약한 라이브가 없습니다."
android:textColor="@color/color_bbbbbb"
android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/fragment_my.xml
View File

@ -233,7 +233,7 @@
android:textSize="18.3sp" />
<LinearLayout
android:id="@+id/ll_reservation_suda"
android:id="@+id/ll_reservation_live"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="13.3dp"
@ -323,7 +323,7 @@
android:drawablePadding="13.7dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:text="요즘라이브 고객센터"
android:text="소다라이브 고객센터"
android:textColor="@color/color_eeeeee"
android:textSize="15.3sp"
app:drawableStartCompat="@drawable/ic_headphones" />

118
app/src/main/res/layout/item_live_reservation_status.xml Normal file
View File

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black">
<ImageView
android:id="@+id/iv_profile"
android:layout_width="80dp"
android:layout_height="116.7dp"
android:adjustViewBounds="true"
android:contentDescription="@null"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="16.3dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@+id/iv_profile"
app:layout_constraintEnd_toStartOf="@+id/tv_cancel"
app:layout_constraintStart_toEndOf="@+id/iv_profile"
app:layout_constraintTop_toTopOf="@+id/iv_profile"
app:layout_goneMarginEnd="16.3dp">
<TextView
android:id="@+id/tv_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_ffd300"
android:textSize="9.3sp"
tools:ignore="SmallSp"
tools:text="2021.06.20 SUN 10p.m" />
<TextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_bbbbbb"
android:textSize="11.3sp"
tools:text="사냥꾼1004" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4.3dp"
android:ellipsize="end"
android:fontFamily="@font/gmarket_sans_medium"
android:lineSpacingExtra="4.7sp"
android:maxLines="2"
android:textColor="@color/color_e2e2e2"
android:textSize="15.3sp"
tools:text="여자들이 좋아하는 남자 스타일은?" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15.3dp"
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_7fe2e2e2"
android:textSize="12sp"
tools:text="300코인" />
<TextView
android:id="@+id/tv_non_cancellable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="15.3dp"
android:fontFamily="sans-serif-light"
android:text="예약 취소 불가"
android:textColor="@color/color_777777"
android:textSize="10.7sp"
android:visibility="gone"
tools:ignore="RelativeOverlap,SmallSp" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_round_corner_6_7_transparent_9970ff"
android:fontFamily="@font/gmarket_sans_bold"
android:padding="10.7dp"
android:text="예약\n취소"
android:textColor="@color/color_9970ff"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="13dp"
android:background="@color/color_88909090"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_profile" />
</androidx.constraintlayout.widget.ConstraintLayout>