Cometleonard (#441)

* Added a first cut at the comets layer just a clone of the meteors layer
to start with.

* Move all the celestial objects into their own file. Will need to do the
same for other languages.

* Added string resources for two comets.

* Remove a duplicitative method.

* Work in progress on the Comets Layer.

* Checkpointing this as an example of what not to do. Number in Kotlin
doesn't really support many number-like things...so this won't work.
There are good reasons for it, but it's still a pain.

* Added all the structure for the comets layer.

* Added in the data for Comet Leonard and also realized how clunky the
search code is.  Made it so we return no search results when an object
is invisible, but it's still unsatisfactory that it shows in the
autocomplete.

* Crappy comet image #1

* Slightly less crappy comet image.

app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.google.android.stardroid"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 31
         versionCode 1530
         versionName "1.10.0 - RC1"

app/src/main/java/com/google/android/stardroid/ApplicationModule.java

@@ -18,6 +18,7 @@
 import com.google.android.stardroid.control.MagneticDeclinationCalculator;
 import com.google.android.stardroid.control.RealMagneticDeclinationCalculator;
 import com.google.android.stardroid.control.ZeroMagneticDeclinationCalculator;
+import com.google.android.stardroid.layers.CometsLayer;
 import com.google.android.stardroid.layers.EclipticLayer;
 import com.google.android.stardroid.layers.GridLayer;
 import com.google.android.stardroid.layers.HorizonLayer;
@@ -153,6 +154,7 @@ LayerManager provideLayerManager(
     layerManager.addLayer(new ConstellationsLayer(assetManager, resources));
     layerManager.addLayer(new SolarSystemLayer(model, resources, preferences));
     layerManager.addLayer(new MeteorShowerLayer(model, resources));
+    layerManager.addLayer(new CometsLayer(model, resources));
     layerManager.addLayer(new GridLayer(resources, 24, 9));
     layerManager.addLayer(new HorizonLayer(model, resources));
     layerManager.addLayer(new EclipticLayer(resources));

app/src/main/java/com/google/android/stardroid/activities/DynamicStarMapActivity.java

@@ -615,7 +615,7 @@ private void doSearchWithIntent(Intent searchIntent) {
     } else {
       Log.d(TAG, "One result returned.");
       final SearchResult result = results.get(0);
-      activateSearchTarget(result.coords, result.capitalizedName);
+      activateSearchTarget(result.coords(), result.capitalizedName);
     }
   }
 

app/src/main/java/com/google/android/stardroid/activities/dialogs/MultipleSearchResultsDialogFragment.java

@@ -48,7 +48,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
           Log.d(TAG, "Many search results Dialog closed with cancel");
         } else {
           final SearchResult item = multipleSearchResultsAdaptor.getItem(whichButton);
-          parentActivity.activateSearchTarget(item.coords, item.capitalizedName);
+          parentActivity.activateSearchTarget(item.coords(), item.capitalizedName);
         }
         dialog.dismiss();
       }

app/src/main/java/com/google/android/stardroid/activities/dialogs/NoSearchResultsDialogFragment.java

@@ -32,7 +32,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
     ((HasComponent<ActivityComponent>) getActivity()).getComponent().inject(this);
 
     return new AlertDialog.Builder(parentActivity)
-        .setTitle(R.string.no_search_title).setMessage(R.string.no_search_results_text)
+        .setTitle(R.string.no_search_title).setMessage(R.string.no_search_results_text2)
         .setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog1, int whichButton) {
             Log.d(TAG, "No search results Dialog closed");

app/src/main/java/com/google/android/stardroid/layers/AbstractRenderablesLayer.kt

@@ -50,9 +50,8 @@ abstract class AbstractRenderablesLayer(resources: Resources, private val should
             linePrimitives.addAll(renderables.lines)
             val names = astroRenderable.names
             if (!names.isEmpty()) {
-                val searchLoc = astroRenderable.searchLocation
                 for (name in names) {
-                    searchIndex[name.toLowerCase()] = SearchResult(name, searchLoc)
+                    searchIndex[name.toLowerCase()] = SearchResult(name, astroRenderable)
                     prefixStore.add(name.toLowerCase())
                 }
             }
@@ -105,9 +104,9 @@ abstract class AbstractRenderablesLayer(resources: Resources, private val should
 
     override fun searchByObjectName(name: String): List<SearchResult> {
         Log.d(TAG, "Search planets layer for $name")
-        val matches: MutableList<SearchResult> = ArrayList()
+        val matches = ArrayList<SearchResult>()
         val searchResult = searchIndex[name.toLowerCase()]
-        if (searchResult != null) {
+        if (searchResult != null && searchResult.renderable.isVisible) {
             matches.add(searchResult)
         }
         Log.d(TAG, layerName + " provided " + matches.size + "results for " + name)
@@ -122,6 +121,6 @@ abstract class AbstractRenderablesLayer(resources: Resources, private val should
     }
 
     companion object {
-        private val TAG = MiscUtil.getTag(AbstractRenderablesLayer::class.java)
+        val TAG = MiscUtil.getTag(AbstractRenderablesLayer::class.java)
     }
 }