wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5713 from k9mail/drawer_item_ids

Browse source 
Tweak drawer item IDs
This commit is contained in:
cketti 2021-10-04 14:36:39 +02:00 committed by GitHub
commit a90c4394d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
View file

@ -258,7 +258,6 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
var newActiveProfile: IProfile? = null
val accountItems = displayAccounts.map { displayAccount ->
val account = displayAccount.account
val drawerId = (account.accountNumber + 1 shl DRAWER_ACCOUNT_SHIFT).toLong()
val drawerColors = getDrawerColorsForAccount(account)
val selectedTextColor = drawerColors.accentColor.toSelectedColorStateList()
@ -267,7 +266,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
isNameShown = true
nameText = account.description ?: ""
descriptionText = account.email
identifier = drawerId
identifier = account.drawerId
tag = account
textColor = selectedTextColor
descriptionTextColor = selectedTextColor
@ -309,7 +308,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
fun updateUserAccountsAndFolders(account: Account?) {
if (account != null) {
initializeWithAccountColor(account)
headerView.setActiveProfile((account.accountNumber + 1 shl DRAWER_ACCOUNT_SHIFT).toLong())
headerView.setActiveProfile(account.drawerId)
foldersViewModel.loadFolders(account)
}
@ -389,9 +388,10 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
}
}
val accountOffset = folderList.accountId.toLong() shl DRAWER_ACCOUNT_SHIFT
for (displayFolder in folderList.folders) {
val folder = displayFolder.folder
val drawerId = folder.id shl DRAWER_FOLDER_SHIFT
val drawerId = accountOffset + folder.id
val drawerItem = FolderDrawerItem().apply {
iconRes = folderIconProvider.getFolderIcon(folder.type)
@ -522,10 +522,12 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
private val IProfile.accountUuid: String?
get() = (this.tag as? Account)?.uuid
private val Account.drawerId: Long
get() = (accountNumber + 1).toLong()
companion object {
// Bit shift for identifiers of user folders items, to leave space for other items
private const val DRAWER_FOLDER_SHIFT: Int = 20
private const val DRAWER_ACCOUNT_SHIFT: Int = 3
// Use the lower 48 bits for the folder ID, the upper bits for the account's drawer ID
private const val DRAWER_ACCOUNT_SHIFT: Int = 48
private const val DRAWER_ID_UNIFIED_INBOX: Long = 0
private const val DRAWER_ID_DIVIDER: Long = 1

14
app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt
View file

@ -30,13 +30,20 @@ class FoldersViewModel(
private val foldersFlow = inputFlow
.flatMapLatest { account ->
if (account == null) {
flowOf(emptyList())
flowOf(0 to emptyList())
} else {
folderRepository.getDisplayFoldersFlow(account)
.map { displayFolders ->
account.accountNumber to displayFolders
}
}
}
.map { displayFolders ->
FolderList(unifiedInbox = createDisplayUnifiedInbox(), folders = displayFolders)
.map { (accountNumber, displayFolders) ->
FolderList(
unifiedInbox = createDisplayUnifiedInbox(),
accountId = accountNumber + 1,
folders = displayFolders
)
}
.flowOn(backgroundDispatcher)
@ -68,6 +75,7 @@ class FoldersViewModel(
data class FolderList(
val unifiedInbox: DisplayUnifiedInbox?,
val accountId: Int,
val folders: List<DisplayFolder>
)