Hide search buttons when not needed

INDIForJava · Jan 8, 2021 · a2f9cbd · a2f9cbd
1 parent a46987b
commit a2f9cbd
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 41 deletions.
diff --git a/app/src/main/java/org/indilib/i4j/iparcos/ControlPanelFragment.java b/app/src/main/java/org/indilib/i4j/iparcos/ControlPanelFragment.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -44,6 +46,7 @@ public class ControlPanelFragment extends Fragment
     private ViewPager2 viewPager;
     private TabLayout tabLayout;
     private Context context;
+    private MenuItem searchMenu;
 
     @Override
     public void onAttach(@NonNull Context context) {
@@ -119,12 +122,12 @@ public void onDestroy() {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) {
-        MenuItem item = menu.add(R.string.mount_goto);
-        item.setIcon(R.drawable.search);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        searchMenu = menu.add(R.string.search);
+        searchMenu.setIcon(R.drawable.search);
+        searchMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         SearchView searchView = new SearchView(context);
         searchView.setOnQueryTextListener(this);
-        item.setActionView(searchView);
+        searchMenu.setActionView(searchView);
     }
 
     @Override
@@ -145,11 +148,13 @@ private void noDevices() {
         noDevicesText.post(() -> noDevicesText.setVisibility(View.VISIBLE));
         controlLayout.post(() -> controlLayout.setVisibility(View.GONE));
         viewPager.post(() -> fragmentAdapter.notifyDataSetChanged());
+        new Handler(Looper.getMainLooper()).post(() -> searchMenu.setVisible(false));
     }
 
     private void devices() {
         noDevicesText.post(() -> noDevicesText.setVisibility(View.GONE));
         controlLayout.post(() -> controlLayout.setVisibility(View.VISIBLE));
+        new Handler(Looper.getMainLooper()).post(() -> searchMenu.setVisible(true));
     }
 
     @Override

diff --git a/app/src/main/java/org/indilib/i4j/iparcos/GoToFragment.java b/app/src/main/java/org/indilib/i4j/iparcos/GoToFragment.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -35,7 +37,6 @@
 import org.indilib.i4j.iparcos.catalog.Coordinates;
 import org.indilib.i4j.iparcos.prop.PropUpdater;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -60,6 +61,7 @@ public class GoToFragment extends ListFragment
     private static ArrayAdapter<CatalogEntry> entriesAdapter;
     private ConnectionManager connectionManager;
     private Context context;
+    private MenuItem searchMenu;
     // INDI properties
     private INDINumberProperty telescopeCoordP = null;
     private INDINumberElement telescopeCoordRA = null;
@@ -129,34 +131,12 @@ public void onAttach(@NonNull Context context) {
         this.context = context;
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        // Set up INDI connection
-        connectionManager = IPARCOSApp.getConnectionManager();
-        connectionManager.addListener(this);
-        // Enumerate existing properties
-        if (connectionManager.isConnected()) {
-            List<INDIDevice> list = connectionManager.getConnection().getDevicesAsList();
-            if (list != null) {
-                for (INDIDevice device : list) {
-                    device.addINDIDeviceListener(this);
-                    for (INDIProperty<?> property : device.getPropertiesAsList()) {
-                        newProperty(device, property);
-                    }
-                }
-            }
-        } else {
-            clearVars();
-        }
-    }
-
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         setEmptyText(getString(R.string.empty_catalog));
         setHasOptionsMenu(true);
-        ArrayList<CatalogEntry> entries = catalog.getEntries();
+        List<CatalogEntry> entries = catalog.getEntries();
         entriesAdapter = new ArrayAdapter<CatalogEntry>(context,
                 android.R.layout.simple_list_item_2, android.R.id.text1, entries) {
             @NonNull
@@ -171,22 +151,47 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             }
         };
         setListAdapter(entriesAdapter);
-        if (!catalog.isReady()) {
+        if (catalog.isReady()) {
+            new Handler(Looper.getMainLooper()).post(() -> searchMenu.setVisible(true));
+        } else {
             // List loading
             setListShown(false);
             catalog.setListener(this);
             if (!catalog.isLoading()) new Thread(catalog::load).start();
         }
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        // Set up INDI connection
+        connectionManager = IPARCOSApp.getConnectionManager();
+        connectionManager.addListener(this);
+        // Enumerate existing properties
+        if (connectionManager.isConnected()) {
+            List<INDIDevice> list = connectionManager.getConnection().getDevicesAsList();
+            if (list != null) {
+                for (INDIDevice device : list) {
+                    device.addINDIDeviceListener(this);
+                    for (INDIProperty<?> property : device.getPropertiesAsList()) {
+                        newProperty(device, property);
+                    }
+                }
+            }
+        } else {
+            clearVars();
+        }
+    }
+
     @Override
     public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) {
-        MenuItem item = menu.add(R.string.mount_goto);
-        item.setIcon(R.drawable.search);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        searchMenu = menu.add(R.string.mount_goto);
+        searchMenu.setIcon(R.drawable.search);
+        searchMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        searchMenu.setVisible(false);
         SearchView searchView = new SearchView(context);
         searchView.setOnQueryTextListener(this);
-        item.setActionView(searchView);
+        searchMenu.setActionView(searchView);
     }
 
     @Override
