From 50419e284cbde5e3b294c328c4095e86789c6d95 Mon Sep 17 00:00:00 2001 From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com> Date: Sun, 13 Apr 2025 10:45:33 -0600 Subject: [PATCH] Fix sorting crash --- .../com/ridgebotics/ridgescout/types/input/TallyType.java | 5 ++++- .../com/ridgebotics/ridgescout/utility/AlertManager.java | 2 +- app/src/main/res/layout/fragment_data_parent.xml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/ridgebotics/ridgescout/types/input/TallyType.java b/app/src/main/java/com/ridgebotics/ridgescout/types/input/TallyType.java index 3b3a877..7f165e5 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/types/input/TallyType.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/types/input/TallyType.java @@ -337,7 +337,10 @@ public class TallyType extends FieldType { // parent.addView(new ); - Collections.sort(views, (a, b) -> (int) ((b.average - a.average)*50.f)); + try { + Collections.sort(views, (a, b) -> (int) ((b.average - a.average) * 50.f)); + }catch (Exception e){} + for(int i = 0; i < views.size(); i++){ row = new TableRow(parent.getContext()); CandlestickView view = views.get(i); diff --git a/app/src/main/java/com/ridgebotics/ridgescout/utility/AlertManager.java b/app/src/main/java/com/ridgebotics/ridgescout/utility/AlertManager.java index 50fecf0..2956dd5 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/utility/AlertManager.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/utility/AlertManager.java @@ -102,7 +102,7 @@ public class AlertManager { if(!errorList.isEmpty()) alert.setNeutralButton("View Detailed Error" + (errorList.size() != 1 ? "s" : ""), (dialogInterface, i) -> alert("Details", detailedErrors)); - alert.setOnDismissListener((x) -> {if(currentError != null){errorList.clear(); simpleErrorList.clear();}}); +// alert.setOnDismissListener((x) -> {if(currentError != null){errorList.clear(); simpleErrorList.clear();}}); alert.setCancelable(true); currentError = alert.create(); diff --git a/app/src/main/res/layout/fragment_data_parent.xml b/app/src/main/res/layout/fragment_data_parent.xml index 545c661..4971048 100644 --- a/app/src/main/res/layout/fragment_data_parent.xml +++ b/app/src/main/res/layout/fragment_data_parent.xml @@ -76,8 +76,8 @@ android:layout_width="50dp" android:layout_height="50dp" android:layout_marginEnd="5dp" - android:text="C" - android:textSize="20dp" + android:text="⎘" + android:textSize="22dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" />