1 Commits

Author SHA1 Message Date
Daniel Carta 5ddc032be9 Update to 2026
Updates app to 2026, also a few minor UI fixes.
2026-02-10 10:23:05 -07:00
21 changed files with 42 additions and 25 deletions
Vendored
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
@@ -112,7 +112,7 @@ public class DropdownType extends FieldType {
.layout_match_wrap() .layout_match_wrap()
.padding(20) .padding(20)
.size(18) .size(18)
.align_center() .align_left()
.build()); .build());
} }
@@ -121,7 +121,7 @@ public class NumberType extends FieldType {
if(data.isNull()) return; if(data.isNull()) return;
parent.addView(new TextViewBuilder(parent.getContext(), String.valueOf((int) data.get())) parent.addView(new TextViewBuilder(parent.getContext(), String.valueOf((int) data.get()))
.layout_match_wrap() .layout_match_wrap()
.align_center() .align_left()
.size(24) .size(24)
.build()); .build());
} }
@@ -106,7 +106,7 @@ public class TallyType extends FieldType {
if(data.isNull()) return; if(data.isNull()) return;
parent.addView(new TextViewBuilder(parent.getContext(), String.valueOf((int) data.get())) parent.addView(new TextViewBuilder(parent.getContext(), String.valueOf((int) data.get()))
.layout_match_wrap() .layout_match_wrap()
.align_center() .align_left()
.size(24) .size(24)
.build()); .build());
} }
@@ -115,7 +115,7 @@ public class TextType extends FieldType {
if(data.isNull()) return; if(data.isNull()) return;
parent.addView(new TextViewBuilder(parent.getContext(), (String) data.get()) parent.addView(new TextViewBuilder(parent.getContext(), (String) data.get())
.layout_match_wrap() .layout_match_wrap()
.align_center() .align_left()
.size(18) .size(18)
.build()); .build());
} }
@@ -11,6 +11,7 @@ import static com.ridgebotics.ridgescout.utility.DataManager.pit_transferValues;
import static com.ridgebotics.ridgescout.utility.DataManager.pit_values; import static com.ridgebotics.ridgescout.utility.DataManager.pit_values;
import android.content.Intent; import android.content.Intent;
import android.graphics.Paint;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity; import android.view.Gravity;
@@ -221,19 +222,18 @@ public class TeamsFragment extends Fragment {
ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[matchIndex], match_values, match_transferValues); ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[matchIndex], match_values, match_transferValues);
binding.matchArea.addView( TextView title = new TextViewBuilder(getContext(),
new TextViewBuilder(getContext(), "M" + (match_num) + " " + split[2] + "-" + split[3] + " by " + psda.username) "M" + (match_num) + " " + split[2] + "-" + split[3] + " by " + psda.username)
.align_center() .align_center()
.size(30) .size(30)
.padding(0, 0, 40, 5) .padding(0, 0, 40, 5)
.build() .build();
title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
); binding.matchArea.addView(title);
for (int i = 0; i < psda.data.array.length; i++) { for (int i = 0; i < psda.data.array.length; i++) {
TextViewBuilder tv = new TextViewBuilder(getContext(), match_latest_values[i].name) TextViewBuilder tv = new TextViewBuilder(getContext(), match_latest_values[i].name)
.align_center() .align_left()
.size(25); .size(25);
if (psda.data.array[i].isNull()) { if (psda.data.array[i].isNull()) {
@@ -282,6 +282,7 @@ public class TeamsFragment extends Fragment {
.build() .build()
); );
if(data[i] != null) if(data[i] != null)
match_latest_values[i].add_compiled_view(binding.matchArea, data[i]); match_latest_values[i].add_compiled_view(binding.matchArea, data[i]);
} }
@@ -307,13 +308,13 @@ public class TeamsFragment extends Fragment {
for(int i = 0; i < match_latest_values.length; i++){ for(int i = 0; i < match_latest_values.length; i++){
binding.matchArea.addView( TextView tv = new TextViewBuilder(getContext(), match_latest_values[i].name)
new TextViewBuilder(getContext(), match_latest_values[i].name)
.align_center() .align_center()
.size(30) .size(30)
.padding(0,0,20,5) .padding(0,0,20,5)
.build() .build();
); tv.setPaintFlags(tv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
binding.matchArea.addView(tv);
if(data[i] != null) if(data[i] != null)
match_latest_values[i].add_history_view(binding.matchArea, data[i]); match_latest_values[i].add_history_view(binding.matchArea, data[i]);
@@ -152,6 +152,8 @@ public class SettingsFragment extends Fragment {
manager.addItem(new CheckboxSettingsItem(EnableQuickAllianceChangeKey, "Enable quick alliance swap", null)); manager.addItem(new CheckboxSettingsItem(EnableQuickAllianceChangeKey, "Enable quick alliance swap", null));
manager.addItem(new DropdownSettingsItem(FieldImageKey, "Field Image", new String[]{ manager.addItem(new DropdownSettingsItem(FieldImageKey, "Field Image", new String[]{
"2026",
"2026 (Flipped)",
"2025", "2025",
"2025 (Flipped)" "2025 (Flipped)"
})); }));
@@ -81,6 +81,12 @@ public class FieldPosView extends FrameLayout {
case "2025 (Flipped)": case "2025 (Flipped)":
setImageResource(R.drawable.field_2025_flipped); setImageResource(R.drawable.field_2025_flipped);
break; break;
case "2026":
setImageResource(R.drawable.field_2026);
break;
case "2026 (Flipped)":
setImageResource(R.drawable.field_2026_flipped);
break;
} }
} }
@@ -46,8 +46,8 @@ public class SettingsManager {
hm.put(UnameKey, "Username"); hm.put(UnameKey, "Username");
hm.put(SelEVCodeKey, "unset"); hm.put(SelEVCodeKey, "unset");
hm.put(WifiModeKey, false); hm.put(WifiModeKey, false);
hm.put(YearNumKey, 2025); hm.put(YearNumKey, 2026);
hm.put(FieldImageKey, "2025"); hm.put(FieldImageKey, "2026");
hm.put(MatchNumKey, 0); hm.put(MatchNumKey, 0);
hm.put(AllyPosKey, "red-1"); hm.put(AllyPosKey, "red-1");
hm.put(DataModeKey, 0); hm.put(DataModeKey, 0);
BIN
View File
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 636 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 954 KiB

@@ -60,7 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Pit Data" android:text="Pit Data"
android:textAlignment="center" android:textAlignment="center"
android:textSize="24sp" android:textSize="35sp"
app:layout_constraintTop_toBottomOf="@+id/team_description2" app:layout_constraintTop_toBottomOf="@+id/team_description2"
tools:layout_editor_absoluteX="0dp" /> tools:layout_editor_absoluteX="0dp" />
@@ -73,6 +73,11 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/divider3"
android:layout_width="match_parent"
android:layout_height="12dp"
android:background="?android:attr/listDivider" />
</LinearLayout> </LinearLayout>
<TextView <TextView
@@ -81,7 +86,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Match Data" android:text="Match Data"
android:textAlignment="center" android:textAlignment="center"
android:textSize="24sp" android:textSize="35sp"
app:layout_constraintTop_toBottomOf="@+id/team_description2" app:layout_constraintTop_toBottomOf="@+id/team_description2"
tools:layout_editor_absoluteX="0dp" /> tools:layout_editor_absoluteX="0dp" />
@@ -139,9 +144,13 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/divider2"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/listDivider" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
+1 -1
View File
@@ -1,5 +1,5 @@
[versions] [versions]
agp = "8.13.0" agp = "8.13.2"
junit = "4.13.2" junit = "4.13.2"
junitVersion = "1.1.5" junitVersion = "1.1.5"
espressoCore = "3.5.1" espressoCore = "3.5.1"
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
-1
View File
@@ -17,7 +17,6 @@ dependencyResolutionManagement {
google() google()
mavenCentral() mavenCentral()
maven ( url = "https://jitpack.io" ) maven ( url = "https://jitpack.io" )
jcenter()
} }
} }