ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert MailboxActivity to Kotlin 

Affected: MailboxActivity

Ticket: MAILAND-749
This commit is contained in:
Dimitar Solev 2020-09-04 07:27:23 +00:00
parent c03b1fe182
commit 65ec01233f
4 changed files with 2034 additions and 2125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ch/protonmail/android/activities/NavigationActivity.kt
View File

@ -160,7 +160,7 @@ abstract class NavigationActivity : BaseActivity(),
protected abstract val currentMailboxLocation: Constants.MessageLocationType
protected abstract val currentLabelId: String
protected abstract val currentLabelId: String?
/**
* A lambda that holds an operation that needs to be executed after the Drawer has been closed

2117
app/src/main/java/ch/protonmail/android/activities/mailbox/MailboxActivity.java
View File

File diff suppressed because it is too large Load Diff

2026
app/src/main/java/ch/protonmail/android/activities/mailbox/MailboxActivity.kt Normal file
View File

File diff suppressed because it is too large Load Diff

14
app/src/main/java/ch/protonmail/android/adapters/messages/MessagesRecyclerViewAdapter.kt
View File

@ -34,8 +34,10 @@ import ch.protonmail.android.views.messagesList.MessagesListItemView
/**
* Created by Kamil Rajtar on 17.07.18. */
class MessagesRecyclerViewAdapter(private val context: Context,
private val onSelectionModeChange: ((SelectionModeEnum) -> Unit)?) : RecyclerView.Adapter<MessagesListViewHolder>() {
class MessagesRecyclerViewAdapter(
private val context: Context,
private val onSelectionModeChange: ((SelectionModeEnum) -> Unit)?
) : RecyclerView.Adapter<MessagesListViewHolder>() {
private var mMailboxLocation = Constants.MessageLocationType.INVALID
@ -90,10 +92,8 @@ class MessagesRecyclerViewAdapter(private val context: Context,
}
override fun getItemViewType(position: Int): Int {
return when (position) {
messages.size -> ElementType.FOOTER
else -> ElementType.MESSAGE
}.ordinal
val itemViewType = if (position == messages.size) ElementType.FOOTER else ElementType.MESSAGE
return itemViewType.ordinal
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MessagesListViewHolder {
@ -111,7 +111,7 @@ class MessagesRecyclerViewAdapter(private val context: Context,
when (ElementType.values()[getItemViewType(position)]) {
ElementType.MESSAGE -> (holder as MessagesListViewHolder.MessageViewHolder).bindMessage(position)
ElementType.FOOTER -> {
//NOOP
// NOOP
}
}
}