Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-09 00:37:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some random bugfixes and changes

Browse Source
This commit is contained in:
Astatin3
2024-08-01 11:54:46 -06:00
parent 230ba0857b
commit 96cdda23ca
17 changed files with 129 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/fragment_data.xml
+34 -35
View File
@@ -27,50 +27,49 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<Button
android:id="@+id/status_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="status"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/teamsButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.307" />
<Button
android:id="@+id/teamsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="teams"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@id/compileButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_button" />
<Button
android:id="@+id/compileButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Compile"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/fieldsButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/teamsButton" />
<Button
android:id="@+id/fieldsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Fields"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/teamsButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/teamsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Teams"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@id/compareButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/fieldsButton" />
<Button
android:id="@+id/compareButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Compare"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/reportButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/teamsButton" />
<Button
android:id="@+id/reportButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Report"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/compileButton"
app:layout_constraintTop_toBottomOf="@+id/compareButton"
app:layout_constraintVertical_bias="0.689" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_data_compile.xml → app/src/main/res/layout/fragment_data_compare.xml
View File
app/src/main/res/layout/fragment_data_report.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TBD"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_scouting.xml
+14 -1
View File
@@ -50,11 +50,24 @@
android:layout_height="wrap_content"
android:text="@string/pit_n_scouting"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/status_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/matchScoutingButton" />
<Button
android:id="@+id/status_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Status"
android:textSize="34sp"
app:layout_constraintTop_toBottomOf="@+id/pitScoutingButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.307" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_data_status.xml → app/src/main/res/layout/fragment_scouting_status.xml
View File
app/src/main/res/layout/fragment_settings.xml
-2
View File
@@ -97,7 +97,6 @@
app:spinner_divider_color="@color/teal_200"
app:spinner_divider_show="true"
app:spinner_divider_size="0.4dp"
app:spinner_item_height="46dp"
app:spinner_popup_background="@color/black_2"
app:spinner_popup_elevation="14dp" />
@@ -133,7 +132,6 @@
app:spinner_divider_color="@color/teal_200"
app:spinner_divider_show="true"
app:spinner_divider_size="0.4dp"
app:spinner_item_height="46dp"
app:spinner_popup_background="@color/black_2"
app:spinner_popup_elevation="14dp" />
app/src/main/res/navigation/mobile_navigation.xml
+4 -11
View File
@@ -67,13 +67,6 @@
android:name="com.astatin3.scoutingapp2025.ui.data.dataFragment"
android:label="@string/title_data"
tools:layout="@layout/fragment_data">
<action
android:id="@+id/action_navigation_data_to_navigation_data_status"
app:destination="@id/navigation_data_status"
app:enterAnim="@anim/enter_anim"
app:exitAnim="@anim/exit_anim"
app:popEnterAnim="@anim/enter_anim"
app:popExitAnim="@anim/pop_exit_anim" />
<action
android:id="@+id/action_navigation_data_to_navigation_team_selector"
app:destination="@id/navigation_team_selector"
@@ -99,8 +92,8 @@
<fragment
android:id="@+id/navigation_data_status"
android:name="com.astatin3.scoutingapp2025.ui.data.StatusFragment"
tools:layout="@layout/fragment_data_status">
android:name="com.astatin3.scoutingapp2025.ui.scouting.StatusFragment"
tools:layout="@layout/fragment_scouting_status">
</fragment>
<fragment
@@ -111,8 +104,8 @@
<fragment
android:id="@+id/navigation_data_compile"
android:name="com.astatin3.scoutingapp2025.ui.data.CompileFragment"
tools:layout="@layout/fragment_data_compile">
android:name="com.astatin3.scoutingapp2025.ui.data.ReportFragment"
tools:layout="@layout/fragment_data_report">
</fragment>
<fragment