Add ability to change account name position

2024-07-08 19:45:46 +00:00 · 2023-08-16 14:17:57 +02:00 · 2023-08-16 14:17:57 +02:00 · 813fd62dc7
commit 813fd62dc7
parent b08a2f5f93
49 changed files with 118 additions and 102 deletions
--- a/app/src/main/java/com/beemdevelopment/aegis/AccountNamePosition.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/AccountNamePosition.java
@ -0,0 +1,17 @@
+package com.beemdevelopment.aegis;
+
+public enum AccountNamePosition {
+    HIDDEN,
+    END,
+    BELOW;
+
+    private static AccountNamePosition[] _values;
+
+    static {
+        _values = values();
+    }
+
+    public static AccountNamePosition fromInteger(int x) {
+        return _values[x];
+    }
+}
--- a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
@ -114,10 +114,6 @@ public class Preferences {
        setPasswordReminderTimestamp(new Date().getTime());
    }

-    public boolean isAccountNameVisible() {
-        return _prefs.getBoolean("pref_account_name", true);
-    }
-
    public boolean isIconVisible() {
        return _prefs.getBoolean("pref_show_icons", true);
    }
@ -189,6 +185,14 @@ public class Preferences {
        _prefs.edit().putInt("pref_current_view_mode", viewMode.ordinal()).apply();
    }

+    public AccountNamePosition getAccountNamePosition() {
+        return AccountNamePosition.fromInteger(_prefs.getInt("pref_account_name_position", AccountNamePosition.END.ordinal()));
+    }
+
+    public void setAccountNamePosition(AccountNamePosition accountNamePosition) {
+        _prefs.edit().putInt("pref_account_name_position", accountNamePosition.ordinal()).apply();
+    }
+
    public Integer getUsageCount(UUID uuid) {
        Integer usageCount = getUsageCounts().get(uuid);

--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@ -35,6 +35,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;

+import com.beemdevelopment.aegis.AccountNamePosition;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
@ -131,7 +132,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
        _entryListView = (EntryListView) getSupportFragmentManager().findFragmentById(R.id.key_profiles);
        _entryListView.setListener(this);
        _entryListView.setCodeGroupSize(_prefs.getCodeGroupSize());
-        _entryListView.setShowAccountName(_prefs.isAccountNameVisible());
+        _entryListView.setAccountNamePosition(_prefs.getAccountNamePosition());
        _entryListView.setShowIcon(_prefs.isIconVisible());
        _entryListView.setHighlightEntry(_prefs.isEntryHighlightEnabled());
        _entryListView.setPauseFocused(_prefs.isPauseFocusedEnabled());
@ -269,7 +270,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
            if (data.getBooleanExtra("needsRecreate", false)) {
                recreate();
            } else if (data.getBooleanExtra("needsRefresh", false)) {
-                boolean showAccountName = _prefs.isAccountNameVisible();
+                AccountNamePosition accountNamePosition = _prefs.getAccountNamePosition();
                boolean showIcons = _prefs.isIconVisible();
                Preferences.CodeGrouping codeGroupSize = _prefs.getCodeGroupSize();
                boolean highlightEntry = _prefs.isEntryHighlightEnabled();
@ -278,7 +279,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                int tapToRevealTime = _prefs.getTapToRevealTime();
                ViewMode viewMode = _prefs.getCurrentViewMode();
                boolean copyOnTap = _prefs.isCopyOnTapEnabled();
-                _entryListView.setShowAccountName(showAccountName);
+                _entryListView.setAccountNamePosition(accountNamePosition);
                _entryListView.setShowIcon(showIcons);
                _entryListView.setCodeGroupSize(codeGroupSize);
                _entryListView.setHighlightEntry(highlightEntry);
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AppearancePreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AppearancePreferencesFragment.java
@ -7,6 +7,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;

+import com.beemdevelopment.aegis.AccountNamePosition;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.ViewMode;
@ -102,9 +103,24 @@ public class AppearancePreferencesFragment extends PreferencesFragment {
            return true;
        });

-        Preference issuerPreference = requirePreference("pref_account_name");
-        issuerPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            getResult().putExtra("needsRefresh", true);
+        int currentAccountNamePosition = _prefs.getAccountNamePosition().ordinal();
+        Preference currentAccountNamePositionPreference = requirePreference("pref_account_name_position");
+        currentAccountNamePositionPreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.account_name_position_titles)[currentAccountNamePosition]));
+        currentAccountNamePositionPreference.setOnPreferenceClickListener(preference -> {
+            int currentAccountNamePosition1 = _prefs.getAccountNamePosition().ordinal();
+
+            Dialogs.showSecureDialog(new AlertDialog.Builder(requireContext())
+                    .setTitle(getString(R.string.choose_account_name_position))
+                    .setSingleChoiceItems(R.array.account_name_position_titles, currentAccountNamePosition1, (dialog, which) -> {
+                        int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
+                        _prefs.setAccountNamePosition(AccountNamePosition.fromInteger(i));
+                        currentAccountNamePositionPreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.account_name_position_titles)[i]));
+                        getResult().putExtra("needsRefresh", true);
+                        dialog.dismiss();
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create());
+
            return true;
        });

