Skip to content

pull into staging #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghostreapa69 merged 12 commits into from
Feb 5, 2025
Merged

pull into staging #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
65cb3bd
Merge pull request #3 from CrevolutionRoboticsProgramming/main
pix-xl Jan 25, 2025
42ac18d
Merge pull request #5 from CrevolutionRoboticsProgramming/main
pix-xl Jan 30, 2025
59a440d
Update AndroidManifest.xml
pix-xl Feb 1, 2025
6edaa44
Merge pull request #7 from CrevolutionRoboticsProgramming/jays-branch
pix-xl Feb 3, 2025
7f02fba
App Icon vector format
pix-xl Feb 4, 2025
cf567df
Fixed xml to include all pages
ghostreapa69 Feb 4, 2025
4396f2e
Merge remote-tracking branch 'origin/main'
ghostreapa69 Feb 4, 2025
36da40d
merge main to jay's branch
pix-xl Feb 5, 2025
5d5e292
created teleop & auton pages
pix-xl Feb 5, 2025
2c2f356
Fixed activity_auton_page.xml issues
pix-xl Feb 5, 2025
654fe5d
Merge pull request #13 from CrevolutionRoboticsProgramming/jays-branch
ghostreapa69 Feb 5, 2025
f77afa6
Create gradle.yml
ghostreapa69 Feb 5, 2025
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
67 changes: 67 additions & 0 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: Java CI with Gradle

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
- name: Setup Gradle
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

- name: Build with Gradle Wrapper
run: ./gradlew build

# NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
# If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
#
# - name: Setup Gradle
# uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
# with:
# gradle-version: '8.9'
#
# - name: Build with Gradle 8.9
# run: gradle build

dependency-submission:

runs-on: ubuntu-latest
permissions:
contents: write

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

# Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
# See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
8 changes: 8 additions & 0 deletions .idea/deploymentTargetSelector.xml
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ dependencies {
implementation libs.material
implementation libs.firebase.auth
implementation libs.firebase.database
implementation libs.activity
implementation libs.constraintlayout
testImplementation libs.junit
testImplementation libs.runner
androidTestImplementation libs.ext.junit
Expand Down
37 changes: 36 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,41 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.AquaAnalyzomatic"
tools:targetApi="31" />
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" />
=======
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"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Binary file added app/src/main/ic_launcher-playstore.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions app/src/main/java/com/example/aquaanalyzomatic/AutonPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
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 AutonPage extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_auton_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;
});
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/aquaanalyzomatic/CreateUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.aquaanalyzomatic;

import static androidx.constraintlayout.motion.widget.MotionScene.TAG;
import static androidx.constraintlayout.helper.widget.MotionEffect.TAG;

