investigation test 2 (b711badf) · Commits · e / os / Message

presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt

+11 −13

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		package com.moez.QKSMS.feature.compose

		import android.content.Context
		import android.util.Log
		import android.view.LayoutInflater
		import android.view.ViewGroup
		import androidx.core.view.isVisible
		@@ -73,7 +72,6 @@ class AttachmentAdapter @Inject constructor(

		override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
		val attachment = getItem(position)
		val view = holder.containerView

		when (attachment) {
		is Attachment.Image -> Glide.with(context)

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt

+43 −38

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.view.Menu
		import android.view.MenuItem
		import androidx.appcompat.app.AlertDialog
		import androidx.core.app.ActivityCompat
		import androidx.core.content.ContextCompat
		import androidx.core.view.isVisible
		import androidx.lifecycle.ViewModelProvider
		import androidx.lifecycle.ViewModelProviders
		@@ -149,7 +148,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView {

		theme
		.doOnNext { loading.setTint(it.theme) }
		.doOnNext { attach.setTint(ContextCompat.getColor(this, R.color.colorPrimaryDark)) }
		.doOnNext { attach.setBackgroundTint(it.theme) }
		.doOnNext { attach.setTint(it.textPrimary) }
		.doOnNext { messageAdapter.theme = it }
		.autoDisposable(scope())
		.subscribe()
		@@ -238,13 +238,13 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
		simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString()

		send.isEnabled = state.canSend

		send.imageAlpha = if (state.canSend) 255 else 128
		}

		override fun clearSelection() = messageAdapter.clearSelection()

		override fun showDetails(details: String) {
		AlertDialog.Builder(this, R.style.customAlertDialog)
		AlertDialog.Builder(this)
		.setTitle(R.string.compose_details_title)
		.setMessage(details)
		.setCancelable(true)
		@@ -267,8 +267,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView {

		override fun requestDatePicker() {
		val calendar = Calendar.getInstance()
		DatePickerDialog(this, R.style.customAlertDialog, DatePickerDialog.OnDateSetListener { _, year, month, day ->
		TimePickerDialog(this, R.style.customAlertDialog, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
		DatePickerDialog(this, DatePickerDialog.OnDateSetListener { _, year, month, day ->
		TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
		calendar.set(Calendar.YEAR, year)
		calendar.set(Calendar.MONTH, month)
		calendar.set(Calendar.DAY_OF_MONTH, day)
		@@ -392,6 +392,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
		super.onSaveInstanceState(outState)
		}

		override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
		cameraDestination = savedInstanceState?.getParcelable(CameraDestinationKey)
		super.onRestoreInstanceState(savedInstanceState)
		}

		override fun onBackPressed() = backPressedIntent.onNext(Unit)

		}
		No newline at end of file

presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt

+11 −11

Original line number	Diff line number	Diff line
		@@ -49,12 +49,12 @@ class MediaBinder @Inject constructor(colors: Colors, private val context: Conte
		holder.video.setVisible(part.isVideo())
		holder.containerView.setOnClickListener { clicks.onNext(part.id) }

		// holder.thumbnail.bubbleStyle = when {
		// !canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_FIRST else BubbleImageView.Style.IN_FIRST
		// canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_MIDDLE else BubbleImageView.Style.IN_MIDDLE
		// canGroupWithPrevious && !canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_LAST else BubbleImageView.Style.IN_LAST
		// else -> BubbleImageView.Style.ONLY
		// }
		holder.thumbnail.bubbleStyle = when {
		!canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_FIRST else BubbleImageView.Style.IN_FIRST
		canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_MIDDLE else BubbleImageView.Style.IN_MIDDLE
		canGroupWithPrevious && !canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_LAST else BubbleImageView.Style.IN_LAST
		else -> BubbleImageView.Style.ONLY
		}

		GlideApp.with(context).load(part.getUri()).fitCenter().into(holder.thumbnail)
		}