diff --git a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/CreatorNoticeWriteActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/CreatorNoticeWriteActivity.kt deleted file mode 100644 index 8436ef8..0000000 --- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/CreatorNoticeWriteActivity.kt +++ /dev/null @@ -1,73 +0,0 @@ -package kr.co.vividnext.sodalive.explorer.profile - -import android.content.Intent -import android.widget.Toast -import com.orhanobut.logger.Logger -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers -import io.reactivex.rxjava3.schedulers.Schedulers -import kr.co.vividnext.sodalive.base.BaseActivity -import kr.co.vividnext.sodalive.common.LoadingDialog -import kr.co.vividnext.sodalive.common.SharedPreferenceManager -import kr.co.vividnext.sodalive.databinding.ActivityCreatorNoticeWriteBinding -import kr.co.vividnext.sodalive.explorer.ExplorerRepository -import org.koin.android.ext.android.inject - -class CreatorNoticeWriteActivity : BaseActivity( - ActivityCreatorNoticeWriteBinding::inflate -) { - - private val repository: ExplorerRepository by inject() - - private lateinit var loadingDialog: LoadingDialog - - override fun setupView() { - loadingDialog = LoadingDialog(this, layoutInflater) - binding.toolbar.tvBack.text = "공지사항 쓰기" - binding.toolbar.tvBack.setOnClickListener { finish() } - - val notice = intent.getStringExtra("notice") - binding.etContent.setText(notice) - - binding.tvSave.setOnClickListener { - loadingDialog.show(screenWidth) - - val writtenNotice = binding.etContent.text.toString() - compositeDisposable.add( - repository.writeCreatorNotice( - notice = writtenNotice, - token = "Bearer ${SharedPreferenceManager.token}" - ) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - { - loadingDialog.dismiss() - - val message = it.message ?: "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - Toast.makeText( - applicationContext, - message, - Toast.LENGTH_LONG - ).show() - - if (it.success) { - val dataIntent = Intent() - dataIntent.putExtra("notice", writtenNotice) - setResult(RESULT_OK, dataIntent) - finish() - } - }, - { - loadingDialog.dismiss() - it.message?.let { message -> Logger.e(message) } - Toast.makeText( - applicationContext, - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.", - Toast.LENGTH_LONG - ).show() - } - ) - ) - } - } -} diff --git a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt index 9131aa1..34cd05e 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt @@ -65,8 +65,6 @@ class UserProfileActivity : BaseActivity( private lateinit var donationAdapter: UserProfileDonationAdapter private lateinit var cheersAdapter: UserProfileCheersAdapter - private lateinit var noticeWriteLauncher: ActivityResultLauncher - private val handler = Handler(Looper.getMainLooper()) private var userId: Long = 0 @@ -75,17 +73,6 @@ class UserProfileActivity : BaseActivity( super.onCreate(savedInstanceState) imm = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager - noticeWriteLauncher = registerForActivityResult( - ActivityResultContracts.StartActivityForResult() - ) { - if (it.resultCode == Activity.RESULT_OK) { - val writtenNotice = it.data?.getStringExtra("notice") - binding.tvNotice.text = writtenNotice?.ifBlank { - "공지사항이 없습니다." - } - } - } - if (userId <= 0) { Toast.makeText(applicationContext, "잘못된 요청입니다.", Toast.LENGTH_LONG).show() finish() @@ -509,20 +496,11 @@ class UserProfileActivity : BaseActivity( viewModel.creatorProfileLiveData.observe(this) { setCheers(it.cheers) setCreatorProfile(it.creator) - setCreatorNotice(it.notice, it.creator.creatorId) setAudioContentList(it.contentList) setLiveRoomList(it.liveRoomList) setUserDonationRanking(it.userDonationRanking) setActivitySummary(it.activitySummary) } - - viewModel.isExpandNotice.observe(this) { - if (it) { - binding.tvNotice.maxLines = Int.MAX_VALUE - } else { - binding.tvNotice.maxLines = 1 - } - } } private fun setActivitySummary(activitySummary: GetCreatorActivitySummary) { @@ -636,28 +614,6 @@ class UserProfileActivity : BaseActivity( binding.layoutUserProfileIntroduce.tvIntroduce.text = introduce } - private fun setCreatorNotice(notice: String, creatorId: Long) { - binding.tvNotice.text = notice.ifBlank { - "공지사항이 없습니다." - } - - binding.rlNotice.setOnClickListener { - if (creatorId == SharedPreferenceManager.userId) { - val intent = Intent(applicationContext, CreatorNoticeWriteActivity::class.java) - intent.putExtra("notice", notice) - noticeWriteLauncher.launch(intent) - } else { - viewModel.toggleExpandNotice() - } - } - - binding.ivWrite.visibility = if (creatorId == SharedPreferenceManager.userId) { - View.VISIBLE - } else { - View.GONE - } - } - @SuppressLint("NotifyDataSetChanged") private fun setAudioContentList(audioContentList: List) { binding.layoutUserProfileAudioContent.root.visibility = diff --git a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileViewModel.kt index 76085a5..070037a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileViewModel.kt @@ -38,10 +38,6 @@ class UserProfileViewModel( val creatorProfileLiveData: LiveData get() = _creatorProfileLiveData - private val _isExpandNotice = MutableLiveData(false) - val isExpandNotice: LiveData - get() = _isExpandNotice - private var creatorNickname = "" fun cheersReport(cheersId: Long, reason: String) { @@ -216,10 +212,6 @@ class UserProfileViewModel( ) } - fun toggleExpandNotice() { - _isExpandNotice.value = !isExpandNotice.value!! - } - fun writeCheers(parentCheersId: Long? = null, creatorId: Long, cheersContent: String) { if (cheersContent.isBlank()) { _toastLiveData.postValue("내용을 입력하세요") diff --git a/app/src/main/res/layout/activity_creator_notice_write.xml b/app/src/main/res/layout/activity_creator_notice_write.xml deleted file mode 100644 index 9cae77a..0000000 --- a/app/src/main/res/layout/activity_creator_notice_write.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml index b68bf1c..8773e22 100644 --- a/app/src/main/res/layout/activity_user_profile.xml +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -203,39 +203,10 @@ - - - - - - + android:layout_height="wrap_content" />