luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-29 10:08:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reset the action bar subtitle when the back button is pressed

Browse source
This commit is contained in:
Alexander Bakker 2022-05-22 12:02:23 +02:00
parent 239d8740be
commit 3b1035b5e1
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -14,7 +14,6 @@ import android.view.KeyEvent;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
@ -526,6 +525,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
collapseSearchView(); collapseSearchView();
setTitle(R.string.app_name); setTitle(R.string.app_name);
getSupportActionBar().setSubtitle(null);
return; return;
} }
@ -546,8 +546,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
saveAndBackupVault(); saveAndBackupVault();
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
_menu = menu; _menu = menu;
@ -581,8 +579,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
return false; return false;
} }
@Override @Override
public boolean onQueryTextChange(String s) { public boolean onQueryTextChange(String s) {
if (_submittedSearchSubtitle == null) { if (_submittedSearchSubtitle == null) {
@ -593,6 +589,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
return false; return false;
} }
}); });
_searchView.setOnSearchClickListener(v -> { _searchView.setOnSearchClickListener(v -> {
if (_submittedSearchSubtitle != null) { if (_submittedSearchSubtitle != null) {
_entryListView.setSearchFilter(null); _entryListView.setSearchFilter(null);
@ -600,16 +597,20 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_submittedSearchSubtitle = null; _submittedSearchSubtitle = null;
} }
}); });
if(_submittedSearchSubtitle != null) {
if (_submittedSearchSubtitle != null) {
getSupportActionBar().setSubtitle(_submittedSearchSubtitle); getSupportActionBar().setSubtitle(_submittedSearchSubtitle);
} }
if(_activeSearchFilter != null) {
if (_activeSearchFilter != null) {
_entryListView.setSearchFilter(_activeSearchFilter); _entryListView.setSearchFilter(_activeSearchFilter);
} }
if(_searchQueryInputText != null) {
if (_searchQueryInputText != null) {
_searchView.setQuery(_searchQueryInputText, false); _searchView.setQuery(_searchQueryInputText, false);
_searchView.setIconified(false); _searchView.setIconified(false);
} }
return true; return true;
} }