diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..68363d0 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml new file mode 100644 index 0000000..dd9eb9c --- /dev/null +++ b/.idea/material_theme_project_new.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e869354..e7c7de5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,30 +12,16 @@ android:supportsRtl="true" android:theme="@style/Theme.AquaAnalyzomatic" tools:targetApi="31"> -<<<<<<< Updated upstream -======= - - ->>>>>>> Stashed changes -======= + - ->>>>>>> Stashed changes { - Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); - return insets; - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java b/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java deleted file mode 100644 index 7cfd2f8..0000000 --- a/app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.aquaanalyzomatic; - -import android.os.Bundle; - -import androidx.activity.EdgeToEdge; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.graphics.Insets; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; - -public class TeleopPage extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - EdgeToEdge.enable(this); - setContentView(R.layout.activity_teleop_page); - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { - Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); - return insets; - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java index d2ac3eb..0fc5f65 100644 --- a/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java +++ b/app/src/main/java/com/example/aquaanalyzomatic/mainPage.java @@ -1,10 +1,17 @@ package com.example.aquaanalyzomatic; import android.content.Intent; import android.os.Bundle; +import android.widget.Button; +import android.widget.EditText; +import android.widget.ImageView; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; public class mainPage extends AppCompatActivity { + + private Button submitBtn, signOutBtn, autonFieldBtn; + private EditText matchNum, teamNum, L1Num, L2Num, L3Num, L4Num, netAttemptsNum, netScoredNum, humanPlayerAttemptsNum, humanPlayerScoredNum; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -14,8 +21,6 @@ protected void onCreate(Bundle savedInstanceState) { Intent intent = getIntent(); String username = intent.getStringExtra("username"); - // Use the username to customize the UI or perform actions - TextView usernameTextView = findViewById(R.id.usernameTextView); - usernameTextView.setText("Welcome, " + username); + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/black_back.jpg b/app/src/main/res/drawable/black_back.jpg new file mode 100644 index 0000000..2aca59d Binary files /dev/null and b/app/src/main/res/drawable/black_back.jpg differ diff --git a/app/src/main/res/drawable/finalminusbutton.png b/app/src/main/res/drawable/finalminusbutton.png new file mode 100644 index 0000000..e73ac1c Binary files /dev/null and b/app/src/main/res/drawable/finalminusbutton.png differ diff --git a/app/src/main/res/drawable/finalplusbutton.png b/app/src/main/res/drawable/finalplusbutton.png new file mode 100644 index 0000000..3acf706 Binary files /dev/null and b/app/src/main/res/drawable/finalplusbutton.png differ diff --git a/app/src/main/res/layout/activity_auton_page.xml b/app/src/main/res/layout/activity_auton_page.xml deleted file mode 100644 index ed86452..0000000 --- a/app/src/main/res/layout/activity_auton_page.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - -