From 813fd62dc7ac67f911619d3f16ac765dfde61184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= Date: Wed, 16 Aug 2023 14:17:57 +0200 Subject: [PATCH] Add ability to change account name position --- .../aegis/AccountNamePosition.java | 17 ++++++ .../beemdevelopment/aegis/Preferences.java | 12 +++-- .../aegis/ui/MainActivity.java | 7 +-- .../AppearancePreferencesFragment.java | 22 ++++++-- .../aegis/ui/views/EntryAdapter.java | 9 ++-- .../aegis/ui/views/EntryHolder.java | 52 +++++++++++++++++-- .../aegis/ui/views/EntryListView.java | 5 +- app/src/main/res/layout/card_entry.xml | 1 - .../main/res/layout/card_entry_compact.xml | 1 - app/src/main/res/layout/card_entry_small.xml | 1 - app/src/main/res/values-ar-rSA/strings.xml | 2 - app/src/main/res/values-ast-rES/strings.xml | 2 - app/src/main/res/values-bg-rBG/strings.xml | 2 - app/src/main/res/values-ca-rES/strings.xml | 2 - app/src/main/res/values-cs-rCZ/strings.xml | 2 - app/src/main/res/values-da-rDK/strings.xml | 2 - app/src/main/res/values-de-rDE/strings.xml | 2 - app/src/main/res/values-el-rGR/strings.xml | 2 - app/src/main/res/values-es-rES/strings.xml | 2 - app/src/main/res/values-eu-rES/strings.xml | 2 - app/src/main/res/values-fa-rIR/strings.xml | 2 - app/src/main/res/values-fi-rFI/strings.xml | 2 - app/src/main/res/values-fr-rFR/strings.xml | 2 - app/src/main/res/values-gl-rES/strings.xml | 2 - app/src/main/res/values-hi-rIN/strings.xml | 2 - app/src/main/res/values-hu-rHU/strings.xml | 2 - app/src/main/res/values-in-rID/strings.xml | 2 - app/src/main/res/values-it-rIT/strings.xml | 2 - app/src/main/res/values-iw-rIL/strings.xml | 2 - app/src/main/res/values-ja-rJP/strings.xml | 2 - app/src/main/res/values-kn-rIN/strings.xml | 2 - app/src/main/res/values-lt-rLT/strings.xml | 1 - app/src/main/res/values-lv-rLV/strings.xml | 2 - app/src/main/res/values-nl-rNL/strings.xml | 2 - app/src/main/res/values-pl-rPL/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-ro-rRO/strings.xml | 2 - app/src/main/res/values-ru-rRU/strings.xml | 2 - app/src/main/res/values-sk-rSK/strings.xml | 2 - app/src/main/res/values-sv-rSE/strings.xml | 2 - app/src/main/res/values-tr-rTR/strings.xml | 2 - app/src/main/res/values-uk-rUA/strings.xml | 2 - app/src/main/res/values-vi-rVN/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/arrays.xml | 6 +++ app/src/main/res/values/strings.xml | 8 ++- .../main/res/xml/preferences_appearance.xml | 8 ++- 49 files changed, 118 insertions(+), 102 deletions(-) create mode 100644 app/src/main/java/com/beemdevelopment/aegis/AccountNamePosition.java diff --git a/app/src/main/java/com/beemdevelopment/aegis/AccountNamePosition.java b/app/src/main/java/com/beemdevelopment/aegis/AccountNamePosition.java new file mode 100644 index 0000000000..bbc4a072da --- /dev/null +++ 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]; + } +} diff --git a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java index e8c636b53d..9c7bd335f5 100644 --- 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 void resetPasswordReminderTimestamp() { 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 void setCurrentViewMode(ViewMode viewMode) { _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); diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java index 8b65f47c43..223a15ed9f 100644 --- 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.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 @@ protected void onCreate(Bundle savedInstanceState) { _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 @@ private void onPreferencesResult(Intent data) { 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 @@ private void onPreferencesResult(Intent data) { 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); diff --git 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 index de74f75a7f..798a5e6e42 100644 --- 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 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 void onCreatePreferences(Bundle savedInstanceState, String rootKey) { 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; }); diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java index 53083c9797..98a049f4dc 100644 --- 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 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 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 void setCodeGroupSize(Preferences.CodeGrouping codeGroupSize) { _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 void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) 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)); diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java index 03e1910f21..4c5070c34f 100644 --- 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.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 long getMillisTillNextRefresh() { }); } - 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 void setData(VaultEntry entry, Preferences.CodeGrouping groupSize, boolea _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 void setData(VaultEntry entry, Preferences.CodeGrouping groupSize, boolea 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 void animateCopyText() { 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); } diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java index 99393f0d7b..e13601c64e 100644 --- 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.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 void setCodeGroupSize(Preferences.CodeGrouping codeGrouping) { _adapter.setCodeGroupSize(codeGrouping); } - public void setShowAccountName(boolean showAccountName) { - _adapter.setShowAccountName(showAccountName); + public void setAccountNamePosition(AccountNamePosition accountNamePosition) { + _adapter.setAccountNamePosition(accountNamePosition); } public void setShowIcon(boolean showIcon) { diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml index 6ffff7c437..9090dc3a34 100644 --- 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" diff --git a/app/src/main/res/layout/card_entry_compact.xml b/app/src/main/res/layout/card_entry_compact.xml index e52ec9e8fc..f716f578d3 100644 --- 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" diff --git a/app/src/main/res/layout/card_entry_small.xml b/app/src/main/res/layout/card_entry_small.xml index a0fb0a911f..9d76bbc56e 100644 --- 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" diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index c1b8adbccf..71019f4b2e 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -39,8 +39,6 @@ عرض الأيقونات بجانب كل مدخل تجميع أرقام الكود اختر عدد الخانات المستخدمة في تجميع الرموز - اظهر اسم الحساب - قم بالتفعيل لإظهار اسم الحساب بجانب المصدِّر استيراد من ملف استيراد الرموز من ملف النسخ الاحتياطية السحابية للأندرويد diff --git a/app/src/main/res/values-ast-rES/strings.xml b/app/src/main/res/values-ast-rES/strings.xml index b732a90caf..6f7652edb8 100644 --- a/app/src/main/res/values-ast-rES/strings.xml +++ b/app/src/main/res/values-ast-rES/strings.xml @@ -39,8 +39,6 @@ Amuesa los iconos al llau de cada entrada Agrupamientu de díxitos Seleiciona\'l númberu de díxitos pol que s\'agrupen los códigos - Amosar el nome de les cuentes - Activa esta opción p\'amosar el nome de les cuentes xunto al del emisor Importar d\'un ficheru Importa los pases d\'un ficheru Copies de seguranza na ñube diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 6b657855f6..6d8bc39403 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -27,8 +27,6 @@ Режим на преглед Език Групиране на кодови цифри - Показване на профилното име - Активирайте това, за да се показва името на акаунта до издателя Импорт от файл Импортиране на токени от файл Автоматично архивирайте трезора diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 7ce1b82116..28316280c3 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -39,8 +39,6 @@ Mostra icones al costat de cada entrada Agrupació dels dígits Triar nombre de digits per agrupar els codis - Mostra el nom del compte - Activa això per a mostrar en nom del compte al costat de l\'emissor Importa des d\'un fitxer Importar fitxes des d\'un fitxer Copies al núvol d\'Android diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index db52b5e589..e842082014 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -39,8 +39,6 @@ Zobrazit ikony vedle každého záznamu Seskupení číslic kódu Vyberte počet číslic, po kterých se mají seskupovat kódy - Zobrazit název účtu - Zobrazit název účtu vedle poskytovatele Importovat ze souboru Importovat tokeny ze souboru Cloudové zálohování systému Android diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index a03477e9c6..864b601e80 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -39,8 +39,6 @@ Vis ikoner ved siden af hver post Kodeciffergruppering Vælg antal cifre til kodegruppering - Vis kontonavn - Aktiver dette for at vise kontonavnet ved siden af udstederen Import fra fil Importér tokens fra en fil Android cloud-sikkerhedskopier diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 9cf3e66986..935ed598a3 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -39,8 +39,6 @@ Symbole neben jedem Eintrag anzeigen Zifferngruppierung Wähle die Anzahl der Ziffern, nach denen die Codes gruppiert werden sollen - Kontonamen anzeigen - Aktiviere dies, um den Kontonamen neben dem Herausgeber anzuzeigen Aus Datei importieren Token aus einer Datei importieren Cloud-Back-ups durch Android diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index f98ea30ecb..da91abaf25 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -39,8 +39,6 @@ Εμφάνιση εικονιδίων δίπλα σε κάθε καταχώρηση Ομαδοποίηση ψηφίων κωδικού Επιλέξτε τον αριθμό των ψηφίων για να ομαδοποιήσετε τους κωδικούς κατά - Εμφάνιση του ονόματος λογαριασμού - Ενεργοποίηση προβολής ονόματος λογαριασμού δίπλα στον εκδότη Εισαγωγή από αρχείο Εισαγωγή αναγνωριστικών από αρχείο Αντίγραφα ασφαλείας cloud Android diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 4e41870b0e..5d5615f557 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -39,8 +39,6 @@ Mostrar iconos al lado de cada entrada Agrupación de los dígitos del código Seleccione el número de dígitos por los que agrupar los códigos - Mostrar el nombre de la cuenta - Active esto para mostrar el nombre de la cuenta junto al emisor Importar desde un archivo Importar tokens desde un archivo Copias de seguridad en la nube de Android diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml index 14a5347bf5..68c63610e4 100644 --- a/app/src/main/res/values-eu-rES/strings.xml +++ b/app/src/main/res/values-eu-rES/strings.xml @@ -39,8 +39,6 @@ Ikonoak erakutsi sarrera bakoitzaren ondoan Kode-digituen taldekatzea Aukeratu kodeak zenbat zenbakiko taldetan taldekatuko diren - Erakutsi kontuaren izena - Aktibatu hau kontu-izena igorlearen ondoan bistaratzeko Inportatu fitxategi batetik Inportatu marka-ikurrak fitxategi batetik Androiden lainoko segurtasun kopiak diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml index 1e6da83f64..2cc61ea862 100644 --- a/app/src/main/res/values-fa-rIR/strings.xml +++ b/app/src/main/res/values-fa-rIR/strings.xml @@ -34,8 +34,6 @@ حالت نمایش زبان حالت نمایش کد - نمایش نام حساب کاربری - برای نمایش نام حساب کاربری کنار صادر کننده فعال کنید وارد کردن از فایل وارد کردن توکن ها از فایل پشتیبان‌گیری ابری Android diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 84258812d8..3324aa4097 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -39,8 +39,6 @@ Näytä kuvakkeet jokaisen kohteen vieressä Numeroiden ryhmittely Valitse numeroiden määrä ryhmiteltäessä koodeja - Näytä tilin nimi - Näytä tilin nimi todennuskoodin myöntäjän rinnalla Tuo tiedostosta Tuo todennuskoodit tiedostosta Androidin pilvivarmuuskopiot diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 41d9d7adf9..328f7a5099 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -39,8 +39,6 @@ Afficher les icônes à côté de chaque entrée Regroupement des chiffres du code Sélectionner le nombre de chiffres par lequel regrouper les codes - Afficher le nom du compte - Activer pour afficher le nom de compte près de l\'émetteur Importer depuis un fichier Importer des jetons depuis un fichier Sauvegardes cloud d\'Android diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml index 1d2bdf8a72..bf18c5abe7 100644 --- a/app/src/main/res/values-gl-rES/strings.xml +++ b/app/src/main/res/values-gl-rES/strings.xml @@ -39,8 +39,6 @@ Amosar iconas ao lado de cada entrada Agrupación dos díxitos do código Escolle o número de díxitos polos que agrupar os códigos - Mostrar o nome da conta - Activa isto para mostrar o nome da conta ao lado do provedor Importar desde un ficheiro Importar tokens desde un ficheiro Copias de seguridade na nube de Android diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index f0212e503e..0a2573de83 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -35,8 +35,6 @@ देखने का प्रकार भाषा कोड संख्या समूह - खाते का नाम दिखाएँ - जारीकर्ता के बगल में खाता नाम दिखाने के लिए इसे सक्षम करें फ़ाइल से आयात करें टोकन को फ़ाइल से आयात करें एंड्रॉयड क्लाउड बैकअप diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index a95048e2a8..07ff98e3e3 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -36,8 +36,6 @@ Nézetmód Nyelv Kód számjegyeinek csoportosítása - A fióknév megjelenítése - Kapcsolja be a fiók nevének megjelenítéséhez a kibocsátó mellett Importálás fájlból Tokenek importálása fájlból Android felhő mentések diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index d4a0d78cc7..84a4c58ea2 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -36,8 +36,6 @@ Mode tampilan Bahasa Pengelompokan digit kode - Tampilkan nama akun - Aktifkan ini untuk menampilkan nama akun di samping penerbit Impor berkas Impor token dari berkas Pencadangan awan Android diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 7fa3317548..68c773e7d2 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -39,8 +39,6 @@ Mostra le icone accanto a ogni voce Divisione cifre codice Seleziona il numero di cifre per cui raggruppare i codici - Mostra nome account - Abilita questa opzione per mostrare il nome dell\'account vicino all\'emittente Importa da file Importa token da file Backup cloud Android diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index f82d4c3683..edc0f4ee5a 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -40,8 +40,6 @@ הצגת סמלים לצד כל ערך קיבוץ ספרות קוד בחר את מספר הספרות לקיבוץ קודים לפיהן - הצג את שם החשבון - הפעל את זה כדי להציג את שם החשבון לצד המנפיק ייבוא מקובץ ייבוא טוקנים מקובץ גיבויי ענן אנדרואיד diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index a84f580977..fd52a681d4 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -39,8 +39,6 @@ 各エントリーの横にアイコンを表示する コードの桁数のグループ化 グループ化する桁数を選択してください - アカウント名を表示 - 有効にすると発行者の隣にアカウント名を表示します ファイルからインポート ファイルからトークンをインポート Androidクラウドバックアップ diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml index 3a82fad7b7..de8c49ef6b 100644 --- a/app/src/main/res/values-kn-rIN/strings.xml +++ b/app/src/main/res/values-kn-rIN/strings.xml @@ -10,8 +10,6 @@ ಥೀಮ್ ವೀಕ್ಷಣೆಯ ರೀತಿ ಭಾಷೆ - ಖಾತೆಯ ಹೆಸರನ್ನು ತೋರಿಸು - ಖಾತೆಯ ಹೆಸರನ್ನು ನೀಡುವವರ ಪಕ್ಕ ತೋರಿಸುವುದಕ್ಕೆ ಇದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು ಫೈಲಿಂದ ಆಮದಿಸು ಅಪ್ಲಿಕೇಶನಿಂದ ಆಮದಿಸು ರಫ್ತು ಮಾಡು diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index 584e80405c..234ba8f124 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -32,7 +32,6 @@ Rodyti piktogramas Rodyti piktogramas prie kiekvieno įrašo Kodo skaitmenų grupavimas - Rodyti paskyros pavadinimą Importuoti iš failo Importuoti prieigos raktus iš failo „Android“ debesijos atsarginės kopijos diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml index 6435ef86d6..4a7b492105 100644 --- a/app/src/main/res/values-lv-rLV/strings.xml +++ b/app/src/main/res/values-lv-rLV/strings.xml @@ -39,8 +39,6 @@ Rādīt ikonu pie katra ieraksta Koda ciparu kopošana Atlasīt koda ciparu kopu lielumu - Rādīt konta nosaukumu - Iespējot, lai rādītu konta nosaukumu blakus izsniedzējam Ievietot no datnes Ievietot kodus no datnes Android mākoņa rezerves kopijas diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index b2321ebb73..41612665e5 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -39,8 +39,6 @@ Pictogrammen weergeven naast elk item Codecijfergroepering Selecteer aantal cijfers om de codes op te groeperen - Toon de accountnaam - Schakel in om de accountnaam naast de uitgever te tonen Importeren vanuit een bestand Importeer tokens vanuit een bestand Android cloud-back-ups diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index d76e13ecb3..ef5fcd9f09 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -39,8 +39,6 @@ Wyświetlaj ikony obok każdego wpisu Grupowanie cyfr kodu Wybierz liczbę cyfr do grupowania według - Pokaż nazwę konta - Włącz tę opcję, aby pokazywać nazwę konta obok wydawcy Importuj z pliku Importuj tokeny z aplikacji Kopia zapasowa Android w chmurze diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f471e1fbb3..a36ffba811 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -39,8 +39,6 @@ Mostrar ícones ao lado de cada entrada Agrupamento de dígitos Selecione o número de dígitos para agrupar códigos - Exibir o nome da conta - Habilite essa opção para exibir o nome da conta ao lado do nome do serviço Importar de arquivo Importa tokens de um arquivo Backups na nuvem do Android diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 465363c7fa..47d18bf22b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -13,8 +13,6 @@ Modo de exibição Idioma Agrupamento de dígitos - Exibir o nome da conta - Ative isto para mostrar o nome da conta ao lado do emissor Importar arquivo Importar tokens de um arquivo Cria automaticamente backups do cofre no armazenamento externo quando alterações forem feitas. Isso só é suportado para cofres criptografados. diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 93ed7fe163..db513805e5 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -39,8 +39,6 @@ Afişare pictograme lângă fiecare intrare Grupare cifre cod Selectează numărul de cifre pentru a grupa codurile - Arată numele contului - Activează pentru a afișa numele contului lângă emitent Importă din fișier Importă token-uri dintr-un fișier Backup-uri Android în cloud diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index b254657c85..bf62a1f16a 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -39,8 +39,6 @@ Показывать значки рядом с каждой записью Перегруппировка цифр кода Выберите количество цифр для группировки кодов - Показывать название учётной записи - Включите, чтобы показывать название учётной записи рядом с эмитентом Импорт из файла Импорт ключей из файла Облачное резервное копирование Android diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index a0c9c982d6..8ea57b1bfc 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -38,8 +38,6 @@ Zobraziť ikony Zobrazte ikony vedľa každého záznamu Zoskupenie číselných znakov - Zobraziť názov účtu - Povolením tejto možnosti zobrazíte názov účtu vedľa vydavateľa Importovať zo súboru Importovať tokeny zo súboru Zálohy na Android cloude diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 981857d2fc..0169170491 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -39,8 +39,6 @@ Visa ikoner bredvid varje post Gruppering av kodsiffror Välj antal siffror att gruppera koder efter - Visa kontonamnet - Aktivera denna för att visa kontonamnet bredvid utfärdaren Importera från fil Importera polletter från en fil Android-molnsäkerhetskopior diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 1b96ab6b3e..e853f756e8 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -39,8 +39,6 @@ Her girdinin yanında simgeleri göster Kod hanelerinin gruplanması Kodların kaç basamakla gruplanacağını seçin - Hesap adını göster - Hesap adını sağlayıcının yanında göstermek için bunu etkinleştirin Dosyadan içeriye aktar Veritabanını dosyadan içeriye aktar Android bulut yedekleme diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index 250af1f1da..69b2841e42 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -39,8 +39,6 @@ Показувати піктограми біля кожного запису Групування цифр Виберіть як групувати цифри у токенах - Показати обліковий запис - Увімкніть, щоб показувати обліковий запис поруч з емітентом Імпорт з файлу Імпортувати токени з файлу Резервні копії в хмарі Android diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index f22ec59885..cc93905402 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -36,8 +36,6 @@ Chế độ xem Ngôn ngữ Gộp nhóm chữ số mã - Hiện tên tài khoản - Bật tuỳ chọn này để hiện tên tài khoản bên cạnh người cấp Nhập từ tệp Nhập các token từ một tệp Bản sao lưu đám mây của Android diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4d291977b1..2e845d53b0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -39,8 +39,6 @@ 在每个条目旁边显示图标 分组显示验证码 选择按多少位数字进行代码分组 - 显示帐户名称 - 在服务商名称旁边显示账户名称 从文件导入 从文件导入令牌 Android 云备份 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0997e7e9d2..103e4ca6f8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -38,8 +38,6 @@ 顯示圖示 在每個條目旁顯示圖示 分組顯示驗證碼 - 顯示帳戶名稱 - 在服務商名稱旁邊顯示帳戶名稱 從檔案匯入 從檔案匯入憑證 Android 雲端備份 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index b0be9b996d..9e8ce27d09 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -149,4 +149,10 @@ GROUPING_THREES GROUPING_FOURS + + + @string/pref_account_name_position_hidden + @string/pref_account_name_position_end + @string/pref_account_name_position_below + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c5455c48c0..83490e41e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,8 +42,7 @@ Display icons next to each entry Code digit grouping Select number of digits to group codes by - Show the account name - Enable this to show the account name next to the issuer + Show the account name Import from file Import tokens from a file Android cloud backups @@ -242,6 +241,7 @@ Is this TOTP Authenticator backup encrypted with a password? Select the application you\'d like to import from Select your desired theme + Select your desired account name position Select your desired view mode An error occurred while trying to parse the file Error: File not found @@ -494,6 +494,10 @@ Groups of 3 Groups of 4 + Hidden + Next to the issuer + Below the issuer + %d second ago %d seconds ago diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml index ce4b72dd20..986be0b4d7 100644 --- 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"/> -