diff --git a/.DS_Store b/.DS_Store
index cdd8148..baa8b44 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/app/.DS_Store b/app/.DS_Store
new file mode 100644
index 0000000..9a874b5
Binary files /dev/null and b/app/.DS_Store differ
diff --git a/app/src/.DS_Store b/app/src/.DS_Store
new file mode 100644
index 0000000..7b0d367
Binary files /dev/null and b/app/src/.DS_Store differ
diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store
new file mode 100644
index 0000000..b7b0f1d
Binary files /dev/null and b/app/src/main/.DS_Store differ
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/types/input/DropdownType.java b/app/src/main/java/com/ridgebotics/ridgescout/types/input/DropdownType.java
index 5358437..728ecea 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/types/input/DropdownType.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/types/input/DropdownType.java
@@ -112,7 +112,7 @@ public class DropdownType extends FieldType {
.layout_match_wrap()
.padding(20)
.size(18)
- .align_center()
+ .align_left()
.build());
}
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/types/input/NumberType.java b/app/src/main/java/com/ridgebotics/ridgescout/types/input/NumberType.java
index 194a07d..71881f5 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/types/input/NumberType.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/types/input/NumberType.java
@@ -121,7 +121,7 @@ public class NumberType extends FieldType {
if(data.isNull()) return;
parent.addView(new TextViewBuilder(parent.getContext(), String.valueOf((int) data.get()))
.layout_match_wrap()
- .align_center()
+ .align_left()
.size(24)
.build());
}
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 3231afa..ac922ea 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
@@ -106,7 +106,7 @@ public class TallyType extends FieldType {
if(data.isNull()) return;
parent.addView(new TextViewBuilder(parent.getContext(), String.valueOf((int) data.get()))
.layout_match_wrap()
- .align_center()
+ .align_left()
.size(24)
.build());
}
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/types/input/TextType.java b/app/src/main/java/com/ridgebotics/ridgescout/types/input/TextType.java
index 80e85a8..795f1d8 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/types/input/TextType.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/types/input/TextType.java
@@ -115,7 +115,7 @@ public class TextType extends FieldType {
if(data.isNull()) return;
parent.addView(new TextViewBuilder(parent.getContext(), (String) data.get())
.layout_match_wrap()
- .align_center()
+ .align_left()
.size(18)
.build());
}
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java
index 5ff9277..887b1f0 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java
@@ -11,6 +11,7 @@ import static com.ridgebotics.ridgescout.utility.DataManager.pit_transferValues;
import static com.ridgebotics.ridgescout.utility.DataManager.pit_values;
import android.content.Intent;
+import android.graphics.Paint;
import android.net.Uri;
import android.os.Bundle;
import android.view.Gravity;
@@ -221,19 +222,18 @@ public class TeamsFragment extends Fragment {
ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[matchIndex], match_values, match_transferValues);
- binding.matchArea.addView(
- new TextViewBuilder(getContext(), "M" + (match_num) + " " + split[2] + "-" + split[3] + " by " + psda.username)
- .align_center()
- .size(30)
- .padding(0,0,40,5)
- .build()
-
- );
-
+ TextView title = new TextViewBuilder(getContext(),
+ "M" + (match_num) + " " + split[2] + "-" + split[3] + " by " + psda.username)
+ .align_center()
+ .size(30)
+ .padding(0, 0, 40, 5)
+ .build();
+ title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+ binding.matchArea.addView(title);
for (int i = 0; i < psda.data.array.length; i++) {
TextViewBuilder tv = new TextViewBuilder(getContext(), match_latest_values[i].name)
- .align_center()
+ .align_left()
.size(25);
if (psda.data.array[i].isNull()) {
@@ -282,6 +282,7 @@ public class TeamsFragment extends Fragment {
.build()
);
+
if(data[i] != null)
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++){
- binding.matchArea.addView(
- new TextViewBuilder(getContext(), match_latest_values[i].name)
+ TextView tv = new TextViewBuilder(getContext(), match_latest_values[i].name)
.align_center()
.size(30)
.padding(0,0,20,5)
- .build()
- );
+ .build();
+ tv.setPaintFlags(tv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+ binding.matchArea.addView(tv);
if(data[i] != null)
match_latest_values[i].add_history_view(binding.matchArea, data[i]);
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/settings/SettingsFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/settings/SettingsFragment.java
index 926d0fe..c68e63f 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/settings/SettingsFragment.java
@@ -152,6 +152,8 @@ public class SettingsFragment extends Fragment {
manager.addItem(new CheckboxSettingsItem(EnableQuickAllianceChangeKey, "Enable quick alliance swap", null));
manager.addItem(new DropdownSettingsItem(FieldImageKey, "Field Image", new String[]{
+ "2026",
+ "2026 (Flipped)",
"2025",
"2025 (Flipped)"
}));
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/views/FieldPosView.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/views/FieldPosView.java
index b1b3cd5..bdd8f30 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/views/FieldPosView.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/views/FieldPosView.java
@@ -81,6 +81,12 @@ public class FieldPosView extends FrameLayout {
case "2025 (Flipped)":
setImageResource(R.drawable.field_2025_flipped);
break;
+ case "2026":
+ setImageResource(R.drawable.field_2026);
+ break;
+ case "2026 (Flipped)":
+ setImageResource(R.drawable.field_2026_flipped);
+ break;
}
}
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/utility/SettingsManager.java b/app/src/main/java/com/ridgebotics/ridgescout/utility/SettingsManager.java
index 897d12d..a778c86 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/utility/SettingsManager.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/utility/SettingsManager.java
@@ -46,8 +46,8 @@ public class SettingsManager {
hm.put(UnameKey, "Username");
hm.put(SelEVCodeKey, "unset");
hm.put(WifiModeKey, false);
- hm.put(YearNumKey, 2025);
- hm.put(FieldImageKey, "2025");
+ hm.put(YearNumKey, 2026);
+ hm.put(FieldImageKey, "2026");
hm.put(MatchNumKey, 0);
hm.put(AllyPosKey, "red-1");
hm.put(DataModeKey, 0);
diff --git a/app/src/main/res/.DS_Store b/app/src/main/res/.DS_Store
index 746f05c..8ec7eec 100644
Binary files a/app/src/main/res/.DS_Store and b/app/src/main/res/.DS_Store differ
diff --git a/app/src/main/res/drawable/field_2026.png b/app/src/main/res/drawable/field_2026.png
new file mode 100644
index 0000000..6f9c67b
Binary files /dev/null and b/app/src/main/res/drawable/field_2026.png differ
diff --git a/app/src/main/res/drawable/field_2026_flipped.png b/app/src/main/res/drawable/field_2026_flipped.png
new file mode 100644
index 0000000..bc77da6
Binary files /dev/null and b/app/src/main/res/drawable/field_2026_flipped.png differ
diff --git a/app/src/main/res/layout/fragment_data_teams.xml b/app/src/main/res/layout/fragment_data_teams.xml
index 44650d0..3d183f2 100644
--- a/app/src/main/res/layout/fragment_data_teams.xml
+++ b/app/src/main/res/layout/fragment_data_teams.xml
@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:text="Pit Data"
android:textAlignment="center"
- android:textSize="24sp"
+ android:textSize="35sp"
app:layout_constraintTop_toBottomOf="@+id/team_description2"
tools:layout_editor_absoluteX="0dp" />
@@ -73,6 +73,11 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
+
@@ -139,9 +144,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
+
-
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d945bd2..cf1cd07 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-agp = "8.13.0"
+agp = "8.13.2"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
diff --git a/metadata/.DS_Store b/metadata/.DS_Store
index eb75219..ae40684 100644
Binary files a/metadata/.DS_Store and b/metadata/.DS_Store differ
diff --git a/metadata/en-US/.DS_Store b/metadata/en-US/.DS_Store
index f92882b..3b35122 100644
Binary files a/metadata/en-US/.DS_Store and b/metadata/en-US/.DS_Store differ
diff --git a/metadata/en-US/images/.DS_Store b/metadata/en-US/images/.DS_Store
index aa8a009..f477324 100644
Binary files a/metadata/en-US/images/.DS_Store and b/metadata/en-US/images/.DS_Store differ
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b613cad..0541bd6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,7 +17,6 @@ dependencyResolutionManagement {
google()
mavenCentral()
maven ( url = "https://jitpack.io" )
- jcenter()
}
}