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

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

Add id for the drawer layout

parent 36330788

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/LegacyDrawer.kt

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ class LegacyDrawer( 
    private val accountImageLoader: AccountImageLoader by inject()

    private val folderIconProvider: FolderIconProvider by inject()



    private val drawer: DrawerLayout = parent.findViewById(R.id.drawerLayout)

    private val drawer: DrawerLayout = parent.findViewById(R.id.navigation_drawer_layout)

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

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

        attachToSliderView(this@LegacyDrawer.sliderView)

feature/navigation/drawer/src/main/res/values/ids.xml

+2 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <item name="navigation_drawer_layout" type="id" />



    <item name="navigation_drawer_legacy_list_folder_item" type="id" />



</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ open class MessageList : 


    private fun initializeDrawer(savedInstanceState: Bundle?) {

        if (!isDrawerEnabled) {

            val drawerLayout = findViewById<DrawerLayout>(R.id.drawerLayout)

            val drawerLayout = findViewById<DrawerLayout>(R.id.navigation_drawer_layout)

            drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)

            return

        }

legacy/ui/legacy/src/main/res/layout/message_list.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<androidx.drawerlayout.widget.DrawerLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/drawerLayout"

    android:id="@+id/navigation_drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context="com.fsck.k9.activity.MessageList"

legacy/ui/legacy/src/main/res/layout/split_message_list.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<androidx.drawerlayout.widget.DrawerLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/drawerLayout"

    android:id="@+id/navigation_drawer_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context="com.fsck.k9.activity.MessageList"