fix formatting

This commit is contained in:
Konrad Pozniak 2020-07-01 22:14:49 +02:00
parent 3d6f6206e6
commit dc139d4dae
11 changed files with 88 additions and 80 deletions

View File

@ -79,7 +79,6 @@ class TimelineFragment : DaggerFragment(R.layout.fragment_timeline), TimeLineAct
adapter.addDataRefreshListener { adapter.addDataRefreshListener {
binding.timelineSwipeRefresh.isRefreshing = false binding.timelineSwipeRefresh.isRefreshing = false
} }
} }
override fun onFavorite(status: StatusEntity) { override fun onFavorite(status: StatusEntity) {

View File

@ -33,7 +33,6 @@ class TimelineUseCases @Inject constructor(
} else { } else {
api.reblogStatus(status.actionableId) api.reblogStatus(status.actionableId)
}.updateStatusInDb() }.updateStatusInDb()
} }
suspend fun onMediaVisibilityChanged(status: StatusEntity) { suspend fun onMediaVisibilityChanged(status: StatusEntity) {
@ -42,7 +41,6 @@ class TimelineUseCases @Inject constructor(
status.id, status.id,
accountManager.activeAccount()?.id!! accountManager.activeAccount()?.id!!
) )
} }
private suspend fun NetworkResponse<Status>.updateStatusInDb() { private suspend fun NetworkResponse<Status>.updateStatusInDb() {
@ -57,5 +55,4 @@ class TimelineUseCases @Inject constructor(
} }
) )
} }
} }

View File

@ -71,5 +71,4 @@ class TimelineViewModel @Inject constructor(
useCases.onMediaVisibilityChanged(status) useCases.onMediaVisibilityChanged(status)
} }
} }
} }

View File

@ -69,7 +69,9 @@ class DetailActivity: BaseActivity(), TimeLineActionListener {
binding.detailRecyclerView.adapter = ConcatAdapter(statusAdapter, repliesAdapter) binding.detailRecyclerView.adapter = ConcatAdapter(statusAdapter, repliesAdapter)
viewModel.currentStatus.observe(this, Observer { viewModel.currentStatus.observe(
this,
Observer {
when (it) { when (it) {
is Success -> { is Success -> {
binding.detailSwipeRefresh.show() binding.detailSwipeRefresh.show()
@ -88,18 +90,20 @@ class DetailActivity: BaseActivity(), TimeLineActionListener {
binding.detailSwipeRefresh.hide() binding.detailSwipeRefresh.hide()
binding.detailStatus.show() binding.detailStatus.show()
binding.detailProgress.hide() binding.detailProgress.hide()
binding.detailStatus.setOnRetryListener { }
binding.detailStatus.showGeneralError() binding.detailStatus.showGeneralError()
} }
} }
}) }
)
viewModel.replies.observe(this, Observer { viewModel.replies.observe(
this,
Observer {
if (it is Success) { if (it is Success) {
repliesAdapter.submitList(it.data) repliesAdapter.submitList(it.data)
} }
}) }
)
} }
override fun onFavorite(status: StatusEntity) { override fun onFavorite(status: StatusEntity) {
@ -131,5 +135,4 @@ class DetailActivity: BaseActivity(), TimeLineActionListener {
} }
} }
} }
} }

View File

@ -51,8 +51,6 @@ class DetailReplyAdapter(
holder.binding.postReplyButton.setOnClickListener { holder.binding.postReplyButton.setOnClickListener {
listener.onReply(status) listener.onReply(status)
} }
} }
} }
} }

View File

@ -12,7 +12,6 @@ import at.connyduck.pixelcat.databinding.ItemStatusBinding
import at.connyduck.pixelcat.db.entitity.StatusEntity import at.connyduck.pixelcat.db.entitity.StatusEntity
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
class DetailStatusAdapter( class DetailStatusAdapter(
private val displayWidth: Int, private val displayWidth: Int,
private val listener: TimeLineActionListener private val listener: TimeLineActionListener
@ -36,5 +35,4 @@ class DetailStatusAdapter(
holder.bind(status, displayWidth, listener, dateTimeFormatter) holder.bind(status, displayWidth, listener, dateTimeFormatter)
} }
} }
} }

View File

@ -78,23 +78,31 @@ class DetailViewModel @Inject constructor(
} }
private suspend fun loadStatus() { private suspend fun loadStatus() {
api.status(statusId).fold({ api.status(statusId).fold(
{
val statusEntity = it.toEntity(accountManager.activeAccount()?.id!!) val statusEntity = it.toEntity(accountManager.activeAccount()?.id!!)
db.statusDao().insertOrReplace(statusEntity) db.statusDao().insertOrReplace(statusEntity)
currentStatus.value = Success(statusEntity) currentStatus.value = Success(statusEntity)
}, { },
{
currentStatus.value = Error(cause = it) currentStatus.value = Error(cause = it)
}) }
)
} }
private suspend fun loadReplies() { private suspend fun loadReplies() {
api.statusContext(statusId).fold({ api.statusContext(statusId).fold(
replies.value = Success(it.descendants.map{ {
descendant -> descendant.toEntity(accountManager.activeAccount()?.id!!) replies.value = Success(
}) it.descendants.map { descendant ->
}, { descendant.toEntity(accountManager.activeAccount()?.id!!)
}
)
},
{
replies.value = Error(cause = it) replies.value = Error(cause = it)
}) }
)
} }
fun onFavorite(status: StatusEntity) { fun onFavorite(status: StatusEntity) {
@ -114,5 +122,4 @@ class DetailViewModel @Inject constructor(
useCases.onMediaVisibilityChanged(status) useCases.onMediaVisibilityChanged(status)
} }
} }
} }

View File

@ -19,7 +19,14 @@
package at.connyduck.pixelcat.network package at.connyduck.pixelcat.network
import at.connyduck.pixelcat.model.* import at.connyduck.pixelcat.model.AccessToken
import at.connyduck.pixelcat.model.Account
import at.connyduck.pixelcat.model.AppCredentials
import at.connyduck.pixelcat.model.Attachment
import at.connyduck.pixelcat.model.NewStatus
import at.connyduck.pixelcat.model.Relationship
import at.connyduck.pixelcat.model.Status
import at.connyduck.pixelcat.model.StatusContext
import at.connyduck.pixelcat.network.calladapter.NetworkResponse import at.connyduck.pixelcat.network.calladapter.NetworkResponse
import okhttp3.MultipartBody import okhttp3.MultipartBody
import retrofit2.http.Body import retrofit2.http.Body