From 2ced76049b14180007be86177fce26134a917f26 Mon Sep 17 00:00:00 2001 From: n0tst3v3 Date: Wed, 19 Aug 2026 00:54:47 -0600 Subject: [PATCH] Revert "fix(map): make filter panel compact and scrollable" This reverts commit dc63fffb6787f37781087caad11a1ac0d093917c. --- .../com/wytehat/btlogger/MapActivity.java | 80 ++++++++----------- 1 file changed, 34 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/com/wytehat/btlogger/MapActivity.java b/app/src/main/java/com/wytehat/btlogger/MapActivity.java index 2d63920..c35f08f 100644 --- a/app/src/main/java/com/wytehat/btlogger/MapActivity.java +++ b/app/src/main/java/com/wytehat/btlogger/MapActivity.java @@ -22,7 +22,6 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.CheckBox; import android.widget.LinearLayout; -import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; @@ -49,8 +48,6 @@ implements SensorEventListener { private LinearLayout filterPanel; - private ScrollView filterScroll; - private Spinner categorySpinner; private Spinner deviceSpinner; @@ -210,6 +207,7 @@ implements SensorEventListener { dp(4) ); + filterPanel.setVisibility(View.GONE); /* * Category. @@ -389,30 +387,13 @@ implements SensorEventListener { filterPanel.addView(showAll); - /* - * Bounded to a third of the screen and scrollable, so every - * control stays reachable on short screens. - */ - filterScroll = new ScrollView(this); - - filterScroll.setVisibility(View.GONE); - - filterScroll.addView( - filterPanel, - new android.widget.FrameLayout.LayoutParams( - android.widget.FrameLayout.LayoutParams.MATCH_PARENT, - android.widget.FrameLayout.LayoutParams.WRAP_CONTENT - ) - ); - - root.addView( - filterScroll, - new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, - 0, - 1 - ) - ); + root.addView( + filterPanel, + new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT + ) + ); /* * WebView map. @@ -455,13 +436,13 @@ implements SensorEventListener { } ); - root.addView( - web, - new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, - 0, - 2 - ) + root.addView( + web, + new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + 0, + 1 + ) ); setContentView(root); @@ -495,12 +476,19 @@ implements SensorEventListener { @Override public void onClick(View view) { - filterScroll.setVisibility( - filterScroll.getVisibility() - == View.VISIBLE - ? View.GONE - : View.VISIBLE - ); + if (filterPanel.getVisibility() + == View.VISIBLE) { + + filterPanel.setVisibility( + View.GONE + ); + + } else { + + filterPanel.setVisibility( + View.VISIBLE + ); + } } } ); @@ -658,8 +646,8 @@ implements SensorEventListener { /* * Collapse after applying. */ - filterScroll.setVisibility( - View.GONE + filterPanel.setVisibility( + View.GONE ); } } @@ -708,10 +696,10 @@ implements SensorEventListener { private LinearLayout.LayoutParams compactParams() { - return new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, - dp(38) - ); + return new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + dp(42) + ); } private TextView smallLabel(String text) {