Commit 7e2b1423 authored by Thomas's avatar Thomas
Browse files

Merge pull request 'Don't show instance search results if there aren't any.'... 

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

Reviewed-on: https://codeberg.org/tom79/Fedilab/pulls/284
parents 316b815d f4290171

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

+14 −10
Original line number Diff line number Diff line
@@ -104,17 +104,21 @@ public class FragmentLoginMain extends Fragment { 
                        InstanceSocialVM instanceSocialVM = new ViewModelProvider(FragmentLoginMain.this).get(InstanceSocialVM.class);

                        instanceSocialVM.getInstances(query).observe(requireActivity(), instanceSocialList -> {

                            binding.loginInstance.setAdapter(null);

                            if (instanceSocialList.instances.isEmpty()) {

                                binding.loginInstance.dismissDropDown();

                            } else {

                                String[] instances = new String[instanceSocialList.instances.size()];

                                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);

                                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())) {

                                binding.loginInstance.dismissDropDown();

                            }