@@ -231,7 +236,7 @@ public boolean onQueryTextSubmit(String query) {
 
     @Override
     public void onListItemClick(@NonNull ListView l, @NonNull View v, int position, long id) {
-        ArrayList<CatalogEntry> entries = catalog.getEntries();
+        List<CatalogEntry> entries = catalog.getEntries();
         final Coordinates coord = entries.get(position).getCoordinates();
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
         builder.setMessage(entries.get(position).createDescription(context)).setTitle(entries.get(position).getName());
@@ -356,8 +361,9 @@ public void newMessage(INDIServerConnection connection, Date timestamp, String m
 
     @Override
     public void onLoaded(boolean success) {
-        getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             if (success) {
+                searchMenu.setVisible(true);
                 entriesAdapter.notifyDataSetChanged();
                 if (isResumed()) {
                     setListShown(true);

diff --git a/app/src/main/java/org/indilib/i4j/iparcos/catalog/Catalog.java b/app/src/main/java/org/indilib/i4j/iparcos/catalog/Catalog.java
@@ -9,6 +9,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * A catalog of astronomical objects.
@@ -21,7 +22,7 @@ public class Catalog {
     /**
      * Catalog objects.
      */
-    private final ArrayList<CatalogEntry> entries = new ArrayList<>();
+    private final List<CatalogEntry> entries = new ArrayList<>();
     private boolean ready = false;
     private boolean loading = false;
     private CatalogLoadingListener listener = null;
@@ -68,7 +69,7 @@ public boolean isReady() {
     /**
      * @return an {@link ArrayList} containing all the entries of this catalog.
      */
-    public ArrayList<CatalogEntry> getEntries() {
+    public List<CatalogEntry> getEntries() {
         return entries;
     }
 

diff --git a/app/src/main/java/org/indilib/i4j/iparcos/catalog/DSOEntry.java b/app/src/main/java/org/indilib/i4j/iparcos/catalog/DSOEntry.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Represents a deep sky object. This class also contains a loader to fetch DSO from the app's catalog.
@@ -78,7 +78,7 @@ private DSOEntry(String data) {
         coord = new Coordinates(raString, decString);
     }
 
-    public static void loadToList(ArrayList<CatalogEntry> list, Resources resources) throws IOException {
+    public static void loadToList(List<CatalogEntry> list, Resources resources) throws IOException {
         // Open and read the catalog file
         InputStream resourceStream = resources.openRawResource(RESOURCE);
         BufferedReader br = new BufferedReader(new InputStreamReader(resourceStream));

diff --git a/app/src/main/java/org/indilib/i4j/iparcos/catalog/StarEntry.java b/app/src/main/java/org/indilib/i4j/iparcos/catalog/StarEntry.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Represents a star. This class also contains a loader to fetch stars from the app's catalog.
@@ -52,7 +52,7 @@ private StarEntry(String data) {
         }
     }
 
-    public static void loadToList(ArrayList<CatalogEntry> list, Resources resources) throws IOException {
+    public static void loadToList(List<CatalogEntry> list, Resources resources) throws IOException {
         // Open and read the catalog file
         InputStream resourceStream = resources.openRawResource(RESOURCE);
         BufferedReader br = new BufferedReader(new InputStreamReader(resourceStream));

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -112,4 +112,5 @@
     <string name="telescope_parking">Parcheggiamento montatura</string>
     <string name="telescope_parking_confirm">Sei sicuro di voler cambiare lo stato della montatura?</string>
     <string name="dark_nebula">Nebulosa oscura</string>
+    <string name="search">Cerca</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -113,4 +113,5 @@
     <string name="telescope_parking">Telescope parking</string>
     <string name="telescope_parking_confirm">Are you sure you want change the parking state?</string>
     <string name="dark_nebula">Dark nebula</string>
+    <string name="search">Search</string>
 </resources>