쿠폰등록 페이지 추가

app/src/main/AndroidManifest.xml

@@ -86,6 +86,7 @@
         <activity android:name=".mypage.can.status.CanStatusActivity" />
         <activity android:name=".mypage.can.charge.CanChargeActivity" />
         <activity android:name=".mypage.can.payment.CanPaymentActivity" />
+        <activity android:name=".mypage.can.coupon.CanCouponActivity" />
         <activity android:name=".live.room.create.LiveRoomCreateActivity" />
         <activity android:name=".live.room.update.LiveRoomEditActivity" />
         <activity android:name=".live.reservation.complete.LiveReservationCompleteActivity" />

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

@@ -72,6 +72,7 @@ import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
 import kr.co.vividnext.sodalive.mypage.can.CanApi
 import kr.co.vividnext.sodalive.mypage.can.CanRepository
 import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeViewModel
+import kr.co.vividnext.sodalive.mypage.can.coupon.CanCouponViewModel
 import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentViewModel
 import kr.co.vividnext.sodalive.mypage.can.status.CanStatusViewModel
 import kr.co.vividnext.sodalive.mypage.profile.ProfileUpdateViewModel
@@ -223,6 +224,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
         viewModel { CreatorCommunityCommentListViewModel(get()) }
         viewModel { CreatorCommunityWriteViewModel(get()) }
         viewModel { CreatorCommunityModifyViewModel(get()) }
+        viewModel { CanCouponViewModel(get()) }
     }
 
     private val repositoryModule = module {

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

@@ -31,6 +31,7 @@ import kr.co.vividnext.sodalive.mypage.auth.Auth
 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.coupon.CanCouponActivity
 import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity
 import kr.co.vividnext.sodalive.mypage.profile.ProfileUpdateActivity
 import kr.co.vividnext.sodalive.mypage.service_center.ServiceCenterActivity
@@ -131,6 +132,15 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
             )
         }
 
