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

Unverified Commit a3d6fd7a authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #5283 from k9mail/drawer_toggle 

Remove ActionBarDrawerToggle
parents fd96d3f8 79fe2ca7

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

+6 −16
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ import android.view.animation.AnimationUtils 
import android.widget.ProgressBar

import android.widget.Toast

import androidx.appcompat.app.ActionBar

import androidx.appcompat.app.ActionBarDrawerToggle

import androidx.appcompat.widget.Toolbar

import androidx.drawerlayout.widget.DrawerLayout

import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
@@ -88,8 +87,7 @@ open class MessageList : 
    private val storageListener: StorageListener = StorageListenerImplementation()

    private val permissionUiHelper: PermissionUiHelper = K9PermissionUiHelper(this)



    private var actionBar: ActionBar? = null

    private var drawerToggle: ActionBarDrawerToggle? = null

    private lateinit var actionBar: ActionBar

    private var drawer: K9Drawer? = null

    private var openFolderTransaction: FragmentTransaction? = null

    private var menu: Menu? = null
@@ -522,8 +520,8 @@ open class MessageList : 
    }



    private fun initializeActionBar() {

        actionBar = supportActionBar

        actionBar!!.setDisplayHomeAsUpEnabled(true)

        actionBar = supportActionBar!!

        actionBar.setDisplayHomeAsUpEnabled(true)

    }



    private fun initializeDrawer(savedInstanceState: Bundle?) {
@@ -534,14 +532,6 @@ open class MessageList : 
        }



        drawer = K9Drawer(this, savedInstanceState)



        val drawerLayout = drawer!!.layout

        drawerToggle = ActionBarDrawerToggle(

            this, drawerLayout, null,

            R.string.navigation_drawer_open, R.string.navigation_drawer_close

        )

        drawerLayout.addDrawerListener(drawerToggle!!)

        drawerToggle!!.syncState()

    }



    fun createDrawerListener(): DrawerListener {
@@ -1133,7 +1123,7 @@ open class MessageList : 
    }



    fun setActionBarTitle(title: String) {

        actionBar!!.title = title

        actionBar.title = title

    }



    override fun setMessageListTitle(title: String) {
@@ -1451,12 +1441,12 @@ open class MessageList : 


    private fun lockDrawer() {

        drawer!!.lock()

        drawerToggle!!.isDrawerIndicatorEnabled = false

        actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back)

    }



    private fun unlockDrawer() {

        drawer!!.unlock()

        drawerToggle!!.isDrawerIndicatorEnabled = true

        actionBar.setHomeAsUpIndicator(R.drawable.ic_menu)

    }



    private fun initializeFromLocalSearch(search: LocalSearch?) {

app/ui/legacy/src/main/res/drawable/ic_arrow_back.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />

</vector>

app/ui/legacy/src/main/res/drawable/ic_menu.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />

</vector>