diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d529d7c..d544ff5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,5 @@ +import com.android.build.api.dsl.Packaging + plugins { alias(libs.plugins.android.application) } @@ -51,3 +53,4 @@ dependencies { androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.espresso.core) } + diff --git a/app/src/main/java/com/example/myapplication/Autonomous.java b/app/src/main/java/com/example/myapplication/Autonomous.java index 581ff10..479296b 100644 --- a/app/src/main/java/com/example/myapplication/Autonomous.java +++ b/app/src/main/java/com/example/myapplication/Autonomous.java @@ -29,9 +29,7 @@ public View onCreateView( ){ binding = AutonomousBinding.inflate(inflater, container, false); v = container; - binding.btnNone.setButtonDrawable(null); - binding.btnFail.setButtonDrawable(null); - binding.btnL1.setButtonDrawable(null); + return binding.getRoot(); } @@ -43,7 +41,6 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { //initialization binding.fuelScored.setText(data.getAutoHub() + ""); binding.fuelMissed.setText(data.getAutoHubMissed() + ""); - ((RadioButton) binding.toggleGroupClimbLevel.getChildAt(data.getAutoClimb())).setChecked(true); binding.title.setText("Autonomous Team " + data.getTeamNumber()); binding.fuelScoredPlus.setOnClickListener(v -> { @@ -64,7 +61,23 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { binding.fuelMissed.setText(Integer.toString(data.getAutoHubMissed())); }); - binding.toggleGroupClimbLevel.setOnCheckedChangeListener((r, i) -> data.setAutoClimb(binding.toggleGroupClimbLevel.indexOfChild(binding.toggleGroupClimbLevel.findViewById(i)))); + binding.toggleGroupClimbLevel.setOnCheckedChangeListener((r, i) -> { + int climb = binding.toggleGroupClimbLevel.indexOfChild(binding.toggleGroupClimbLevel.findViewById(i)); + data.setAutoClimb(climb); + if (climb > 0){ + binding.climbImage.setVisibility(View.VISIBLE); + binding.toggleGroupClimbLocation.setVisibility(View.VISIBLE); + } else { + binding.climbImage.setVisibility(View.GONE); + binding.toggleGroupClimbLocation.setVisibility(View.GONE); + } + }); + + ((RadioButton) binding.toggleGroupClimbLevel.getChildAt(data.getAutoClimb())).setChecked(true); //Triggers listener + + binding.toggleGroupClimbLocation.setOnCheckedChangeListener((r, i) -> data.setAutoClimbLocation(binding.toggleGroupClimbLocation.indexOfChild(binding.toggleGroupClimbLocation.findViewById(i)) + 1)); + + ((RadioButton) binding.toggleGroupClimbLocation.getChildAt(data.getAutoClimbLocation() - 1)).setChecked(true); binding.cont.setOnClickListener(view12 -> NavHostFragment.findNavController(Autonomous.this) .navigate(R.id.action_ThirdFragment_to_SecondFragment)); @@ -78,6 +91,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { binding.fuelScored.setText(data.getAutoHub() + ""); binding.fuelMissed.setText(data.getAutoHubMissed() + ""); ((RadioButton) binding.toggleGroupClimbLevel.getChildAt(0)).setChecked(true); + ((RadioButton) binding.toggleGroupClimbLocation.getChildAt(0)).setChecked(true); }, () ->{}, getContext())); } @Override diff --git a/app/src/main/java/com/example/myapplication/EndGame.java b/app/src/main/java/com/example/myapplication/EndGame.java index af1b274..8769583 100644 --- a/app/src/main/java/com/example/myapplication/EndGame.java +++ b/app/src/main/java/com/example/myapplication/EndGame.java @@ -20,6 +20,8 @@ import com.example.myapplication.databinding.EndGameBinding; +import java.util.Objects; + public class EndGame extends Fragment { private EndGameBinding binding; @@ -46,12 +48,6 @@ public View onCreateView( binding.star5 }; - binding.rbNone.setButtonDrawable(null); - binding.rbFail.setButtonDrawable(null); - binding.rbL1.setButtonDrawable(null); - binding.rbL2.setButtonDrawable(null); - binding.rbL3.setButtonDrawable(null); - return binding.getRoot(); } @@ -97,6 +93,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {} @SuppressLint("SetTextI18n") @Override public void afterTextChanged(Editable s) { + binding.characterLimit.setText("CHARACTER LIMIT: " + Objects.requireNonNull(binding.etMatchNotes.getText()).length() + "/150"); data.setNotes(s.toString()); } }); @@ -117,12 +114,23 @@ public void afterTextChanged(Editable s) { private void setupClimbLevelButtons() { MatchData data = UserModel.getMatchData(); - ((RadioButton) binding.radioGroupClimbLevel.getChildAt(data.getTeleOpClimb())).setChecked(true); - binding.radioGroupClimbLevel.setOnCheckedChangeListener((r, i) -> { int selectedIndex = binding.radioGroupClimbLevel.indexOfChild(binding.radioGroupClimbLevel.findViewById(i)); data.setTeleOpClimb(selectedIndex); + if (selectedIndex > 0){ + binding.climbImage.setVisibility(View.VISIBLE); + binding.toggleGroupClimbLocation.setVisibility(View.VISIBLE); + } else { + binding.climbImage.setVisibility(View.GONE); + binding.toggleGroupClimbLocation.setVisibility(View.GONE); + } }); + + ((RadioButton) binding.radioGroupClimbLevel.getChildAt(data.getTeleOpClimb())).setChecked(true); + + binding.toggleGroupClimbLocation.setOnCheckedChangeListener((r, i) -> data.setTeleOpClimbLocation(binding.toggleGroupClimbLocation.indexOfChild(binding.toggleGroupClimbLocation.findViewById(i)) + 1)); + + ((RadioButton) binding.toggleGroupClimbLocation.getChildAt(data.getTeleOpClimbLocation() - 1)).setChecked(true); } @@ -204,6 +212,7 @@ private void resetAllFields() { MatchData data = UserModel.getMatchData(); ((RadioButton) binding.radioGroupClimbLevel.getChildAt(0)).setChecked(true); + ((RadioButton) binding.toggleGroupClimbLocation.getChildAt(0)).setChecked(true); data.setTeleOpClimb(0); binding.sliderDefense.setValue(0); diff --git a/app/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/example/myapplication/MainActivity.java index 3530b6c..d82326f 100644 --- a/app/src/main/java/com/example/myapplication/MainActivity.java +++ b/app/src/main/java/com/example/myapplication/MainActivity.java @@ -1,6 +1,10 @@ package com.example.myapplication; -import android.annotation.SuppressLint; + + + +import android.content.Context; +import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; @@ -12,16 +16,10 @@ import androidx.navigation.ui.NavigationUI; import com.example.myapplication.databinding.ActivityMainBinding; -import android.util.Log; + import android.view.Menu; import android.view.MenuItem; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.Objects; import java.util.Scanner; @@ -34,9 +32,11 @@ public class MainActivity extends AppCompatActivity { public static ArrayList names = new ArrayList<>(); - public static int scoutLocation = readInt("ScoutLocation"); + public static int scoutLocation = 0;//readInt("ScoutLocation"); @Override protected void onCreate(Bundle savedInstanceState) { + scoutLocation = readInt("ScoutLocation"); + super.onCreate(savedInstanceState); ActivityMainBinding binding = ActivityMainBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); @@ -54,8 +54,9 @@ protected void onCreate(Bundle savedInstanceState) { if (names.isEmpty()) { updateNames(getResources()); } - writeInt("ScoutLocation", scoutLocation); + + writeInt("ScoutLocation", scoutLocation); OnBackPressedCallback callback = new OnBackPressedCallback(true /* enabled by default */) { @Override public void handleOnBackPressed() { @@ -124,38 +125,16 @@ public static void updateNames(Resources r){ } } - public static void writeInt(String fileName, int num){ - @SuppressLint("SdCardPath") File file = new File("/sdcard/Documents/" + fileName + ".txt"); - boolean deleted = file.delete(); - if (!deleted) { - // Log the failure or take appropriate action - Log.w("FileDeletion", "Failed to delete file"); - } - try { - boolean created = file.createNewFile(); - if (!created) { - // Log the failure or take appropriate action - Log.w("FileCreation", "Failed to create file"); - } - OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file)); - writer.write(num); - writer.close(); - } catch (IOException ignored) { - - } + public void writeInt(String fileName, int num){ + SharedPreferences sharedPref = this.getPreferences(Context.MODE_PRIVATE); + SharedPreferences.Editor editor = sharedPref.edit(); + editor.putInt(fileName, num); + editor.apply(); } - public static int readInt(String fileName) { - @SuppressLint("SdCardPath") File file = new File("/sdcard/Documents/" + fileName + ".txt"); - try { - InputStreamReader reader = new InputStreamReader(new FileInputStream(file)); - int res = reader.read(); - reader.close(); - return res; - } catch (IOException ignored) { - - } - return 0; + public int readInt(String fileName) { + SharedPreferences sharedPref = this.getPreferences(Context.MODE_PRIVATE); + return sharedPref.getInt(fileName, 0); } } diff --git a/app/src/main/java/com/example/myapplication/MatchData.java b/app/src/main/java/com/example/myapplication/MatchData.java index 21b3590..47aebdf 100644 --- a/app/src/main/java/com/example/myapplication/MatchData.java +++ b/app/src/main/java/com/example/myapplication/MatchData.java @@ -16,10 +16,13 @@ public class MatchData { private String matchNumber = ""; //For climb, 0 = none, 1 = fail, 2 = L1, 3 = L2, and 4 = L3 + //For climb location, refer to climb.png private int autoHub, autoHubMissed, autoClimb = 0; + private int autoClimbLocation = 1; private int teleOpHub, teleOpHubMissed, teleOpPassed, teleOpClimb = 0; + private int teleOpClimbLocation = 1; private int defEffectiveness = 0; @@ -118,6 +121,14 @@ public void setAutoClimb(int autoClimb) { this.autoClimb = autoClimb; } + public int getAutoClimbLocation() { + return autoClimbLocation; + } + + public void setAutoClimbLocation(int autoClimbLocation) { + this.autoClimbLocation = autoClimbLocation; + } + public int getTeleOpHub() { return teleOpHub; } @@ -149,5 +160,13 @@ public int getTeleOpClimb() { public void setTeleOpClimb(int teleOpClimb) { this.teleOpClimb = teleOpClimb; } + + public int getTeleOpClimbLocation() { + return teleOpClimbLocation; + } + + public void setTeleOpClimbLocation(int teleOpClimbLocation) { + this.teleOpClimbLocation = teleOpClimbLocation; + } } diff --git a/app/src/main/java/com/example/myapplication/PitScouting.java b/app/src/main/java/com/example/myapplication/PitScouting.java index 18e1369..d980af4 100644 --- a/app/src/main/java/com/example/myapplication/PitScouting.java +++ b/app/src/main/java/com/example/myapplication/PitScouting.java @@ -105,7 +105,7 @@ public void onNothingSelected(AdapterView parent) {} binding.back.setOnClickListener(v -> UIHelpers.makeConfirmationAlert("Cancel Pit Data", "Do you want to cancel your pit data?", () -> NavHostFragment.findNavController(PitScouting.this) .navigate(R.id.action_HomePage_to_FirstFragment), () -> {}, getContext())); - binding.reset.setOnClickListener(v -> UIHelpers.makeConfirmationAlert("Reset Data", "Do you want to reset all Autonomous fields?", () -> { + binding.reset.setOnClickListener(v -> UIHelpers.makeConfirmationAlert("Reset Data", "Do you want to reset all Pit Scouting fields?", () -> { binding.driveTrain.setSelection(0); binding.intake.setSelection(0); binding.terrain.setSelection(0); diff --git a/app/src/main/java/com/example/myapplication/TeamSelection.java b/app/src/main/java/com/example/myapplication/TeamSelection.java index 8a57dd2..e33bee0 100644 --- a/app/src/main/java/com/example/myapplication/TeamSelection.java +++ b/app/src/main/java/com/example/myapplication/TeamSelection.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,11 +28,14 @@ import com.google.android.material.snackbar.Snackbar; +import java.util.Objects; import java.util.Random; public class TeamSelection extends Fragment { private TeamSelectionBinding binding; + private ViewGroup v; + @Override public View onCreateView( @NonNull LayoutInflater inflater, ViewGroup container, @@ -39,22 +43,7 @@ public View onCreateView( ) { binding = TeamSelectionBinding.inflate(inflater, container, false); - String currentMatchNumber = UserModel.getMatchData().getMatchNumber(); - binding.matchInputContainer.setText(currentMatchNumber); - String scouterName = UserModel.getMatchData().getScouterName(); - binding.scouterNameInput.setText(scouterName); - try { - String currentTeamNumber = MainActivity.teams.get(Integer.parseInt(currentMatchNumber) - 1)[MainActivity.scoutLocation]; - binding.teamNumberInput.setText(currentTeamNumber); - } catch (Exception ignored){ - - } - - ViewModelProvider viewModelProvider = new ViewModelProvider(requireActivity()); - UserModel userModel = viewModelProvider.get(UserModel.class); - MatchData matchData = new MatchData(); - userModel.setMatchData(matchData); - UserModel.setPitData(new PitData()); + v = container; return binding.getRoot(); } @@ -62,6 +51,10 @@ public View onCreateView( public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + binding.subtitleText.setText(MainActivity.getLocationText()); + + binding.logoImage.setOnClickListener(view1 -> UIHelpers.darkModeToggle(v, binding.logoImage, this.getContext())); + binding.startScoutingButton.setOnClickListener(v -> { String teamNumber = String.valueOf(binding.teamNumberInput.getText()); String matchNumber = String.valueOf(binding.matchInputContainer.getText()); @@ -144,13 +137,10 @@ public void afterTextChanged(Editable s) { try { int num = Integer.parseInt(matchNumber) - 1; if (num >= 0 && num < MainActivity.teams.size()) { - LinearLayout[] matchBoxes = {binding.Match1, binding.Match2, binding.Match3}; - TextView[] matchBoxNums = {binding.matchBox1Num, binding.matchBox2Num, binding.matchBox3Num}; - - MainActivity.teams.size(); - binding.teamNumberInput.setText(MainActivity.teams.get(num)[MainActivity.scoutLocation]); + LinearLayout[] matchBoxes = {binding.Match1, binding.Match2, binding.Match3}; + TextView[] matchBoxNums = {binding.matchBox1Num, binding.matchBox2Num, binding.matchBox3Num}; for(int i = 0; i < 3; i++){ int currentMatchIndex = num + i; @@ -187,12 +177,30 @@ public void afterTextChanged(Editable s) { binding.teamNumberInput.setText(""); } } - } catch (Exception e){ - Snackbar.make(view, "Please Enter a Value", 600).show(); + } catch (Exception ignored){ + } } } }); + + String currentMatchNumber = UserModel.getMatchData().getMatchNumber(); + binding.matchInputContainer.setText(currentMatchNumber); + String scouterName = UserModel.getMatchData().getScouterName(); + binding.scouterNameInput.setText(scouterName); + try { + String currentTeamNumber = MainActivity.teams.get(Integer.parseInt(currentMatchNumber) - 1)[MainActivity.scoutLocation]; + binding.teamNumberInput.setText(currentTeamNumber); + } catch (Exception ignored){ + + } + + ViewModelProvider viewModelProvider = new ViewModelProvider(requireActivity()); + UserModel userModel = viewModelProvider.get(UserModel.class); + MatchData matchData = new MatchData(); + userModel.setMatchData(matchData); + UserModel.setPitData(new PitData()); + ArrayAdapter adapter = new ArrayAdapter<>(requireContext(), android.R.layout.simple_dropdown_item_1line, MainActivity.names); binding.scouterNameInput.setAdapter(adapter); @@ -208,7 +216,7 @@ public void afterTextChanged(Editable s) { builder.setNeutralButton("Cancel", (d, w) -> d.cancel()); builder.setItems(new CharSequence[]{"Red 1", "Red 2", "Red 3", "Blue 1", "Blue 2", "Blue 3"}, (d, w) -> { MainActivity.scoutLocation = w; - MainActivity.writeInt("ScoutLocation", w); + ((MainActivity) requireActivity()).writeInt("ScoutLocation", w); }); builder.create().show(); return false; diff --git a/app/src/main/java/com/example/myapplication/TeleOp.java b/app/src/main/java/com/example/myapplication/TeleOp.java index dc4909c..8ccde44 100644 --- a/app/src/main/java/com/example/myapplication/TeleOp.java +++ b/app/src/main/java/com/example/myapplication/TeleOp.java @@ -21,7 +21,6 @@ public class TeleOp extends Fragment { private TeleOpBinding binding; - ViewGroup v = null; @SuppressLint("SetTextI18n") @Override @@ -31,8 +30,8 @@ public View onCreateView( ) { binding = TeleOpBinding.inflate(inflater, container, false); - v = container; - binding.team.setText("Team " + UserModel.getMatchData().getTeamNumber()); + + binding.title.setText("Tele-Operated Team " + UserModel.getMatchData().getTeamNumber()); return binding.getRoot(); } @@ -41,13 +40,43 @@ public View onCreateView( public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + MatchData data = UserModel.getMatchData(); + //initialization + binding.fuelScored.setText(data.getTeleOpHub() + ""); + binding.fuelMissed.setText(data.getTeleOpHubMissed() + ""); + binding.fuelPassed.setText(data.getTeleOpPassed() + ""); binding.cont.setOnClickListener(view1 -> NavHostFragment.findNavController(TeleOp.this) .navigate(R.id.action_SecondFragment_to_SecondFragment2)); binding.back.setOnClickListener(view12 -> NavHostFragment.findNavController(TeleOp.this) .navigate(R.id.action_SecondFragment_to_ThirdFragment)); - binding.bottomTag.setText(MainActivity.getLocationText()); + binding.fuelScoredPlus.setOnClickListener(v -> { + data.setTeleOpHub(data.getTeleOpHub() + 1); + binding.fuelScored.setText(Integer.toString(data.getTeleOpHub())); + }); + binding.fuelScoredMinus.setOnClickListener(v -> { + data.setTeleOpHub(data.getTeleOpHub() <= 0 ? 0 : data.getTeleOpHub() - 1); + binding.fuelScored.setText(Integer.toString(data.getTeleOpHub())); + }); + + binding.fuelMissedPlus.setOnClickListener(v -> { + data.setTeleOpHubMissed(data.getTeleOpHubMissed() + 1); + binding.fuelMissed.setText(Integer.toString(data.getTeleOpHubMissed())); + }); + binding.fuelMissedMinus.setOnClickListener(v -> { + data.setTeleOpHubMissed(data.getTeleOpHubMissed() <= 0 ? 0 : data.getTeleOpHubMissed() - 1); + binding.fuelMissed.setText(Integer.toString(data.getTeleOpHubMissed())); + }); + + binding.fuelPassedPlus.setOnClickListener(v -> { + data.setTeleOpPassed(data.getTeleOpPassed() + 1); + binding.fuelPassed.setText(Integer.toString(data.getTeleOpPassed())); + }); + binding.fuelPassedMinus.setOnClickListener(v -> { + data.setTeleOpPassed(data.getTeleOpPassed() <= 0 ? 0 : data.getTeleOpPassed() - 1); + binding.fuelPassed.setText(Integer.toString(data.getTeleOpPassed())); + }); } @Override @@ -57,18 +86,5 @@ public void onDestroyView() { binding = null; } - @SuppressLint("ObsoleteSdkInt") - public void checkedOperation (View v){ - if (v instanceof Switch){ - @SuppressLint("UseSwitchCompatOrMaterialCode") Switch s = (Switch) v; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - if (s.isChecked()){ - s.setThumbTintList(UIHelpers.purpleAsList); - s.setTrackTintList(UIHelpers.purpleAsList); - } else { - s.setThumbTintList(UIHelpers.teamColorAsList); - s.setTrackTintList(UIHelpers.teamColorAsList); - } - } - }} +} diff --git a/app/src/main/res/drawable/amp.png b/app/src/main/res/drawable/amp.png deleted file mode 100644 index 2cc1aef..0000000 Binary files a/app/src/main/res/drawable/amp.png and /dev/null differ diff --git a/app/src/main/res/drawable/bgmatch.png b/app/src/main/res/drawable/bgmatch.png deleted file mode 100644 index b1755ea..0000000 Binary files a/app/src/main/res/drawable/bgmatch.png and /dev/null differ diff --git a/app/src/main/res/drawable/bgname.png b/app/src/main/res/drawable/bgname.png deleted file mode 100644 index 007d760..0000000 Binary files a/app/src/main/res/drawable/bgname.png and /dev/null differ diff --git a/app/src/main/res/drawable/bgteamnum.png b/app/src/main/res/drawable/bgteamnum.png deleted file mode 100644 index b1755ea..0000000 Binary files a/app/src/main/res/drawable/bgteamnum.png and /dev/null differ diff --git a/app/src/main/res/drawable/cr6b0d59f2.xml b/app/src/main/res/drawable/blue_bg.xml similarity index 100% rename from app/src/main/res/drawable/cr6b0d59f2.xml rename to app/src/main/res/drawable/blue_bg.xml diff --git a/app/src/main/res/drawable/blue_dark.xml b/app/src/main/res/drawable/blue_dark.xml deleted file mode 100644 index 6b927b8..0000000 --- a/app/src/main/res/drawable/blue_dark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/blue_light.xml b/app/src/main/res/drawable/blue_light.xml deleted file mode 100644 index 2044271..0000000 --- a/app/src/main/res/drawable/blue_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/cr9999b0d59f21a.xml b/app/src/main/res/drawable/blue_rounded.xml similarity index 100% rename from app/src/main/res/drawable/cr9999b0d59f21a.xml rename to app/src/main/res/drawable/blue_rounded.xml diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml index 999d720..8d4ab02 100644 --- a/app/src/main/res/drawable/border.xml +++ b/app/src/main/res/drawable/border.xml @@ -4,11 +4,11 @@ + android:width="1dp" + android:color="#314368" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/border_rounded.xml b/app/src/main/res/drawable/border_rounded.xml index c2d213b..d8ff777 100644 --- a/app/src/main/res/drawable/border_rounded.xml +++ b/app/src/main/res/drawable/border_rounded.xml @@ -4,14 +4,14 @@ + android:width="1dp" + android:color="#314368"/> - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/climb.png b/app/src/main/res/drawable/climb.png new file mode 100644 index 0000000..1100879 Binary files /dev/null and b/app/src/main/res/drawable/climb.png differ diff --git a/app/src/main/res/drawable/coral_branches.png b/app/src/main/res/drawable/coral_branches.png deleted file mode 100644 index 53b2087..0000000 Binary files a/app/src/main/res/drawable/coral_branches.png and /dev/null differ diff --git a/app/src/main/res/drawable/cr12b0d59f2.xml b/app/src/main/res/drawable/cr12b0d59f2.xml deleted file mode 100644 index c4bf3a5..0000000 --- a/app/src/main/res/drawable/cr12b0d59f2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/cr8b101623.xml b/app/src/main/res/drawable/cr8b101623.xml deleted file mode 100644 index 9c6273f..0000000 --- a/app/src/main/res/drawable/cr8b101623.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/flag.png b/app/src/main/res/drawable/flag.png deleted file mode 100644 index 1a405d6..0000000 Binary files a/app/src/main/res/drawable/flag.png and /dev/null differ diff --git a/app/src/main/res/drawable/forwardarrow.xml b/app/src/main/res/drawable/forwardarrow.xml new file mode 100644 index 0000000..1f56c2d --- /dev/null +++ b/app/src/main/res/drawable/forwardarrow.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/app/src/main/res/drawable/minus.png b/app/src/main/res/drawable/minus.png deleted file mode 100644 index 1e43e3f..0000000 Binary files a/app/src/main/res/drawable/minus.png and /dev/null differ diff --git a/app/src/main/res/drawable/notes.png b/app/src/main/res/drawable/notes.png deleted file mode 100644 index 0795822..0000000 Binary files a/app/src/main/res/drawable/notes.png and /dev/null differ diff --git a/app/src/main/res/drawable/plus.png b/app/src/main/res/drawable/plus.png deleted file mode 100644 index fc3cdd8..0000000 Binary files a/app/src/main/res/drawable/plus.png and /dev/null differ diff --git a/app/src/main/res/drawable/radio_button_bg.xml b/app/src/main/res/drawable/radio_button_bg.xml index cfe55ca..888a45c 100644 --- a/app/src/main/res/drawable/radio_button_bg.xml +++ b/app/src/main/res/drawable/radio_button_bg.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/red_dark.xml b/app/src/main/res/drawable/red_dark.xml deleted file mode 100644 index 1bd9a3a..0000000 --- a/app/src/main/res/drawable/red_dark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/red_light.xml b/app/src/main/res/drawable/red_light.xml deleted file mode 100644 index b781128..0000000 --- a/app/src/main/res/drawable/red_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/s0d59f233sw1cr4b0d59f21a.xml b/app/src/main/res/drawable/s0d59f233sw1cr4b0d59f21a.xml deleted file mode 100644 index 08d9739..0000000 --- a/app/src/main/res/drawable/s0d59f233sw1cr4b0d59f21a.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/s314368sw1cr12b151c2b.xml b/app/src/main/res/drawable/s314368sw1cr12b151c2b.xml deleted file mode 100644 index 15ddac5..0000000 --- a/app/src/main/res/drawable/s314368sw1cr12b151c2b.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/s314368sw1cr8b101623.xml b/app/src/main/res/drawable/s314368sw1cr8b101623.xml deleted file mode 100644 index 87456bf..0000000 --- a/app/src/main/res/drawable/s314368sw1cr8b101623.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/seek_bar.xml b/app/src/main/res/drawable/seek_bar.xml deleted file mode 100644 index ce13593..0000000 --- a/app/src/main/res/drawable/seek_bar.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/seek_thumb.xml b/app/src/main/res/drawable/seek_thumb.xml deleted file mode 100644 index ce24f7e..0000000 --- a/app/src/main/res/drawable/seek_thumb.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/speaker.png b/app/src/main/res/drawable/speaker.png deleted file mode 100644 index b676e8f..0000000 Binary files a/app/src/main/res/drawable/speaker.png and /dev/null differ diff --git a/app/src/main/res/drawable/spinner.png b/app/src/main/res/drawable/spinner.png deleted file mode 100644 index 4515ab1..0000000 Binary files a/app/src/main/res/drawable/spinner.png and /dev/null differ diff --git a/app/src/main/res/drawable/switchoff.png b/app/src/main/res/drawable/switchoff.png deleted file mode 100644 index 0e0fc60..0000000 Binary files a/app/src/main/res/drawable/switchoff.png and /dev/null differ diff --git a/app/src/main/res/drawable/switchon.png b/app/src/main/res/drawable/switchon.png deleted file mode 100644 index 032b713..0000000 Binary files a/app/src/main/res/drawable/switchon.png and /dev/null differ diff --git a/app/src/main/res/layout/autonomous.xml b/app/src/main/res/layout/autonomous.xml index 319dcc0..d541382 100644 --- a/app/src/main/res/layout/autonomous.xml +++ b/app/src/main/res/layout/autonomous.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" - tools:context=".PitScouting" + tools:context=".Autonomous" tools:ignore="HardcodedText" > @@ -242,6 +244,7 @@ android:fontFamily="@font/interbold" app:autoSizeMaxTextSize="12s @@ -407,7 +411,8 @@ android:fontFamily="@font/interbold" app:autoSizeMaxTextSize="12s + app:layout_constraintBottom_toTopOf="@id/climbImage"> + + + + + + + + + + + + + + + + + @@ -558,40 +689,27 @@ android:fontFamily="@font/interbold" app:autoSizeMaxTextSize="12s app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent"> -