Minor fixes for group chips, remove remnants of filter menu item

app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java

@@ -116,8 +116,6 @@ public class EditEntryActivity extends AegisActivity {
             setTitle(R.string.add_new_entry);
         }
 
-        String selectedGroup = intent.getStringExtra("selectedGroup");
-
         // set up fields
         _iconView = findViewById(R.id.profile_drawable);
         _kropView = findViewById(R.id.krop_view);
@@ -211,7 +209,6 @@ public class EditEntryActivity extends AegisActivity {
         // automatically open advanced settings since 'Secret' is required.
         if (_isNew) {
             openAdvancedSettings();
-            setGroup(selectedGroup);
         }
 
         _dropdownGroup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -221,13 +218,12 @@ public class EditEntryActivity extends AegisActivity {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 if (position == _dropdownGroupList.size() - 1) {
                     Dialogs.showTextInputDialog(EditEntryActivity.this, R.string.set_group, R.string.group_name_hint, text -> {
-                        String str = new String(text);
+                        String groupName = new String(text);
-                        if (str.isEmpty()) {
+                        if (!groupName.isEmpty()) {
-                            return;
+                            _groups.add(groupName);
-                        }
-                        _groups.add(str);
                             updateGroupDropdownList();
-                        _dropdownGroup.setText(_dropdownGroupList.get(position), false);
+                            _dropdownGroup.setText(groupName, false);
+                        }
                     });
                     _dropdownGroup.setText(_dropdownGroupList.get(prevPosition), false);
                 } else {

app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java

@@ -249,7 +249,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         } else {
             intent.putExtra("entryUUID", entry.getUUID());
         }
-        intent.putExtra("selectedGroup", (ArrayList<String>) _selectedGroups);
         startActivityForResult(intent, requestCode);
     }
 
@@ -326,11 +325,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _menu.findItem(category.getMenuItem()).setChecked(true);
     }
 
