TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-25 16:07:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing divider

Browse Source
This commit is contained in:
andrew 2023-08-21 20:58:51 +09:30
parent d9c48ec84f
commit 6818be21a1
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsActivity.kt
View File

@ -13,13 +13,13 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.divider.MaterialDividerItemDecoration
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import network.loki.messenger.BuildConfig import network.loki.messenger.BuildConfig
import network.loki.messenger.R import network.loki.messenger.R
import network.loki.messenger.databinding.ActivityExpirationSettingsBinding import network.loki.messenger.databinding.ActivityExpirationSettingsBinding
import network.loki.messenger.libsession_util.util.ExpiryMode import network.loki.messenger.libsession_util.util.ExpiryMode
import org.session.libsession.messaging.messages.ExpirationConfiguration
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
import org.thoughtcrime.securesms.database.RecipientDatabase import org.thoughtcrime.securesms.database.RecipientDatabase
import org.thoughtcrime.securesms.database.ThreadDatabase import org.thoughtcrime.securesms.database.ThreadDatabase
@ -93,11 +93,7 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() {
} }
binding.recyclerViewDeleteTypes.apply { binding.recyclerViewDeleteTypes.apply {
adapter = deleteTypeOptionAdapter adapter = deleteTypeOptionAdapter
addItemDecoration(ContextCompat.getDrawable(this@ExpirationSettingsActivity, R.drawable.conversation_menu_divider)!!.let { addDividers()
DividerItemDecoration(this@ExpirationSettingsActivity, RecyclerView.VERTICAL).apply {
setDrawable(it)
}
})
setHasFixedSize(true) setHasFixedSize(true)
} }
deleteTypeOptionAdapter.submitList(deleteTypeOptions) deleteTypeOptionAdapter.submitList(deleteTypeOptions)
@ -107,11 +103,7 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() {
} }
binding.recyclerViewTimerOptions.apply { binding.recyclerViewTimerOptions.apply {
adapter = timerOptionAdapter adapter = timerOptionAdapter
addItemDecoration(ContextCompat.getDrawable(this@ExpirationSettingsActivity, R.drawable.conversation_menu_divider)!!.let { addDividers()
DividerItemDecoration(this@ExpirationSettingsActivity, RecyclerView.VERTICAL).apply {
setDrawable(it)
}
})
} }
binding.buttonSet.setOnClickListener { binding.buttonSet.setOnClickListener {
viewModel.onSetClick() viewModel.onSetClick()
@ -170,6 +162,17 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() {
} }
private fun RecyclerView.addDividers() {
addItemDecoration(
MaterialDividerItemDecoration(
this@ExpirationSettingsActivity,
RecyclerView.VERTICAL
).apply {
isLastItemDecorated = false
}
)
}
private fun showToast(message: String) { private fun showToast(message: String) {
Toast.makeText(this, message, Toast.LENGTH_SHORT).show() Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
} }