Merge branch 'feature/ADFA-5509-build-annotations' into feature/ADFA-5527-chart-font-scale

Author: davidschachterADFA

app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt

@@ -471,14 +471,20 @@ abstract class BaseEditorActivity :
 		 * handed to [MetricsCarouselController], which is in turn handed to the floating window and
 		 * outlives an activity recreation. A pure function of the process name has no business
 		 * pinning an activity in memory, and this one is exactly that.
+		 *
+		 * An unrecognised name falls back rather than throwing. This is reached from the
+		 * once-a-second sample listener and from RecyclerView's bind pass, so a name nobody added a
+		 * colour for would take the editor down from a timer callback or mid-layout -- a crash for
+		 * the sake of a line colour. 5d00a796a and 4c65554e5 each established that; this branch
+		 * removed it again, so it is written down here rather than rediscovered a fourth time.
 		 */
 		@JvmStatic
 		fun getMemUsageLineColorFor(proc: MemoryUsageWatcher.ProcessMemoryInfo): Int =
 			when (proc.pname) {
 				PROC_IDE -> Color.BLUE
 				PROC_GRADLE_TOOLING -> Color.RED
 				PROC_GRADLE_DAEMON -> Color.GREEN
-				else -> throw IllegalArgumentException("Unknown process: $proc")
+				else -> Color.GRAY
 			}
 
 		protected val PROC_IDE = "IDE"
@@ -1018,11 +1024,21 @@ abstract class BaseEditorActivity :
 	}
 
 	private fun setupMetricsCarousel() {
-		metricsCarousel.bind(binding.memUsageView)
 		binding.memUsageView.root.onTwoFingerTap = ::onMetricsCarouselUndockRequested
 		binding.memUsageView.metricsUndockedMessage.setOnClickListener {
 			onMetricsCarouselRedockRequested()
 		}
+
+		// Ask where the carousel is before binding one here. Only one can be live at a time, and
+		// the floating one outlives this activity -- so an activity recreated while it is floating
+		// (a night-mode or locale change, or leaving the editor and coming back) used to bind a
+		// second carousel into the strip and leave the floating one attached to a destroyed
+		// activity's views, frozen, with the strip showing no sign that it had gone anywhere.
+		//
+		// [setMetricsCarouselUndocked] is the same call the undock request makes, so the strip
+		// shows the "tap to bring them back" message and tapping it re-docks onto *this*
+		// activity's controller.
+		setMetricsCarouselUndocked(isMetricsCarouselUndocked())
 	}
 
 	/**

app/src/main/java/com/itsaky/androidide/ui/MetricsChartRenderer.kt

@@ -100,10 +100,25 @@ abstract class MetricsChartRenderer(
 	 * One predicate, because the tap that opens the sampling-rate chooser and the long press that
 	 * explains it have to agree on where that band is: written twice, they can drift apart and the
 	 * tooltip then describes a control the tap no longer reaches.
+	 *
+	 * Bounded below, not just above. Everything under the plot used to count, and the legend lives
+	 * there too -- MPAndroidChart aligns it to the bottom by default, under the axis labels. So
+	 * tapping the legend, which is the one thing in a chart a reader expects to be tappable, opened
+	 * the sampling-rate chooser; picking a rate there clears every buffer, and the user loses the
+	 * history they were looking at for an action they did not ask for.
+	 *
+	 * The band stops at the legend's top edge, and is never narrower than one axis label, so a
+	 * legend that measures larger than expected cannot squeeze the rate chooser out of reach.
 	 */
 	private fun isOnAxisBand(y: Float): Boolean {
 		val chart = this.chart ?: return false
-		return y >= chart.viewPortHandler.contentBottom()
+		val top = chart.viewPortHandler.contentBottom()
+		val legend = chart.legend
+		// What the chart reserves for the legend at the bottom: its measured height plus the
+		// offset it keeps above itself. Both are pixels, as MPAndroidChart stores them.
+		val reservedForLegend = if (legend.isEnabled) legend.mNeededHeight + legend.yOffset else 0f
+		val bottom = maxOf(chart.height - reservedForLegend, top + chart.xAxis.textSize)
+		return y >= top && y < bottom
 	}
 
 	/**

app/src/test/java/com/itsaky/androidide/activities/editor/MemUsageLineColorTest.kt

@@ -0,0 +1,58 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.androidide.activities.editor
+
+import android.graphics.Color
+import com.google.common.truth.Truth.assertThat
+import com.itsaky.androidide.utils.MemoryUsageWatcher
+import com.itsaky.androidide.utils.MutableShiftedLongArray
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * That an unnamed process costs a line colour rather than the editor.
+ *
+ * This fallback has been established twice and removed twice. It is reached from the once-a-second
+ * sample listener and from RecyclerView's bind pass, so throwing here takes the editor down from a
+ * timer callback or mid-layout -- for the sake of a colour.
+ */
+@RunWith(RobolectricTestRunner::class)
+class MemUsageLineColorTest {
+	private fun process(name: String) =
+		MemoryUsageWatcher.ProcessMemoryInfo(
+			pid = 1234,
+			pname = name,
+			_history = MutableShiftedLongArray(4),
+		)
+
+	@Test
+	fun `the three watched processes keep their colours`() {
+		assertThat(BaseEditorActivity.getMemUsageLineColorFor(process("IDE"))).isEqualTo(Color.BLUE)
+		assertThat(BaseEditorActivity.getMemUsageLineColorFor(process("Gradle Tooling"))).isEqualTo(Color.RED)
+		assertThat(BaseEditorActivity.getMemUsageLineColorFor(process("Gradle Daemon"))).isEqualTo(Color.GREEN)
+	}
+
+	@Test
+	fun `a process nobody gave a colour gets one anyway`() {
+		// Not a throw. The names are only ever supplied by watchProcess call sites today, so this
+		// is a guard rather than a live path -- but the cost of being wrong is a crash from a
+		// timer callback, and the cost of the guard is one grey line.
+		assertThat(BaseEditorActivity.getMemUsageLineColorFor(process("Kotlin Daemon"))).isEqualTo(Color.GRAY)
+	}
+}