--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
@ -16,6 +16,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

+import com.beemdevelopment.aegis.AccountNamePosition;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.SortCategory;
@ -47,7 +48,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
    private VaultEntry _focusedEntry;
    private VaultEntry _copiedEntry;
    private Preferences.CodeGrouping _codeGroupSize;
-    private boolean _showAccountName;
+    private AccountNamePosition _accountNamePosition;
    private boolean _showIcon;
    private boolean _highlightEntry;
    private boolean _tempHighlightEntry;
@ -87,8 +88,8 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
        _codeGroupSize = codeGroupSize;
    }

-    public void setShowAccountName(boolean showAccountName) {
-        _showAccountName = showAccountName;
+    public void setAccountNamePosition(AccountNamePosition accountNamePosition) {
+        _accountNamePosition = accountNamePosition;
    }

    public void setShowIcon(boolean showIcon) {
@ -421,7 +422,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
            boolean paused = _pauseFocused && entry == _focusedEntry;
            boolean dimmed = (_highlightEntry || _tempHighlightEntry) && _focusedEntry != null && _focusedEntry != entry;
            boolean showProgress = entry.getInfo() instanceof TotpInfo && ((TotpInfo) entry.getInfo()).getPeriod() != getMostFrequentPeriod();
-            entryHolder.setData(entry, _codeGroupSize, _showAccountName, _showIcon, showProgress, hidden, paused, dimmed);
+            entryHolder.setData(entry, _codeGroupSize, _accountNamePosition, _showIcon, showProgress, hidden, paused, dimmed);
            entryHolder.setFocused(_selectedEntries.contains(entry));
            entryHolder.setShowDragHandle(isEntryDraggable(entry));

--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;

 import com.amulyakhare.textdrawable.TextDrawable;
+import com.beemdevelopment.aegis.AccountNamePosition;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.helpers.IconViewHelper;
@ -50,6 +51,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
    private final Handler _selectedHandler;

    private Preferences.CodeGrouping _codeGrouping = Preferences.CodeGrouping.NO_GROUPING;
+    private AccountNamePosition _accountNamePosition = AccountNamePosition.HIDDEN;

    private boolean _hidden;
    private boolean _paused;
@ -105,11 +107,12 @@ public class EntryHolder extends RecyclerView.ViewHolder {
        });
    }