-    private void setGroupFilter(List<String> group) {
-        _selectedGroups = group;
-        _entryListView.setGroupFilter(group, true);
-    }
-
     private void onDoIntroResult() {
         _vault = _app.getVaultManager();
         loadEntries();
@@ -460,10 +454,8 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         if (_app.isVaultLocked()) {
             startAuthActivity(false);
         } else if (_loaded) {
-            // update the list of groups in the filter menu
+            // update the list of groups in the entry list view so that the chip gets updated
-            if (_menu != null) {
             _entryListView.setGroups(_vault.getGroups());
-            }
 
             // refresh all codes to prevent showing old ones
             _entryListView.refresh(false);
@@ -485,8 +477,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             _entryListView.setSearchFilter(null);
 
             collapseSearchView();
-            setTitle("Aegis");
+            setTitle(R.string.app_name);
-            setGroupFilter(_selectedGroups);
             return;
         }
 
@@ -566,16 +557,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 _app.lock(true);
                 return true;
             default:
-                /*if (item.getGroupId() == R.id.action_filter_group) {
-                    item.setChecked(true);
-
-                    String group = null;
-                    if (item.getItemId() != R.id.menu_filter_all) {
-                        group = item.getTitle().toString();
-                    }
-                    setGroupFilter(group);
-                }*/
-
                 if (item.getGroupId() == R.id.action_sort_category) {
                     item.setChecked(true);
 

app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java

@@ -237,7 +237,7 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
     }
 
     public void setGroupFilter(List<String> groups, boolean apply) {
-        if(groups == null) {
+        if (groups == null) {
             groups = new ArrayList<>();
         }
 

app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java

@@ -86,6 +86,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         View view = inflater.inflate(R.layout.fragment_entry_list_view, container, false);
         _progressBar = view.findViewById(R.id.progressBar);
         _groupChip = view.findViewById(R.id.chip_group);
+        initializeGroupChip();
 
         // set up the recycler view
         _recyclerView = view.findViewById(R.id.rvKeyProfiles);
@@ -141,8 +142,9 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         super.onDestroyView();
     }
 
-    public void setGroupFilter(List<String> group, boolean apply) {
+    public void setGroupFilter(List<String> groups, boolean apply) {
-        _adapter.setGroupFilter(group, apply);
+        _groupFilter = groups;
+        _adapter.setGroupFilter(groups, apply);
         _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
 
         if (apply) {
@@ -285,6 +287,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
 
     public void addEntry(VaultEntry entry) {
         addEntry(entry, false);
+
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -352,44 +355,11 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     }
 
     private void initializeGroupChip() {
-        if (_groups.isEmpty()) {
-            _groupChip.setVisibility(View.GONE);
-            return;
-        }
-
         View view = getLayoutInflater().inflate(R.layout.dialog_select_groups, null);
         BottomSheetDialog dialog = new BottomSheetDialog(getContext());
         dialog.setContentView(view);
 
-        ColorStateList colorStateList = ContextCompat.getColorStateList(getContext(), R.color.bg_chip_text_color);
-
         ChipGroup chipGroup = view.findViewById(R.id.groupChipGroup);
-        String groupChipText = _groupChip.getText().toString();
-        chipGroup.removeAllViews();
-        for (String group : _groups) {
-            Chip chip = new Chip(getContext());
-            chip.setText(group);
-            chip.setCheckable(true);
-            chip.setCheckedIconVisible(false);
-            chip.setChipBackgroundColorResource(R.color.bg_chip_color);
-            chip.setTextColor(colorStateList);
-            chip.setOnCheckedChangeListener((group1, checkedId) -> {
-                List<String> groupFilter = chipGroup.getCheckedChipIds().stream()
-                        .map(i -> ((Chip) view.findViewById(i)).getText().toString())
-                        .collect(Collectors.toList());
-                _groupFilter = groupFilter;
-                setGroupFilter(groupFilter, true);
-
-                if (_groupFilter.isEmpty()) {
-                    _groupChip.setText(groupChipText);
-                } else {
-                    _groupChip.setText(String.format("%s (%d)", getString(R.string.groups), _groupFilter.size()));
-                }
-            });
-
-            chipGroup.addView(chip);
-        }
-
         Button clearButton = view.findViewById(R.id.btnClear);
         clearButton.setOnClickListener(v -> {
             chipGroup.clearCheck();
@@ -398,6 +368,33 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         });
 
         _groupChip.setOnClickListener(v -> {
+            ColorStateList colorStateList = ContextCompat.getColorStateList(getContext(), R.color.bg_chip_text_color);
+            chipGroup.removeAllViews();
+
+            for (String group : _groups) {
+                Chip chip = new Chip(getContext());
+                chip.setText(group);
+                chip.setCheckable(true);
+                chip.setChecked(_groupFilter != null && _groupFilter.contains(group));
+                chip.setCheckedIconVisible(false);
+                chip.setChipBackgroundColorResource(R.color.bg_chip_color);
+                chip.setTextColor(colorStateList);
+                chip.setOnCheckedChangeListener((group1, checkedId) -> {
+                    List<String> groupFilter = chipGroup.getCheckedChipIds().stream()
+                            .map(i -> ((Chip) view.findViewById(i)).getText().toString())
+                            .collect(Collectors.toList());
+                    setGroupFilter(groupFilter, true);
+
+                    if (groupFilter.isEmpty()) {
+                        _groupChip.setText(R.string.groups);
+                    } else {
+                        _groupChip.setText(String.format("%s (%d)", getString(R.string.groups), groupFilter.size()));
+                    }
+                });
+
+                chipGroup.addView(chip);
+            }
+
             Dialogs.showSecureDialog(dialog);
         });
     }
@@ -409,7 +406,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
 
     public void setGroups(TreeSet<String> groups) {
         _groups = groups;
-        initializeGroupChip();
+        _groupChip.setVisibility(_groups.isEmpty() ? View.GONE : View.VISIBLE);
     }
 
     private void updateDividerDecoration() {

app/src/main/res/layout/dialog_select_groups.xml

@@ -22,7 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="?attr/primaryText"
-        android:text="Groups" />
+        android:text="@string/groups" />
 
     <View
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_entry_list_view.xml

@@ -24,6 +24,7 @@
         android:layout_marginEnd="8dp"
         android:textAppearance="@style/TextAppearance.Aegis.ActionChip"
         android:textColor="?attr/primaryText"
+        android:visibility="gone"
         app:chipBackgroundColor="?attr/cardBackground"
         app:chipEndPadding="6dp"
         app:chipIcon="@drawable/ic_baseline_filter_list_24dp"

app/src/main/res/menu/menu_main.xml

@@ -12,23 +12,6 @@
         android:icon="@drawable/ic_lock"
         app:showAsAction="ifRoom"
         android:title="@string/lock"/>
-    <item
-        android:id="@+id/action_filter"
-        android:icon="@drawable/ic_baseline_filter_list_24dp"
-        app:showAsAction="ifRoom"
-        android:title="@string/filter">
-        <menu>
-            <group
-                android:id="@+id/action_filter_group"
-                android:checkableBehavior="single">
-                <item
-                    android:id="@+id/menu_filter_all"
-                    android:title="@string/all"
-                    android:checked="true" />
-            </group>
-
-        </menu>
-    </item>
     <item
         android:id="@+id/action_sort"
         android:icon="@drawable/ic_action_sort"

app/src/main/res/values-ar-rSA/strings.xml

@@ -182,7 +182,6 @@
     <string name="filter">تصفية</string>
     <string name="filter_ungrouped">تمت إزالتها من المجموعة</string>
     <string name="lock">قفل</string>
-    <string name="all">الكل</string>
     <string name="name">الاسم</string>
     <string name="no_group">بلا مجموعة</string>
     <string name="sort_alphabetically">المصدِّر (أ إلى ي)</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -199,7 +199,6 @@
     <string name="filter">Filtr</string>
     <string name="filter_ungrouped">Bez skupiny</string>
     <string name="lock">Uzamknout</string>
-    <string name="all">Vše</string>
     <string name="name">Název</string>
     <string name="no_group">Žádná skupina</string>
     <string name="sort_alphabetically">Poskytovatel (A → Z)</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -195,7 +195,6 @@
     <string name="filter">Filter</string>
     <string name="filter_ungrouped">Nicht gruppiert</string>
     <string name="lock">Sperren</string>
-    <string name="all">Alle</string>
     <string name="name">Name</string>
     <string name="no_group">Keine Gruppe</string>
     <string name="sort_alphabetically">Herausgeber (A bis Z)</string>

app/src/main/res/values-el-rGR/strings.xml

@@ -195,7 +195,6 @@
     <string name="filter">Φίλτρο</string>
     <string name="filter_ungrouped">Χωρίς ομάδα</string>
     <string name="lock">Κλείδωμα</string>
-    <string name="all">Όλα</string>
     <string name="name">Όνομα</string>
     <string name="no_group">Χωρίς ομάδα</string>
     <string name="sort_alphabetically">Εκδότης (Α προς Ζ)</string>

app/src/main/res/values-es-rES/strings.xml

@@ -176,7 +176,6 @@
     <string name="filter">Filtrar</string>
     <string name="filter_ungrouped">Sin agrupar</string>
     <string name="lock">Bloquear</string>
-    <string name="all">Todo</string>
     <string name="name">Cuenta</string>
     <string name="no_group">Sin grupo</string>
     <string name="sort_alphabetically">Emisor (A a Z)</string>

app/src/main/res/values-eu-rES/strings.xml

@@ -191,7 +191,6 @@
     <string name="filter">Iragazkia</string>
     <string name="filter_ungrouped">Taldekatu gabekoak</string>
     <string name="lock">Blokeatu</string>
-    <string name="all">Denak</string>
     <string name="name">Izena</string>
     <string name="no_group">Talderik ez</string>
     <string name="sort_alphabetically">Igorlea (A-tik Z-ra)</string>

app/src/main/res/values-fa-rIR/strings.xml

@@ -191,7 +191,6 @@
     <string name="filter">فیلتر</string>
     <string name="filter_ungrouped">گروه‌بندی نشده</string>
     <string name="lock">قفل</string>
-    <string name="all">همه</string>
     <string name="name">نام</string>
     <string name="no_group">بدون گروه</string>
     <string name="sort_alphabetically">صادر کننده (A - Z)</string>

app/src/main/res/values-fi-rFI/strings.xml

@@ -191,7 +191,6 @@
     <string name="filter">Suodata</string>
     <string name="filter_ungrouped">Ryhmittelemättömät</string>
     <string name="lock">Lukitse</string>
-    <string name="all">Kaikki</string>
     <string name="name">Nimi</string>
     <string name="no_group">Ei ryhmää</string>
     <string name="sort_alphabetically">Myöntäjä (A-Ö)</string>

app/src/main/res/values-fr-rFR/strings.xml

@@ -195,7 +195,6 @@
     <string name="filter">Filtre</string>
     <string name="filter_ungrouped">Non groupés</string>
     <string name="lock">Verrouiller</string>
-    <string name="all">Tous</string>
     <string name="name">Nom</string>
     <string name="no_group">Aucun groupe</string>
     <string name="sort_alphabetically">Émetteur (de A à Z)</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -186,7 +186,6 @@
     <string name="filter">फ़िल्टर</string>
     <string name="filter_ungrouped">असमूहीकृत</string>
     <string name="lock">लॉक करें</string>
-    <string name="all">सभी</string>
     <string name="name">नाम</string>
     <string name="no_group">कोई समूह नहीं</string>
     <string name="sort_alphabetically">जारीकर्ता (A से Z)</string>

app/src/main/res/values-hu-rHU/strings.xml

@@ -155,7 +155,6 @@
     <string name="filter">Szűrő</string>
     <string name="filter_ungrouped">Csoport nélküli</string>
     <string name="lock">Zárolás</string>
-    <string name="all">Összes</string>
     <string name="name">Név</string>
     <string name="no_group">Nincs csoport</string>
     <string name="sort_alphabetically">Kibocsátó (A-tól Z-ig)</string>

app/src/main/res/values-in-rID/strings.xml

@@ -190,7 +190,6 @@
     <string name="filter">Saring</string>
     <string name="filter_ungrouped">Tidak dikelompokkan</string>
     <string name="lock">Kunci</string>
-    <string name="all">Semua</string>
     <string name="name">Nama</string>
     <string name="no_group">Tidak ada kelompok</string>
     <string name="sort_alphabetically">Penerbit (A ke Z)</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -195,7 +195,6 @@
     <string name="filter">Filtra</string>
     <string name="filter_ungrouped">Non raggruppati</string>
     <string name="lock">Blocca</string>
-    <string name="all">Tutti</string>
     <string name="name">Nome</string>
     <string name="no_group">Nessun gruppo</string>
     <string name="sort_alphabetically">Emittente (A-Z)</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -191,7 +191,6 @@
     <string name="filter">フィルター</string>
     <string name="filter_ungrouped">グループ解除</string>
     <string name="lock">ロックする</string>
-    <string name="all">すべて</string>
     <string name="name">名前</string>
     <string name="no_group">グループなし</string>
     <string name="sort_alphabetically">発行者 (A to Z)</string>

app/src/main/res/values-kn-rIN/strings.xml

@@ -102,7 +102,6 @@
     <string name="details">ವಿವರಗಳು</string>
     <string name="filter">ಮಿತಿಗೊಳಿಸು</string>
     <string name="lock">ಬೀಗ ಹಾಕು</string>
-    <string name="all">ಎಲ್ಲಾ</string>
     <string name="name">ಹೆಸರು</string>
     <string name="no_group">ಗುಂಪಿಲ್ಲ</string>
     <string name="sort_alphabetically">ನೀಡುವವರು (ವರ್ಣಮಾಲೆಯಂತೆ)</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -195,7 +195,6 @@
     <string name="filter">Filter</string>
     <string name="filter_ungrouped">Geen groep</string>
     <string name="lock">Vergrendel</string>
-    <string name="all">Alles</string>
     <string name="name">Naam</string>
     <string name="no_group">Geen groep</string>
     <string name="sort_alphabetically">Uitgever (A t/m Z)</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -201,7 +201,6 @@
     <string name="filter">Filtruj</string>
     <string name="filter_ungrouped">Bez grupy</string>
     <string name="lock">Zablokuj</string>
-    <string name="all">Wszystkie</string>
     <string name="name">Nazwa</string>
     <string name="no_group">Brak grupy</string>
     <string name="sort_alphabetically">Wydawca (od A do Z)</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -195,7 +195,6 @@
     <string name="filter">Filtrar</string>
     <string name="filter_ungrouped">Não agrupar</string>
     <string name="lock">Bloquear</string>
-    <string name="all">Todos</string>
     <string name="name">Conta</string>
     <string name="no_group">Sem grupo</string>
     <string name="sort_alphabetically">Nome (A to Z)</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -195,7 +195,6 @@
     <string name="filter">Filtrar</string>
     <string name="filter_ungrouped">Não agrupado</string>
     <string name="lock">Bloquear</string>
-    <string name="all">Todos</string>
     <string name="name">Nome</string>
     <string name="no_group">Sem grupo</string>
     <string name="sort_alphabetically">Emissor (A a Z)</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -196,7 +196,6 @@
     <string name="filter">Filtru</string>
     <string name="filter_ungrouped">Negrupat</string>
     <string name="lock">Blocare</string>
-    <string name="all">Toate</string>
     <string name="name">Nume</string>
     <string name="no_group">Niciun grup</string>
     <string name="sort_alphabetically">Emitent (A - Z)</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -201,7 +201,6 @@
     <string name="filter">Фильтр</string>
     <string name="filter_ungrouped">Без группировки</string>
     <string name="lock">Заблокировать</string>
-    <string name="all">Все</string>
     <string name="name">Имя</string>
     <string name="no_group">Нет группы</string>
     <string name="sort_alphabetically">Эмитент (А→Я)</string>

app/src/main/res/values-sk-rSK/strings.xml

@@ -85,7 +85,6 @@
     <string name="filter">Filtrovať</string>
     <string name="filter_ungrouped">Nezoskupené</string>
     <string name="lock">Uzamknúť</string>
-    <string name="all">Všetko</string>
     <string name="name">Meno</string>
     <string name="no_group">Žiadna skupina</string>
     <string name="sort_alphabetically_name">Účet (A až Z)</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -162,7 +162,6 @@
     <string name="filter">Filtrele</string>
     <string name="filter_ungrouped">Gruplandırılmamış</string>
     <string name="lock">Kilitle</string>
-    <string name="all">Hepsi</string>
     <string name="name">Ad</string>
     <string name="no_group">Grupsuz</string>
     <string name="sort_alphabetically">Sağlayıcı (A\'dan Z\'ye)</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -192,7 +192,6 @@
     <string name="filter">筛选</string>
     <string name="filter_ungrouped">未分组</string>
     <string name="lock">锁定</string>
-    <string name="all">所有</string>
     <string name="name">名称</string>
     <string name="no_group">无群组</string>
     <string name="sort_alphabetically">服务商（A 到 Z）</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -183,7 +183,6 @@
     <string name="filter">篩選</string>
     <string name="filter_ungrouped">未分組</string>
     <string name="lock">鎖定</string>
-    <string name="all">所有</string>
     <string name="name">名稱</string>
     <string name="no_group">無群組</string>
     <string name="sort_alphabetically">服務商（A 到 Z）</string>

app/src/main/res/values/strings.xml

@@ -224,7 +224,6 @@
     <string name="filter">Filter</string>
     <string name="filter_ungrouped">Ungrouped</string>
     <string name="lock">Lock</string>
-    <string name="all">All</string>
     <string name="name">Name</string>
     <string name="no_group">No group</string>
     <string name="sort_alphabetically">Issuer (A to Z)</string>