Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d0b1cacb authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Rename `K9Drawer` to `LegacyDrawer`

parent db3cabec

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import com.fsck.k9.controller.MessagingController 
import com.fsck.k9.helper.ParcelableUtil

import com.fsck.k9.search.isUnifiedInbox

import com.fsck.k9.ui.BuildConfig

import com.fsck.k9.ui.K9Drawer

import com.fsck.k9.ui.LegacyDrawer

import com.fsck.k9.ui.R

import com.fsck.k9.ui.base.K9Activity

import com.fsck.k9.ui.managefolders.ManageFoldersActivity
@@ -97,7 +97,7 @@ open class MessageList : 
    private var initialSearchViewQuery: String? = null

    private var initialSearchViewIconified: Boolean = true



    private var drawer: K9Drawer? = null

    private var drawer: LegacyDrawer? = null

    private var openFolderTransaction: FragmentTransaction? = null

    private var progressBar: ProgressBar? = null

    private var messageViewPlaceHolder: PlaceholderFragment? = null
@@ -577,7 +577,7 @@ open class MessageList : 
            return

        }



        drawer = K9Drawer(this, savedInstanceState)

        drawer = LegacyDrawer(this, savedInstanceState)

    }



    fun createDrawerListener(): DrawerListener {

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt→legacy/ui/legacy/src/main/java/com/fsck/k9/ui/LegacyDrawer.kt

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ private const val STARRED_SYMBOL = "\u2605" 
private const val THIN_SPACE = "\u2009"

private const val EN_SPACE = "\u2000"



class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : KoinComponent {

class LegacyDrawer(private val parent: MessageList, savedInstanceState: Bundle?) : KoinComponent {

    private val foldersViewModel: FoldersViewModel by parent.viewModel()

    private val accountsViewModel: AccountsViewModel by parent.viewModel()

    private val folderNameFormatter: FolderNameFormatter by inject()
@@ -77,7 +77,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K 
    private val drawer: DrawerLayout = parent.findViewById(R.id.drawerLayout)

    private val sliderView: MaterialDrawerSliderView = parent.findViewById(DrawerR.id.material_drawer_slider)

    private val headerView: AccountHeaderView = AccountHeaderView(parent).apply {

        attachToSliderView(this@K9Drawer.sliderView)

        attachToSliderView(this@LegacyDrawer.sliderView)

        dividerBelowHeader = false

        displayBadgesOnCurrentProfileImage = false

    }