me/Fedilab
1
0
Fork 0
forked from mirrors/Fedilab
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'Don't show instance search results if there aren't any.' (#284) from nolan/Fedilab:instance-a11y into develop

Browse source 
Reviewed-on: https://codeberg.org/tom79/Fedilab/pulls/284
This commit is contained in:
Thomas 2022-07-30 10:36:02 +02:00
commit 7e2b1423a6
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
View file

@ -104,17 +104,21 @@ public class FragmentLoginMain extends Fragment {
InstanceSocialVM instanceSocialVM = new ViewModelProvider(FragmentLoginMain.this).get(InstanceSocialVM.class); InstanceSocialVM instanceSocialVM = new ViewModelProvider(FragmentLoginMain.this).get(InstanceSocialVM.class);
instanceSocialVM.getInstances(query).observe(requireActivity(), instanceSocialList -> { instanceSocialVM.getInstances(query).observe(requireActivity(), instanceSocialList -> {
binding.loginInstance.setAdapter(null); binding.loginInstance.setAdapter(null);
String[] instances = new String[instanceSocialList.instances.size()]; if (instanceSocialList.instances.isEmpty()) {
int j = 0; binding.loginInstance.dismissDropDown();
for (InstanceSocial.Instance instance : instanceSocialList.instances) { } else {
instances[j] = instance.name; String[] instances = new String[instanceSocialList.instances.size()];
j++; int j = 0;
for (InstanceSocial.Instance instance : instanceSocialList.instances) {
instances[j] = instance.name;
j++;
}
ArrayAdapter<String> adapter = new ArrayAdapter<>(requireActivity(),
android.R.layout.simple_list_item_1, instances);
binding.loginInstance.setAdapter(adapter);
if (binding.loginInstance.hasFocus() && !requireActivity().isFinishing())
binding.loginInstance.showDropDown();
} }
ArrayAdapter<String> adapter =
new ArrayAdapter<>(requireActivity(), android.R.layout.simple_list_item_1, instances);
binding.loginInstance.setAdapter(adapter);
if (binding.loginInstance.hasFocus() && !requireActivity().isFinishing())
binding.loginInstance.showDropDown();
if (oldSearch != null && oldSearch.equals(binding.loginInstance.getText().toString())) { if (oldSearch != null && oldSearch.equals(binding.loginInstance.getText().toString())) {
binding.loginInstance.dismissDropDown(); binding.loginInstance.dismissDropDown();
} }