Drawer updates

* Fix content overlapping navigation bars * Move manage drawer to settings page * Move drawer actions next to new settings button
1 week ago · 9a693177db
parent 58955bd0a1
commit 9a693177db
46 changed files with 58 additions and 96 deletions
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
@ -11,9 +11,6 @@ import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.mandatorySystemGestures
 import androidx.core.content.IntentCompat.getParcelableExtra
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
@ -112,9 +109,6 @@ class MainActivity : AppCompatActivity() {
            if (state.drawerOpen) {
                TasksTheme {
                    TasksMenu(
-                        bottomPadding = WindowInsets.mandatorySystemGestures
-                            .asPaddingValues()
-                            .calculateBottomPadding(),
                        items = if (state.menuQuery.isNotEmpty()) state.searchItems else state.drawerItems,
                        begForMoney = state.begForMoney,
                        isTopAppBar = preferences.isTopAppBar,
--- a/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt
+++ b/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt
@ -69,7 +69,7 @@ class NavigationDrawerCustomization : ThemedInjectingAppCompatActivity(), Toolba
        toolbar = binding.toolbar.toolbar

        with(toolbar) {
-            title = getString(R.string.manage_drawer)
+            title = getString(R.string.customize_drawer)
            navigationIcon = getDrawable(R.drawable.ic_outline_arrow_back_24px)
            setNavigationOnClickListener { finish() }
            setOnMenuItemClickListener(this@NavigationDrawerCustomization)
--- a/app/src/main/java/org/tasks/compose/drawer/DrawerAction.kt
+++ b/app/src/main/java/org/tasks/compose/drawer/DrawerAction.kt
@ -1,5 +1,5 @@
 package org.tasks.compose.drawer

 enum class DrawerAction {
-    PURCHASE, CUSTOMIZE_DRAWER, SETTINGS, HELP_AND_FEEDBACK
+    PURCHASE, SETTINGS, HELP_AND_FEEDBACK
 }
--- a/app/src/main/java/org/tasks/compose/drawer/TaskListDrawer.kt
+++ b/app/src/main/java/org/tasks/compose/drawer/TaskListDrawer.kt
@ -14,16 +14,21 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.mandatorySystemGestures
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.AttachMoney
 import androidx.compose.material.icons.outlined.ExpandMore
 import androidx.compose.material.icons.outlined.PeopleOutline
 import androidx.compose.material.icons.outlined.PermIdentity
@ -37,21 +42,22 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import org.tasks.R
-import org.tasks.Tasks.Companion.IS_GENERIC
 import org.tasks.compose.components.SearchBar
 import org.tasks.extensions.formatNumber
 import org.tasks.filters.FilterImpl
@ -60,7 +66,6 @@ import org.tasks.themes.TasksTheme

@Composable
 fun TaskListDrawer(
-    bottomPadding: Dp = 0.dp,
    begForMoney: Boolean,
    filters: ImmutableList<DrawerItem>,
    onClick: (DrawerItem) -> Unit,
@ -75,16 +80,19 @@ fun TaskListDrawer(
            query.isNotBlank()
        }
    }
+    var hasFocus by remember { mutableStateOf(false) }
    LazyColumn(
        modifier = Modifier
-            .padding(bottom = bottomPadding)
            .animateContentSize(
                animationSpec = spring(
                    dampingRatio = Spring.DampingRatioNoBouncy,
                    stiffness = Spring.StiffnessMedium
                )
            )
-            .imePadding()
+            .imePadding(),
+        contentPadding = PaddingValues(bottom = WindowInsets.mandatorySystemGestures
+            .asPaddingValues()
+            .calculateBottomPadding()),
    ) {
        item {
            Row(
@ -92,8 +100,16 @@ fun TaskListDrawer(
            ) {
                SearchBar(
                    modifier = Modifier
+                        .onFocusChanged { hasFocus = it.hasFocus }
                        .padding(start = 8.dp, bottom = 4.dp)
-                        .weight(1f),
+                        .weight(1f)
+                        .animateContentSize(
+                            animationSpec = spring(
+                                dampingRatio = Spring.DampingRatioNoBouncy,
+                                stiffness = Spring.StiffnessMedium
+                            )
+                        )
+                    ,
                    text = query,
                    onTextChange = { onQueryChange(it) },
                    placeHolder = stringResource(id = R.string.TLA_menu_search),
@ -102,12 +118,30 @@ fun TaskListDrawer(
                        // TODO: close keyboard
                    },
                )
-                IconButton(onClick = { onDrawerAction(DrawerAction.SETTINGS) }) {
-                    Icon(
-                        imageVector = Icons.Outlined.Settings,
-                        contentDescription = stringResource(id = R.string.TLA_menu_settings),
-                        tint = MaterialTheme.colorScheme.onSurface,
-                    )
+                if (!hasFocus) {
+                    if (begForMoney) {
+                        IconButton(onClick = { onDrawerAction(DrawerAction.PURCHASE) }) {
+                            Icon(
+                                imageVector = Icons.Outlined.AttachMoney,
+                                contentDescription = stringResource(id = R.string.button_subscribe),
+                                tint = MaterialTheme.colorScheme.onSurface,
+                            )
+                        }
+                    }
+                    IconButton(onClick = { onDrawerAction(DrawerAction.HELP_AND_FEEDBACK) }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Outlined.HelpOutline,
+                            contentDescription = stringResource(id = R.string.help_and_feedback),
+                            tint = MaterialTheme.colorScheme.onSurface,
+                        )
+                    }
+                    IconButton(onClick = { onDrawerAction(DrawerAction.SETTINGS) }) {
+                        Icon(
+                            imageVector = Icons.Outlined.Settings,
+                            contentDescription = stringResource(id = R.string.TLA_menu_settings),
+                            tint = MaterialTheme.colorScheme.onSurface,
+                        )
+                    }
                }
            }
        }
@ -130,32 +164,6 @@ fun TaskListDrawer(
            item {
                Divider(modifier = Modifier.fillMaxWidth())
            }
-            if (begForMoney) {
-                item {
-                    MenuAction(
-                        icon = R.drawable.ic_outline_attach_money_24px,
-                        title = if (IS_GENERIC) R.string.TLA_menu_donate else R.string.name_your_price
-                    ) {
-                        onDrawerAction(DrawerAction.PURCHASE)
-                    }
-                }
-            }
-            item {
-                MenuAction(
-                    icon = R.drawable.ic_outline_edit_24px,
-                    title = R.string.manage_drawer
-                ) {
-                    onDrawerAction(DrawerAction.CUSTOMIZE_DRAWER)
-                }
-            }
-            item {
-                MenuAction(
-                    icon = R.drawable.ic_outline_help_outline_24px,
-                    title = R.string.help_and_feedback
-                ) {
-                    onDrawerAction(DrawerAction.HELP_AND_FEEDBACK)
-                }
-            }
        }
    }
 }
--- a/app/src/main/java/org/tasks/compose/drawer/TasksMenu.kt
+++ b/app/src/main/java/org/tasks/compose/drawer/TasksMenu.kt
@ -15,14 +15,11 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.tasks.R
 import org.tasks.Tasks
-import org.tasks.activities.NavigationDrawerCustomization
 import org.tasks.billing.PurchaseActivity
 import org.tasks.extensions.Context.findActivity
 import org.tasks.extensions.Context.openUri
@ -34,7 +31,6 @@ import org.tasks.preferences.MainPreferences
@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun TasksMenu(
-    bottomPadding: Dp = 0.dp,
    items: ImmutableList<DrawerItem>,
    isTopAppBar: Boolean,
    begForMoney: Boolean,
@ -82,7 +78,6 @@ fun TasksMenu(
    ) {
        val scope = rememberCoroutineScope()
        TaskListDrawer(
-            bottomPadding = bottomPadding,
            begForMoney = begForMoney,
            filters = items,
            onClick = {
@ -115,11 +110,6 @@ fun TasksMenu(
                        else
                            context.startActivity(Intent(context, PurchaseActivity::class.java))

-                    DrawerAction.CUSTOMIZE_DRAWER ->
-                        context.startActivity(
-                            Intent(context, NavigationDrawerCustomization::class.java)
-                        )
-
                    DrawerAction.SETTINGS ->
                        settingsRequest.launch(Intent(context, MainPreferences::class.java))

--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -456,7 +456,6 @@
    <string name="CFC_startBefore_name">بدأ عند…</string>
    <string name="CFC_startBefore_text">بدأ عند: \?</string>
    <string name="astrid_sort_order_summary">تشغيل وضع ترتيب Astrid اليدوي ل\'مهامي\' و\'اليوم\' والعلامات. وضع الترتيب هذا سيستبدل ب\'ترتيبي\' في تحديثٍ مستقبلي</string>
-    <string name="manage_drawer">إدارة الدرج</string>
    <string name="markdown_description">تشغيل الماركداون في العنوان والوصف</string>
    <plurals name="repeat_minutes">
        <item quantity="zero">صفر دقيقة</item>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -443,7 +443,6 @@
    <string name="astrid_sort_order_summary">Използвайте режима за ръчно сортиране на Astrid за „Моите задачи“, „Днес“ и етикетите. Този режим на сортиране ще бъде заменен с „Моя подредба“ в бъдещо издание</string>
    <string name="astrid_sort_order">Ръчно сортиране на Astrid</string>
    <string name="SSD_sort_my_order">Моя подредба</string>
-    <string name="manage_drawer">Управление на менюто</string>
    <string name="picker_mode_clock">Часовник</string>
    <string name="invite">Покана</string>
    <string name="picker_mode_calendar">Календар</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -141,7 +141,6 @@
    <string name="SSD_sort_start">Per data d\'inici</string>
    <string name="astrid_sort_order_summary">Activa el mode d\'ordenació manual d\'Astrid per a les etiquetes «Les meves tasques», «Avui» i «etiquetes». Aquest mode d\'ordenació serà substituït per «El meu ordre» en una actualització futura</string>
    <string name="astrid_sort_order">Ordenació manual d\'Astrid</string>
-    <string name="manage_drawer">Gestiona el calaix</string>
    <string name="cancel">Cancel·la</string>
    <string name="ok">D\'acord</string>
    <string name="priority_high">Alt</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -573,7 +573,6 @@
    <string name="tasks_org_description">Synchronizujte své úkoly pomocí Tasks.org</string>
    <string name="background_location_permission_required">Tato aplikace sbírá údaje o Vaší poloze, aby fungovala upozornění podle polohy i když aplikaci zrovna nepoužíváte.</string>
    <string name="reinitialize_account">Znovu inicializovat</string>
-    <string name="manage_drawer">Upravit postranní nabídku</string>
    <string name="custom_filter_is_subtask">Je podúkol</string>
    <string name="custom_filter_has_subtask">Má podúkoly</string>
    <string name="date_picker_multiple">Vícenásobné</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -646,7 +646,6 @@
    <string name="CFC_startBefore_name">Start med at…</string>
    <string name="CFC_startBefore_text">Start af: \?</string>
    <string name="SSD_sort_start">Efter startdato</string>
-    <string name="manage_drawer">Administrer skuffe</string>
    <string name="now">Nu</string>
    <string name="cancel">Annuller</string>
    <string name="ok">Ok</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -610,7 +610,6 @@
    <string name="social">Sozial</string>
    <string name="follow_twitter">Folgen Sie @tasks_org</string>
    <string name="map_theme">Kartendesign</string>
-    <string name="manage_drawer">Seitenleiste verwalten</string>
    <string name="map_theme_use_app_theme">Anwendungsthema nutzen</string>
    <string name="tasks_org_account_required">Tasks.org-Konto erforderlich</string>
    <string name="invite_awaiting_response">Einladung wartet auf Antwort</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@ -201,7 +201,6 @@
    <string name="TEA_elapsedDuration_label">Tempo jam pasinta</string>
    <string name="TEA_estimatedDuration_label">Kiom da tempo ĝi daŭros\?</string>
    <string name="FLA_new_filter">Krei novan filtrilon</string>
-    <string name="manage_drawer">Administri tirkeston</string>
    <string name="read_permission_label">Permesoj de Tasks</string>
    <string name="import_summary_title">Restaŭri resumon</string>
    <string name="import_progress_read">Legas taskon, %d…</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -632,7 +632,6 @@
    <string name="remove_user_confirmation">%1$s ya no tendrá acceso a %2$s</string>
    <string name="remove_user">¿Quiere quitar al usuario\?</string>
    <string name="list_members">Lista de miembros</string>
-    <string name="manage_drawer">Gestionar el cajón</string>
    <string name="invite_invalid">Invitación no válida</string>
    <string name="invite_awaiting_response">Invitación en espera de respuesta</string>
    <string name="invite_declined">Invitación declinada</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -619,7 +619,6 @@
    <string name="invite">Gonbidatu</string>
    <string name="email">Posta elektronikoa</string>
    <string name="share_list">Zerrenda partekatu</string>
-    <string name="manage_drawer">Tiradera kudeatu</string>
    <string name="markdown_description">Markdown gaitu izenburuan eta deskribapenean</string>
    <string name="markdown">Markdown</string>
    <string name="more_options">Aukera gehiago</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -228,5 +228,4 @@
    <string name="EPr_reset_preferences">بازنشانی ترجیحات</string>
    <string name="TEA_creation_date">تاریخ ساخت</string>
    <string name="EPr_manage_delete_completed_gcal">وقایع تقویم را برای وضایف کامل شده حذف کن</string>
-    <string name="manage_drawer">مدیریت کشو‌</string>
 </resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -621,7 +621,6 @@
    <string name="start_date">Aloituspäivä</string>
    <string name="SSD_sort_start">Aloituspäivän mukaan</string>
    <string name="astrid_sort_order">Astrid manuaalinen lajittelu</string>
-    <string name="manage_drawer">Laatikon hallinta</string>
    <string name="github_sponsors">GitHubin sponsorit</string>
    <string name="google_play_subscribers">Google Play -tilaajat</string>
    <string name="not_signed_in">Ei kirjautunut sisään</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -632,7 +632,6 @@
    <string name="remove_user_confirmation">%1$s n’aura plus accès à %2$s</string>
    <string name="remove_user">Supprimer l’utilisatrice ou l\'utilisateur \?</string>
    <string name="list_members">Lister les membres</string>
-    <string name="manage_drawer">Gérer le tiroir</string>
    <string name="invite_invalid">Invitation non valide</string>
    <string name="invite_awaiting_response">Invitation en attente de réponse</string>
    <string name="invite_declined">Invitation déclinée</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -257,7 +257,6 @@
    <string name="widget_show_menu">Amosar menú</string>
    <string name="date_and_time">Data e hora</string>
    <string name="custom_filter_is_subtask">É unha subtarefa</string>
-    <string name="manage_drawer">Xestionar as caixoneiras</string>
    <string name="start_date">Data de inicio</string>
    <string name="SSD_sort_start">Por data de inicio</string>
    <string name="TEA_add_subtask">Engadir subtarefa</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -157,7 +157,6 @@
    <string name="not_signed_in">Nisi prijavljen/a</string>
    <string name="contact_developer">Kontaktiraj programera</string>
    <string name="hide_unused_places">Sakrij nekorištena mjesta</string>
-    <string name="manage_drawer">Upravljaj ladicom</string>
    <string name="place_settings">Postavke mjesta</string>
    <string name="places">Mjesta</string>
    <string name="desaturate_colors_summary_off">Boje neće biti nezasićene u tamnim temama</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -613,7 +613,6 @@
    <string name="remove_user_confirmation">%1$s nem fog hozzáférni ehhez: %2$s</string>
    <string name="remove_user">Felhasználó eltávolítása\?</string>
    <string name="list_members">Listatagok</string>
-    <string name="manage_drawer">Fiók kezelése</string>
    <string name="invite_invalid">Érvénytelen meghívás</string>
    <string name="invite_awaiting_response">Válaszra váró meghívás</string>
    <string name="invite_declined">Meghívás visszautasítva</string>
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@ -7,7 +7,6 @@
    <string name="display_name">Monstrar le nomine</string>
    <string name="action_open">Aperir</string>
    <string name="action_call">Appellar</string>
-    <string name="manage_drawer">Gerer le tiratorio</string>
    <string name="TAd_actionEditTask">Modificar</string>
    <string name="TLA_menu_settings">Parametros</string>
    <string name="TLA_menu_search">Cercar</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -596,7 +596,6 @@
    <string name="remove_user_confirmation">%1$s tidak akan mempunyai akses lagi pada %2$s</string>
    <string name="remove_user">Hapus pengguna\?</string>
    <string name="list_members">Daftar anggota</string>
-    <string name="manage_drawer">Laci Kelola</string>
    <string name="invite_invalid">Undangan tidak valid</string>
    <string name="invite_awaiting_response">Undangan menunggu respon</string>
    <string name="invite_declined">Undangan ditolak</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -635,7 +635,6 @@
    <string name="map_theme_use_app_theme">Usa il tema dell\'app</string>
    <string name="support">Supporto</string>
    <string name="more_options">Altre opzioni</string>
-    <string name="manage_drawer">Gestisci menù</string>
    <string name="tasks_org_account_required">È richiesto un account Tasks.org</string>
    <string name="privacy">Privacy</string>
    <string name="open_source">Open source</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -682,5 +682,4 @@
    <string name="CFC_startBefore_text">התחל על ידי: \?</string>
    <string name="default_start_date">תאריך התחלה המוגדר כברירת מחדל</string>
    <string name="SSD_sort_start">לפי תאריך התחלה</string>
-    <string name="manage_drawer">ניהול מגירה</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -463,7 +463,6 @@
    </plurals>
    <string name="TEA_add_subtask">サブタスクを追加</string>
    <string name="sort_created">作成日時</string>
-    <string name="manage_drawer">ドロワーメニューを管理</string>
    <string name="display_name">表示名</string>
    <string name="error_adding_account">エラー：%s</string>
    <string name="tasks_org_account">Tasks.org アカウント</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -635,7 +635,6 @@
    <string name="map_theme">지도 테마</string>
    <string name="filter_criteria_unstarted">시작하지 않음</string>
    <string name="widget_show_title">제목 표시</string>
-    <string name="manage_drawer">서랍 관리</string>
    <string name="next_saturday">다음 토요일</string>
    <string name="next_friday">다음 금요일</string>
    <string name="next_thursday">다음 목요일</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -533,7 +533,6 @@
    <string name="compact">Kompaktiška</string>
    <string name="hide_check_button">Slėpti žymėjimo mygtuką</string>
    <string name="navigation_drawer">Navigacijos parankinės juosta</string>
-    <string name="manage_drawer">Tvarkyti parankinės juostą</string>
    <string name="foreground_location">Vietos nustatymas</string>
    <string name="background_location">Foninis vietos nustatymas</string>
    <string name="multi_select_reschedule">Perplanuoti</string>
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@ -14,7 +14,6 @@
    <string name="TLA_menu_search">ရှာမယ်</string>
    <string name="TLA_menu_settings">ဆက်တင်များ</string>
    <string name="TAd_actionEditTask">ပြုပြင်</string>
-    <string name="manage_drawer">မီနူး ကိုပြင်ဆင်မည်</string>
    <string name="SSD_sort_my_order">အစီအစဥ်</string>
    <string name="SSD_sort_importance">အရေးပါမှုအားဖြင့်</string>
    <string name="sort_list">စာရင်းဖြင့်</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -615,7 +615,6 @@
    <string name="issue_tracker">Problemsporer</string>
    <string name="support">Støtte</string>
    <string name="follow_twitter">Følg @tasks_org</string>
-    <string name="manage_drawer">Håndter skuff</string>
    <string name="email">E-post</string>
    <string name="markdown_description">Aktiver Markdown i tittel og beskrivelse</string>
    <string name="markdown">Markdown</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -615,7 +615,6 @@
    <string name="list_members">Leden op de lijst</string>
    <string name="remove_user_confirmation">%1$s krijgt geen toegang meer tot %2$s</string>
    <string name="remove_user">Gebruiker verwijderen\?</string>
-    <string name="manage_drawer">Bewerken</string>
    <string name="share_list">Lijst delen</string>
    <string name="invite">Uitnodigen</string>
    <string name="invite_invalid">Uitnodiging ongeldig</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -661,7 +661,6 @@
    <string name="next_tuesday">Następny wtorek</string>
    <string name="next_monday">Następny poniedziałek</string>
    <string name="next_sunday">Następna niedziela</string>
-    <string name="manage_drawer">Zarządzaj szufladą</string>
    <string name="completed">Zakończone</string>
    <string name="app_bar_collapse">Zwiń pasek aplikacji</string>
    <string name="caldav_server_unknown">Nieznane</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -579,7 +579,6 @@
    <string name="show_unstarted">Mostrar não iniciadas</string>
    <string name="default_start_date">Data de início padrão</string>
    <string name="always_display_full_date">Mostrar data completa</string>
-    <string name="manage_drawer">Gerenciar seções</string>
    <string name="more_options">Mais opções</string>
    <string name="upgrade_automation">Automação</string>
    <string name="upgrade_open_source_description">Sua assinatura ajuda a continuar o desenvolvimento</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -647,7 +647,6 @@
    <string name="default_start_date">Data de início predefinida</string>
    <string name="start_date">Data de início</string>
    <string name="SSD_sort_start">Por data de início</string>
-    <string name="manage_drawer">Gerir secções</string>
    <string name="chat_libera">Junte-se a #tasks no Libera Chat</string>
    <string name="now">Agora</string>
    <string name="when_started">Quando iniciado</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -472,7 +472,6 @@
    <string name="SSD_sort_my_order">Sortarea mea</string>
    <string name="action_open">Deschide</string>
    <string name="action_call">Sună</string>
-    <string name="manage_drawer">Gestionează bara laterală</string>
    <string name="TAd_actionEditTask">Editare</string>
    <string name="TLA_menu_settings">Setări</string>
    <string name="TLA_menu_search">Căutare</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -661,7 +661,6 @@
    <string name="next_monday">Следующий Пн</string>
    <string name="next_sunday">Следующее Вс</string>
    <string name="next_tuesday">Следующий Вт</string>
-    <string name="manage_drawer">Изменить панель</string>
    <string name="social">Социальные сети</string>
    <string name="upgrade_desktop_access">Доступ к рабочему столу</string>
    <string name="next_wednesday">Следующая Ср</string>
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@ -465,7 +465,6 @@
    <string name="SSD_sort_auto">ස්මාර්ට් වර්ග කිරීම</string>
    <string name="SSD_sort_my_order">මාගේ පිලිවෙල</string>
    <string name="action_open">විවෘත කරන්න</string>
-    <string name="manage_drawer">පිලිවෙල කළමනාකරණය කරන්න</string>
    <string name="TAd_actionEditTask">සංස්කරණය කරන්න</string>
    <string name="TLA_menu_settings">සැකසුම්</string>
    <string name="TLA_menu_search">සොයන්න</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -640,7 +640,6 @@
    <string name="sort_created">Efter skapandetillfälle</string>
    <string name="SSD_sort_start">Efter startdatum</string>
    <string name="astrid_sort_order">Astrid manuell sortering</string>
-    <string name="manage_drawer">Hantera listmeny</string>
    <string name="display_name">Visa namnet</string>
    <string name="now">Nu</string>
    <string name="app_bar_position">Appfältets position</string>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@ -610,7 +610,6 @@
    <string name="SSD_sort_my_order">ใบสั่งของฉัน</string>
    <string name="action_open">เปิด</string>
    <string name="action_call">โทร</string>
-    <string name="manage_drawer">จัดการลิ้นชัก</string>
    <string name="TLA_menu_settings">การตั้งค่า</string>
    <string name="TLA_menu_search">ค้น</string>
    <string name="TLA_no_items">ไม่มีงานที่นี่</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -615,7 +615,6 @@
    <string name="remove_user_confirmation">%1$s, artık %2$s erişimini yitirecek</string>
    <string name="remove_user">Kullanıcıyı kaldır\?</string>
    <string name="list_members">Üyeleri listele</string>
-    <string name="manage_drawer">Çekmeceyi yönet</string>
    <string name="invite_invalid">Davet geçersiz</string>
    <string name="invite_awaiting_response">Davet yanıt bekliyor</string>
    <string name="invite_declined">Davet reddedildi</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -635,7 +635,6 @@
    <string name="remove_user_confirmation">%1$s надалі не матиме доступу до %2$s</string>
    <string name="remove_user">Вилучити користувача\?</string>
    <string name="list_members">Перелік учасників</string>
-    <string name="manage_drawer">Керувати панеллю</string>
    <string name="invite_invalid">Запрошення недійсне</string>
    <string name="invite_awaiting_response">Запрошення в очікуванні відповіді</string>
    <string name="invite_declined">Запрошення відхилено</string>
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@ -460,7 +460,6 @@
    <string name="license_summary">ٹاسکس ایک لیبرے اوپن سورس سافٹ وئیر ہےجو کہ جی این یو لائسنس v3.0 کے تحت لائسنس شدہ ہے</string>
    <string name="about">متعلق</string>
    <string name="button_unsubscribe">سبسکرپسن کینسل کریں</string>
-    <string name="manage_drawer">ڈریئر مینیج کریں</string>
    <string name="subtasks_multilevel_google_task">کثیر الدرجی ذیلی ٹاسکس کو گوگل ٹاسکس سپورٹ نہیں کرتا</string>
    <string name="collapse_subtasks">ذیلی ٹاسکس کو بند کریں</string>
    <string name="expand_subtasks">ذیلی ٹاسکس کو کھولیں</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -32,7 +32,6 @@
    <string name="astrid_sort_order_summary">Bật chế độ sắp xếp thủ công của Astrid đối với \'Công việc của tôi\', \'Hôm nay\', và các thẻ. Chế độ sắp xếp này sẽ được \'Thứ tự của tôi\' thay thế ở một bản cập nhật trong tương lai</string>
    <string name="action_open">Mở</string>
    <string name="action_call">Gọi</string>
-    <string name="manage_drawer">Quản lý ngăn</string>
    <string name="TAd_actionEditTask">Chỉnh sửa</string>
    <string name="TLA_menu_settings">Cài đặt</string>
    <string name="TLA_menu_search">Tìm kiếm</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -604,7 +604,6 @@
    <string name="remove_user_confirmation">%1$s 将无法再访问 %2$s</string>
    <string name="remove_user">是否移除用户？</string>
    <string name="list_members">列表成员</string>
-    <string name="manage_drawer">管理抽屉</string>
    <string name="invite_invalid">邀请无效</string>
    <string name="invite_awaiting_response">邀请等待回应</string>
    <string name="invite_declined">邀请被拒绝</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -529,7 +529,6 @@
    <string name="next_sunday">下週日</string>
    <string name="CFC_startBefore_name">起始…</string>
    <string name="CFC_startBefore_text">起始: \?</string>
-    <string name="manage_drawer">管理側邊欄</string>
    <string name="now">現在</string>
    <string name="when_started">開始后</string>
    <string name="bundle_notifications">捆綁通知</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -29,7 +29,8 @@ File %1$s contained %2$s.\n\n
  <string name="TLA_menu_search">Search</string>
  <string name="TLA_menu_settings">Settings</string>
  <string name="TAd_actionEditTask">Edit</string>
-  <string name="manage_drawer">Manage drawer</string>
+  <string name="customize_drawer">Customize drawer</string>
+  <string name="customize_drawer_summary">Drag and drop to rearrange menu items</string>
  <string name="action_call">Call</string>
  <string name="action_open">Open</string>
  <string name="SSD_sort_my_order">My order</string>
--- a/app/src/main/res/xml/preferences_navigation_drawer.xml
+++ b/app/src/main/res/xml/preferences_navigation_drawer.xml
@ -2,6 +2,14 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
  android:key="@string/preference_screen">

+    <Preference
+        android:summary="@string/customize_drawer_summary"
+        android:title="@string/customize_drawer">
+        <intent
+            android:targetClass="org.tasks.activities.NavigationDrawerCustomization"
+            android:targetPackage="@string/app_package" />
+    </Preference>
+
    <PreferenceCategory android:title="@string/filters">

        <SwitchPreferenceCompat