From e2b6227bc6b5de4ad566922ab5317a66b227fe8e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 13 May 2021 20:31:16 +0200
Subject: [PATCH] Close settings

---
 app/src/main/java/eu/faircode/email/ActivitySetup.java |  2 +-
 app/src/main/res/drawable/twotone_exit_to_app_24.xml   | 10 ----------
 app/src/main/res/values/strings.xml                    |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 app/src/main/res/drawable/twotone_exit_to_app_24.xml

diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index c193a1185f..2752f08879 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -186,7 +186,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
 
         final List<NavMenuItem> menus = new ArrayList<>();
 
-        menus.add(new NavMenuItem(R.drawable.twotone_exit_to_app_24, R.string.menu_exit, new Runnable() {
+        menus.add(new NavMenuItem(R.drawable.twotone_close_24, R.string.title_setup_close, new Runnable() {
             @Override
             public void run() {
                 drawerLayout.closeDrawer(drawerContainer, false);
diff --git a/app/src/main/res/drawable/twotone_exit_to_app_24.xml b/app/src/main/res/drawable/twotone_exit_to_app_24.xml
deleted file mode 100644
index 83cdf05ab2..0000000000
--- a/app/src/main/res/drawable/twotone_exit_to_app_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a109eab629..057910034a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -123,7 +123,6 @@
     <string name="title_title_description" translatable="false">%1$s: %2$s</string>
     <string name="title_factor_minutes">%1$d minutes</string>
 
-    <string name="menu_exit">Exit</string>
     <string name="menu_answers">Templates</string>
     <string name="menu_operations">Operations</string>
     <string name="menu_contacts">Local contacts</string>
@@ -225,6 +224,7 @@
     <string name="title_setup_error">Error</string>
     <string name="title_setup_configuring">Configuring account &#8230;</string>
 
+    <string name="title_setup_close">Close settings</string>
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
     <string name="title_setup_export_do">The password is used to encrypt the settings and is required to import the settings again</string>