Feature/#795 게시글 화면과 댓글 화면 ux 개선

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/base/BaseViewModel.kt

@@ -0,0 +1,70 @@
+package com.emmsale.presentation.base
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.emmsale.data.common.retrofit.callAdapter.ApiResponse
+import com.emmsale.data.common.retrofit.callAdapter.Failure
+import com.emmsale.data.common.retrofit.callAdapter.NetworkError
+import com.emmsale.data.common.retrofit.callAdapter.Success
+import com.emmsale.data.common.retrofit.callAdapter.Unexpected
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+abstract class BaseViewModel : ViewModel() {
+
+    protected abstract fun changeToLoadingState()
+
+    protected abstract fun changeToNetworkErrorState()
+
+    protected abstract fun changeToSuccessState()
+
+    protected abstract fun onUnexpected(throwable: Throwable?)
+
+    protected abstract fun onRequestFailByNetworkError()
+
+    abstract fun refresh(): Job
+
+    protected fun <T : Any> requestToNetwork(
+        getResult: suspend () -> ApiResponse<T>,
+        onSuccess: ((T) -> Unit)? = null,
+        onFailure: ((code: Int, message: String?) -> Unit)? = null,
+        onLoading: (suspend () -> Unit)? = null,
+        onNetworkError: (() -> Unit)? = null,
+    ): Job = viewModelScope.launch {
+        val loadingJob = launch { onLoading?.invoke() ?: changeToLoadingState() }
+        when (val result = getResult()) {
+            is Failure -> onFailure?.invoke(result.code, result.message)
+            NetworkError -> {
+                onNetworkError?.invoke() ?: changeToNetworkErrorState()
+                return@launch
+            }
+
+            is Success -> onSuccess?.invoke(result.data)
+            is Unexpected -> onUnexpected(result.error)
+        }
+        loadingJob.cancel()
+        changeToSuccessState()
+    }
+
+    protected fun <T : Any> commandAndRefresh(
+        command: suspend () -> ApiResponse<T>,
+        onSuccess: ((T) -> Unit)? = null,
+        onFailure: ((code: Int, message: String?) -> Unit)? = null,
+        onLoading: (suspend () -> Unit)? = null,
+        onNetworkError: (() -> Unit)? = null,
+    ): Job = viewModelScope.launch {
+        val loadingJob = launch { onLoading?.invoke() ?: changeToLoadingState() }
+        when (val result = command()) {
+            is Failure -> onFailure?.invoke(result.code, result.message)
+            NetworkError -> onNetworkError?.invoke() ?: onRequestFailByNetworkError()
+            is Success -> {
+                refresh().join()
+                onSuccess?.invoke(result.data)
+            }
+
+            is Unexpected -> onUnexpected(result.error)
+        }
+        loadingJob.cancel()
+        changeToSuccessState()
+    }
+}

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/messageList/KeyboardHider.kt → android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/KeyboardHider.kt

@@ -1,19 +1,15 @@
-package com.emmsale.presentation.ui.messageList
+package com.emmsale.presentation.common
 
-import android.content.Context
+import android.app.Activity
 import android.view.MotionEvent