app/src/test/java/com/itsaky/androidide/ui/MetricsChartAxisTapTest.kt

@@ -128,6 +128,34 @@ class MetricsChartAxisTapTest {
 		assertThat(taps).isEqualTo(1)
 	}
 
+	@Test
+	fun `a tap on the legend does not open the chooser`() {
+		val chart = laidOutChart()
+
+		// MPAndroidChart aligns the legend to the bottom by default, below the axis labels, so
+		// "everything under the plot" included it -- and the legend is the one part of a chart a
+		// reader expects to be tappable. Opening the rate chooser there is bad enough; picking a
+		// rate in it clears every buffer, so a mis-tap costs the history being looked at.
+		//
+		// Robolectric measures no real text, so the legend here is a few pixels rather than the
+		// ~10dp row a device draws. That is enough: the assertion is about which side of the
+		// boundary the legend's own rows fall on, and the bottom row is the legend's.
+		tapAt(chart, CHART_HEIGHT - 1f)
+
+		assertThat(taps).isEqualTo(0)
+	}
+
+	@Test
+	fun `the axis labels still open the chooser, with the legend excluded`() {
+		val chart = laidOutChart()
+
+		// The other half of the bound: narrowing the band must not put the rate chooser out of
+		// reach. One axis label's height below the plot always stays in it.
+		tapAt(chart, chart.viewPortHandler.contentBottom() + chart.xAxis.textSize / 2f)
+
+		assertThat(taps).isEqualTo(1)
+	}
+
 	@Test
 	fun `a tap above the plot does not open the chooser`() {
 		val chart = laidOutChart()