-    public void setData(VaultEntry entry, Preferences.CodeGrouping groupSize, boolean showAccountName, boolean showIcon, boolean showProgress, boolean hidden, boolean paused, boolean dimmed) {
+    public void setData(VaultEntry entry, Preferences.CodeGrouping groupSize, AccountNamePosition accountNamePosition, boolean showIcon, boolean showProgress, boolean hidden, boolean paused, boolean dimmed) {
        _entry = entry;
        _hidden = hidden;
        _paused = paused;
        _codeGrouping = groupSize;
+        _accountNamePosition = accountNamePosition;

        _selected.clearAnimation();
        _selected.setVisibility(View.GONE);
@ -125,12 +128,13 @@ public class EntryHolder extends RecyclerView.ViewHolder {
        _buttonRefresh.setVisibility(entry.getInfo() instanceof HotpInfo ? View.VISIBLE : View.GONE);

        String profileIssuer = entry.getIssuer();
-        String profileName = showAccountName ? entry.getName() : "";
-        if (!profileIssuer.isEmpty() && !profileName.isEmpty()) {
+        String profileName = entry.getName();
+        if (!profileIssuer.isEmpty() && !profileName.isEmpty() && accountNamePosition == AccountNamePosition.END) {
            profileName = String.format(" (%s)", profileName);
        }
        _profileIssuer.setText(profileIssuer);
        _profileName.setText(profileName);
+        setAccountNameLayout(accountNamePosition);

        if (_hidden) {
            hideCode();
@ -143,6 +147,41 @@ public class EntryHolder extends RecyclerView.ViewHolder {
        itemView.setAlpha(dimmed ? DIMMED_ALPHA : DEFAULT_ALPHA);
    }

+    private void setAccountNameLayout(AccountNamePosition accountNamePosition) {
+        RelativeLayout.LayoutParams profileNameLayoutParams;
+        RelativeLayout.LayoutParams copiedLayoutParams;
+        switch (accountNamePosition) {
+            case HIDDEN:
+                _profileName.setVisibility(View.GONE);
+                break;
+
+            case BELOW:
+                profileNameLayoutParams = (RelativeLayout.LayoutParams) _profileName.getLayoutParams();
+                profileNameLayoutParams.removeRule(RelativeLayout.END_OF);
+                profileNameLayoutParams.addRule(RelativeLayout.BELOW, R.id.profile_issuer);
+                _profileName.setLayoutParams(profileNameLayoutParams);
+                _profileName.setVisibility(View.VISIBLE);
+
+                copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
+                copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.profile_account_name);
+                _profileCopied.setLayoutParams(copiedLayoutParams);
+                break;
+
+            case END:
+            default:
+                profileNameLayoutParams = (RelativeLayout.LayoutParams) _profileName.getLayoutParams();
+                profileNameLayoutParams.addRule(RelativeLayout.END_OF, R.id.profile_issuer);
+                profileNameLayoutParams.removeRule(RelativeLayout.BELOW);
+                _profileName.setLayoutParams(profileNameLayoutParams);
+                _profileName.setVisibility(View.VISIBLE);
+
+                copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
+                copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.description);
+                _profileCopied.setLayoutParams(copiedLayoutParams);
+                break;
+        }
+    }
+
    public VaultEntry getEntry() {
        return _entry;
    }
@ -337,11 +376,14 @@ public class EntryHolder extends RecyclerView.ViewHolder {
        Animation fadeIn = AnimationUtils.loadAnimation(itemView.getContext(), R.anim.fade_in);

        _profileCopied.startAnimation(slideDownFadeIn);
-        _description.startAnimation(slideDownFadeOut);
+
+        View fadeOutView = (_accountNamePosition == AccountNamePosition.BELOW) ? _profileName : _description;
+
+        fadeOutView.startAnimation(slideDownFadeOut);

        _animationHandler.postDelayed(() -> {
            _profileCopied.startAnimation(fadeOut);
-            _description.startAnimation(fadeIn);
+            fadeOutView.startAnimation(fadeIn);
        }, 3000);
    }

--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
@ -23,6 +23,7 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

+import com.beemdevelopment.aegis.AccountNamePosition;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
@ -324,8 +325,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
        _adapter.setCodeGroupSize(codeGrouping);
    }

-    public void setShowAccountName(boolean showAccountName) {
-        _adapter.setShowAccountName(showAccountName);
+    public void setAccountNamePosition(AccountNamePosition accountNamePosition) {
+        _adapter.setAccountNamePosition(accountNamePosition);
    }

    public void setShowIcon(boolean showIcon) {
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@ -98,7 +98,6 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_toEndOf="@id/profile_issuer"
-                    android:layout_marginStart="2dp"
                    android:ellipsize="end"
                    android:includeFontPadding="false"
                    android:maxLines="1"
--- a/app/src/main/res/layout/card_entry_compact.xml
+++ b/app/src/main/res/layout/card_entry_compact.xml
@ -99,7 +99,6 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_toEndOf="@id/profile_issuer"
-                android:layout_marginStart="2dp"
                android:ellipsize="end"
                android:includeFontPadding="false"
                android:maxLines="1"
--- a/app/src/main/res/layout/card_entry_small.xml
+++ b/app/src/main/res/layout/card_entry_small.xml
@ -98,7 +98,6 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_toEndOf="@id/profile_issuer"
-                android:layout_marginStart="2dp"
                android:ellipsize="end"
                android:includeFontPadding="false"
                android:maxLines="1"
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">عرض الأيقونات بجانب كل مدخل</string>
    <string name="pref_code_group_size_title">تجميع أرقام الكود</string>
    <string name="pref_code_group_size_summary">اختر عدد الخانات المستخدمة في تجميع الرموز</string>
-    <string name="pref_account_name_title">اظهر اسم الحساب</string>
-    <string name="pref_account_name_summary">قم بالتفعيل لإظهار اسم الحساب بجانب المصدِّر</string>
    <string name="pref_import_file_title">استيراد من ملف</string>
    <string name="pref_import_file_summary">استيراد الرموز من ملف</string>
    <string name="pref_android_backups_title">النسخ الاحتياطية السحابية للأندرويد</string>
--- a/app/src/main/res/values-ast-rES/strings.xml
+++ b/app/src/main/res/values-ast-rES/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Amuesa los iconos al llau de cada entrada</string>
    <string name="pref_code_group_size_title">Agrupamientu de díxitos</string>
    <string name="pref_code_group_size_summary">Seleiciona\'l númberu de díxitos pol que s\'agrupen los códigos</string>
-    <string name="pref_account_name_title">Amosar el nome de les cuentes</string>
-    <string name="pref_account_name_summary">Activa esta opción p\'amosar el nome de les cuentes xunto al del emisor</string>
    <string name="pref_import_file_title">Importar d\'un ficheru</string>
    <string name="pref_import_file_summary">Importa los pases d\'un ficheru</string>
    <string name="pref_android_backups_title">Copies de seguranza na ñube</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -27,8 +27,6 @@
    <string name="pref_view_mode_title">Режим на преглед</string>
    <string name="pref_lang_title">Език</string>
    <string name="pref_code_group_size_title">Групиране на кодови цифри</string>
-    <string name="pref_account_name_title">Показване на профилното име</string>
-    <string name="pref_account_name_summary">Активирайте това, за да се показва името на акаунта до издателя</string>
    <string name="pref_import_file_title">Импорт от файл</string>
    <string name="pref_import_file_summary">Импортиране на токени от файл</string>
    <string name="pref_backups_title">Автоматично архивирайте трезора</string>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Mostra icones al costat de cada entrada</string>
    <string name="pref_code_group_size_title">Agrupació dels dígits</string>
    <string name="pref_code_group_size_summary">Triar nombre de digits per agrupar els codis</string>
-    <string name="pref_account_name_title">Mostra el nom del compte</string>
-    <string name="pref_account_name_summary">Activa això per a mostrar en nom del compte al costat de l\'emissor</string>
    <string name="pref_import_file_title">Importa des d\'un fitxer</string>
    <string name="pref_import_file_summary">Importar fitxes des d\'un fitxer</string>
    <string name="pref_android_backups_title">Copies al núvol d\'Android</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Zobrazit ikony vedle každého záznamu</string>
    <string name="pref_code_group_size_title">Seskupení číslic kódu</string>
    <string name="pref_code_group_size_summary">Vyberte počet číslic, po kterých se mají seskupovat kódy</string>
-    <string name="pref_account_name_title">Zobrazit název účtu</string>
-    <string name="pref_account_name_summary">Zobrazit název účtu vedle poskytovatele</string>
    <string name="pref_import_file_title">Importovat ze souboru</string>
    <string name="pref_import_file_summary">Importovat tokeny ze souboru</string>
    <string name="pref_android_backups_title">Cloudové zálohování systému Android</string>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Vis ikoner ved siden af hver post</string>
    <string name="pref_code_group_size_title">Kodeciffergruppering</string>
    <string name="pref_code_group_size_summary">Vælg antal cifre til kodegruppering</string>
-    <string name="pref_account_name_title">Vis kontonavn</string>
-    <string name="pref_account_name_summary">Aktiver dette for at vise kontonavnet ved siden af udstederen</string>
    <string name="pref_import_file_title">Import fra fil</string>
    <string name="pref_import_file_summary">Importér tokens fra en fil</string>
    <string name="pref_android_backups_title">Android cloud-sikkerhedskopier</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Symbole neben jedem Eintrag anzeigen</string>
    <string name="pref_code_group_size_title">Zifferngruppierung</string>
    <string name="pref_code_group_size_summary">Wähle die Anzahl der Ziffern, nach denen die Codes gruppiert werden sollen</string>
-    <string name="pref_account_name_title">Kontonamen anzeigen</string>
-    <string name="pref_account_name_summary">Aktiviere dies, um den Kontonamen neben dem Herausgeber anzuzeigen</string>
    <string name="pref_import_file_title">Aus Datei importieren</string>
    <string name="pref_import_file_summary">Token aus einer Datei importieren</string>
    <string name="pref_android_backups_title">Cloud-Back-ups durch Android</string>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Εμφάνιση εικονιδίων δίπλα σε κάθε καταχώρηση</string>
    <string name="pref_code_group_size_title">Ομαδοποίηση ψηφίων κωδικού</string>
    <string name="pref_code_group_size_summary">Επιλέξτε τον αριθμό των ψηφίων για να ομαδοποιήσετε τους κωδικούς κατά</string>
-    <string name="pref_account_name_title">Εμφάνιση του ονόματος λογαριασμού</string>
-    <string name="pref_account_name_summary">Ενεργοποίηση προβολής ονόματος λογαριασμού δίπλα στον εκδότη</string>
    <string name="pref_import_file_title">Εισαγωγή από αρχείο</string>
    <string name="pref_import_file_summary">Εισαγωγή αναγνωριστικών από αρχείο</string>
    <string name="pref_android_backups_title">Αντίγραφα ασφαλείας cloud Android</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Mostrar iconos al lado de cada entrada</string>
    <string name="pref_code_group_size_title">Agrupación de los dígitos del código</string>
    <string name="pref_code_group_size_summary">Seleccione el número de dígitos por los que agrupar los códigos</string>
-    <string name="pref_account_name_title">Mostrar el nombre de la cuenta</string>
-    <string name="pref_account_name_summary">Active esto para mostrar el nombre de la cuenta junto al emisor</string>
    <string name="pref_import_file_title">Importar desde un archivo</string>
    <string name="pref_import_file_summary">Importar tokens desde un archivo</string>
    <string name="pref_android_backups_title">Copias de seguridad en la nube de Android</string>
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Ikonoak erakutsi sarrera bakoitzaren ondoan</string>
    <string name="pref_code_group_size_title">Kode-digituen taldekatzea</string>
    <string name="pref_code_group_size_summary">Aukeratu kodeak zenbat zenbakiko taldetan taldekatuko diren</string>
-    <string name="pref_account_name_title">Erakutsi kontuaren izena</string>
-    <string name="pref_account_name_summary">Aktibatu hau kontu-izena igorlearen ondoan bistaratzeko</string>
    <string name="pref_import_file_title">Inportatu fitxategi batetik</string>
    <string name="pref_import_file_summary">Inportatu marka-ikurrak fitxategi batetik</string>
    <string name="pref_android_backups_title">Androiden lainoko segurtasun kopiak</string>
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@ -34,8 +34,6 @@
    <string name="pref_view_mode_title">حالت نمایش</string>
    <string name="pref_lang_title">زبان</string>
    <string name="pref_code_group_size_title">حالت نمایش کد</string>
-    <string name="pref_account_name_title">نمایش نام حساب کاربری</string>
-    <string name="pref_account_name_summary">برای نمایش نام حساب کاربری کنار صادر کننده فعال کنید</string>
    <string name="pref_import_file_title">وارد کردن از فایل</string>
    <string name="pref_import_file_summary">وارد کردن توکن ها از فایل</string>
    <string name="pref_android_backups_title">پشتیبان‌گیری ابری Android</string>
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Näytä kuvakkeet jokaisen kohteen vieressä</string>
    <string name="pref_code_group_size_title">Numeroiden ryhmittely</string>
    <string name="pref_code_group_size_summary">Valitse numeroiden määrä ryhmiteltäessä koodeja</string>
-    <string name="pref_account_name_title">Näytä tilin nimi</string>
-    <string name="pref_account_name_summary">Näytä tilin nimi todennuskoodin myöntäjän rinnalla</string>
    <string name="pref_import_file_title">Tuo tiedostosta</string>
    <string name="pref_import_file_summary">Tuo todennuskoodit tiedostosta</string>
    <string name="pref_android_backups_title">Androidin pilvivarmuuskopiot</string>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Afficher les icônes à côté de chaque entrée</string>
    <string name="pref_code_group_size_title">Regroupement des chiffres du code</string>
    <string name="pref_code_group_size_summary">Sélectionner le nombre de chiffres par lequel regrouper les codes</string>
-    <string name="pref_account_name_title">Afficher le nom du compte</string>
-    <string name="pref_account_name_summary">Activer pour afficher le nom de compte près de l\'émetteur</string>
    <string name="pref_import_file_title">Importer depuis un fichier</string>
    <string name="pref_import_file_summary">Importer des jetons depuis un fichier</string>
    <string name="pref_android_backups_title">Sauvegardes cloud d\'Android</string>
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Amosar iconas ao lado de cada entrada</string>
    <string name="pref_code_group_size_title">Agrupación dos díxitos do código</string>
    <string name="pref_code_group_size_summary">Escolle o número de díxitos polos que agrupar os códigos</string>
-    <string name="pref_account_name_title">Mostrar o nome da conta</string>
-    <string name="pref_account_name_summary">Activa isto para mostrar o nome da conta ao lado do provedor</string>
    <string name="pref_import_file_title">Importar desde un ficheiro</string>
    <string name="pref_import_file_summary">Importar tokens desde un ficheiro</string>
    <string name="pref_android_backups_title">Copias de seguridade na nube de Android</string>
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@ -35,8 +35,6 @@
    <string name="pref_view_mode_title">देखने का प्रकार</string>
    <string name="pref_lang_title">भाषा</string>
    <string name="pref_code_group_size_title">कोड संख्या समूह</string>
-    <string name="pref_account_name_title">खाते का नाम दिखाएँ</string>
-    <string name="pref_account_name_summary">जारीकर्ता के बगल में खाता नाम दिखाने के लिए इसे सक्षम करें</string>
    <string name="pref_import_file_title">फ़ाइल से आयात करें</string>
    <string name="pref_import_file_summary">टोकन को फ़ाइल से आयात करें</string>
    <string name="pref_android_backups_title">एंड्रॉयड क्लाउड बैकअप</string>
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@ -36,8 +36,6 @@
    <string name="pref_view_mode_title">Nézetmód</string>
    <string name="pref_lang_title">Nyelv</string>
    <string name="pref_code_group_size_title">Kód számjegyeinek csoportosítása</string>
-    <string name="pref_account_name_title">A fióknév megjelenítése</string>
-    <string name="pref_account_name_summary">Kapcsolja be a fiók nevének megjelenítéséhez a kibocsátó mellett</string>
    <string name="pref_import_file_title">Importálás fájlból</string>
    <string name="pref_import_file_summary">Tokenek importálása fájlból</string>
    <string name="pref_android_backups_title">Android felhő mentések</string>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@ -36,8 +36,6 @@
    <string name="pref_view_mode_title">Mode tampilan</string>
    <string name="pref_lang_title">Bahasa</string>
    <string name="pref_code_group_size_title">Pengelompokan digit kode</string>
-    <string name="pref_account_name_title">Tampilkan nama akun</string>
-    <string name="pref_account_name_summary">Aktifkan ini untuk menampilkan nama akun di samping penerbit</string>
    <string name="pref_import_file_title">Impor berkas</string>
    <string name="pref_import_file_summary">Impor token dari berkas</string>
    <string name="pref_android_backups_title">Pencadangan awan Android</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Mostra le icone accanto a ogni voce</string>
    <string name="pref_code_group_size_title">Divisione cifre codice</string>
    <string name="pref_code_group_size_summary">Seleziona il numero di cifre per cui raggruppare i codici</string>
-    <string name="pref_account_name_title">Mostra nome account</string>
-    <string name="pref_account_name_summary">Abilita questa opzione per mostrare il nome dell\'account vicino all\'emittente</string>
    <string name="pref_import_file_title">Importa da file</string>
    <string name="pref_import_file_summary">Importa token da file</string>
    <string name="pref_android_backups_title">Backup cloud Android</string>
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@ -40,8 +40,6 @@
    <string name="pref_show_icons_summary">הצגת סמלים לצד כל ערך</string>
    <string name="pref_code_group_size_title">קיבוץ ספרות קוד</string>
    <string name="pref_code_group_size_summary">בחר את מספר הספרות לקיבוץ קודים לפיהן</string>
-    <string name="pref_account_name_title">הצג את שם החשבון</string>
-    <string name="pref_account_name_summary">הפעל את זה כדי להציג את שם החשבון לצד המנפיק</string>
    <string name="pref_import_file_title">ייבוא מקובץ</string>
    <string name="pref_import_file_summary">ייבוא טוקנים מקובץ</string>
    <string name="pref_android_backups_title">גיבויי ענן אנדרואיד</string>
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">各エントリーの横にアイコンを表示する</string>
    <string name="pref_code_group_size_title">コードの桁数のグループ化</string>
    <string name="pref_code_group_size_summary">グループ化する桁数を選択してください</string>
-    <string name="pref_account_name_title">アカウント名を表示</string>
-    <string name="pref_account_name_summary">有効にすると発行者の隣にアカウント名を表示します</string>
    <string name="pref_import_file_title">ファイルからインポート</string>
    <string name="pref_import_file_summary">ファイルからトークンをインポート</string>
    <string name="pref_android_backups_title">Androidクラウドバックアップ</string>
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@ -10,8 +10,6 @@
    <string name="pref_select_theme_title">ಥೀಮ್</string>
    <string name="pref_view_mode_title">ವೀಕ್ಷಣೆಯ ರೀತಿ</string>
    <string name="pref_lang_title">ಭಾಷೆ</string>
-    <string name="pref_account_name_title">ಖಾತೆಯ ಹೆಸರನ್ನು ತೋರಿಸು</string>
-    <string name="pref_account_name_summary">ಖಾತೆಯ ಹೆಸರನ್ನು ನೀಡುವವರ ಪಕ್ಕ ತೋರಿಸುವುದಕ್ಕೆ ಇದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು</string>
    <string name="pref_import_file_title">ಫೈಲಿಂದ ಆಮದಿಸು</string>
    <string name="pref_import_app_title">ಅಪ್ಲಿಕೇಶನಿಂದ ಆಮದಿಸು</string>
    <string name="pref_export_title">ರಫ್ತು ಮಾಡು</string>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -32,7 +32,6 @@
    <string name="pref_show_icons_title">Rodyti piktogramas</string>
    <string name="pref_show_icons_summary">Rodyti piktogramas prie kiekvieno įrašo</string>
    <string name="pref_code_group_size_title">Kodo skaitmenų grupavimas</string>
-    <string name="pref_account_name_title">Rodyti paskyros pavadinimą</string>
    <string name="pref_import_file_title">Importuoti iš failo</string>
    <string name="pref_import_file_summary">Importuoti prieigos raktus iš failo</string>
    <string name="pref_android_backups_title">„Android“ debesijos atsarginės kopijos</string>
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Rādīt ikonu pie katra ieraksta</string>
    <string name="pref_code_group_size_title">Koda ciparu kopošana</string>
    <string name="pref_code_group_size_summary">Atlasīt koda ciparu kopu lielumu</string>
-    <string name="pref_account_name_title">Rādīt konta nosaukumu</string>
-    <string name="pref_account_name_summary">Iespējot, lai rādītu konta nosaukumu blakus izsniedzējam</string>
    <string name="pref_import_file_title">Ievietot no datnes</string>
    <string name="pref_import_file_summary">Ievietot kodus no datnes</string>
    <string name="pref_android_backups_title">Android mākoņa rezerves kopijas</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Pictogrammen weergeven naast elk item</string>
    <string name="pref_code_group_size_title">Codecijfergroepering</string>
    <string name="pref_code_group_size_summary">Selecteer aantal cijfers om de codes op te groeperen</string>
-    <string name="pref_account_name_title">Toon de accountnaam</string>
-    <string name="pref_account_name_summary">Schakel in om de accountnaam naast de uitgever te tonen</string>
    <string name="pref_import_file_title">Importeren vanuit een bestand</string>
    <string name="pref_import_file_summary">Importeer tokens vanuit een bestand</string>
    <string name="pref_android_backups_title">Android cloud-back-ups</string>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Wyświetlaj ikony obok każdego wpisu</string>
    <string name="pref_code_group_size_title">Grupowanie cyfr kodu</string>
    <string name="pref_code_group_size_summary">Wybierz liczbę cyfr do grupowania według</string>
-    <string name="pref_account_name_title">Pokaż nazwę konta</string>
-    <string name="pref_account_name_summary">Włącz tę opcję, aby pokazywać nazwę konta obok wydawcy</string>
    <string name="pref_import_file_title">Importuj z pliku</string>
    <string name="pref_import_file_summary">Importuj tokeny z aplikacji</string>
    <string name="pref_android_backups_title">Kopia zapasowa Android w chmurze</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Mostrar ícones ao lado de cada entrada</string>
    <string name="pref_code_group_size_title">Agrupamento de dígitos</string>
    <string name="pref_code_group_size_summary">Selecione o número de dígitos para agrupar códigos</string>
-    <string name="pref_account_name_title">Exibir o nome da conta</string>
-    <string name="pref_account_name_summary">Habilite essa opção para exibir o nome da conta ao lado do nome do serviço</string>
    <string name="pref_import_file_title">Importar de arquivo</string>
    <string name="pref_import_file_summary">Importa tokens de um arquivo</string>
    <string name="pref_android_backups_title">Backups na nuvem do Android</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -13,8 +13,6 @@
    <string name="pref_view_mode_title">Modo de exibição</string>
    <string name="pref_lang_title">Idioma</string>
    <string name="pref_code_group_size_title">Agrupamento de dígitos</string>
-    <string name="pref_account_name_title">Exibir o nome da conta</string>
-    <string name="pref_account_name_summary">Ative isto para mostrar o nome da conta ao lado do emissor</string>
    <string name="pref_import_file_title">Importar arquivo</string>
    <string name="pref_import_file_summary">Importar tokens de um arquivo</string>
    <string name="pref_backups_summary">Cria automaticamente backups do cofre no armazenamento externo quando alterações forem feitas. Isso só é suportado para cofres criptografados.</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Afişare pictograme lângă fiecare intrare</string>
    <string name="pref_code_group_size_title">Grupare cifre cod</string>
    <string name="pref_code_group_size_summary">Selectează numărul de cifre pentru a grupa codurile</string>
-    <string name="pref_account_name_title">Arată numele contului</string>
-    <string name="pref_account_name_summary">Activează pentru a afișa numele contului lângă emitent</string>
    <string name="pref_import_file_title">Importă din fișier</string>
    <string name="pref_import_file_summary">Importă token-uri dintr-un fișier</string>
    <string name="pref_android_backups_title">Backup-uri Android în cloud</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Показывать значки рядом с каждой записью</string>
    <string name="pref_code_group_size_title">Перегруппировка цифр кода</string>
    <string name="pref_code_group_size_summary">Выберите количество цифр для группировки кодов</string>
-    <string name="pref_account_name_title">Показывать название учётной записи</string>
-    <string name="pref_account_name_summary">Включите, чтобы показывать название учётной записи рядом с эмитентом</string>
    <string name="pref_import_file_title">Импорт из файла</string>
    <string name="pref_import_file_summary">Импорт ключей из файла</string>
    <string name="pref_android_backups_title">Облачное резервное копирование Android</string>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -38,8 +38,6 @@
    <string name="pref_show_icons_title">Zobraziť ikony</string>
    <string name="pref_show_icons_summary">Zobrazte ikony vedľa každého záznamu</string>
    <string name="pref_code_group_size_title">Zoskupenie číselných znakov</string>
-    <string name="pref_account_name_title">Zobraziť názov účtu</string>
-    <string name="pref_account_name_summary">Povolením tejto možnosti zobrazíte názov účtu vedľa vydavateľa</string>
    <string name="pref_import_file_title">Importovať zo súboru</string>
    <string name="pref_import_file_summary">Importovať tokeny zo súboru</string>
    <string name="pref_android_backups_title">Zálohy na Android cloude</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Visa ikoner bredvid varje post</string>
    <string name="pref_code_group_size_title">Gruppering av kodsiffror</string>
    <string name="pref_code_group_size_summary">Välj antal siffror att gruppera koder efter</string>
-    <string name="pref_account_name_title">Visa kontonamnet</string>
-    <string name="pref_account_name_summary">Aktivera denna för att visa kontonamnet bredvid utfärdaren</string>
    <string name="pref_import_file_title">Importera från fil</string>
    <string name="pref_import_file_summary">Importera polletter från en fil</string>
    <string name="pref_android_backups_title">Android-molnsäkerhetskopior</string>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Her girdinin yanında simgeleri göster</string>
    <string name="pref_code_group_size_title">Kod hanelerinin gruplanması</string>
    <string name="pref_code_group_size_summary">Kodların kaç basamakla gruplanacağını seçin</string>
-    <string name="pref_account_name_title">Hesap adını göster</string>
-    <string name="pref_account_name_summary">Hesap adını sağlayıcının yanında göstermek için bunu etkinleştirin</string>
    <string name="pref_import_file_title">Dosyadan içeriye aktar</string>
    <string name="pref_import_file_summary">Veritabanını dosyadan içeriye aktar</string>
    <string name="pref_android_backups_title">Android bulut yedekleme</string>
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">Показувати піктограми біля кожного запису</string>
    <string name="pref_code_group_size_title">Групування цифр</string>
    <string name="pref_code_group_size_summary">Виберіть як групувати цифри у токенах</string>
-    <string name="pref_account_name_title">Показати обліковий запис</string>
-    <string name="pref_account_name_summary">Увімкніть, щоб показувати обліковий запис поруч з емітентом</string>
    <string name="pref_import_file_title">Імпорт з файлу</string>
    <string name="pref_import_file_summary">Імпортувати токени з файлу</string>
    <string name="pref_android_backups_title">Резервні копії в хмарі Android</string>
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@ -36,8 +36,6 @@
    <string name="pref_view_mode_title">Chế độ xem</string>
    <string name="pref_lang_title">Ngôn ngữ</string>
    <string name="pref_code_group_size_title">Gộp nhóm chữ số mã</string>
-    <string name="pref_account_name_title">Hiện tên tài khoản</string>
-    <string name="pref_account_name_summary">Bật tuỳ chọn này để hiện tên tài khoản bên cạnh người cấp</string>
    <string name="pref_import_file_title">Nhập từ tệp</string>
    <string name="pref_import_file_summary">Nhập các token từ một tệp</string>
    <string name="pref_android_backups_title">Bản sao lưu đám mây của Android</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -39,8 +39,6 @@
    <string name="pref_show_icons_summary">在每个条目旁边显示图标</string>
    <string name="pref_code_group_size_title">分组显示验证码</string>
    <string name="pref_code_group_size_summary">选择按多少位数字进行代码分组</string>
-    <string name="pref_account_name_title">显示帐户名称</string>
-    <string name="pref_account_name_summary">在服务商名称旁边显示账户名称</string>
    <string name="pref_import_file_title">从文件导入</string>
    <string name="pref_import_file_summary">从文件导入令牌</string>
    <string name="pref_android_backups_title">Android 云备份</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -38,8 +38,6 @@
    <string name="pref_show_icons_title">顯示圖示</string>
    <string name="pref_show_icons_summary">在每個條目旁顯示圖示</string>
    <string name="pref_code_group_size_title">分組顯示驗證碼</string>
-    <string name="pref_account_name_title">顯示帳戶名稱</string>
-    <string name="pref_account_name_summary">在服務商名稱旁邊顯示帳戶名稱</string>
    <string name="pref_import_file_title">從檔案匯入</string>
    <string name="pref_import_file_summary">從檔案匯入憑證</string>
    <string name="pref_android_backups_title">Android 雲端備份</string>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@ -149,4 +149,10 @@
        <item>GROUPING_THREES</item>
        <item>GROUPING_FOURS</item>
    </string-array>
+
+    <string-array name="account_name_position_titles">
+        <item>@string/pref_account_name_position_hidden</item>
+        <item>@string/pref_account_name_position_end</item>
+        <item>@string/pref_account_name_position_below</item>
+    </string-array>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -42,8 +42,7 @@
    <string name="pref_show_icons_summary">Display icons next to each entry</string>
    <string name="pref_code_group_size_title">Code digit grouping</string>
    <string name="pref_code_group_size_summary">Select number of digits to group codes by</string>
-    <string name="pref_account_name_title">Show the account name</string>
-    <string name="pref_account_name_summary">Enable this to show the account name next to the issuer</string>
+    <string name="pref_account_name_position_title">Show the account name</string>
    <string name="pref_import_file_title">Import from file</string>
    <string name="pref_import_file_summary">Import tokens from a file</string>
    <string name="pref_android_backups_title">Android cloud backups</string>
@ -242,6 +241,7 @@
    <string name="choose_totpauth_importer">Is this TOTP Authenticator backup encrypted with a password?</string>
    <string name="choose_application">Select the application you\'d like to import from</string>
    <string name="choose_theme">Select your desired theme</string>
+    <string name="choose_account_name_position">Select your desired account name position</string>
    <string name="choose_view_mode">Select your desired view mode</string>
    <string name="parsing_file_error">An error occurred while trying to parse the file</string>
    <string name="file_not_found">Error: File not found</string>
@ -494,6 +494,10 @@
    <string name="pref_grouping_size_three">Groups of 3</string>
    <string name="pref_grouping_size_four">Groups of 4</string>

+    <string name="pref_account_name_position_hidden">Hidden</string>
+    <string name="pref_account_name_position_end">Next to the issuer</string>
+    <string name="pref_account_name_position_below">Below the issuer</string>
+
    <plurals name="time_elapsed_seconds">
        <item quantity="one">%d second ago</item>
        <item quantity="other">%d seconds ago</item>
--- a/app/src/main/res/xml/preferences_appearance.xml
+++ b/app/src/main/res/xml/preferences_appearance.xml
@ -46,11 +46,9 @@
            android:defaultValue="GROUPING_THREES"
            app:iconSpaceReserved="false"/>

-        <androidx.preference.SwitchPreferenceCompat
-            android:defaultValue="true"
-            android:key="pref_account_name"
-            android:title="@string/pref_account_name_title"
-            android:summary="@string/pref_account_name_summary"
+        <Preference
+            android:key="pref_account_name_position"
+            android:title="@string/pref_account_name_position_title"
            app:iconSpaceReserved="false"/>

        <Preference