-import android.view.View
-import android.view.inputmethod.InputMethodManager
+import com.emmsale.presentation.common.extension.hideKeyboard
 import kotlin.math.abs
 
 class KeyboardHider(
-    private val targetView: View,
+    private val activity: Activity,
     private val sensitivity: Float = DEFAULT_SENSITIVITY,
     private val willConsumeTouchEvent: Boolean = CONSUMED_TOUCH_EVENT,
 ) {
-    private val imm by lazy {
-        targetView.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    }
 
     private var startY: Float = -1F
     private var movedY: Float = 0F
@@ -22,7 +18,7 @@ class KeyboardHider(
         when (event.action) {
             MotionEvent.ACTION_DOWN -> startY = event.y
             MotionEvent.ACTION_MOVE -> movedY = abs(event.y - startY)
-            MotionEvent.ACTION_UP -> if (canHideKeyboard()) hideKeyboard()
+            MotionEvent.ACTION_UP -> if (canHideKeyboard()) activity.hideKeyboard()
         }
         return willConsumeTouchEvent
     }
@@ -31,12 +27,6 @@ class KeyboardHider(
         return movedY < sensitivity
     }
 
-    private fun hideKeyboard() {
-        if (targetView.onCheckIsTextEditor()) {
-            imm.hideSoftInputFromWindow(targetView.windowToken, 0)
-        }
-    }
-
     companion object {
         private const val DEFAULT_SENSITIVITY: Float = 10F
         private const val CONSUMED_TOUCH_EVENT = false

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/bindingadapter/SwipeRefreshLayoutBindingAdapter.kt

@@ -3,15 +3,36 @@ package com.emmsale.presentation.common.bindingadapter
 import androidx.annotation.ColorInt
 import androidx.databinding.BindingAdapter
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 
-@BindingAdapter("onRefresh")
+@BindingAdapter("app:onRefresh")
 fun SwipeRefreshLayout.setOnRefresh(onRefresh: () -> Unit) {
     setOnRefreshListener {
         onRefresh()
         isRefreshing = false
     }
 }
 
+@BindingAdapter("app:onRefresh1")
+fun SwipeRefreshLayout.setOnRefresh1(onRefreshListener: OnRefreshListener) {
+    setOnRefreshListener {
+        val job = onRefreshListener.onRefresh()
+        if (!job.isCancelled) {
+            CoroutineScope(Dispatchers.Main).launch {
+                job.join()
+                isRefreshing = false
+            }
+        }
+    }
+}
+
+fun interface OnRefreshListener {
+    fun onRefresh(): Job
+}
+
 @BindingAdapter("app:swipeRefreshColor")
 fun SwipeRefreshLayout.setSwipeRefreshColor(@ColorInt color: Int) {
     setColorSchemeColors(color)

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/bindingadapter/ViewBindingAdapter.kt

@@ -4,6 +4,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.updateLayoutParams
 import androidx.databinding.BindingAdapter
+import com.emmsale.presentation.common.extension.dp
+
+private const val DIMEN_UNIT_DP = "dp"
 
 @BindingAdapter("app:visible")
 fun View.setVisible(visible: Boolean) {
@@ -16,3 +19,24 @@ fun View.setLayoutMarginTop(dimen: Float) {
         topMargin = dimen.toInt()
     }
 }
+
+@BindingAdapter("app:layout_marginTop")
+fun View.setLayoutMarginTop(margin: String) {
+    validateMarginFormat(margin)
+    updateLayoutParams<ViewGroup.MarginLayoutParams> {
+        topMargin = margin.toDimen()
+    }
+}
+
+private fun validateMarginFormat(margin: String) {
+    require(margin.endsWith(DIMEN_UNIT_DP) || margin.all { it.isDigit() }) {
+        "숫자만 이루어져 있거나 숫자 뒤에 $DIMEN_UNIT_DP 문자열만 올 수 있습니다."
+    }
+}
+
+private fun String.toDimen(): Int = if (endsWith(DIMEN_UNIT_DP)) {
+    dropLastWhile { !it.isDigit() }
+        .toInt().dp
+} else {
+    toInt()
+}

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/extension/ActivityExt.kt

@@ -0,0 +1,10 @@
+package com.emmsale.presentation.common.extension
+
+import android.app.Activity
+import android.view.inputmethod.InputMethodManager
+import androidx.appcompat.app.AppCompatActivity
+
+fun Activity.hideKeyboard() {
+    val imm = getSystemService(AppCompatActivity.INPUT_METHOD_SERVICE) as InputMethodManager
+    imm.hideSoftInputFromWindow(window.decorView.windowToken, 0)
+}

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/extension/EditTextExt.kt

@@ -0,0 +1,18 @@
+package com.emmsale.presentation.common.extension
+
+import android.content.Context.INPUT_METHOD_SERVICE
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+
+private const val DELAY_SHOW_SOFT_INPUT: Long = 200
+
+fun EditText.showKeyboard() {
+    val imm = context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+    postDelayed(
+        {
+            imm.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
+            setSelection(text.length)
+        },
+        DELAY_SHOW_SOFT_INPUT,
+    )
+}

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/extension/FloatExt.kt

@@ -0,0 +1,6 @@
+package com.emmsale.presentation.common.extension
+
+import android.content.res.Resources
+
+val Float.dp: Float
+    get() = (this * Resources.getSystem().displayMetrics.density)

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/recyclerView/DividerItemDecoration.kt

@@ -0,0 +1,39 @@
+package com.emmsale.presentation.common.recyclerView
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.RectF
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.emmsale.R
+import com.emmsale.presentation.common.extension.dp
+
+class DividerItemDecoration(
+    context: Context,
+    private val dividerHeight: Float = 0.5f.dp,
+    @ColorRes private val dividerColor: Int = R.color.light_gray,
+) : RecyclerView.ItemDecoration() {
+    private val paint = Paint().apply {
+        color = ContextCompat.getColor(context, dividerColor)
+        style = Paint.Style.FILL
+    }
+
+    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        super.onDraw(c, parent, state)
+
+        val left = parent.paddingStart.toFloat()
+        val right = parent.width - parent.paddingEnd.toFloat()
+        for (i in 0 until parent.childCount - 1) {
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+
+            val top = child.bottom.toFloat() + params.bottomMargin
+            val bottom = top + dividerHeight
+
+            val dividerRect = RectF(left, top, right, bottom)
+            c.drawRect(dividerRect, paint)
+        }
+    }
+}

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/feedDetail/recyclerView/FeedDetailImageItemDecoration.kt → android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/recyclerView/SpaceItemDecoration.kt

@@ -1,12 +1,12 @@
-package com.emmsale.presentation.ui.feedDetail.recyclerView
+package com.emmsale.presentation.common.recyclerView
 
 import android.graphics.Rect
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import com.emmsale.presentation.common.extension.dp
 
-class FeedDetailImageItemDecoration(
-    private val divWidth: Int = 10.dp,
+class SpaceItemDecoration(
+    private val width: Int = 0,
+    private val height: Int = 0,
 ) : RecyclerView.ItemDecoration() {
     override fun getItemOffsets(
         outRect: Rect,
@@ -17,6 +17,7 @@ class FeedDetailImageItemDecoration(
         super.getItemOffsets(outRect, view, parent, state)
 
         val position = parent.getChildAdapterPosition(view)
-        if (position > 0) outRect.left = divWidth
+        if (position > 0) outRect.left = width
+        if (position > 0) outRect.top = height
     }
 }

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/BasicTextInputWindow.kt

@@ -0,0 +1,79 @@
+package com.emmsale.presentation.common.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import androidx.databinding.BindingAdapter
+import com.emmsale.R
+import com.emmsale.databinding.LayoutBasicInputWindowBinding
+import com.emmsale.presentation.common.extension.dp
+import com.emmsale.presentation.common.views.BasicTextInputWindow.OnSubmitListener
+import kotlin.properties.Delegates
+
+class BasicTextInputWindow @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+) : ConstraintLayout(context, attrs) {
+
+    private val binding: LayoutBasicInputWindowBinding by lazy {
+        LayoutBasicInputWindowBinding.inflate(LayoutInflater.from(context), this, false)
+    }
+
+    var isSubmitEnabled: Boolean by Delegates.observable(false) { _, _, newValue ->
+        binding.isSubmitEnabled = newValue
+    }
+
+    var onSubmitListener: OnSubmitListener by Delegates.observable(OnSubmitListener { }) { _, _, newValue ->
+        binding.onSubmitListener = newValue
+    }
+
+    init {
+        applyStyledAttributes(attrs)
+        setPadding(
+            BASIC_TEXT_INPUT_WINDOW_HORIZONTAL_PADDING,
+            BASIC_TEXT_INPUT_WINDOW_VERTICAL_PADDING,
+            BASIC_TEXT_INPUT_WINDOW_HORIZONTAL_PADDING,
+            BASIC_TEXT_INPUT_WINDOW_VERTICAL_PADDING,
+        )
+        isClickable = true
+        addView(binding.root)
+    }
+
+    private fun applyStyledAttributes(attrs: AttributeSet?) {
+        context.theme.obtainStyledAttributes(
+            attrs,
+            R.styleable.BasicTextInputWindow,
+            0,
+            0,
+        ).use {
+            binding.etBasicInput.hint = it.getString(R.styleable.BasicTextInputWindow_hint)
+            binding.tvSubmitButton.text =
+                it.getString(R.styleable.BasicTextInputWindow_submitButtonLabel)
+        }
+    }
+
+    fun clearText() {
+        binding.etBasicInput.text.clear()
+    }
+
+    fun interface OnSubmitListener {
+        fun onSubmit(text: String)
+    }
+
+    companion object {
+        private val BASIC_TEXT_INPUT_WINDOW_HORIZONTAL_PADDING = 17.dp
+        private val BASIC_TEXT_INPUT_WINDOW_VERTICAL_PADDING = 8.dp
+    }
+}
+
+@BindingAdapter("app:onSubmit")
+fun BasicTextInputWindow.setOnSubmitListenerBA(onSubmitListener: OnSubmitListener) {
+    this.onSubmitListener = onSubmitListener
+}
+
+@BindingAdapter("app:isSubmitEnabled")
+fun BasicTextInputWindow.setIsSubmitEnabled(isSubmitEnabled: Boolean) {
+    this.isSubmitEnabled = isSubmitEnabled
+}

android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/InfoDialog.kt

@@ -15,13 +15,16 @@ class InfoDialog(
     private val title: String,
     private val message: String,
     private val buttonLabel: String = context.getString(R.string.all_okay),
+    private val onButtonClick: (() -> Unit)? = null,
+    private val cancelable: Boolean = true,
 ) : Dialog(context) {
     private val binding: DialogInfoBinding by lazy { DialogInfoBinding.inflate(layoutInflater) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
+        setCancelable(cancelable)
         initDialogWindow()
         initDataBinding()
     }
@@ -39,6 +42,7 @@ class InfoDialog(
         binding.message = message
         binding.buttonLabel = buttonLabel
         binding.onButtonClick = {
+            onButtonClick?.invoke()
             dismiss()
         }
     }