Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .idea/appInsightsSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/material_theme_project_new.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 1 addition & 15 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,16 @@
android:supportsRtl="true"
android:theme="@style/Theme.AquaAnalyzomatic"
tools:targetApi="31">
<<<<<<< Updated upstream
=======
<activity
android:name=".TeleopPage"
android:exported="false" />
<activity
android:name=".AutonPage"
android:exported="false" />
>>>>>>> Stashed changes
<activity
android:name=".mainPage"
android:exported="false" />
<activity
<<<<<<< Updated upstream
android:name=".CreateUser"
android:exported="false" />
=======
<activity
android:name=".offlinePage"
android:exported="false"
android:theme="@style/Theme.Design.NoActionBar" />
<activity
android:name=".CreateUser"
android:exported="false" />
>>>>>>> Stashed changes
<activity
android:name=".SignInScreen"
android:theme="@style/Theme.Design.NoActionBar"
Expand Down
24 changes: 0 additions & 24 deletions app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java

This file was deleted.

24 changes: 0 additions & 24 deletions app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java

This file was deleted.

11 changes: 8 additions & 3 deletions app/src/main/java/com/example/aquaanalyzomatic/mainPage.java
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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);

}
}
Binary file added app/src/main/res/drawable/black_back.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/finalminusbutton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/finalplusbutton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
125 changes: 0 additions & 125 deletions app/src/main/res/layout/activity_auton_page.xml

This file was deleted.

Loading
Loading