import android.annotation.SuppressLint;
import android.app.Activity;
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/java/com/example/aquaanalyzomatic/TeleopPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
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;
});
}
}
62 changes: 35 additions & 27 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
android:viewportWidth="500"
android:viewportHeight="500">
<group android:scaleX="0.76685715"
android:scaleY="0.76685715"
android:translateX="60.06085"
android:translateY="58.285713">
<path
android:pathData="M58.46,426.66c-7.92,-15.63 -8.6,-26.22 -9.1,-37.17 -1.5,-33.31 0.92,-39.46 -10.5,-56.3 -7.73,-11.4 -26.57,-19.98 -29.16,-30.02 -6.85,-26.51 17.42,-50.26 37.74,-25.37 7.7,9.43 8.33,24.36 10.25,36.52 5.55,35.17 61.95,45.87 67.02,47.32 8.39,2.4 61.91,17.74 89.95,-9.64 28.53,-27.85 30.82,-70.97 52.04,-95.09 50.77,-57.71 34.79,-77.11 38.76,-93.85 8.86,-37.37 43.99,-23.83 43.57,4.17 -0.42,28.17 -63.9,75.48 -2.25,119.01 12.35,8.72 4.63,-27.51 16.5,-41.03 7.42,-8.46 27.23,-2.48 23.24,13s-33.94,26.48 -15.75,51.99c39.99,56.05 52.79,-61.52 82.48,-86.05 22.99,-19 46.15,-0.81 34.99,26.99 -18.4,45.84 -63.82,2.57 -61.57,120.78 0.21,11.2 8.25,24.62 5.78,43.69 -2.18,16.9 -9.38,30.05 -15.16,38.55H74.21s-9.9,-15.96 -15.75,-27.49Z"
android:fillColor="#7dbbe7"/>
<path
android:pathData="M292.06,307.37l3.1,2.08 -32.95,49.07 -3.1,-2.08 -12.73,-8.55c-5.43,4.49 -11.36,8.45 -17.72,11.79l3.68,18.7 -57.99,11.4 -3.68,-18.7c-7.15,-0.68 -14.13,-2.1 -20.86,-4.2l-8.55,12.73 -2.08,3.1 -49.07,-32.94 2.08,-3.1 8.55,-12.73c-4.49,-5.44 -8.45,-11.36 -11.79,-17.72l-18.7,3.68 -11.4,-57.99 18.7,-3.68c0.68,-7.15 2.1,-14.13 4.2,-20.86l-12.73,-8.54 -3.1,-2.08 16.48,-24.53 16.47,-24.54 15.83,10.63c5.43,-4.49 11.36,-8.45 17.71,-11.79l-3.68,-18.7 57.99,-11.4 3.68,18.7c7.15,0.68 14.13,2.1 20.86,4.2l10.63,-15.83 24.53,16.48 24.54,16.47 -2.08,3.1 -8.55,12.73 -15.49,23.08 -22.47,4.42c-12.92,-14.07 -32.65,-21.29 -52.78,-17.33 -30.75,6.04 -50.77,35.87 -44.73,66.62 6.04,30.75 35.87,50.77 66.62,44.73 20.13,-3.96 35.66,-18.1 42.29,-36.02l22.47,-4.42 23.08,15.5 12.73,8.54h0Z"
android:fillColor="#f6f9fd"/>
<path
android:pathData="M426.34,170.53c-1.29,2.32 -4.97,0.92 -4.91,-1.73 0.1,-4.3 0.54,-9.88 1.81,-15.88 4.15,-19.57 4.53,-32.33 17.83,-38.38 23.44,-10.67 52.14,12.28 28.18,31.01 -13,10.17 -28.1,-1.57 -42.92,24.98Z"
android:fillColor="#7dbbe7"/>
<path
android:pathData="M113.13,123.72c0.19,3.34 4.33,4.78 6.58,2.3 6.53,-7.19 14.02,-23.19 16.14,-36.19 2.51,-15.36 0.45,-35.99 -16,-42.02 -22.42,-8.23 -38.33,10.53 -29.99,33.52 2.86,7.89 12.62,14.5 18.37,25.49 3.43,6.56 4.65,12.36 4.9,16.89Z"
android:fillColor="#7dbbe7"/>
<path
android:pathData="M75.51,141.77m-9.15,0a9.15,9.15 0,1 1,18.3 0a9.15,9.15 0,1 1,-18.3 0"
android:fillColor="#7dbbe7"/>
<path
android:pathData="M346.6,86.56m-8.06,0a8.06,8.06 0,1 1,16.12 0a8.06,8.06 0,1 1,-16.12 0"
android:fillColor="#7dbbe7"/>
<path
android:pathData="M352.46,216.32m-5.86,0a5.86,5.86 0,1 1,11.72 0a5.86,5.86 0,1 1,-11.72 0"
android:fillColor="#7dbbe7"/>
<path
android:pathData="M37.68,366.24m-5.06,0a5.06,5.06 0,1 1,10.12 0a5.06,5.06 0,1 1,-10.12 0"
android:fillColor="#7dbbe7"/>
<path
android:pathData="M21.11,352.31m-6.13,0a6.13,6.13 0,1 1,12.26 0a6.13,6.13 0,1 1,-12.26 0"
android:fillColor="#7dbbe7"/>
</group>
</vector>
125 changes: 125 additions & 0 deletions app/src/main/res/layout/activity_auton_page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?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:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".AutonPage"
android:background="#09070E"





>


<LinearLayout
android:id="@+id/TopOrangeBox"
android:layout_width="1280dp"
android:layout_height="150dp"
android:background="#EFB821"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">

<TextView
android:id="@+id/TeamNum"
android:layout_width="296dp"
android:layout_height="154dp"
android:gravity="center"
android:text="Team #:"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textSize="45sp"
android:translationX="500dp" />

<EditText
android:id="@+id/TeamNumInput"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:ems="10"
android:gravity="center"
android:inputType="number"
android:text="#"
android:textSize="45sp"
android:translationX="425dp" />

<TextView
android:id="@+id/MatchNum"
android:layout_width="296dp"
android:layout_height="154dp"
android:gravity="center"
android:text="Match #:"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textSize="45sp"
android:translationX="375dp" />

<EditText
android:id="@+id/MatchNumInput"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:ems="10"
android:gravity="center"
android:inputType="number"
android:text="#"
android:textSize="45sp"
android:translationX="300dp" />

<Button
android:id="@+id/AutonButton"
android:layout_width="174dp"
android:layout_height="match_parent"
android:background="#7DBBE7"
android:text="Auton"
android:textSize="35sp"
android:translationX="-825dp" />

<Button
android:id="@+id/TeleOpButton"
android:layout_width="174dp"
android:layout_height="match_parent"
android:background="#EFB821"
android:text="Tele-Op"
android:textSize="35sp"
android:translationX="-800dp" />
</LinearLayout>
<!--top orange box - Text Team #:, Enter #,-->


<LinearLayout
android:id="@+id/LeftOrangeLine"
android:layout_width="20dp"
android:layout_height="800dp"
android:background="#EFB821"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.986" />
<!-- left orange box-->

<LinearLayout
android:id="@+id/RightOrangeLine"
android:layout_width="20dp"
android:layout_height="800dp"
android:background="#EFB821"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
<!--// right orange box-->
</LinearLayout>


<!-- team # text-->
</androidx.constraintlayout.widget.ConstraintLayout>
Loading
Loading