+        binding.rlCoupon.setOnClickListener {
+            startActivity(
+                Intent(
+                    requireActivity(),
+                    CanCouponActivity::class.java
+                )
+            )
+        }
+
         binding.llReservationLive.setOnClickListener {
             startActivity(
                 Intent(
@@ -207,8 +217,10 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
         viewModel.myPageLiveData.observe(viewLifecycleOwner) {
             if (it.isAuth) {
                 binding.tvAuth.visibility = View.GONE
+                binding.rlCoupon.visibility = View.VISIBLE
             } else {
                 binding.tvAuth.visibility = View.VISIBLE
+                binding.rlCoupon.visibility = View.GONE
             }
 
             binding.ivProfile.load(it.profileUrl) {

app/src/main/java/kr/co/vividnext/sodalive/mypage/can/CanApi.kt

@@ -6,6 +6,7 @@ import kr.co.vividnext.sodalive.mypage.can.charge.CanResponse
 import kr.co.vividnext.sodalive.mypage.can.charge.ChargeRequest
 import kr.co.vividnext.sodalive.mypage.can.charge.ChargeResponse
 import kr.co.vividnext.sodalive.mypage.can.charge.VerifyRequest
+import kr.co.vividnext.sodalive.mypage.can.coupon.UseCanCouponRequest
 import kr.co.vividnext.sodalive.mypage.can.status.GetCanStatusResponse
 import kr.co.vividnext.sodalive.mypage.can.status.charge.GetCanChargeStatusResponseItem
 import kr.co.vividnext.sodalive.mypage.can.status.use.GetCanUseStatusResponseItem
@@ -56,4 +57,10 @@ interface CanApi {
         @Query("container") container: String = "aos",
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<List<GetCanChargeStatusResponseItem>>>
+
+    @POST("/can/coupon/use")
+    fun useCanCoupon(
+        @Body request: UseCanCouponRequest,
+        @Header("Authorization") authHeader: String
+    ): Single<ApiResponse<Any>>
 }

app/src/main/java/kr/co/vividnext/sodalive/mypage/can/CanRepository.kt

@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.mypage.can
 
 import kr.co.vividnext.sodalive.mypage.can.charge.ChargeRequest
 import kr.co.vividnext.sodalive.mypage.can.charge.VerifyRequest
+import kr.co.vividnext.sodalive.mypage.can.coupon.UseCanCouponRequest
 import java.util.TimeZone
 
 class CanRepository(private val api: CanApi) {
@@ -40,4 +41,9 @@ class CanRepository(private val api: CanApi) {
         size = pageSize,
         authHeader = token
     )
+
+    fun useCanCoupon(couponNumber: String, token: String) = api.useCanCoupon(
+        request = UseCanCouponRequest(couponNumber),
+        authHeader = token
+    )
 }

app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponActivity.kt

@@ -0,0 +1,66 @@
+package kr.co.vividnext.sodalive.mypage.can.coupon
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.InputFilter
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.widget.Toast
+import kr.co.vividnext.sodalive.base.BaseActivity
+import kr.co.vividnext.sodalive.common.LoadingDialog
+import kr.co.vividnext.sodalive.databinding.ActivityCanCouponBinding
+import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity
+import org.koin.android.ext.android.inject
+
+class CanCouponActivity : BaseActivity<ActivityCanCouponBinding>(
+    ActivityCanCouponBinding::inflate
+) {
+
+    private val viewModel: CanCouponViewModel by inject()
+
+    private lateinit var loadingDialog: LoadingDialog
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        bindData()
+    }
+
+    override fun setupView() {
+        loadingDialog = LoadingDialog(this, layoutInflater)
+
+        binding.toolbar.tvBack.text = "쿠폰등록"
+        binding.toolbar.tvBack.setOnClickListener { finish() }
+
+        val uppercaseAndDigitsFilter = InputFilter { source, _, _, _, _, _ ->
+            val filtered = source.filter { it.isUpperCase() || it.isDigit() }
+            if (source is Spanned) {
+                return@InputFilter SpannableStringBuilder(filtered)
+            } else {
+                return@InputFilter filtered
+            }
+        }
+        binding.etCouponNumber.filters = arrayOf(uppercaseAndDigitsFilter)
+
+        binding.tvRegistration.setOnClickListener {
+            val couponNumber = binding.etCouponNumber.text.toString()
+            viewModel.useCoupon(couponNumber) {
+                finish()
+                startActivity(Intent(applicationContext, CanStatusActivity::class.java))
+            }
+        }
+    }
+
+    private fun bindData() {
+        viewModel.toastLiveData.observe(this) {
+            it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
+        }
+
+        viewModel.isLoading.observe(this) {
+            if (it) {
+                loadingDialog.show(screenWidth)
+            } else {
+                loadingDialog.dismiss()
+            }
+        }
+    }
+}

app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponViewModel.kt

@@ -0,0 +1,59 @@
+package kr.co.vividnext.sodalive.mypage.can.coupon
+
+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.mypage.can.CanRepository
+
+class CanCouponViewModel(private val repository: CanRepository) : BaseViewModel() {
+    private var _isLoading = MutableLiveData(false)
+    val isLoading: LiveData<Boolean>
+        get() = _isLoading
+
+    private val _toastLiveData = MutableLiveData<String?>()
+    val toastLiveData: LiveData<String?>
+        get() = _toastLiveData
+
+    fun useCoupon(couponNumber: String, onSuccess: () -> Unit) {
+        _isLoading.value = true
+        compositeDisposable.add(
+            repository.useCanCoupon(
+                couponNumber = couponNumber,
+                token = "Bearer ${SharedPreferenceManager.token}"
+            )
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    {
+                        _isLoading.value = false
+                        if (it.success && it.data != null) {
+                            _toastLiveData.postValue("해당 쿠폰의 캔이 충전되었습니다.")
+                            onSuccess()
+                        } else {
+                            if (it.message != null) {
+                                _toastLiveData.postValue(it.message)
+                            } else {
+                                _toastLiveData.postValue(
+                                    "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                )
+                            }
+                        }
+                    },
+                    {
+                        _isLoading.value = false
+                        if (it.message != null) {
+                            _toastLiveData.postValue(it.message)
+                            Logger.e(it.message!!)
+                        } else {
+                            _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                        }
+
+                    }
+                )
+        )
+    }
+}

app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/UseCanCouponRequest.kt

@@ -0,0 +1,7 @@
+package kr.co.vividnext.sodalive.mypage.can.coupon
+
+import com.google.gson.annotations.SerializedName
+
+data class UseCanCouponRequest(
+    @SerializedName("couponNumber") val couponNumber: String
+)

app/src/main/res/layout/activity_can_coupon.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/detail_toolbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="13.3dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/gmarket_sans_bold"
+                android:text="쿠폰번호 입력"
+                android:textColor="@color/color_eeeeee"
+                android:textSize="16.7sp" />
+
+            <EditText
+                android:id="@+id/et_coupon_number"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="13.3dp"
+                android:background="@drawable/bg_round_corner_6_7_222222"
+                android:fontFamily="@font/gmarket_sans_medium"
+                android:hint="쿠폰번호를 입력해 주세요"
+                android:importantForAutofill="no"
+                android:maxEms="12"
+                android:inputType="textCapCharacters"
+                android:paddingHorizontal="13.3dp"
+                android:paddingVertical="17dp"
+                android:textColor="@color/color_eeeeee"
+                android:textColorHint="@color/color_777777"
+                android:textCursorDrawable="@drawable/edit_text_cursor"
+                android:textSize="13.3sp"
+                android:theme="@style/EditTextStyle"
+                tools:ignore="LabelFor,TextFields" />
+
+            <TextView
+                android:id="@+id/tv_registration"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="21.3dp"
+                android:background="@drawable/bg_round_corner_10_3bb9f1"
+                android:fontFamily="@font/gmarket_sans_bold"
+                android:gravity="center"
+                android:paddingVertical="16dp"
+                android:text="등록하기"
+                android:textColor="@color/white"
+                android:textSize="18.3sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="21.3dp"
+                android:background="@drawable/bg_round_corner_6_7_13181b"
+                android:orientation="vertical"
+                android:paddingHorizontal="13.3dp"
+                android:paddingVertical="26.7dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/gmarket_sans_bold"
+                    android:text="등록안내"
+                    android:textColor="@color/color_eeeeee"
+                    android:textSize="13.3sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:lineSpacingExtra="5sp"
+                    android:text="공백없이 쿠폰번호 12자리를 입력해주세요.\n입력한 쿠폰은 소멸시까지 취소처리가 되지 않습니다.\n충전된 캔은 캔 충전현황에서 확인할 수 있습니다."
+                    android:paddingHorizontal="10dp"
+                    android:fontFamily="@font/gmarket_sans_medium"
+                    android:textColor="@color/color_bbbbbb"
+                    android:textSize="13.3sp" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginVertical="26.7dp"
+                    android:background="@color/color_555555" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/gmarket_sans_bold"
+                    android:text="주의사항"
+                    android:textColor="@color/color_eeeeee"
+                    android:textSize="13.3sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:paddingHorizontal="10dp"
+                    android:fontFamily="@font/gmarket_sans_medium"
+                    android:lineSpacingExtra="5sp"
+                    android:text="이벤트 쿠폰을 통해 충전한 캔은 환불되지 않습니다.\n쿠폰은 상업적 용도로 사용하거나 매매할 수 없습니다.\n한번 등록한 쿠폰은 재사용이 불가합니다.\n연령 제한 정책에 따라 쿠폰이용은 본인인증한 회원만 이용 가능합니다."
+                    android:textColor="@color/color_bbbbbb"
+                    android:textSize="13.3sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

app/src/main/res/layout/fragment_my.xml

@@ -180,7 +180,7 @@
                         android:fontFamily="@font/gmarket_sans_bold"
                         android:gravity="center"
                         android:textColor="@color/color_eeeeee"
-                        android:textSize="18.3sp"
+                        android:textSize="16sp"
                         tools:text="23,000" />
 
                     <ImageView
@@ -218,6 +218,43 @@
                     app:drawableStartCompat="@drawable/ic_coin_w" />
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/rl_coupon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="13.3dp"
+                android:background="@drawable/bg_round_corner_6_7_13181b"
+                android:paddingHorizontal="13.3dp"
+                android:paddingVertical="20dp">
+
+                <TextView
+                    android:id="@+id/tv_coupon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="5.3dp"
+                    android:fontFamily="@font/gmarket_sans_bold"
+                    android:gravity="center"
+                    android:text="쿠폰 등록"
+                    android:textColor="@color/color_eeeeee"
+                    android:textSize="16sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toEndOf="@+id/tv_coupon"
+                    android:layout_centerVertical="true"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_coupon" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_forward" />
+            </RelativeLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"